--- a/include/rsearcher.h	Tue Oct 02 21:20:05 2018 +0900
+++ b/include/rsearcher.h	Thu Oct 11 22:11:09 2018 +0900
@@ -1,5 +1,5 @@
 // Filename   : rsearcher.h
-// Last Change: 2018-10-02 Tue 19:36:21.
+// Last Change: 2018-10-11 –Ø 18:29:13.
 //
 
 #ifndef __RSEARCH_H__
@@ -25,7 +25,10 @@
 #include <wx/msgdlg.h> 
 #include <wx/filefn.h> 
 #include <wx/regex.h>
+#include <wx/progdlg.h>
+#include <wx/utils.h> 
 #include <wx/textfile.h>
+#include <wx/timer.h>
 
 class MySearchCtrl : public wxSearchCtrl
 {
@@ -40,7 +43,8 @@
 class MyStaticBitmap : public wxStaticBitmap
 {
 	private:
-        int m_dragx, m_dragy;
+        int m_dragx, m_dragy;	// for image drag
+		int cx, cy;             // for mouse-gesture
         int m_zoom = 0;
         wxBitmap m_bmp[5];
 		wxScrolledWindow* m_parent;
@@ -51,6 +55,8 @@
 
         void OnLeftDown( wxMouseEvent& event );
         void OnLeftUp( wxMouseEvent& event );
+		void OnStartRGesture( wxMouseEvent& event );
+		void OnEndRGesture( wxMouseEvent& event );
         void OnMotion( wxMouseEvent& event );
         void OnWheel( wxMouseEvent& event );
         void SetImage( int i, wxBitmap bmp ) { m_bmp[i] = bmp; };
@@ -64,7 +70,9 @@
 		bool		  startup = true;
 		wxString	  m_server;
 		wxString	  m_hhs;
+		wxString	  m_user;
 		wxArrayString m_index;
+		wxTimer       m_timer;
 	
 	protected:
 		enum {
@@ -72,7 +80,8 @@
 			ID_LIST,
 			ID_NBOOK,
 			ID_SLDR,
-			ID_PRINT,
+			ID_TIMER,
+			ID_LOGOUT,
             ID_TEST,
 		};
 		
@@ -100,27 +109,34 @@
 		wxTextCtrl* 		m_textCtrlLog;
 		wxSlider*           m_slider;
 		wxButton*           m_buttonPrint;
+		wxButton*           m_buttonLogout;
 		wxButton*           m_buttonTest;
 	
 	public:
 		MainFrame( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxT( "Searcher Remote" ), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 500,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
 		~MainFrame();
+
 		void SetServer( wxString server ) { m_server = server; };
+		void SetUser( wxString user ) { m_user = user; };
 		void CreateControls( void );
 		void Cmd( wxString cmd );
 		void Search( void );
-		void LoadIndex( void );
+		void LoadDB( void );
         void LoadBitmap( wxScrolledWindow* sc, wxStaticBitmap* sb, wxString file );
         void LoadBitmaps( wxString date );
         void GetImages( wxString hhs, wxString date );
+		void PrintImages( void );
 		void RemoveFile( wxString pattern );
-		void SaveConfig( wxCloseEvent& event );
         void InDevelop( bool );
 
 		void OnItemSelected( wxDataViewEvent& event );
 		void OnItemDClicked( wxDataViewEvent& event );
         void OnNBookChanged( wxBookCtrlEvent& event );
-		//void OnIdle( wxIdleEvent& event );
+        void OnPrint( wxCommandEvent& event );
+		void OnClose( wxCloseEvent& event );	// save config
+		void OnIdle( wxIdleEvent& event );
+		void OnTimer( wxTimerEvent& event );
+        void OnLogout( wxCommandEvent& event );
         void OnTestButton( wxCommandEvent& event );
 };