[haiku-commits] r41132 - in haiku/trunk/src: kits/tracker preferences/locale
- From: jonas@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 28 Mar 2011 09:43:41 +0200 (CEST)
Author: kirilla
Date: 2011-03-28 09:43:41 +0200 (Mon, 28 Mar 2011)
New Revision: 41132
Changeset: https://dev.haiku-os.org/changeset/41132
Modified:
haiku/trunk/src/kits/tracker/FSUtils.cpp
haiku/trunk/src/preferences/locale/LocaleWindow.cpp
Log:
Set Escape as shortcut for BAlert Cancel option.
Modified: haiku/trunk/src/kits/tracker/FSUtils.cpp
===================================================================
--- haiku/trunk/src/kits/tracker/FSUtils.cpp 2011-03-28 06:44:46 UTC (rev
41131)
+++ haiku/trunk/src/kits/tracker/FSUtils.cpp 2011-03-28 07:43:41 UTC (rev
41132)
@@ -695,9 +695,11 @@
warning.ReplaceFirst("%ifYouDoAction", ifYouDoAction);
warning.ReplaceFirst("%toDoAction", toDoAction);
- if ((new OverrideAlert("", warning.String(), B_TRANSLATE("Do it"),
- (requireOverride ? B_SHIFT_KEY : 0),
B_TRANSLATE("Cancel"), 0, NULL,
- 0, B_WIDTH_AS_USUAL, B_WARNING_ALERT))->Go() == 1) {
+ OverrideAlert *alert = new OverrideAlert("", warning.String(),
+ B_TRANSLATE("Do it"), (requireOverride ? B_SHIFT_KEY : 0),
+ B_TRANSLATE("Cancel"), 0, NULL, 0, B_WIDTH_AS_USUAL,
B_WARNING_ALERT);
+ alert->SetShortcut(1, B_ESCAPE);
+ if (alert->Go() == 1) {
if (confirmedAlready)
*confirmedAlready = kNotConfirmed;
return false;
Modified: haiku/trunk/src/preferences/locale/LocaleWindow.cpp
===================================================================
--- haiku/trunk/src/preferences/locale/LocaleWindow.cpp 2011-03-28 06:44:46 UTC
(rev 41131)
+++ haiku/trunk/src/preferences/locale/LocaleWindow.cpp 2011-03-28 07:43:41 UTC
(rev 41132)
@@ -425,6 +425,7 @@
"change to take effect. Would you like to
restart them now?"),
B_TRANSLATE("Cancel"), B_TRANSLATE("Restart"),
NULL,
B_WIDTH_FROM_WIDEST, B_IDEA_ALERT);
+ alert->SetShortcut(0, B_ESCAPE);
alert->Go(new BInvoker(new
BMessage(kMsgRestartTrackerAndDeskbar),
NULL, be_app));
break;
Other related posts:
- » [haiku-commits] r41132 - in haiku/trunk/src: kits/tracker preferences/locale - jonas
