/mercurial/hgweb_rsearcher.cgi: src/rsearcher.cpp comparison

comparison src/rsearcher.cpp @ 7:29829e98d510

add net.cpp

author	pyon@macmini
date	Fri, 26 Oct 2018 21:05:11 +0900
parents	9a8b581c1993
children	82f9af6aa7e4

comparison

equal deleted inserted replaced

-:9a8b581c1993
+:29829e98d510
 // Filename   : rsearcher.cpp
-// Last Change: 2018-10-23 ‰Î 13:09:30.
+// Last Change: 2018-10-26 ‹à 15:12:02.
 //
 #include <wx/arrstr.h>
 #include <wx/html/htmprint.h>
 #include <wx/clipbrd.h>
 /** Main Frame     **/
 /********************/
 MainFrame::MainFrame( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )
 	: wxFrame( parent, id, title, pos, size, style )
 {
+	http = RsHttp();
 	CreateControls();
 	SetAccelerator();
 LoadBitmaps( wxEmptyString, false );
 	m_timer.SetOwner( this, ID_TIMER );
 }
 // Event Table
 BEGIN_EVENT_TABLE( MainFrame, wxFrame )
 EVT_DATAVIEW_SELECTION_CHANGED( ID_LIST, MainFrame::OnItemSelected )
 EVT_DATAVIEW_ITEM_ACTIVATED( ID_LIST, MainFrame::OnItemDClicked )
 EVT_NOTEBOOK_PAGE_CHANGED( ID_NBOOK, MainFrame::OnNBookChanged )
+	EVT_BUTTON( ID_PSEARCH, MainFrame::OnPasteSearch )
 	EVT_BUTTON( wxID_PRINT, MainFrame::OnPrint )
-	EVT_BUTTON( ID_PSEARCH, MainFrame::OnPasteSearch )
+	EVT_CLOSE( MainFrame::OnClose )
+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( wxID_HELP, MainFrame::OnHelp )
+	EVT_BUTTON( wxID_CLOSE, MainFrame::OnBClose )
 	EVT_BUTTON( ID_LOGOUT, MainFrame::OnLogout )
-	EVT_CLOSE( MainFrame::OnClose )
-EVT_IDLE( MainFrame::OnIdle )
-EVT_TIMER( ID_TIMER, MainFrame::OnTimer )
 END_EVENT_TABLE()
 // Event Handler
 void MainFrame::OnItemSelected( wxDataViewEvent& WXUNUSED(event) )
 m_notebook->SetPageImage( i, 1 );
 }
 m_notebook->SetPageImage( m_notebook->GetSelection(), 0 );
 }
-void MainFrame::OnClose( wxCloseEvent& WXUNUSED(event) )	// save config
+void MainFrame::OnBClose( wxCommandEvent& WXUNUSED(event) )
 {
-	WriteLog( wxT( "[logout]" ) );
+	Close();
-if ( !IsIconized() && !IsMaximized() ) {
+}
-wxGetApp().rect = this->GetRect();
-}
+void MainFrame::OnClose( wxCloseEvent& WXUNUSED(event) )
-Destroy();
+{
+	Close();
+}
+void MainFrame::OnFocus( wxCommandEvent& WXUNUSED(event) )
+{
+	m_searchCtrl->SetFocus();
 }
 void MainFrame::OnPasteSearch( wxCommandEvent& WXUNUSED(event) )
 {
 	PasteSeaarch();
 	m_buttonLogout = new wxButton( this, ID_LOGOUT, wxT( "Logout" ), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerRight->Add( m_buttonLogout, 0, wxALL, 5 );
 	// invisible buttons for shortcut-key
+	m_buttonFocus = new wxButton( this, ID_FOCUS, wxT( "Focus" ), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonFocus->Hide();
 	m_buttonPzoom = new wxButton( this, ID_PZOOM, wxT( "ZOOM" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonPzoom->Hide();
 	m_buttonMzoom = new wxButton( this, ID_MZOOM, wxT( "zoom" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonMzoom->Hide();
 	m_buttonDark = new wxButton( this, ID_DARK, wxT( "Dark" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonDark->Hide();
+	m_buttonClose  = new wxButton( this, wxID_CLOSE, wxT( "Close" ), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonClose->Hide();
 	m_buttonHelp  = new wxButton( this, wxID_HELP, wxT( "Help" ), wxDefaultPosition, wxDefaultSize, 0 );
 	m_buttonHelp->Hide();
 	bSizerTop->Add( bSizerRight, 0, wxEXPAND, 5 );
 m_staticBitmap5 = new MyStaticBitmap( m_scrolledWindow5, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0, wxEmptyString );
 }
 void MainFrame::SetAccelerator( void )
 {
-	wxAcceleratorEntry entries[5];
+	wxAcceleratorEntry entries[8];
 	entries[0].Set( wxACCEL_CTRL,   (int)'P', wxID_PRINT );
 	entries[1].Set( wxACCEL_NORMAL, WXK_F1,   wxID_HELP );
-	entries[2].Set( wxACCEL_NORMAL, (int)'Z', ID_PZOOM );
+	entries[2].Set( wxACCEL_NORMAL, WXK_F4,   ID_FOCUS );
-	entries[3].Set( wxACCEL_NORMAL, (int)'X', ID_MZOOM );
+	entries[3].Set( wxACCEL_NORMAL, (int)'Z', ID_PZOOM );
-	entries[4].Set( wxACCEL_NORMAL, (int)'D', ID_DARK );
+	entries[4].Set( wxACCEL_NORMAL, (int)'X', ID_MZOOM );
-	wxAcceleratorTable accel( 5, entries );
+	entries[5].Set( wxACCEL_NORMAL, (int)'D', ID_DARK );
+	entries[6].Set( wxACCEL_SHIFT,  (int)'Q', wxID_CLOSE );
+	entries[7].Set( wxACCEL_SHIFT,  (int)'L', ID_DARK );	// now building ( logout )
+	wxAcceleratorTable accel( 8, entries );
 	SetAcceleratorTable( accel );
 }
 void MainFrame::Cmd( wxString cmd )
 {
 ok = LoadBitmap( m_scrolledWindow4, m_staticBitmap4, wxString::Format( wxT( ".cache/%08s_4" ), date ) );
 ok = LoadBitmap( m_scrolledWindow5, m_staticBitmap5, wxString::Format( wxT( ".cache/%08s_5" ), date ) );
 	if ( !ok && reload ) {
 		wxSleep( 5 );
-		LoadBitmaps( date, false );
+		ok = LoadBitmaps( date, false );
 	}
 	return ok;
 }
 void MainFrame::ChangeCZoom( int z )
 	}
 sb->SetBitmap( wxBitmap( img ) );
 }
 void MainFrame::GetImages( wxString hhs, wxString date )
+{
+	GetImages2( hhs, date); return;	// here comment out
+	int estimate = 5;
+wxProgressDialog pd( wxT( "Connecting Server" ), wxT( "Start..." ), estimate, NULL, wxPD_APP_MODAL|wxPD_ELAPSED_TIME|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE );
+pd.SetSize( wxSize( 320, 140 ) );
+	http.GetImages( hhs, date );
+	for ( int i = 0; i < estimate; i++ ) {
+		wxSleep( 1 );
+		pd.Update( i, wxT( "Now Loading..." ) );
+	}
+}
+void MainFrame::GetImages2( wxString hhs, wxString date )
 {
 	wxArrayString args;	// http get
 	args.Add( wxT( "client.exe" ) );
 	args.Add( m_server );
 	args.Add( hhs );
 	logfile.AddLine( now.Format( wxT("%Y-%m-%d %H:%M:%S ") ) + msg );
 logfile.Write();
 logfile.Close();
 }
+void MainFrame::Close( void )
+{
+	WriteLog( wxT( "[logout]" ) );
+if ( !IsIconized() && !IsMaximized() ) {
+wxGetApp().rect = this->GetRect();
+}
+Destroy();
+}
 void MainFrame::InDevelop( bool flag )
 {
 if ( !flag ) return;
 	bool lo = false;

Mercurial > mercurial > hgweb_rsearcher.cgi

comparison src/rsearcher.cpp @ 7:29829e98d510