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

Close panels with menu or Escape key

This commit is contained in:
Zane U. Ji 2014-02-28 20:09:08 +08:00
parent e750774b05
commit 878c981934
7 changed files with 95 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commandpanel.cpp
View File

@ -30,6 +30,7 @@ BEGIN_EVENT_TABLE ( CommandPanel, wxPanel )
EVT_BUTTON ( ID_BUTTON_PATH, CommandPanel::OnVariableButton ) EVT_BUTTON ( ID_BUTTON_PATH, CommandPanel::OnVariableButton )
EVT_BUTTON ( ID_BUTTON_EXTENSION, CommandPanel::OnVariableButton ) EVT_BUTTON ( ID_BUTTON_EXTENSION, CommandPanel::OnVariableButton )
EVT_BUTTON ( ID_BUTTON_FULLPATH, CommandPanel::OnVariableButton ) EVT_BUTTON ( ID_BUTTON_FULLPATH, CommandPanel::OnVariableButton )
EVT_CHAR_HOOK ( CommandPanel::OnCharHook )
END_EVENT_TABLE() END_EVENT_TABLE()
CommandPanel::CommandPanel ( CommandPanel::CommandPanel (
@ -265,3 +266,11 @@ void CommandPanel::OnIdle ( wxIdleEvent& event )
outputInsert->Enable ( b ); outputInsert->Enable ( b );
outputNewDocument->Enable ( b ); outputNewDocument->Enable ( b );
} }
void CommandPanel::OnCharHook ( wxKeyEvent& event )
{
if ( event.GetKeyCode() == WXK_ESCAPE && event.GetModifiers() == 0 )
( ( MyFrame* ) GetParent() )->closeCommandPane();
else
event.Skip();
}

1
src/commandpanel.h
View File

@ -53,6 +53,7 @@ class CommandPanel : public wxPanel
void OnRun ( wxCommandEvent& event ); void OnRun ( wxCommandEvent& event );
void OnVariableButton ( wxCommandEvent& event ); void OnVariableButton ( wxCommandEvent& event );
void OnIdle ( wxIdleEvent& event ); void OnIdle ( wxIdleEvent& event );
void OnCharHook ( wxKeyEvent& event );
void focusOnCommand(); void focusOnCommand();
bool getSync(); bool getSync();
int getOutput(); int getOutput();

9
src/findreplacepanel.cpp
View File

@ -26,6 +26,7 @@ BEGIN_EVENT_TABLE ( FindReplacePanel, wxPanel )
EVT_BUTTON ( ID_FINDREPLACE_FIND_NEXT, FindReplacePanel::OnFindNext ) EVT_BUTTON ( ID_FINDREPLACE_FIND_NEXT, FindReplacePanel::OnFindNext )
EVT_BUTTON ( ID_FINDREPLACE_REPLACE, FindReplacePanel::OnReplace ) EVT_BUTTON ( ID_FINDREPLACE_REPLACE, FindReplacePanel::OnReplace )
EVT_BUTTON ( ID_FINDREPLACE_REPLACE_ALL, FindReplacePanel::OnReplaceAll ) EVT_BUTTON ( ID_FINDREPLACE_REPLACE_ALL, FindReplacePanel::OnReplaceAll )
EVT_CHAR_HOOK ( FindReplacePanel::OnCharHook )
EVT_IDLE ( FindReplacePanel::OnIdle ) EVT_IDLE ( FindReplacePanel::OnIdle )
END_EVENT_TABLE() END_EVENT_TABLE()
@ -295,3 +296,11 @@ void FindReplacePanel::enableButtons ( bool b )
replaceButton->Enable ( b ); replaceButton->Enable ( b );
replaceAllButton->Enable ( b ); replaceAllButton->Enable ( b );
} }
void FindReplacePanel::OnCharHook ( wxKeyEvent& event )
{
if ( event.GetKeyCode() == WXK_ESCAPE && event.GetModifiers() == 0 )
( ( MyFrame* ) GetParent() )->closeFindReplacePane();
else
event.Skip();
}

1
src/findreplacepanel.h
View File

@ -69,6 +69,7 @@ class FindReplacePanel : public wxPanel
bool matchCaseMemory, regexMemory; bool matchCaseMemory, regexMemory;
bool incrementalFind, isReplaceDialog, notFoundSet, isRegex; bool incrementalFind, isReplaceDialog, notFoundSet, isRegex;
void OnCharHook ( wxKeyEvent& event );
void OnIdle ( wxIdleEvent& event ); void OnIdle ( wxIdleEvent& event );
void sendFindEvent ( size_t flags ); void sendFindEvent ( size_t flags );

2
src/insertpanel.cpp
View File

@ -179,7 +179,7 @@ void InsertPanel::handleChoice ( const wxString& choice )
return; return;
if ( parentWindow ) if ( parentWindow )
parentWindow->closePane(); parentWindow->closeMessagePane();
switch ( type ) switch ( type )
{ {

98
src/xmlcopyeditor.cpp
View File

@ -126,7 +126,9 @@ BEGIN_EVENT_TABLE ( MyFrame, wxFrame )
EVT_MENU ( ID_IMPORT_MSWORD, MyFrame::OnImportMSWord ) EVT_MENU ( ID_IMPORT_MSWORD, MyFrame::OnImportMSWord )
EVT_MENU ( ID_EXPORT_MSWORD, MyFrame::OnExportMSWord ) EVT_MENU ( ID_EXPORT_MSWORD, MyFrame::OnExportMSWord )
EVT_MENU ( ID_EXPORT, MyFrame::OnExport ) EVT_MENU ( ID_EXPORT, MyFrame::OnExport )
EVT_MENU ( ID_HIDE_PANE, MyFrame::OnClosePane ) EVT_MENU ( ID_CLOSE_MESSAGE_PANE, MyFrame::OnCloseMessagePane )
EVT_MENU ( ID_CLOSE_FIND_REPLACE_PANE, MyFrame::OnCloseFindReplacePane )
EVT_MENU ( ID_CLOSE_COMMAND_PANE, MyFrame::OnCloseCommandPane )
EVT_MENU ( ID_COMMAND, MyFrame::OnCommand ) EVT_MENU ( ID_COMMAND, MyFrame::OnCommand )
EVT_MENU ( ID_FIND, MyFrame::OnFind ) EVT_MENU ( ID_FIND, MyFrame::OnFind )
EVT_MENU ( ID_FIND_AGAIN, MyFrame::OnFindAgain ) EVT_MENU ( ID_FIND_AGAIN, MyFrame::OnFindAgain )
@ -195,7 +197,9 @@ BEGIN_EVENT_TABLE ( MyFrame, wxFrame )
EVT_UPDATE_UI_RANGE ( ID_FIND, ID_EXPORT_MSWORD, MyFrame::OnUpdateDocRange ) EVT_UPDATE_UI_RANGE ( ID_FIND, ID_EXPORT_MSWORD, MyFrame::OnUpdateDocRange )
EVT_UPDATE_UI ( ID_PREVIOUS_DOCUMENT, MyFrame::OnUpdatePreviousDocument ) EVT_UPDATE_UI ( ID_PREVIOUS_DOCUMENT, MyFrame::OnUpdatePreviousDocument )
EVT_UPDATE_UI ( ID_NEXT_DOCUMENT, MyFrame::OnUpdateNextDocument ) EVT_UPDATE_UI ( ID_NEXT_DOCUMENT, MyFrame::OnUpdateNextDocument )
EVT_UPDATE_UI ( ID_HIDE_PANE, MyFrame::OnUpdateClosePane ) EVT_UPDATE_UI ( ID_CLOSE_MESSAGE_PANE, MyFrame::OnUpdateCloseMessagePane )
EVT_UPDATE_UI ( ID_CLOSE_FIND_REPLACE_PANE, MyFrame::OnUpdateCloseFindReplacePane )
EVT_UPDATE_UI ( ID_CLOSE_COMMAND_PANE, MyFrame::OnUpdateCloseCommandPane )
EVT_UPDATE_UI ( ID_RELOAD, MyFrame::OnUpdateReload ) EVT_UPDATE_UI ( ID_RELOAD, MyFrame::OnUpdateReload )
EVT_IDLE ( MyFrame::OnIdle ) EVT_IDLE ( MyFrame::OnIdle )
EVT_AUINOTEBOOK_PAGE_CLOSE ( wxID_ANY, MyFrame::OnPageClosing ) EVT_AUINOTEBOOK_PAGE_CLOSE ( wxID_ANY, MyFrame::OnPageClosing )
@ -1400,7 +1404,7 @@ void MyFrame::OnPageClosing ( wxAuiNotebookEvent& event ) //wxNotebookEvent& eve
return; return;
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
if ( doc->GetModify() ) //CanUndo()) if ( doc->GetModify() ) //CanUndo())
{ {
@ -1470,27 +1474,30 @@ void MyFrame::OnCloseAll ( wxCommandEvent& WXUNUSED ( event ) )
; ;
} }
void MyFrame::OnClosePane ( wxCommandEvent& WXUNUSED ( event ) ) void MyFrame::OnCloseMessagePane ( wxCommandEvent& WXUNUSED ( event ) )
{ {
closePane(); closeMessagePane();
//closeFindReplacePane();
//closeCommandPane();
XmlDoc *doc = getActiveDocument();
if ( doc )
doc->SetFocus();
} }
void MyFrame::closePane() void MyFrame::OnCloseFindReplacePane ( wxCommandEvent& WXUNUSED ( event ) )
{
closeFindReplacePane();
}
void MyFrame::OnCloseCommandPane ( wxCommandEvent& WXUNUSED ( event ) )
{
closeCommandPane();
}
void MyFrame::closeMessagePane()
{ {
if ( !htmlReport ) if ( !htmlReport )
return; return;
manager.GetPane ( htmlReport ).Hide(); manager.GetPane ( htmlReport ).Hide();
manager.Update(); manager.Update();
XmlDoc *doc; XmlDoc *doc = getActiveDocument();
if ( ( doc = getActiveDocument() ) == NULL ) if ( doc )
return;
doc->SetFocus(); doc->SetFocus();
} }
@ -1499,6 +1506,10 @@ void MyFrame::closeFindReplacePane()
if ( manager.GetPane ( findReplacePanel ).IsShown() ) if ( manager.GetPane ( findReplacePanel ).IsShown() )
manager.GetPane ( findReplacePanel ).Hide(); manager.GetPane ( findReplacePanel ).Hide();
manager.Update(); manager.Update();
XmlDoc *doc = getActiveDocument();
if ( doc != NULL )
doc->SetFocus();
} }
void MyFrame::closeCommandPane() void MyFrame::closeCommandPane()
@ -1506,6 +1517,10 @@ void MyFrame::closeCommandPane()
if ( manager.GetPane ( commandPanel ).IsShown() ) if ( manager.GetPane ( commandPanel ).IsShown() )
manager.GetPane ( commandPanel ).Hide(); manager.GetPane ( commandPanel ).Hide();
manager.Update(); manager.Update();
XmlDoc *doc = getActiveDocument();
if ( doc != NULL )
doc->SetFocus();
} }
bool MyFrame::panelHasFocus() bool MyFrame::panelHasFocus()
@ -2149,7 +2164,7 @@ void MyFrame::OnImportMSWord ( wxCommandEvent& event )
void MyFrame::OnExport ( wxCommandEvent& event ) void MyFrame::OnExport ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
XmlDoc *doc; XmlDoc *doc;
if ( ( doc = getActiveDocument() ) == NULL ) if ( ( doc = getActiveDocument() ) == NULL )
@ -3310,7 +3325,7 @@ bool MyFrame::openFile ( wxString& fileName, bool largeFile )
} }
else else
{ {
closePane(); closeMessagePane();
} }
return true; return true;
} }
@ -3415,7 +3430,7 @@ void MyFrame::OnSpelling ( wxCommandEvent& event )
return; return;
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
#ifdef __WXMSW__ #ifdef __WXMSW__
doc->SetUndoCollection ( false ); doc->SetUndoCollection ( false );
@ -3479,7 +3494,7 @@ void MyFrame::OnPreviousDocument ( wxCommandEvent& WXUNUSED ( event ) )
return; return;
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
int currentSelection = mainBook->GetSelection(); int currentSelection = mainBook->GetSelection();
if ( currentSelection < 1 ) if ( currentSelection < 1 )
@ -3496,7 +3511,7 @@ void MyFrame::OnNextDocument ( wxCommandEvent& WXUNUSED ( event ) )
return; return;
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
int currentSelection = mainBook->GetSelection(); int currentSelection = mainBook->GetSelection();
int maxSelection = mainBook->GetPageCount(); int maxSelection = mainBook->GetPageCount();
@ -3730,13 +3745,22 @@ void MyFrame::OnUpdateNextDocument ( wxUpdateUIEvent& event )
event.Enable ( ( currentDocument >= ( maxDocument - 1 ) ) ? false : true ); event.Enable ( ( currentDocument >= ( maxDocument - 1 ) ) ? false : true );
} }
void MyFrame::OnUpdateClosePane ( wxUpdateUIEvent& event ) void MyFrame::OnUpdateCloseMessagePane ( wxUpdateUIEvent& event )
{ {
wxAuiPaneInfo i1, i2, i3; wxAuiPaneInfo &info = manager.GetPane ( htmlReport );
i1 = manager.GetPane ( htmlReport ); event.Enable ( info.IsShown() );
i2 = manager.GetPane ( findReplacePanel ); }
i3 = manager.GetPane ( commandPanel );
event.Enable ( i1.IsShown() || i2.IsShown() || i3.IsShown() ); void MyFrame::OnUpdateCloseFindReplacePane ( wxUpdateUIEvent& event )
{
wxAuiPaneInfo &info = manager.GetPane ( findReplacePanel );
event.Enable ( info.IsShown() );
}
void MyFrame::OnUpdateCloseCommandPane ( wxUpdateUIEvent& event )
{
wxAuiPaneInfo &info = manager.GetPane ( commandPanel );
event.Enable ( info.IsShown() );
} }
void MyFrame::OnValidateDTD ( wxCommandEvent& event ) void MyFrame::OnValidateDTD ( wxCommandEvent& event )
@ -3956,7 +3980,7 @@ void MyFrame::OnCreateSchema ( wxCommandEvent& event )
void MyFrame::OnDtd2Schema ( wxCommandEvent& event ) void MyFrame::OnDtd2Schema ( wxCommandEvent& event )
{ {
closePane(); closeMessagePane();
#if wxCHECK_VERSION(2,9,0) #if wxCHECK_VERSION(2,9,0)
long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST; long style = wxFD_OPEN | wxFD_FILE_MUST_EXIST;
@ -3988,7 +4012,7 @@ void MyFrame::OnDtd2Schema ( wxCommandEvent& event )
void MyFrame::OnXPath ( wxCommandEvent& event ) void MyFrame::OnXPath ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
XmlDoc *doc; XmlDoc *doc;
if ( ( doc = getActiveDocument() ) == NULL ) if ( ( doc = getActiveDocument() ) == NULL )
@ -4039,7 +4063,7 @@ void MyFrame::OnXPath ( wxCommandEvent& event )
void MyFrame::OnXslt ( wxCommandEvent& event ) void MyFrame::OnXslt ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
// fetch document contents // fetch document contents
XmlDoc *doc; XmlDoc *doc;
@ -4162,7 +4186,7 @@ void MyFrame::OnXslt ( wxCommandEvent& event )
void MyFrame::OnPrettyPrint ( wxCommandEvent& event ) void MyFrame::OnPrettyPrint ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
// fetch document contents // fetch document contents
XmlDoc *doc; XmlDoc *doc;
@ -4231,7 +4255,7 @@ void MyFrame::OnPrettyPrint ( wxCommandEvent& event )
void MyFrame::OnEncoding ( wxCommandEvent& event ) void MyFrame::OnEncoding ( wxCommandEvent& event )
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
// fetch document contents // fetch document contents
XmlDoc *doc; XmlDoc *doc;
@ -4497,7 +4521,7 @@ void MyFrame::findAgain ( wxString s, int flags )
bool MyFrame::closeActiveDocument() bool MyFrame::closeActiveDocument()
{ {
statusProgress ( wxEmptyString ); statusProgress ( wxEmptyString );
closePane(); closeMessagePane();
int selection = mainBook->GetSelection(); int selection = mainBook->GetSelection();
if ( selection == -1 || !mainBook->GetPageCount() ) // GetPageCount needed for wxAuiNotebook if ( selection == -1 || !mainBook->GetPageCount() ) // GetPageCount needed for wxAuiNotebook
@ -4563,7 +4587,7 @@ bool MyFrame::saveFile ( XmlDoc *doc, wxString& fileName, bool checkLastModified
fileNameLocal = fileName.mb_str ( wxConvLocal ); fileNameLocal = fileName.mb_str ( wxConvLocal );
closePane(); closeMessagePane();
bool success; bool success;
success = true; success = true;
if ( getFileType ( fileName ) != FILE_TYPE_XML ) if ( getFileType ( fileName ) != FILE_TYPE_XML )
@ -5073,8 +5097,12 @@ wxMenuBar *MyFrame::getMenuBar()
viewMenu->AppendCheckItem ( viewMenu->AppendCheckItem (
ID_TOOLBAR_VISIBLE, _ ( "Sh&ow Toolbar" ), _ ( "Show Toolbar" ) ); ID_TOOLBAR_VISIBLE, _ ( "Sh&ow Toolbar" ), _ ( "Show Toolbar" ) );
viewMenu->Check ( ID_TOOLBAR_VISIBLE, toolbarVisible ); viewMenu->Check ( ID_TOOLBAR_VISIBLE, toolbarVisible );
viewMenu->Append ( viewMenu->Append ( ID_CLOSE_MESSAGE_PANE,
ID_HIDE_PANE, _ ( "C&lose Message Pane\tAlt+C" ), _ ( "Close Message Pane" ) ); _ ( "C&lose Message Pane\tAlt+C" ), _ ( "Close Message Pane" ) );
viewMenu->Append ( ID_CLOSE_FIND_REPLACE_PANE,
_ ( "Close Find/Replace Pane" ), _ ( "Close Find/Replace Pane" ) );
viewMenu->Append ( ID_CLOSE_COMMAND_PANE,
_ ( "Close Command Pane" ), _ ( "Close Command Pane" ) );
// insert menu // insert menu
wxMenu *insertMenu = new wxMenu; wxMenu *insertMenu = new wxMenu;

14
src/xmlcopyeditor.h
View File

@ -76,7 +76,9 @@ enum
ID_NEXT_DOCUMENT, ID_NEXT_DOCUMENT,
ID_OPTIONS, ID_OPTIONS,
ID_IMPORT_MSWORD, ID_IMPORT_MSWORD,
ID_HIDE_PANE, ID_CLOSE_MESSAGE_PANE,
ID_CLOSE_FIND_REPLACE_PANE,
ID_CLOSE_COMMAND_PANE,
ID_HOME, ID_HOME,
ID_PASTE_NEW_DOCUMENT, ID_PASTE_NEW_DOCUMENT,
ID_PRINT_SETUP, ID_PRINT_SETUP,
@ -218,7 +220,9 @@ class MyFrame : public wxFrame
void OnCheckWellformedness ( wxCommandEvent& event ); void OnCheckWellformedness ( wxCommandEvent& event );
void OnClose ( wxCommandEvent& event ); void OnClose ( wxCommandEvent& event );
void OnCloseAll ( wxCommandEvent& event ); void OnCloseAll ( wxCommandEvent& event );
void OnClosePane ( wxCommandEvent& event ); void OnCloseMessagePane ( wxCommandEvent& event );
void OnCloseFindReplacePane ( wxCommandEvent& event );
void OnCloseCommandPane ( wxCommandEvent& event );
void OnCut ( wxCommandEvent& event ); void OnCut ( wxCommandEvent& event );
void OnCopy ( wxCommandEvent& event ); void OnCopy ( wxCommandEvent& event );
void OnPaste ( wxCommandEvent& event ); void OnPaste ( wxCommandEvent& event );
@ -270,7 +274,9 @@ class MyFrame : public wxFrame
void OnDialogReplaceAll ( wxFindDialogEvent& event ); void OnDialogReplaceAll ( wxFindDialogEvent& event );
void OnFrameClose ( wxCloseEvent& event ); void OnFrameClose ( wxCloseEvent& event );
void OnIdle ( wxIdleEvent& event ); void OnIdle ( wxIdleEvent& event );
void OnUpdateClosePane ( wxUpdateUIEvent& event ); void OnUpdateCloseMessagePane ( wxUpdateUIEvent& event );
void OnUpdateCloseFindReplacePane ( wxUpdateUIEvent& event );
void OnUpdateCloseCommandPane ( wxUpdateUIEvent& event );
void OnUpdateCloseAll ( wxUpdateUIEvent& event ); void OnUpdateCloseAll ( wxUpdateUIEvent& event );
void OnUpdateUndo ( wxUpdateUIEvent& event ); void OnUpdateUndo ( wxUpdateUIEvent& event );
void OnUpdatePreviousDocument ( wxUpdateUIEvent& event ); void OnUpdatePreviousDocument ( wxUpdateUIEvent& event );
@ -315,7 +321,7 @@ class MyFrame : public wxFrame
XmlDoc *doc, XmlDoc *doc,
const wxString& schemaName, const wxString& schemaName,
wxString& fileName ); wxString& fileName );
void closePane(); void closeMessagePane();
void closeFindReplacePane(); void closeFindReplacePane();
void closeCommandPane(); void closeCommandPane();
bool closeActiveDocument(); bool closeActiveDocument();