Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use separate strings for stock labels with and without mnemonics.

Browse Source 
Obtaining the string without mnemonics by simply removing "&" characters from
the string containing mnemonics doesn't work for some languages, notably
Chinese where the convention is to use "Chinese Text (&M)" for the labels with
"M" being the ASCII mnemonic and just "Chinese Text" and not "Chinese Text (M)"
should be used if wxSTOCK_WITH_MNEMONIC flag is not specified.

Fix the fundamental problem by using separate strings for the two cases.
Translations still need to be updated to really correct the labels appearance.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@68641 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2011-08-11 10:56:05 +00:00
parent f5f302d721
commit f8a1c5715f
2 changed files with 77 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
docs/changes.txt
View File

@@ -452,6 +452,7 @@ All (GUI):
- Add wxDataViewEvent::IsEditCancelled() (Allonii). - Add wxDataViewEvent::IsEditCancelled() (Allonii).
- Allow marking wxTreeBook nodes to expand initially in XRC (RedTide). - Allow marking wxTreeBook nodes to expand initially in XRC (RedTide).
- Added customizable wxDocManager::OnMRUFileNotExist() virtual method. - Added customizable wxDocManager::OnMRUFileNotExist() virtual method.
- Fix stock labels when not using mnemonics for Chinese (cw.ahbong).
OSX: OSX:

163
src/common/stockitem.cpp
View File

@@ -118,85 +118,85 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
{ {
wxString stockLabel; wxString stockLabel;
#define STOCKITEM(stockid, label) \ #ifdef __WXMSW__
// special case: the "Cancel" button shouldn't have a mnemonic under MSW
// for consistency with the native dialogs (which don't use any mnemonic
// for it because it is already bound to Esc implicitly)
if ( id == wxID_CANCEL )
flags &= ~wxSTOCK_WITH_MNEMONIC;
#endif // __WXMSW__
#define STOCKITEM(stockid, labelWithMnemonic, labelPlain) \
case stockid: \ case stockid: \
stockLabel = label; \ if(flags & wxSTOCK_WITH_MNEMONIC) \
break; stockLabel = labelWithMnemonic; \
else \
stockLabel = labelPlain; \
break
switch (id) switch (id)
{ {
STOCKITEM(wxID_ABOUT, _("&About...")) STOCKITEM(wxID_ABOUT, _("&About..."), _("About..."));
STOCKITEM(wxID_ADD, _("Add")) STOCKITEM(wxID_ADD, _("Add"), _("Add"));
STOCKITEM(wxID_APPLY, _("&Apply")) STOCKITEM(wxID_APPLY, _("&Apply"), _("Apply"));
STOCKITEM(wxID_BACKWARD, _("&Back")) STOCKITEM(wxID_BACKWARD, _("&Back"), _("Back"));
STOCKITEM(wxID_BOLD, _("&Bold")) STOCKITEM(wxID_BOLD, _("&Bold"), _("Bold"));
STOCKITEM(wxID_BOTTOM, _("&Bottom")) STOCKITEM(wxID_BOTTOM, _("&Bottom"), _("Bottom"));
STOCKITEM(wxID_CANCEL, _("&Cancel")) STOCKITEM(wxID_CANCEL, _("&Cancel"), _("Cancel"));
STOCKITEM(wxID_CDROM, _("&CD-Rom")) STOCKITEM(wxID_CDROM, _("&CD-Rom"), _("CD-Rom"));
STOCKITEM(wxID_CLEAR, _("&Clear")) STOCKITEM(wxID_CLEAR, _("&Clear"), _("Clear"));
STOCKITEM(wxID_CLOSE, _("&Close")) STOCKITEM(wxID_CLOSE, _("&Close"), _("Close"));
STOCKITEM(wxID_CONVERT, _("&Convert")) STOCKITEM(wxID_CONVERT, _("&Convert"), _("Convert"));
STOCKITEM(wxID_COPY, _("&Copy")) STOCKITEM(wxID_COPY, _("&Copy"), _("Copy"));
STOCKITEM(wxID_CUT, _("Cu&t")) STOCKITEM(wxID_CUT, _("Cu&t"), _("Cut"));
STOCKITEM(wxID_DELETE, _("&Delete")) STOCKITEM(wxID_DELETE, _("&Delete"), _("Delete"));
STOCKITEM(wxID_DOWN, _("&Down")) STOCKITEM(wxID_DOWN, _("&Down"), _("Down"));
STOCKITEM(wxID_EDIT, _("&Edit")) STOCKITEM(wxID_EDIT, _("&Edit"), _("Edit"));
STOCKITEM(wxID_EXECUTE, _("&Execute")) STOCKITEM(wxID_EXECUTE, _("&Execute"), _("Execute"));
STOCKITEM(wxID_EXIT, _("&Quit")) STOCKITEM(wxID_EXIT, _("&Quit"), _("Quit"));
STOCKITEM(wxID_FILE, _("&File")) STOCKITEM(wxID_FILE, _("&File"), _("File"));
STOCKITEM(wxID_FIND, _("&Find")) STOCKITEM(wxID_FIND, _("&Find"), _("Find"));
STOCKITEM(wxID_FIRST, _("&First")) STOCKITEM(wxID_FIRST, _("&First"), _("First"));
STOCKITEM(wxID_FLOPPY, _("&Floppy")) STOCKITEM(wxID_FLOPPY, _("&Floppy"), _("Floppy"));
STOCKITEM(wxID_FORWARD, _("&Forward")) STOCKITEM(wxID_FORWARD, _("&Forward"), _("Forward"));
STOCKITEM(wxID_HARDDISK, _("&Harddisk")) STOCKITEM(wxID_HARDDISK, _("&Harddisk"), _("Harddisk"));
STOCKITEM(wxID_HELP, _("&Help")) STOCKITEM(wxID_HELP, _("&Help"), _("Help"));
STOCKITEM(wxID_HOME, _("&Home")) STOCKITEM(wxID_HOME, _("&Home"), _("Home"));
STOCKITEM(wxID_INDENT, _("Indent")) STOCKITEM(wxID_INDENT, _("Indent"), _("Indent"));
STOCKITEM(wxID_INDEX, _("&Index")) STOCKITEM(wxID_INDEX, _("&Index"), _("Index"));
STOCKITEM(wxID_INFO, _("&Info")) STOCKITEM(wxID_INFO, _("&Info"), _("Info"));
STOCKITEM(wxID_ITALIC, _("&Italic")) STOCKITEM(wxID_ITALIC, _("&Italic"), _("Italic"));
STOCKITEM(wxID_JUMP_TO, _("&Jump to")) STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered"), _("Centered"));
STOCKITEM(wxID_JUSTIFY_CENTER, _("Centered")) STOCKITEM(wxID_JUSTIFY_FILL, _("Justified"), _("Justified"));
STOCKITEM(wxID_JUSTIFY_FILL, _("Justified")) STOCKITEM(wxID_LAST, _("&Last"), _("Last"));
STOCKITEM(wxID_JUSTIFY_LEFT, _("Align Left")) STOCKITEM(wxID_NETWORK, _("&Network"), _("Network"));
STOCKITEM(wxID_JUSTIFY_RIGHT, _("Align Right")) STOCKITEM(wxID_NEW, _("&New"), _("New"));
STOCKITEM(wxID_LAST, _("&Last")) STOCKITEM(wxID_NO, _("&No"), _("No"));
STOCKITEM(wxID_NETWORK, _("&Network")) STOCKITEM(wxID_OK, _("&OK"), _("OK"));
STOCKITEM(wxID_NEW, _("&New")) STOCKITEM(wxID_OPEN, _("&Open..."), _("Open..."));
STOCKITEM(wxID_NO, _("&No")) STOCKITEM(wxID_PASTE, _("&Paste"), _("Paste"));
STOCKITEM(wxID_OK, _("&OK")) STOCKITEM(wxID_PREFERENCES, _("&Preferences"), _("Preferences"));
STOCKITEM(wxID_OPEN, _("&Open...")) STOCKITEM(wxID_PRINT, _("&Print..."), _("Print..."));
STOCKITEM(wxID_PASTE, _("&Paste")) STOCKITEM(wxID_PROPERTIES, _("&Properties"), _("Properties"));
STOCKITEM(wxID_PREFERENCES, _("&Preferences")) STOCKITEM(wxID_REDO, _("&Redo"), _("Redo"));
STOCKITEM(wxID_PREVIEW, _("Print previe&w")) STOCKITEM(wxID_REFRESH, _("Refresh"), _("Refresh"));
STOCKITEM(wxID_PRINT, _("&Print...")) STOCKITEM(wxID_REMOVE, _("Remove"), _("Remove"));
STOCKITEM(wxID_PROPERTIES, _("&Properties")) STOCKITEM(wxID_REPLACE, _("Rep&lace"), _("Replace"));
STOCKITEM(wxID_REDO, _("&Redo")) STOCKITEM(wxID_SAVE, _("&Save"), _("Save"));
STOCKITEM(wxID_REFRESH, _("Refresh")) STOCKITEM(wxID_SELECT_COLOR, _("&Color"), _("Color"));
STOCKITEM(wxID_REMOVE, _("Remove")) STOCKITEM(wxID_SELECT_FONT, _("&Font"), _("Font"));
STOCKITEM(wxID_REPLACE, _("Rep&lace")) STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending"), _("Ascending"));
STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved")) STOCKITEM(wxID_SORT_DESCENDING, _("&Descending"), _("Descending"));
STOCKITEM(wxID_SAVE, _("&Save")) STOCKITEM(wxID_STOP, _("&Stop"), _("Stop"));
STOCKITEM(wxID_SAVEAS, _("Save &As...")) STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough"), _("Strikethrough"));
STOCKITEM(wxID_SELECTALL, _("Select &All")) STOCKITEM(wxID_TOP, _("&Top"), _("Top"));
STOCKITEM(wxID_SELECT_COLOR, _("&Color")) STOCKITEM(wxID_UNDELETE, _("Undelete"), _("Undelete"));
STOCKITEM(wxID_SELECT_FONT, _("&Font")) STOCKITEM(wxID_UNDERLINE, _("&Underline"), _("Underline"));
STOCKITEM(wxID_SORT_ASCENDING, _("&Ascending")) STOCKITEM(wxID_UNDO, _("&Undo"), _("Undo"));
STOCKITEM(wxID_SORT_DESCENDING, _("&Descending")) STOCKITEM(wxID_UNINDENT, _("&Unindent"), _("Unindent"));
STOCKITEM(wxID_SPELL_CHECK, _("&Spell Check")) STOCKITEM(wxID_UP, _("&Up"), _("Up"));
STOCKITEM(wxID_STOP, _("&Stop")) STOCKITEM(wxID_YES, _("&Yes"), _("Yes"));
STOCKITEM(wxID_STRIKETHROUGH, _("&Strikethrough"))
STOCKITEM(wxID_TOP, _("&Top"))
STOCKITEM(wxID_UNDELETE, _("Undelete"))
STOCKITEM(wxID_UNDERLINE, _("&Underline"))
STOCKITEM(wxID_UNDO, _("&Undo"))
STOCKITEM(wxID_UNINDENT, _("&Unindent"))
STOCKITEM(wxID_UP, _("&Up"))
STOCKITEM(wxID_YES, _("&Yes"))
STOCKITEM(wxID_ZOOM_100, _("&Actual Size"))
STOCKITEM(wxID_ZOOM_FIT, _("Zoom to &Fit"))
STOCKITEM(wxID_ZOOM_IN, _("Zoom &In"))
STOCKITEM(wxID_ZOOM_OUT, _("Zoom &Out"))
default: default:
wxFAIL_MSG( wxT("invalid stock item ID") ); wxFAIL_MSG( wxT("invalid stock item ID") );
@@ -218,19 +218,6 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
"labels without ellipsis shouldn't use accelerators" ); "labels without ellipsis shouldn't use accelerators" );
} }
#ifdef __WXMSW__
// special case: the "Cancel" button shouldn't have a mnemonic under MSW
// for consistency with the native dialogs (which don't use any mnemonic
// for it because it is already bound to Esc implicitly)
if ( id == wxID_CANCEL )
flags &= ~wxSTOCK_WITH_MNEMONIC;
#endif // __WXMSW__
if ( !(flags & wxSTOCK_WITH_MNEMONIC) )
{
stockLabel = wxStripMenuCodes(stockLabel);
}
#if wxUSE_ACCEL #if wxUSE_ACCEL
if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) ) if ( !stockLabel.empty() && (flags & wxSTOCK_WITH_ACCELERATOR) )
{ {