--- a/include/myframe.h	Thu Nov 08 20:17:12 2012 +0900
+++ b/include/myframe.h	Sun Nov 25 12:59:11 2012 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.h
-// Last Change: 20-Oct-2012.
+// Last Change: 25-Nov-2012.
 //
 #ifndef __MYFRAME_H__
 #define __MYFRAME_H__
@@ -10,66 +10,66 @@
 {
     DECLARE_EVENT_TABLE()
 	private:
+        wxFileSystemWatcher* m_watcher;
 	
 	protected:
-		wxMenuBar* m_menubar;
-		wxMenu*	   m_menuFile;
+		wxMenuBar*		    m_menubar;
+		wxMenu*		        m_menuFile;
+
+		wxSearchCtrl*		m_searchCtrlFile;
+		wxDirPickerCtrl*	m_dirPickerWatchDir;
+		wxListCtrl*		    m_listCtrlWatchDir;
+		wxChoice*		    m_choiceMove;
+		wxStaticText*		m_staticText0;
+		wxChoice*		    m_choiceSuffix;
+		wxDirPickerCtrl*	m_dirPickerMoveTo;
+		wxListCtrl*		    m_listCtrlMove;
 
-		wxStaticText*    m_staticText1;
-		wxDirPickerCtrl* m_dirPickerWatch;
-		wxStaticText*    m_staticText2;
-		wxTextCtrl*      m_textCtrlFile;
-		wxStaticText*    m_staticText3;
-		wxTextCtrl*      m_textCtrlCommand;
-		wxStaticText*    m_staticText4;
-		wxTextCtrl*      m_textCtrlWait;
-		wxStaticText*    m_staticText5;
-		wxDirPickerCtrl* m_dirPickerMove;
-		wxStaticText*    m_staticText6;
-        wxCheckBox*      m_checkBoxCopy;
-		wxStaticText*    m_staticText7;
-        wxComboBox*      m_comboSuffix;
-		wxStaticText*    m_staticTextDummy1;
-		wxStaticText*    m_staticTextDummy2;
-		wxStaticText*    m_staticTextDummy3;
-		wxStaticText*    m_staticText8;
-        wxCheckBox*      m_checkBoxExit;
-		wxToggleButton*  m_toggleBtn;
+		wxStaticText*		m_staticTextCmd0;
+		wxTextCtrl*		    m_textCtrlCmd0;
+		wxChoice*		    m_choiceCmd0;
+		wxStaticText*		m_staticTextCmd1;
+		wxTextCtrl*		    m_textCtrlCmd1;
+		wxChoice*		    m_choiceCmd1;
+		wxStaticText*		m_staticTextCmd2;
+		wxTextCtrl*		    m_textCtrlCmd2;
+		wxChoice*		    m_choiceCmd2;
 
-        wxFileSystemWatcher* m_watcher;
+		wxChoice*		    m_choiceFound;
 
+		wxTextCtrl*		    m_textCtrlWait;
+		wxStaticText*		m_staticText1;
+		wxChoice*		    m_choiceNotFound;
+		wxToggleButton*		m_toggleBtn;
+	
 	public:
-        MyFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style );
+		
+		MyFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style );
 		~MyFrame();
-
+	
         void OnFileSystemEvent( wxFileSystemWatcherEvent& event );
         void OnWatch( wxCommandEvent& WXUNUSED(event) );
+        void OnSetup( wxCommandEvent& WXUNUSED(event) );
+        void OnSaveParams( wxCommandEvent& WXUNUSED(event) );
 
         void OnWinSize( wxSizeEvent& event );
         void OnWinMove( wxMoveEvent& WXUNUSED(event) );
         void TellLocation( void );
         void OnQuit( wxCommandEvent& WXUNUSED(event) );
         void OnAbout( wxCommandEvent& WXUNUSED(event) );
-        void OnSetup( wxCommandEvent& WXUNUSED(event) );
-        void OnSaveParams( wxCommandEvent& WXUNUSED(event) );
         void SaveConfig( wxCloseEvent& WXUNUSED(event) );
 };
 
-enum {
+enum
+{
     ID_MNAPPDIR = wxID_HIGHEST + 10,
     ID_MNSETUP,
     ID_MNSAVE,
     ID_MNABOUT,
-    ID_WATCHDIR,
-    ID_FILENAME,
-    ID_COMMAND,
-    ID_WAIT,
-    ID_MOVEDIR,
-    ID_COPY,
-    ID_SUFFIX,
-    ID_EXIT,
-    ID_TOGGLEWATCH,
+    ID_TGLWATCH,
 };
 
+
 #endif //__MYFRAME_H__
 
+