neox
/
xml-copy-editor-code
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

On Linux Tools>Options is now Edit>Preferences.

This commit is contained in:
Gerald Schmidt 2007-09-30 22:31:22 +00:00
parent f855f9ff28
commit 8f849260b5
1 changed files with 27 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/xmlcopyeditor.cpp
View File

@ -882,7 +882,11 @@ MyFrame::MyFrame (
wxAuiPaneInfo().Bottom().Hide().Caption ( _T ( "Command" ) ).DestroyOnClose ( false ).Layer ( 3 ) ); wxAuiPaneInfo().Bottom().Hide().Caption ( _T ( "Command" ) ).DestroyOnClose ( false ).Layer ( 3 ) );
if ( !wxFileName::DirExists ( applicationDir ) ) if ( !wxFileName::DirExists ( applicationDir ) )
#ifdef __WXMSW__
GetStatusBar()->SetStatusText ( _ ( "Cannot open application directory: see Tools, Options..., General" ) ); GetStatusBar()->SetStatusText ( _ ( "Cannot open application directory: see Tools, Options..., General" ) );
#else
GetStatusBar()->SetStatusText ( _ ( "Cannot open application directory: see Edit, Preferences..., General" ) );
#endif
// handle command line and, on Windows, MS Word integration // handle command line and, on Windows, MS Word integration
handleCommandLineFlag = ( wxTheApp->argc > 1 ) ? true : false; handleCommandLineFlag = ( wxTheApp->argc > 1 ) ? true : false;
@ -2290,7 +2294,12 @@ void MyFrame::OnOptions ( wxCommandEvent& WXUNUSED ( event ) )
properties.zoom = doc->GetZoom(); properties.zoom = doc->GetZoom();
} }
wxString title ( _ ( "Options" ) ); wxString title
#ifdef __WXMSW__
( _ ( "Options" ) );
#else
( _ ( "Preferences" ) );
#endif
std::auto_ptr<MyPropertySheet> mpsd ( new MyPropertySheet ( std::auto_ptr<MyPropertySheet> mpsd ( new MyPropertySheet (
this, this,
properties, properties,
@ -4856,6 +4865,8 @@ wxMenuBar *MyFrame::getMenuBar()
new wxMenuItem ( NULL, ID_GOTO, _ ( "G&o To...\tCtrl+G" ), _ ( "Go To..." ) ); new wxMenuItem ( NULL, ID_GOTO, _ ( "G&o To...\tCtrl+G" ), _ ( "Go To..." ) );
gotoItem->SetBitmap ( wxNullBitmap ); gotoItem->SetBitmap ( wxNullBitmap );
editMenu->Append ( undoItem ); editMenu->Append ( undoItem );
editMenu->Append ( redoItem ); editMenu->Append ( redoItem );
editMenu->AppendSeparator(); editMenu->AppendSeparator();
@ -4871,6 +4882,13 @@ wxMenuBar *MyFrame::getMenuBar()
editMenu->AppendSeparator(); editMenu->AppendSeparator();
editMenu->Append ( gotoItem ); editMenu->Append ( gotoItem );
#ifndef __WXMSW__
wxMenuItem *preferencesItem =
new wxMenuItem ( NULL, ID_OPTIONS, _ ( "Pr&eferences..." ), _ ( "Preferences..." ) );
editMenu->AppendSeparator();
editMenu->Append ( preferencesItem );
#endif
// font size menu // font size menu
wxMenu *fontSizeMenu = new wxMenu; wxMenu *fontSizeMenu = new wxMenu;
fontSizeMenu->Append ( fontSizeMenu->Append (
@ -5117,6 +5135,13 @@ wxMenuBar *MyFrame::getMenuBar()
_ ( "Command" ) ); _ ( "Command" ) );
commandItem->SetBitmap ( wxNullBitmap ); commandItem->SetBitmap ( wxNullBitmap );
toolsMenu->Append ( spellingItem );
toolsMenu->Append ( wordCountItem );
toolsMenu->AppendSeparator();
toolsMenu->Append ( commandItem );
toolsMenu->AppendSeparator();
#ifdef __WXMSW__
wxMenuItem *optionsItem = wxMenuItem *optionsItem =
new wxMenuItem ( new wxMenuItem (
NULL, NULL,
@ -5124,13 +5149,8 @@ wxMenuBar *MyFrame::getMenuBar()
_ ( "&Options..." ), _ ( "&Options..." ),
_ ( "Options..." ) ); _ ( "Options..." ) );
optionsItem->SetBitmap ( wxNullBitmap ); optionsItem->SetBitmap ( wxNullBitmap );
toolsMenu->Append ( spellingItem );
toolsMenu->Append ( wordCountItem );
toolsMenu->AppendSeparator();
toolsMenu->Append ( commandItem );
toolsMenu->AppendSeparator();
toolsMenu->Append ( optionsItem ); toolsMenu->Append ( optionsItem );
#endif
// help menu // help menu
wxMenu *helpMenu = new wxMenu; wxMenu *helpMenu = new wxMenu;