diff src/rsearcher.cpp @ 16:b651aa41b9d4 default tip

hhsinfo method (server)
author pyon@macmini
date Mon, 15 Jul 2019 07:03:05 +0900
parents c262e17de9b1
children
line wrap: on
line diff
--- a/src/rsearcher.cpp	Sat Jun 08 15:50:59 2019 +0900
+++ b/src/rsearcher.cpp	Mon Jul 15 07:03:05 2019 +0900
@@ -1,5 +1,5 @@
 // Filename   : rsearcher.cpp
-// Last Change: 2019-05-29 水 15:37:32.
+// Last Change: 2019-07-15 Mon 06:58:17.
 //
 
 #include <wx/arrstr.h> 
@@ -7,6 +7,8 @@
 #include <wx/clipbrd.h>
 #include "id.h"
 #include "mngdb.h"
+#include "batchprint.h"
+#include "index.h"
 #include "rsearcher.h"
 #include "main.h"
 
@@ -92,26 +94,26 @@
     : wxStaticBitmap( parent, id, label, pos, size, style, name )
 {
 	m_parent = parent;
-    Connect( wxEVT_LEFT_DOWN,    wxMouseEventHandler( OnLeftDown      ), NULL, this );
-    Connect( wxEVT_LEFT_UP,      wxMouseEventHandler( OnLeftUp        ), NULL, this );
-    Connect( wxEVT_LEFT_DCLICK,  wxMouseEventHandler( OnLeftDClick    ), NULL, this );
-    Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( OnRightDClick   ), NULL, this );
-    Connect( wxEVT_MOTION,       wxMouseEventHandler( OnMotion        ), NULL, this );
-    Connect( wxEVT_MOUSEWHEEL,   wxMouseEventHandler( OnWheel         ), NULL, this );
-    Connect( wxEVT_RIGHT_DOWN,   wxMouseEventHandler( OnStartRGesture ), NULL, this );
-    Connect( wxEVT_RIGHT_UP,     wxMouseEventHandler( OnEndRGesture   ), NULL, this );
+    Connect( wxEVT_LEFT_DOWN,    wxMouseEventHandler( MyStaticBitmap::OnLeftDown      ), NULL, this );
+    Connect( wxEVT_LEFT_UP,      wxMouseEventHandler( MyStaticBitmap::OnLeftUp        ), NULL, this );
+    Connect( wxEVT_LEFT_DCLICK,  wxMouseEventHandler( MyStaticBitmap::OnLeftDClick    ), NULL, this );
+    Connect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnRightDClick   ), NULL, this );
+    Connect( wxEVT_MOTION,       wxMouseEventHandler( MyStaticBitmap::OnMotion        ), NULL, this );
+    Connect( wxEVT_MOUSEWHEEL,   wxMouseEventHandler( MyStaticBitmap::OnWheel         ), NULL, this );
+    Connect( wxEVT_RIGHT_DOWN,   wxMouseEventHandler( MyStaticBitmap::OnStartRGesture ), NULL, this );
+    Connect( wxEVT_RIGHT_UP,     wxMouseEventHandler( MyStaticBitmap::OnEndRGesture   ), NULL, this );
 }
 
 MyStaticBitmap::~MyStaticBitmap()
 {
-    Disconnect( wxEVT_LEFT_DOWN,    wxMouseEventHandler( OnLeftDown      ), NULL, this );
-    Disconnect( wxEVT_LEFT_UP,      wxMouseEventHandler( OnLeftUp        ), NULL, this );
-    Disconnect( wxEVT_LEFT_DCLICK,  wxMouseEventHandler( OnLeftDClick    ), NULL, this );
-    Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( OnRightDClick   ), NULL, this );
-    Disconnect( wxEVT_MOTION,       wxMouseEventHandler( OnMotion        ), NULL, this );
-    Disconnect( wxEVT_MOUSEWHEEL,   wxMouseEventHandler( OnWheel         ), NULL, this );
-    Disconnect( wxEVT_RIGHT_DOWN,   wxMouseEventHandler( OnStartRGesture ), NULL, this );
-    Disconnect( wxEVT_RIGHT_UP,     wxMouseEventHandler( OnEndRGesture   ), NULL, this );
+    Disconnect( wxEVT_LEFT_DOWN,    wxMouseEventHandler( MyStaticBitmap::OnLeftDown      ), NULL, this );
+    Disconnect( wxEVT_LEFT_UP,      wxMouseEventHandler( MyStaticBitmap::OnLeftUp        ), NULL, this );
+    Disconnect( wxEVT_LEFT_DCLICK,  wxMouseEventHandler( MyStaticBitmap::OnLeftDClick    ), NULL, this );
+    Disconnect( wxEVT_RIGHT_DCLICK, wxMouseEventHandler( MyStaticBitmap::OnRightDClick   ), NULL, this );
+    Disconnect( wxEVT_MOTION,       wxMouseEventHandler( MyStaticBitmap::OnMotion        ), NULL, this );
+    Disconnect( wxEVT_MOUSEWHEEL,   wxMouseEventHandler( MyStaticBitmap::OnWheel         ), NULL, this );
+    Disconnect( wxEVT_RIGHT_DOWN,   wxMouseEventHandler( MyStaticBitmap::OnStartRGesture ), NULL, this );
+    Disconnect( wxEVT_RIGHT_UP,     wxMouseEventHandler( MyStaticBitmap::OnEndRGesture   ), NULL, this );
 }
 
 // Event Handlers
@@ -285,16 +287,18 @@
     EVT_IDLE( MainFrame::OnIdle )
     EVT_TIMER( ID_TIMER, MainFrame::OnTimer )
 	// shortcut-key
-	EVT_BUTTON( ID_FOCUS, MainFrame::OnFocus )
-	EVT_BUTTON( ID_PZOOM, MainFrame::OnPlusZoom )
-	EVT_BUTTON( ID_MZOOM, MainFrame::OnMinusZoom )
-	EVT_BUTTON( ID_DARK, MainFrame::OnDark )
-	EVT_BUTTON( ID_SWIN, MainFrame::OnSatellite )
-	EVT_BUTTON( ID_UPIDX, MainFrame::OnUpdateIndex )
-	EVT_BUTTON( ID_DLMAN, MainFrame::OnDownloadManual )
-	EVT_BUTTON( wxID_HELP, MainFrame::OnHelp )
+	EVT_BUTTON( ID_FOCUS,   MainFrame::OnFocus )
+	EVT_BUTTON( ID_PZOOM,   MainFrame::OnPlusZoom )
+	EVT_BUTTON( ID_MZOOM,   MainFrame::OnMinusZoom )
+	EVT_BUTTON( ID_DARK,    MainFrame::OnDark )
+	EVT_BUTTON( ID_SWIN,    MainFrame::OnSatellite )
+	EVT_BUTTON( ID_UPIDX,   MainFrame::OnUpdateIndex )
+	EVT_BUTTON( ID_DLMAN,   MainFrame::OnDownloadManual )
+	EVT_BUTTON( ID_BPRINT,  MainFrame::OnBatchPrint )
+	EVT_BUTTON( ID_INDEX,   MainFrame::OnIndex )
+	EVT_BUTTON( wxID_HELP,  MainFrame::OnHelp )
 	EVT_BUTTON( wxID_CLOSE, MainFrame::OnBClose )
-	EVT_BUTTON( ID_LOGOUT, MainFrame::OnLogout )
+	EVT_BUTTON( ID_LOGOUT,  MainFrame::OnLogout )
 END_EVENT_TABLE()
 
 
@@ -442,6 +446,20 @@
 	wxExecute( execmd );
 }
 
+void MainFrame::OnIndex( wxCommandEvent& WXUNUSED(event) )
+{
+	IndexFrame *idx = new IndexFrame( NULL, wxID_ANY, wxT( "Index" ), wxPoint( 0, 0 ), wxSize( 800, 500 ), wxDEFAULT_FRAME_STYLE );
+	idx->Show( true );
+	idx->Raise();
+}
+
+void MainFrame::OnBatchPrint( wxCommandEvent& WXUNUSED(event) )
+{
+	BatchPrintFrame *bp = new BatchPrintFrame( NULL, wxID_ANY, wxT( "Batch Print" ), wxPoint( 0, 0 ), wxSize( 800, 500 ), wxDEFAULT_FRAME_STYLE );
+	bp->Show( true );
+	bp->Raise();
+}
+
 void MainFrame::OnHelp( wxCommandEvent& WXUNUSED(event) )
 {
 	wxString version, build;
@@ -606,6 +624,10 @@
 	m_buttonDark->Hide();
 	m_buttonSatellite = new wxButton( this, ID_SWIN, wxT( "Satellite" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonSatellite->Hide();
+	m_buttonIndex = new wxButton( this, ID_INDEX, wxT( "Index" ), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonIndex->Hide();
+	m_buttonBPrint = new wxButton( this, ID_BPRINT, wxT( "Batch Print" ), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonBPrint->Hide();
 	m_buttonDLMan = new wxButton( this, ID_DLMAN, wxT( "Manual" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonDLMan->Hide();
 	m_buttonUpdateIndex = new wxButton( this, ID_UPIDX, wxT( "Update Index" ), wxDefaultPosition, wxDefaultSize, 0 );
@@ -644,19 +666,21 @@
 
 void MainFrame::SetAccelerator( void )
 {
-	wxAcceleratorEntry entries[11];
+	wxAcceleratorEntry entries[13];
 	entries[0].Set(  wxACCEL_CTRL,   (int)'P', wxID_PRINT );
 	entries[1].Set(  wxACCEL_NORMAL, WXK_F1,   wxID_HELP );
 	entries[2].Set(  wxACCEL_NORMAL, WXK_F2,   ID_DLMAN );
-	entries[3].Set(  wxACCEL_NORMAL, WXK_F4,   ID_FOCUS );
-	entries[4].Set(  wxACCEL_NORMAL, (int)'Z', ID_PZOOM );
-	entries[5].Set(  wxACCEL_NORMAL, (int)'X', ID_MZOOM );
-	entries[6].Set(  wxACCEL_NORMAL, (int)'D', ID_DARK );
-	entries[7].Set(  wxACCEL_CTRL,   (int)'Q', wxID_CLOSE );
-	entries[8].Set(  wxACCEL_SHIFT,  (int)'W', ID_SWIN );
-	entries[9].Set(  wxACCEL_SHIFT,  (int)'R', ID_UPIDX );
-	entries[10].Set( wxACCEL_SHIFT,  (int)'L', ID_DARK );	// now building ( logout )
-	wxAcceleratorTable accel( 10, entries );
+	entries[3].Set(  wxACCEL_NORMAL, WXK_F3,   ID_BPRINT );
+	entries[4].Set(  wxACCEL_NORMAL, WXK_F4,   ID_FOCUS );
+	entries[5].Set(  wxACCEL_NORMAL, WXK_F7,   ID_INDEX );
+	entries[6].Set(  wxACCEL_NORMAL, (int)'Z', ID_PZOOM );
+	entries[7].Set(  wxACCEL_NORMAL, (int)'X', ID_MZOOM );
+	entries[8].Set(  wxACCEL_NORMAL, (int)'D', ID_DARK );
+	entries[9].Set(  wxACCEL_CTRL,   (int)'Q', wxID_CLOSE );
+	entries[10].Set(  wxACCEL_SHIFT,  (int)'W', ID_SWIN );
+	entries[11].Set( wxACCEL_SHIFT,  (int)'R', ID_UPIDX );
+	entries[12].Set( wxACCEL_SHIFT,  (int)'L', ID_DARK );	// now building ( logout )
+	wxAcceleratorTable accel( 13, entries );
 	SetAcceleratorTable( accel );
 }