Mercurial > mercurial > hgweb_dw.cgi

changeset 1:20018a6f69a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
implement copy.
author pyon@macmini
date Wed, 31 Oct 2012 18:08:52 +0900
parents 7c3921bf511e
children deaf3f2d54b2
files Changes include/myframe.h src/myframe.cpp
diffstat 3 files changed, 46 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/Changes	Sat Oct 20 16:07:42 2012 +0900
+++ b/Changes	Wed Oct 31 18:08:52 2012 +0900
@@ -1,5 +1,5 @@
 version 0.2
-2012-06-22
+2012-10-31
  Beta2 Release.
 
 ----
--- a/include/myframe.h	Sat Oct 20 16:07:42 2012 +0900
+++ b/include/myframe.h	Wed Oct 31 18:08:52 2012 +0900
@@ -22,8 +22,14 @@
 		wxStaticText*    m_staticText3;
 		wxTextCtrl*      m_textCtrlCommand;
 		wxStaticText*    m_staticText4;
+		wxTextCtrl*      m_textCtrlWait;
+		wxStaticText*    m_staticText5;
 		wxDirPickerCtrl* m_dirPickerMove;
-		wxStaticText*    m_staticText5;
+		wxStaticText*    m_staticText6;
+        wxCheckBox*      m_checkBoxCopy;
+		wxStaticText*    m_staticTextDummy1;
+		wxStaticText*    m_staticTextDummy2;
+		wxStaticText*    m_staticTextDummy3;
 		wxToggleButton*  m_toggleBtn;
 
         wxFileSystemWatcher* m_watcher;
@@ -49,7 +55,9 @@
     ID_WATCHDIR,
     ID_FILENAME,
     ID_COMMAND,
+    ID_WAIT,
     ID_MOVEDIR,
+    ID_COPY,
     ID_TOGGLEWATCH,
 };
 
--- a/src/myframe.cpp	Sat Oct 20 16:07:42 2012 +0900
+++ b/src/myframe.cpp	Wed Oct 31 18:08:52 2012 +0900
@@ -26,12 +26,12 @@
 	wxMenuItem* m_menuItemAbout = new wxMenuItem( m_menuFile, ID_MNABOUT, wxString( wxT("&About...\tF1") ) , wxT("Show about dialog"), wxITEM_NORMAL );
 	m_menuFile->Append( m_menuItemAbout );
 	
-	m_menubar->Append( m_menuFile, wxT("ファイル(&F)") ); 
+	m_menubar->Append( m_menuFile, wxT("File(&F)") ); 
 	
 	this->SetMenuBar( m_menubar );
 	
     // 
-	wxFlexGridSizer* fgSizer = new wxFlexGridSizer( 0, 2, 0, 0 );
+	wxFlexGridSizer* fgSizer = new wxFlexGridSizer( 0, 4, 0, 0 );
 	fgSizer->SetFlexibleDirection( wxBOTH );
 	fgSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 	
@@ -53,14 +53,32 @@
 	m_textCtrlCommand = new wxTextCtrl( this, ID_COMMAND, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); 
 	fgSizer->Add( m_textCtrlCommand, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
 	
-	m_staticText4 = new wxStaticText( this, wxID_ANY, wxT("MoveTo"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText4 = new wxStaticText( this, wxID_ANY, wxT("wait [sec]"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer->Add( m_staticText4, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+	m_textCtrlWait = new wxTextCtrl( this, ID_WAIT, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); 
+	fgSizer->Add( m_textCtrlWait, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
+
+	m_staticText5 = new wxStaticText( this, wxID_ANY, wxT("MoveTo"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 	
 	m_dirPickerMove = new wxDirPickerCtrl( this, ID_MOVEDIR, wxEmptyString, wxT("Select a folder"), wxDefaultPosition, wxDefaultSize, wxDIRP_DEFAULT_STYLE );
 	fgSizer->Add( m_dirPickerMove, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_staticText5 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
-	fgSizer->Add( m_staticText5, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+	m_staticText6 = new wxStaticText( this, wxID_ANY, wxT("copy"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText6, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+    m_checkBoxCopy = new wxCheckBox( this, ID_COPY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_checkBoxCopy, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
+
+	m_staticTextDummy1 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticTextDummy1, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+	m_staticTextDummy2 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticTextDummy2, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
+
+	m_staticTextDummy3 = new wxStaticText( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticTextDummy3, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 	
 	m_toggleBtn = new wxToggleButton( this, ID_TOGGLEWATCH, wxT("Start Watching"), wxDefaultPosition, wxDefaultSize, 0 );
 	fgSizer->Add( m_toggleBtn, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 );
@@ -70,8 +88,10 @@
 	
 	this->Centre( wxBOTH );
 
-    m_dirPickerWatch->SetPath( wxT("/Users/takayuki/wx/dw_test" ) );
-    m_dirPickerMove->SetPath( wxT("/Users/takayuki/wx/dw_test/log" ) );
+    //m_dirPickerWatch->SetPath( wxT("/Users/takayuki/wx/dw_test" ) );
+    //m_dirPickerMove->SetPath( wxT("/Users/takayuki/wx/dw_test/log" ) );
+    m_dirPickerWatch->SetPath( wxT("\\\\Kai-sv51\\Users\\Administrator\\Documents\\Fuji Xerox\\DocuWorks\\DWFolders\\ユーザーフォルダ" ) );
+    m_dirPickerMove->SetPath( wxT("C:\\Users\\KAIGO\\Desktop\\dww\\" ) );
     m_textCtrlFile->SetValue( wxT("test.file") );
 }
 
@@ -115,7 +135,8 @@
 /* フォルダ監視 */
 void MyFrame::OnFileSystemEvent( wxFileSystemWatcherEvent& event )
 {
-    //wxMessageBox(wxT(""));
+    wxMilliSleep( 1500 );
+
     wxString watchdir = m_dirPickerWatch->GetPath();
     wxString filename = m_textCtrlFile->GetValue();
     wxString command  = m_textCtrlCommand->GetValue();
@@ -130,6 +151,7 @@
     while ( cont ) {
 
         if ( !command.IsEmpty() ) {
+            wxSleep( 2 );
             wxExecute( command );
         }
 
@@ -138,7 +160,12 @@
             wxFileName f( from );
             wxDateTime now = wxDateTime::Now();
             to = movedir + wxFILE_SEP_PATH + f.GetName() + wxT("_") + now.Format(wxT("%Y%m%d%H%M%S")) + wxT(".") + f.GetExt();
-            wxRenameFile( from, to, false );
+            if ( m_checkBoxCopy->IsChecked() ) {
+                wxCopyFile( from, to, false );
+            }
+            else {
+                wxRenameFile( from, to, false );
+            }
         }
 
         cont = dir.GetNext( &file );