From 51048c159a4e4dcf834a2a6b2e9012761f8e3fa9 Mon Sep 17 00:00:00 2001 From: "Zane U. Ji" Date: Sat, 7 Jun 2014 22:16:47 +0800 Subject: [PATCH] Feature #169 Close current tab with Ctrl+W --- ChangeLog | 5 ++++- src/xmlcopyeditor.cpp | 8 ++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index f526f67..ba7aba2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,7 @@ -1.2.1.2 +1.2.1.3 + + Feature #169 Close current tab with Ctrl+W + +1.2.1.2 2014/06/02 + Feature #69 Add "current XPath" shortcut + Feature #155 XPath - functions + Click on the error message to jump to the error location diff --git a/src/xmlcopyeditor.cpp b/src/xmlcopyeditor.cpp index bb43054..78d1c29 100644 --- a/src/xmlcopyeditor.cpp +++ b/src/xmlcopyeditor.cpp @@ -1047,6 +1047,10 @@ MyFrame::MyFrame ( manager.Update(); + wxAcceleratorEntry entry ( wxACCEL_CTRL, WXK_F4, wxID_CLOSE ); + wxAcceleratorTable accel ( 1, &entry ); + SetAcceleratorTable ( accel ); + /* defaultLayout = manager.SavePerspective(); @@ -5063,7 +5067,7 @@ wxMenuBar *MyFrame::getMenuBar() ID_UNFOLD_ALL, _ ( "&Unfold Tags\tCtrl+Shift+U" ), _T ( "Unfold Tags" ) ); viewMenu->AppendSeparator(); viewMenu->AppendCheckItem ( - ID_WRAP_WORDS, _ ( "&Wrap Words\tCtrl+W" ), _T ( "Wrap Words" ) ); + ID_WRAP_WORDS, _ ( "&Wrap Words" ), _T ( "Wrap Words" ) ); viewMenu->Check ( ID_WRAP_WORDS, properties.wrap ); viewMenu->Append ( wxID_ANY, _ ( "&Color Scheme" ), colorSchemeMenu ); viewMenu->Append ( wxID_ANY, _ ( "&Text Size" ), fontSizeMenu ); @@ -5336,7 +5340,7 @@ void MyFrame::updateFileMenu ( bool deleteExisting ) openLargeFileItem->SetBitmap ( wxNullBitmap ); wxMenuItem *closeItem = - new wxMenuItem ( fileMenu, wxID_CLOSE, _ ( "&Close\tCtrl+F4" ), _ ( "Close" ) ); + new wxMenuItem ( fileMenu, wxID_CLOSE, _ ( "&Close\tCtrl+W" ), _ ( "Close" ) ); closeItem->SetBitmap ( wxNullBitmap ); wxMenuItem *closeAllItem = new wxMenuItem ( fileMenu, wxID_CLOSE_ALL, _ ( "C&lose All" ), _ ( "Close All" ) );