Mercurial > mercurial > hgweb_mover2.cgi

changeset 29:24283d3a9592 v2.3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix shortcut-keys
author pyon@macmini
date Sat, 05 Nov 2011 12:25:39 +0900
parents d54f1f1e583d
children e4d585cbd172
files include/common.h include/main.h include/myframe.h src/myframe.cpp
diffstat 4 files changed, 34 insertions(+), 36 deletions(-) [+]
line wrap: on
line diff
--- a/include/common.h	Sat Nov 05 12:21:36 2011 +0900
+++ b/include/common.h	Sat Nov 05 12:25:39 2011 +0900
@@ -34,18 +34,19 @@
     #include <wx/frame.h>
     #include <wx/textfile.h>
     #include <wx/stopwatch.h>
-    #include "wx/regex.h"
+    #include <wx/regex.h>
 #endif
 
 enum {
     // mainframe
-    ID_MAIN    = wxID_HIGHEST + 1,
+    ID_MAIN = wxID_HIGHEST + 1,
     ID_TEST,
 
     ID_MENUBARFILE,
+    ID_MENUITEMDETECT,
+    ID_MENUITEMMOVE,
     ID_MENUITEMPARAM,
     ID_MENUITEMAPPDIR,
-    ID_MENUITEMQUIT,
 
     ID_BUTTONNEXTTHU,
     ID_BUTTONMKDIR,
--- a/include/main.h	Sat Nov 05 12:21:36 2011 +0900
+++ b/include/main.h	Sat Nov 05 12:25:39 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : main.h
-// Last Change: 03-Nov-2011.
+// Last Change: 05-Nov-2011.
 //
 #include "wx/wx.h"
 #include "wx/config.h"
@@ -8,8 +8,8 @@
 #define MYAPPNAME wxT("AMover2")
 
 #define VER 2
-#define REV 2
-#define BLD 20111104
+#define REV 3
+#define BLD 20111107
 
 // private classes
 // Define a new application type, each program should derive a class from wxApp
--- a/include/myframe.h	Sat Nov 05 12:21:36 2011 +0900
+++ b/include/myframe.h	Sat Nov 05 12:25:39 2011 +0900
@@ -75,7 +75,6 @@
         // $B0J2<!$Dj7?$b$N(B
         void OnTimer(wxTimerEvent& event);
         void OnChar(wxKeyEvent& event);
-        void F5_Shortcut(void);
         void F7_Shortcut(void);
         void OnIdle(wxIdleEvent& event);
         void OnWinSize(wxSizeEvent& event);
--- a/src/myframe.cpp	Sat Nov 05 12:21:36 2011 +0900
+++ b/src/myframe.cpp	Sat Nov 05 12:25:39 2011 +0900
@@ -33,22 +33,31 @@
     // メニューバー
 	m_menubarFile = new wxMenuBar();
 	m_menuFile = new wxMenu();
+
+	wxMenuItem* m_menuItemDetect;
+	m_menuItemDetect = new wxMenuItem( m_menuFile, ID_MENUITEMDETECT, wxString( wxT("検知\tF5") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemDetect );
+
+	wxMenuItem* m_menuItemMove;
+	m_menuItemMove = new wxMenuItem( m_menuFile, ID_MENUITEMMOVE, wxString( wxT("移動\tF7") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuFile->Append( m_menuItemMove );
+
+	m_menuFile->AppendSeparator();    // ----
 	wxMenuItem* m_menuItemParam;
-	m_menuItemParam = new wxMenuItem( m_menuFile, ID_MENUITEMPARAM, wxString( wxT("パラメータ(&P)") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItemParam = new wxMenuItem( m_menuFile, ID_MENUITEMPARAM, wxString( wxT("パラメータ\tAlt+P") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemParam );
 	
 	wxMenuItem* m_menuItemAppDIr;
-	m_menuItemAppDIr = new wxMenuItem( m_menuFile, ID_MENUITEMAPPDIR, wxString( wxT("アプリフォルダを開く(&O)") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItemAppDIr = new wxMenuItem( m_menuFile, ID_MENUITEMAPPDIR, wxString( wxT("アプリフォルダを開く\tCtrl+O") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemAppDIr );
 	
-	wxMenuItem* m_separator;
-	m_separator = m_menuFile->AppendSeparator();    // ----
+	m_menuFile->AppendSeparator();    // ----
 	
 	wxMenuItem* m_menuItemQuit;
-	m_menuItemQuit = new wxMenuItem( m_menuFile, ID_MENUITEMQUIT, wxString( wxT("終了(&X)") ) , wxEmptyString, wxITEM_NORMAL );
+	m_menuItemQuit = new wxMenuItem( m_menuFile, wxID_EXIT, wxString( wxT("終了\tAlt+X") ) , wxEmptyString, wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemQuit );
 	
-	m_menubarFile->Append( m_menuFile, wxT("ファイル(&F)") ); 
+	m_menubarFile->Append( m_menuFile, wxT("ファイル\tAlt+F") ); 
 	
 	this->SetMenuBar( m_menubarFile );
 	
@@ -212,11 +221,12 @@
 
 // Event Table
 BEGIN_EVENT_TABLE( MyFrame, wxFrame )
-    EVT_CHAR( MyFrame::OnChar )
     EVT_IDLE( MyFrame::OnIdle )
     EVT_TIMER( ID_TIMER, MyFrame::OnTimer )
     EVT_SIZE( MyFrame::OnWinSize )
     EVT_MOVE( MyFrame::OnWinMove )
+    EVT_MENU( ID_MENUITEMDETECT,  MyFrame::OnDetect )
+    EVT_MENU( ID_MENUITEMMOVE,    MyFrame::OnMove )
     EVT_MENU( ID_MENUITEMPARAM,   MyFrame::OnParam )
     EVT_MENU( ID_MENUITEMAPPDIR,  MyFrame::OnOpenAppDir )
     EVT_MENU( wxID_EXIT,          MyFrame::OnQuit )
@@ -281,13 +291,21 @@
 /* 検知 */
 void MyFrame::OnDetect(wxCommandEvent& WXUNUSED(event))
 {
-    F5_Shortcut(); // UpdateCache -> UpdateListImage
+    UpdateCache();
+    UpdateListImage();
 }
 
 /* 移動 */
 void MyFrame::OnMove(wxCommandEvent& WXUNUSED(event))
 {
-    F7_Shortcut(); // MoveImages -> UpdateCache -> UpdateListImage -> ListHhsDir
+    wxString distdir = m_textCtrlDist->GetValue();
+    if ( distdir.IsEmpty() ) return;
+
+    MoveImages();
+    UpdateCache();
+    UpdateListImage();
+    ListHhsDir();
+    m_buttonUndo->Enable(true);
 }
 
 /* 選択したファイルを移動 */
@@ -621,26 +639,6 @@
     UpdateCache();
 }
 
-/* キーハンドリング */
-void MyFrame::OnChar(wxKeyEvent& event)
-{
-    if ( event.GetKeyCode() == WXK_F5 ) F5_Shortcut();
-    if ( event.GetKeyCode() == WXK_F7 ) F7_Shortcut();
-}
-void MyFrame::F5_Shortcut()
-{
-    UpdateCache();
-    UpdateListImage();
-}
-void MyFrame::F7_Shortcut()
-{
-    MoveImages();
-    UpdateCache();
-    UpdateListImage();
-    ListHhsDir();
-    m_buttonUndo->Enable(true);
-}
-
 /* アイドリング */
 void MyFrame::OnIdle(wxIdleEvent& event)
 {