cui/source/inc/helpid.hrc | 4 ----
vcl/inc/svids.hrc | 2 ++
vcl/source/control/button.cxx | 20 +++++++++-----------
vcl/source/src/btntext.src | 19 ++++++++++++++++++-
4 files changed, 29 insertions(+), 16 deletions(-)
New commits:
commit 14d8cd11d6b4831811dbaeb6cfa1f81392251abe
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 25 13:42:13 2013 +0000
Resolves: rhbz#902694 impossible short-cuts for OK/Cancel translations
auto-adding mnemonics to the first character of OK/Cancel translations
suggests
short-cuts under various CJK/Indic languages which can't be achieved with a
single keystroke combination
Some platforms want mnemonic-ed OK/Cancel, some don't. So lets have two
translations, one for each situation, rather than trying to automunge.
Change-Id: I23e21e79b27ead86f535309ca0efc2adea86ae24
diff --git a/vcl/inc/svids.hrc b/vcl/inc/svids.hrc
index 27e5e0a..064cd53 100644
--- a/vcl/inc/svids.hrc
+++ b/vcl/inc/svids.hrc
@@ -156,6 +156,8 @@
#define SV_BUTTONTEXT_NEW 10115
#define SV_BUTTONTEXT_EDIT 10116
#define SV_BUTTONTEXT_APPLY 10117
+#define SV_BUTTONTEXT_OK_NOMNEMONIC 10118
+#define SV_BUTTONTEXT_CANCEL_NOMNEMONIC 10119
#define SV_STDTEXT_FIRST SV_STDTEXT_SERVICENOTAVAILABLE
#define SV_STDTEXT_SERVICENOTAVAILABLE 10200
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 1cc10af..e2f8b76 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -143,18 +143,16 @@ OUString Button::GetStandardText( StandardButtonType
eButton )
}
sal_uInt32 nResId = aResIdAry[(sal_uInt16)eButton].nResId;
- OUString aText = ResId(nResId, *pResMgr).toString();
-
- if (nResId == SV_BUTTONTEXT_OK || nResId == SV_BUTTONTEXT_CANCEL)
- {
-#ifndef WNT
- // Windows (apparently) has some magic auto-accelerator evil around
- // ok / cancel so add accelerators only for Unix
- if (aText.indexOf('~') == -1)
- return "~" + aText;
+#ifdef WNT
+ //
http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
+ // Under windows we don't want accelerators on ok/cancel but do on other
+ // buttons
+ if (nResId == SV_BUTTONTEXT_OK)
+ nResId = SV_BUTTONTEXT_OK_NOMNEMONIC;
+ else if (nResId == SV_BUTTONTEXT_CANCEL)
+ nResId = SV_BUTTONTEXT_CANCEL_NOMNEMONIC;
#endif
- }
- return aText;
+ return ResId(nResId, *pResMgr).toString();
}
// -----------------------------------------------------------------------
diff --git a/vcl/source/src/btntext.src b/vcl/source/src/btntext.src
index 5f93307..a16fc70 100644
--- a/vcl/source/src/btntext.src
+++ b/vcl/source/src/btntext.src
@@ -18,13 +18,30 @@
#include <svids.hrc>
+//http://lists.freedesktop.org/archives/libreoffice/2013-January/044513.html
+//Special OK/Cancel handling
+
String SV_BUTTONTEXT_OK
{
- Text [ en-US ] = "OK";
+ Text [ x-comment ] = "This is used on buttons for platforms other than
windows, there should be a ~ mnemonic in this string";
+ Text [ en-US ] = "~OK";
};
String SV_BUTTONTEXT_CANCEL
{
+ Text [ x-comment ] = "This is used on buttons for platforms other than
windows, there should be a ~ mnemonic in this string";
+ Text [ en-US ] = "~Cancel";
+};
+
+String SV_BUTTONTEXT_OK_NOMNEMONIC
+{
+ Text [ x-comment ] = "This is used on buttons for Windows, there should be
no ~ mnemonic in this string";
+ Text [ en-US ] = "OK";
+};
+
+String SV_BUTTONTEXT_CANCEL_NOMNEMONIC
+{
+ Text [ x-comment ] = "This is used on buttons for Windows, there should be
no ~ mnemonic in this string";
Text [ en-US ] = "Cancel";
};
commit 610ebd9a1100095b81835a476465b6ef126e8e1e
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jan 25 12:44:20 2013 +0000
remove redundant HIDs
Change-Id: I982b760084cf9ed259432b7c77a865e3f8f13fed
diff --git a/cui/source/inc/helpid.hrc b/cui/source/inc/helpid.hrc
index 82c1567..c1ab0c6 100644
--- a/cui/source/inc/helpid.hrc
+++ b/cui/source/inc/helpid.hrc
@@ -190,13 +190,9 @@
#define HID_CHARMAP_CTL_SHOWSET "CUI_HID_CHARMAP_CTL_SHOWSET"
#define HID_CHARMAP_CTL_SHOWTEXT "CUI_HID_CHARMAP_CTL_SHOWTEXT"
#define HID_CHARMAP_CTL_SHOWCHAR "CUI_HID_CHARMAP_CTL_SHOWCHAR"
-#define HID_DLG_NAME "CUI_HID_DLG_NAME"
-#define HID_DLG_MESSBOX "CUI_HID_DLG_MESSBOX"
#define HID_HANGULDLG_SUGGESTIONS "CUI_HID_HANGULDLG_SUGGESTIONS"
#define HID_HANGULDLG_SUGGESTIONS_GRID "CUI_HID_HANGULDLG_SUGGESTIONS_GRID"
#define HID_HANGULDLG_SUGGESTIONS_LIST "CUI_HID_HANGULDLG_SUGGESTIONS_LIST"
-#define HID_DLG_OBJECT_NAME "CUI_HID_DLG_OBJECT_NAME"
-#define HID_DLG_OBJECT_TITLE_DESC "CUI_HID_DLG_OBJECT_TITLE_DESC"
#define HID_SVX_CONFIG_MENU_ORGANIZER "CUI_HID_SVX_CONFIG_MENU_ORGANIZER"
#define HID_SVX_CONFIG_ICON_SELECTOR "CUI_HID_SVX_CONFIG_ICON_SELECTOR"
#define HID_SVX_CONFIG_NAME_SUBMENU "CUI_HID_SVX_CONFIG_NAME_SUBMENU"
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
