The Trunk: Morphic-dtl.787.mcz

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
4 messages Options
Reply | Threaded
Open this post in threaded view
|

The Trunk: Morphic-dtl.787.mcz

commits-2
David T. Lewis uploaded a new version of Morphic to project The Trunk:
http://source.squeak.org/trunk/Morphic-dtl.787.mcz

==================== Summary ====================

Name: Morphic-dtl.787
Author: dtl
Time: 29 March 2015, 5:04:13.048 pm
UUID: 432e13de-c7e6-4d70-83ce-2992da504a5b
Ancestors: Morphic-topa.786

UserDialogBoxMorph constructor for UIManager access

=============== Diff against Morphic-topa.786 ===============

Item was changed:
  ----- Method: UserDialogBoxMorph class>>confirm:orCancel:at: (in category 'utilities') -----
  confirm: aString orCancel: cancelBlock at: aPointOrNil
+ ^self
+ confirm: aString
+ orCancel: cancelBlock
+ title: 'Please confirm:'
+ at: aPointOrNil!
-
- ^(self new
- title: 'Please confirm:';
- label: aString;
- addSelectedButton: '       Yes       ' translated value: true;
- addButton: '        No        ' translated  value: false;
- addCancelButton: '     Cancel     ' translated  value: nil;
- runModalIn: ActiveWorld forHand: ActiveHand at: aPointOrNil)
- ifNil: [ cancelBlock value ]!

Item was added:
+ ----- Method: UserDialogBoxMorph class>>confirm:orCancel:title:at: (in category 'utilities') -----
+ confirm: aString orCancel: cancelBlock title: titleString at: aPointOrNil
+
+ ^(self new
+ title: titleString;
+ label: aString;
+ addSelectedButton: '       Yes       ' translated value: true;
+ addButton: '        No        ' translated  value: false;
+ addCancelButton: '     Cancel     ' translated  value: nil;
+ runModalIn: ActiveWorld forHand: ActiveHand at: aPointOrNil)
+ ifNil: [ cancelBlock value ]!


Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-dtl.787.mcz

marcel.taeumel (old)
Please update your image before commit. ;-) You should have got a warning anyway?

I will merge it.

Best,
Marcel
Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-dtl.787.mcz

David T. Lewis
On Sun, Mar 29, 2015 at 11:39:06PM -0700, Marcel Taeumel wrote:
> Please update your image before commit. ;-) You should have got a warning
> anyway?
>
> I will merge it.
>

Thanks Marcel,

Actually, I did receive a warning, and I did update my image before doing the commit
in order to bring in Morphic-topa.786. Morphic-mt-787.mcz was not yet in the repository
at that time. I may have let a few minutes go by between the time I updated and the
time that I committed Morphic-dtl.787.

We must have both been doing a .787 update at about the same time :-)

Thanks for the merge.

Dave


Reply | Threaded
Open this post in threaded view
|

Re: The Trunk: Morphic-dtl.787.mcz

Eliot Miranda-2


On Mar 30, 2015, at 5:34 AM, "David T. Lewis" <[hidden email]> wrote:

> On Sun, Mar 29, 2015 at 11:39:06PM -0700, Marcel Taeumel wrote:
>> Please update your image before commit. ;-) You should have got a warning
>> anyway?
>>
>> I will merge it.
>
> Thanks Marcel,
>
> Actually, I did receive a warning, and I did update my image before doing the commit
> in order to bring in Morphic-topa.786. Morphic-mt-787.mcz was not yet in the repository
> at that time. I may have let a few minutes go by between the time I updated and the
> time that I committed Morphic-dtl.787.
>
> We must have both been doing a .787 update at about the same time :-)
>
> Thanks for the merge.
The 787 update was just too fast:


>
> Dave
>
>



mazda-787b-10.jpg (54K) Download Attachment