Improve wxAcceleratorEntry::ToString() formatting
This method used the wxKeyNames[] array originally intended for parsing accelerator specification and not for human-friendly formatting. In particular, non-alphanumeric keys such as WXK_DOWN and many others were formatted using all-uppercase name, which was highly unusual and not native on any platforms (the only unaffected one was OS X). Improve the formatting by doing the following: a) use Title case for the entries; because parsing is case-insensitive, this has no effect on it; b) add display_name field for keys where the symbolic name wasn't appropriate for display and set it for some of the keys that are likely to show up in menus; c) add explanatory comments for translators git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_3_0_BRANCH@78185 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Václav Slavík
@@ -42,73 +42,74 @@ static const struct wxKeyName
|
|||||||
{
|
{
|
||||||
wxKeyCode code;
|
wxKeyCode code;
|
||||||
const char *name;
|
const char *name;
|
||||||
|
const char *display_name;
|
||||||
} wxKeyNames[] =
|
} wxKeyNames[] =
|
||||||
{
|
{
|
||||||
{ WXK_DELETE, wxTRANSLATE("DEL") },
|
{ WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Delete") },
|
||||||
{ WXK_DELETE, wxTRANSLATE("DELETE") },
|
{ WXK_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Del") },
|
||||||
{ WXK_BACK, wxTRANSLATE("BACK") },
|
{ WXK_BACK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Back"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Backspace") },
|
||||||
{ WXK_INSERT, wxTRANSLATE("INS") },
|
{ WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Insert") },
|
||||||
{ WXK_INSERT, wxTRANSLATE("INSERT") },
|
{ WXK_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Ins") },
|
||||||
{ WXK_RETURN, wxTRANSLATE("ENTER") },
|
{ WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Enter") },
|
||||||
{ WXK_RETURN, wxTRANSLATE("RETURN") },
|
{ WXK_RETURN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Return") },
|
||||||
{ WXK_PAGEUP, wxTRANSLATE("PGUP") },
|
{ WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Up") },
|
||||||
{ WXK_PAGEDOWN, wxTRANSLATE("PGDN") },
|
{ WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Page Down") },
|
||||||
{ WXK_LEFT, wxTRANSLATE("LEFT") },
|
{ WXK_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgUp") },
|
||||||
{ WXK_RIGHT, wxTRANSLATE("RIGHT") },
|
{ WXK_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("PgDn") },
|
||||||
{ WXK_UP, wxTRANSLATE("UP") },
|
{ WXK_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Left") },
|
||||||
{ WXK_DOWN, wxTRANSLATE("DOWN") },
|
{ WXK_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Right") },
|
||||||
{ WXK_HOME, wxTRANSLATE("HOME") },
|
{ WXK_UP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Up") },
|
||||||
{ WXK_END, wxTRANSLATE("END") },
|
{ WXK_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Down") },
|
||||||
{ WXK_SPACE, wxTRANSLATE("SPACE") },
|
{ WXK_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Home") },
|
||||||
{ WXK_TAB, wxTRANSLATE("TAB") },
|
{ WXK_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("End") },
|
||||||
{ WXK_ESCAPE, wxTRANSLATE("ESC") },
|
{ WXK_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Space") },
|
||||||
{ WXK_ESCAPE, wxTRANSLATE("ESCAPE") },
|
{ WXK_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Tab") },
|
||||||
{ WXK_CANCEL, wxTRANSLATE("CANCEL") },
|
{ WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Esc") },
|
||||||
{ WXK_CLEAR, wxTRANSLATE("CLEAR") },
|
{ WXK_ESCAPE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Escape") },
|
||||||
{ WXK_MENU, wxTRANSLATE("MENU") },
|
{ WXK_CANCEL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Cancel") },
|
||||||
{ WXK_PAUSE, wxTRANSLATE("PAUSE") },
|
{ WXK_CLEAR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Clear") },
|
||||||
{ WXK_CAPITAL, wxTRANSLATE("CAPITAL") },
|
{ WXK_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Menu") },
|
||||||
{ WXK_SELECT, wxTRANSLATE("SELECT") },
|
{ WXK_PAUSE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Pause") },
|
||||||
{ WXK_PRINT, wxTRANSLATE("PRINT") },
|
{ WXK_CAPITAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Capital") },
|
||||||
{ WXK_EXECUTE, wxTRANSLATE("EXECUTE") },
|
{ WXK_SELECT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Select") },
|
||||||
{ WXK_SNAPSHOT, wxTRANSLATE("SNAPSHOT") },
|
{ WXK_PRINT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Print") },
|
||||||
{ WXK_HELP, wxTRANSLATE("HELP") },
|
{ WXK_EXECUTE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Execute") },
|
||||||
{ WXK_ADD, wxTRANSLATE("ADD") },
|
{ WXK_SNAPSHOT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Snapshot") },
|
||||||
{ WXK_SEPARATOR, wxTRANSLATE("SEPARATOR") },
|
{ WXK_HELP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Help") },
|
||||||
{ WXK_SUBTRACT, wxTRANSLATE("SUBTRACT") },
|
{ WXK_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Add") },
|
||||||
{ WXK_DECIMAL, wxTRANSLATE("DECIMAL") },
|
{ WXK_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Separator") },
|
||||||
{ WXK_DIVIDE, wxTRANSLATE("DIVIDE") },
|
{ WXK_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Subtract") },
|
||||||
{ WXK_NUMLOCK, wxTRANSLATE("NUM_LOCK") },
|
{ WXK_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Decimal") },
|
||||||
{ WXK_SCROLL, wxTRANSLATE("SCROLL_LOCK") },
|
{ WXK_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Divide") },
|
||||||
{ WXK_PAGEUP, wxTRANSLATE("PAGEUP") },
|
{ WXK_NUMLOCK, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Lock") },
|
||||||
{ WXK_PAGEDOWN, wxTRANSLATE("PAGEDOWN") },
|
{ WXK_SCROLL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll_lock"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Scroll Lock") },
|
||||||
{ WXK_NUMPAD_SPACE, wxTRANSLATE("KP_SPACE") },
|
{ WXK_NUMPAD_SPACE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Space"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Space") },
|
||||||
{ WXK_NUMPAD_TAB, wxTRANSLATE("KP_TAB") },
|
{ WXK_NUMPAD_TAB, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Tab"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Tab") },
|
||||||
{ WXK_NUMPAD_ENTER, wxTRANSLATE("KP_ENTER") },
|
{ WXK_NUMPAD_ENTER, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Enter"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Enter") },
|
||||||
{ WXK_NUMPAD_HOME, wxTRANSLATE("KP_HOME") },
|
{ WXK_NUMPAD_HOME, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Home"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Home") },
|
||||||
{ WXK_NUMPAD_LEFT, wxTRANSLATE("KP_LEFT") },
|
{ WXK_NUMPAD_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Left"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num left") },
|
||||||
{ WXK_NUMPAD_UP, wxTRANSLATE("KP_UP") },
|
{ WXK_NUMPAD_UP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Up"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Up") },
|
||||||
{ WXK_NUMPAD_RIGHT, wxTRANSLATE("KP_RIGHT") },
|
{ WXK_NUMPAD_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Right"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Right") },
|
||||||
{ WXK_NUMPAD_DOWN, wxTRANSLATE("KP_DOWN") },
|
{ WXK_NUMPAD_DOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Down"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Down") },
|
||||||
{ WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PRIOR") },
|
{ WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageUp"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Up") },
|
||||||
{ WXK_NUMPAD_PAGEUP, wxTRANSLATE("KP_PAGEUP") },
|
{ WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_PageDown"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Page Down") },
|
||||||
{ WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_NEXT") },
|
{ WXK_NUMPAD_PAGEUP, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Prior") },
|
||||||
{ WXK_NUMPAD_PAGEDOWN, wxTRANSLATE("KP_PAGEDOWN") },
|
{ WXK_NUMPAD_PAGEDOWN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Next") },
|
||||||
{ WXK_NUMPAD_END, wxTRANSLATE("KP_END") },
|
{ WXK_NUMPAD_END, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_End"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num End") },
|
||||||
{ WXK_NUMPAD_BEGIN, wxTRANSLATE("KP_BEGIN") },
|
{ WXK_NUMPAD_BEGIN, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Begin"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Begin") },
|
||||||
{ WXK_NUMPAD_INSERT, wxTRANSLATE("KP_INSERT") },
|
{ WXK_NUMPAD_INSERT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Insert"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Insert") },
|
||||||
{ WXK_NUMPAD_DELETE, wxTRANSLATE("KP_DELETE") },
|
{ WXK_NUMPAD_DELETE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Delete"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num Delete") },
|
||||||
{ WXK_NUMPAD_EQUAL, wxTRANSLATE("KP_EQUAL") },
|
{ WXK_NUMPAD_EQUAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Equal"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num =") },
|
||||||
{ WXK_NUMPAD_MULTIPLY, wxTRANSLATE("KP_MULTIPLY") },
|
{ WXK_NUMPAD_MULTIPLY, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Multiply"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num *") },
|
||||||
{ WXK_NUMPAD_ADD, wxTRANSLATE("KP_ADD") },
|
{ WXK_NUMPAD_ADD, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Add"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num +") },
|
||||||
{ WXK_NUMPAD_SEPARATOR, wxTRANSLATE("KP_SEPARATOR") },
|
{ WXK_NUMPAD_SEPARATOR, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Separator"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num ,") },
|
||||||
{ WXK_NUMPAD_SUBTRACT, wxTRANSLATE("KP_SUBTRACT") },
|
{ WXK_NUMPAD_SUBTRACT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Subtract"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num -") },
|
||||||
{ WXK_NUMPAD_DECIMAL, wxTRANSLATE("KP_DECIMAL") },
|
{ WXK_NUMPAD_DECIMAL, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Decimal"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num .") },
|
||||||
{ WXK_NUMPAD_DIVIDE, wxTRANSLATE("KP_DIVIDE") },
|
{ WXK_NUMPAD_DIVIDE, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("KP_Divide"), /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Num /") },
|
||||||
{ WXK_WINDOWS_LEFT, wxTRANSLATE("WINDOWS_LEFT") },
|
{ WXK_WINDOWS_LEFT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Left") },
|
||||||
{ WXK_WINDOWS_RIGHT, wxTRANSLATE("WINDOWS_RIGHT") },
|
{ WXK_WINDOWS_RIGHT, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Right") },
|
||||||
{ WXK_WINDOWS_MENU, wxTRANSLATE("WINDOWS_MENU") },
|
{ WXK_WINDOWS_MENU, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Windows_Menu") },
|
||||||
{ WXK_COMMAND, wxTRANSLATE("COMMAND") },
|
{ WXK_COMMAND, /*TRANSLATORS: Name of keyboard key*/ wxTRANSLATE("Command") },
|
||||||
};
|
};
|
||||||
|
|
||||||
// return true if the 2 strings refer to the same accel
|
// return true if the 2 strings refer to the same accel
|
||||||
@@ -346,7 +347,7 @@ wxString wxAcceleratorEntry::AsPossiblyLocalizedString(bool localized) const
|
|||||||
const wxKeyName& kn = wxKeyNames[n];
|
const wxKeyName& kn = wxKeyNames[n];
|
||||||
if ( code == kn.code )
|
if ( code == kn.code )
|
||||||
{
|
{
|
||||||
text << PossiblyLocalize(kn.name, localized);
|
text << PossiblyLocalize(kn.display_name ? kn.display_name : kn.name, localized);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user