diff src/kaigo/horori/searcher/include/searcher.h @ 56:7396e7407abd

searcher version up.
author pyon@macmini
date Sat, 27 Jun 2020 16:25:13 +0900
parents 638e1ad05cae
children 0369656be06c
line wrap: on
line diff
--- a/src/kaigo/horori/searcher/include/searcher.h	Sat Jun 27 16:19:45 2020 +0900
+++ b/src/kaigo/horori/searcher/include/searcher.h	Sat Jun 27 16:25:13 2020 +0900
@@ -1,5 +1,5 @@
 // Filename   : searcher.h
-// Last Change: 2020-04-24 金 09:50:28.
+// Last Change: 2020-06-26 金 10:07:26.
 //
 #pragma once
 
@@ -78,7 +78,7 @@
 		wxString m_addr, m_port;
 		wxRect m_mask1, m_mask2, m_mask3;
 		int m_searchmode;
-		wxArrayString m_hist;
+		wxList m_hist;
 		wxString m_user, m_usergroup;
 
         MyStaticBitmap* m_staticBitmap1;
@@ -142,7 +142,7 @@
 		wxDataViewColumn*   m_dataViewListColumnDrvHno;
 		wxDataViewColumn*   m_dataViewListColumnDrvName;
 
-		wxStaticLine* m_staticline;
+		wxStaticLine* m_staticline1;
 
 		wxStaticText*     m_staticTextDBmainte;
 		wxStaticText*     m_staticTextHhsDB;
@@ -155,6 +155,15 @@
 		wxButton*         m_buttonRegImg;
 		wxTextCtrl*       m_textCtrlLastIndex;
 
+		wxStaticText*     m_staticTextCSV;
+		wxFilePickerCtrl* m_filePickerCSV;
+		wxButton*         m_buttonCSV;
+
+		wxStaticLine*     m_staticline2;
+
+		wxStaticText*     m_staticTextVersion;
+		wxTextCtrl*       m_textCtrlVersion;
+
 		// Setup
 		wxPanel*            m_panelSetup;
 		wxDataViewListCtrl* m_dataViewListCtrlPw;
@@ -167,7 +176,7 @@
 
 		// Right-Pane
 		wxSearchCtrl*       m_searchCtrl;
-		wxButton*           m_buttonHist;
+		wxButton*           m_buttonPaste;
 		wxTextCtrl*         m_textCtrlName;
 		wxTextCtrl*         m_textCtrlAddr;
 		wxDataViewListCtrl* m_dataViewListCtrlAny;
@@ -205,12 +214,13 @@
 
 		virtual void OnUploadHhsDB(wxCommandEvent& event);
 		virtual void OnUploadImage(wxCommandEvent& event);
+		virtual void OnDB2CSV(wxCommandEvent& event);
 
 		virtual void OnUPassword(wxCommandEvent& event);
 		virtual void OnSavePw(wxCommandEvent& event);
 
 		virtual void OnChar(wxKeyEvent& event);
-		virtual void OnHist(wxCommandEvent& event);
+		virtual void OnPaste(wxCommandEvent& event);
 		virtual void OnSelectAnyListItem(wxDataViewEvent& event);
 		virtual void OnPrint(wxCommandEvent& event);
 		virtual void OnPassword(wxCommandEvent& event);
@@ -219,8 +229,9 @@
 
 		void CreateControls();
 		void InitializeControlsValue();
+		void SearchByHno(wxString hno);
 		void SetHhsInfo(wxString h);
-		void SetListAny(wxString s);
+		void SetListAnyHeader(int mode);
 		void SetImages();
 		void LoadBookImage(MyStaticBitmap& mysb, wxString file);
 		void LoadBookImages();
@@ -229,6 +240,7 @@
 		void SavePasswd();
 		void RemoveTemp();
 		void MaskImage1();
+		void SetVersionInfo();
 
 	public:
 		SearchFrame(wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 800,697 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL);