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

Merge branch 'master' of https://github.com/dhowland/wxWidgets

Browse Source 
Improve stock items consistency and aesthetics.

Closes https://github.com/wxWidgets/wxWidgets/pull/763
This commit is contained in:
Vadim Zeitlin
2018-03-25 14:16:42 +02:00
parent 6b859ce330 c841e78083
commit 5dd156185f
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
docs/changes.txt
View File

@@ -72,6 +72,10 @@ All:
- Make wxList and wxVector iterators conform to input iterator requirements.
- Fix MT-safety problem when reading and writing from wxSocket (jkubalik).
All (GUI):
- Improve stock items consistency and aesthetics (dhowland).
wxGTK:
- Fix the build with glib < 2.32 (e.g. CentOS 6).

4
docs/doxygen/mainpages/const_stockitems.h
View File

@@ -39,7 +39,7 @@ Also note that you can retrieve stock bitmaps using wxArtProvider.
@stock{wxID_EXECUTE,execute,&Execute}
@stock{wxID_EXIT,quit,&Quit}
@stock{wxID_FILE,file,&File}
@stock{wxID_FIND,find,&Find}
@stock{wxID_FIND,find,&Find...}
@stock{wxID_FIRST,goto-first-ltr,&First}
@stock{wxID_FLOPPY,floppy,&Floppy}
@stock{wxID_FORWARD,go-forward-ltr,&Forward}
@@ -69,7 +69,7 @@ Also note that you can retrieve stock bitmaps using wxArtProvider.
@stock{wxID_REDO,redo-ltr,&Redo}
@stock{wxID_REFRESH,refresh,Refresh}
@stock{wxID_REMOVE,remove,Remove}
@stock{wxID_REPLACE,find-and-replace,Rep&lace}
@stock{wxID_REPLACE,find-and-replace,Rep&lace...}
@stock{wxID_REVERT_TO_SAVED,revert-to-saved-ltr,Revert to Saved}
@stock{wxID_SAVE,save,&Save}
@stock{wxID_SAVEAS,save-as,Save &As...}

14
src/common/stockitem.cpp
View File

@@ -155,7 +155,7 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
STOCKITEM(wxID_EXECUTE, _("&Execute"), _("Execute"));
STOCKITEM(wxID_EXIT, _("&Quit"), _("Quit"));
STOCKITEM(wxID_FILE, _("&File"), _("File"));
STOCKITEM(wxID_FIND, _("&Find"), _("Find"));
STOCKITEM(wxID_FIND, _("&Find..."), _("Find..."));
STOCKITEM(wxID_FIRST, _("&First"), _("First"));
STOCKITEM(wxID_FLOPPY, _("&Floppy"), _("Floppy"));
STOCKITEM(wxID_FORWARD, _("&Forward"), _("Forward"));
@@ -185,10 +185,10 @@ wxString wxGetStockLabel(wxWindowID id, long flags)
STOCKITEM(wxID_REDO, _("&Redo"), _("Redo"));
STOCKITEM(wxID_REFRESH, _("Refresh"), _("Refresh"));
STOCKITEM(wxID_REMOVE, _("Remove"), _("Remove"));
STOCKITEM(wxID_REPLACE, _("Rep&lace"), _("Replace"));
STOCKITEM(wxID_REPLACE, _("Rep&lace..."), _("Replace..."));
STOCKITEM(wxID_REVERT_TO_SAVED, _("Revert to Saved"), _("Revert to Saved"));
STOCKITEM(wxID_SAVE, _("&Save"), _("Save"));
STOCKITEM(wxID_SAVEAS, _("&Save as"), _("Save as"));
STOCKITEM(wxID_SAVEAS, _("Save &As..."), _("Save As..."));
STOCKITEM(wxID_SELECTALL, _("Select &All"), _("Select All"));
STOCKITEM(wxID_SELECT_COLOR, _("&Color"), _("Color"));
STOCKITEM(wxID_SELECT_FONT, _("&Font"), _("Font"));
@@ -258,11 +258,14 @@ wxString wxGetStockHelpString(wxWindowID id, wxStockHelpStringClient client)
STOCKITEM(wxID_COPY, wxSTOCK_MENU, _("Copy selection"))
STOCKITEM(wxID_CUT, wxSTOCK_MENU, _("Cut selection"))
STOCKITEM(wxID_DELETE, wxSTOCK_MENU, _("Delete selection"))
STOCKITEM(wxID_REPLACE, wxSTOCK_MENU, _("Replace selection"))
STOCKITEM(wxID_FIND, wxSTOCK_MENU, _("Find in document"))
STOCKITEM(wxID_REPLACE, wxSTOCK_MENU, _("Find and replace in document"))
STOCKITEM(wxID_PASTE, wxSTOCK_MENU, _("Paste selection"))
STOCKITEM(wxID_EXIT, wxSTOCK_MENU, _("Quit this program"))
STOCKITEM(wxID_REDO, wxSTOCK_MENU, _("Redo last action"))
STOCKITEM(wxID_UNDO, wxSTOCK_MENU, _("Undo last action"))
STOCKITEM(wxID_NEW, wxSTOCK_MENU, _("Create new document"))
STOCKITEM(wxID_OPEN, wxSTOCK_MENU, _("Open an existing document"))
STOCKITEM(wxID_CLOSE, wxSTOCK_MENU, _("Close current document"))
STOCKITEM(wxID_SAVE, wxSTOCK_MENU, _("Save current document"))
STOCKITEM(wxID_SAVEAS, wxSTOCK_MENU, _("Save current document with a different filename"))
@@ -293,13 +296,12 @@ wxAcceleratorEntry wxGetStockAccelerator(wxWindowID id)
STOCKITEM(wxID_COPY, wxACCEL_CTRL,'C')
STOCKITEM(wxID_CUT, wxACCEL_CTRL,'X')
STOCKITEM(wxID_FIND, wxACCEL_CTRL,'F')
STOCKITEM(wxID_HELP, wxACCEL_CTRL,'H')
STOCKITEM(wxID_NEW, wxACCEL_CTRL,'N')
STOCKITEM(wxID_OPEN, wxACCEL_CTRL,'O')
STOCKITEM(wxID_PASTE, wxACCEL_CTRL,'V')
STOCKITEM(wxID_PRINT, wxACCEL_CTRL,'P')
STOCKITEM(wxID_REDO, wxACCEL_CTRL | wxACCEL_SHIFT,'Z')
STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'R')
STOCKITEM(wxID_REPLACE, wxACCEL_CTRL,'H')
STOCKITEM(wxID_SAVE, wxACCEL_CTRL,'S')
STOCKITEM(wxID_SELECTALL, wxACCEL_CTRL,'A')
STOCKITEM(wxID_UNDO, wxACCEL_CTRL,'Z')