No changes, just reorganize the menu slightly in the exec sample.

Move all file association related commands under "File" menu from the "Exec"
one, having them there makes more sense and "Exec" menu is already quite big.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@73105 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-12-02 23:50:10 +00:00
parent d180df5c43
commit e9f012bc4c

View File

@@ -457,12 +457,19 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
menuFile->Append(Exec_Kill, wxT("&Kill process...\tCtrl-K"), menuFile->Append(Exec_Kill, wxT("&Kill process...\tCtrl-K"),
wxT("Kill a process by PID")); wxT("Kill a process by PID"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Exec_ClearLog, wxT("&Clear log\tCtrl-L"), menuFile->Append(Exec_OpenFile, wxT("Open &file...\tCtrl-F"),
wxT("Clear the log window")); wxT("Launch the command to open this kind of files"));
menuFile->Append(Exec_LaunchFile, wxT("La&unch file...\tShift-Ctrl-F"),
wxT("Launch the default application associated with the file"));
menuFile->Append(Exec_OpenURL, wxT("Open &URL...\tCtrl-U"),
wxT("Launch the default browser with the given URL"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Exec_BeginBusyCursor, wxT("Show &busy cursor\tCtrl-C")); menuFile->Append(Exec_BeginBusyCursor, wxT("Show &busy cursor\tCtrl-C"));
menuFile->Append(Exec_EndBusyCursor, wxT("Show &normal cursor\tShift-Ctrl-C")); menuFile->Append(Exec_EndBusyCursor, wxT("Show &normal cursor\tShift-Ctrl-C"));
menuFile->AppendSeparator(); menuFile->AppendSeparator();
menuFile->Append(Exec_ClearLog, wxT("&Clear log\tCtrl-L"),
wxT("Clear the log window"));
menuFile->AppendSeparator();
menuFile->Append(Exec_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program")); menuFile->Append(Exec_Quit, wxT("E&xit\tAlt-X"), wxT("Quit this program"));
wxMenu *flagsMenu = new wxMenu; wxMenu *flagsMenu = new wxMenu;
@@ -488,13 +495,6 @@ MyFrame::MyFrame(const wxString& title, const wxPoint& pos, const wxSize& size)
execMenu->Append(Exec_POpen, wxT("&Open a pipe to a command...\tCtrl-P"), execMenu->Append(Exec_POpen, wxT("&Open a pipe to a command...\tCtrl-P"),
wxT("Open a pipe to and from another program")); wxT("Open a pipe to and from another program"));
execMenu->AppendSeparator();
execMenu->Append(Exec_OpenFile, wxT("Open &file...\tCtrl-F"),
wxT("Launch the command to open this kind of files"));
execMenu->Append(Exec_LaunchFile, wxT("La&unch file...\tShift-Ctrl-F"),
wxT("Launch the default application associated with the file"));
execMenu->Append(Exec_OpenURL, wxT("Open &URL...\tCtrl-U"),
wxT("Launch the default browser with the given URL"));
#ifdef __WINDOWS__ #ifdef __WINDOWS__
execMenu->AppendSeparator(); execMenu->AppendSeparator();
execMenu->Append(Exec_DDEExec, wxT("Execute command via &DDE...\tCtrl-D")); execMenu->Append(Exec_DDEExec, wxT("Execute command via &DDE...\tCtrl-D"));