[haiku-commits] Re: haiku: hrev44473 - in src: apps preferences kits/tracker apps/installer apps/mail
- From: "Humdinger" <humdingerb@xxxxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 06 Aug 2012 18:23:48 +0200
Hi Ryan!
Thanks for looking over this.
On Sun, 5 Aug 2012 14:03:10 -0400 Ryan Leavengood wrote:
> > @@ -876,11 +891,13 @@ InstallerWindow::_QuitCopyEngine(bool askUser)
> >
> > bool quit = true;
> > if (askUser) {
> > - quit = (new BAlert("cancel",
> > + BAlert* alert = new BAlert("cancel",
> > B_TRANSLATE("Are you sure you want to to
> > stop the installation?"),
> > B_TRANSLATE_COMMENT("Continue", "In alert
> > after pressing Stop"),
> > B_TRANSLATE_COMMENT("Stop", "In alert after
> > pressing Stop"), 0,
> > - B_WIDTH_AS_USUAL, B_STOP_ALERT))->Go() != 0;
> > + B_WIDTH_AS_USUAL, B_STOP_ALERT);
> > + alert->SetShortcut(1, B_ESCAPE);
> > + quit = alert->Go();
>
> I'm pretty sure to replicate the original code this should be "quit =
> alert->Go() != 0;", though given this alert it may not matter.
You're right. Must have dozed off a bit at that point... :)
I'll add the !=0 in a second.
> > diff --git a/src/apps/powerstatus/PowerStatus.cpp
> > b/src/apps/powerstatus/PowerStatus.cpp
> > index ebaefb7..06b9355 100644
> > --- a/src/apps/powerstatus/PowerStatus.cpp
> > +++ b/src/apps/powerstatus/PowerStatus.cpp
> > @@ -90,7 +90,6 @@ PowerStatus::ReadyToRun()
> > "or install it in the Deskbar."),
> > B_TRANSLATE("Run in window"),
> > B_TRANSLATE("Install in Deskbar"), NULL,
> > B_WIDTH_AS_USUAL,
> > B_WARNING_ALERT);
> > - alert->SetShortcut(0, B_ESCAPE);
>
> Did you really want to remove this here since you are adding it
> everywhere else?
[same for processcontroller]
I did. These alerts give two explicit choices: window or deskbar.
Pressing ESC isn't logically assigned to either choice. That's only
possible for choices like "Cancel", "Abort", "Keep old settings" etc.
At least that was my thinking...
> > diff --git a/src/apps/resedit/BitmapView.cpp
> > b/src/apps/resedit/BitmapView.cpp
> > index 57e928b..007fc60 100644
> > --- a/src/apps/resedit/BitmapView.cpp
> > +++ b/src/apps/resedit/BitmapView.cpp
> > @@ -250,8 +250,9 @@ BitmapView::MessageReceived(BMessage *msg)
> > switch (msg->what)
> > {
> > case M_REMOVE_IMAGE: {
> > - BAlert *alert = new BAlert("Mr. Peeps!",
> > "This cannot be undone. Remove the image?",
> > -
> >
> > "Remove", "Cancel");
> > + BAlert *alert = new BAlert("Mr. Peeps!",
> > "This cannot be undone. "
> > + "Remove the image?", "Remove",
> > "Cancel");
> > + alert->SetShortcut(1, B_ESCAPE);
>
> While the alert title is generally useless we probably don't want Mr
> Peeps! here at least. I guess this is a leftover from code from
> DarkWyrm that he copied from Mr Peeps! Changing it to ResEdit would
> match the other alert you modified below:
Right! Missed that one too... Will fix.
Thanks!
Regards,
Humdinger
--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-=--=-
Deutsche Haiku News - Haiku Gazette
http://haiku-gazette.blogspot.com
Other related posts:
