Mercurial > mercurial > hgweb_searcher2.cgi

changeset 24:cbdfda601609 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
myframe layout finished.
author pyon@macmini
date Thu, 28 Jul 2011 23:04:36 +0900
parents a10c2fe880f8
children
files include/myframe.h src/main.cpp src/myframe.cpp
diffstat 3 files changed, 38 insertions(+), 37 deletions(-) [+]
line wrap: on
line diff
--- a/include/myframe.h	Wed Jul 27 21:27:56 2011 +0900
+++ b/include/myframe.h	Thu Jul 28 23:04:36 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.h
-// Last Change: 27-Jul-2011.
+// Last Change: 28-Jul-2011.
 //
 #ifndef MYFRAME
 #define MYFRAME
@@ -55,7 +55,6 @@
     wxToolBar*        m_toolBar;
     wxStatusBar*      m_statusBar;
 
-    wxPanel*          m_panel;
     wxPanel*          m_panelHead;
     wxStaticText*     m_staticTextHname;
     wxStaticText*     m_staticTextIdx;
@@ -65,6 +64,7 @@
     wxButton*         m_btnMkIdx;
     wxButton*         m_btnLsCcn;
     
+    wxPanel*          m_panelHtml;
     wxHtmlWindow*     m_html;
 
     wxPanel*          m_panelCmd;
--- a/src/main.cpp	Wed Jul 27 21:27:56 2011 +0900
+++ b/src/main.cpp	Thu Jul 28 23:04:36 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : main.cpp
-// Last Change: 27-Jul-2011.
+// Last Change: 28-Jul-2011.
 //
 
 #include "common.h"
@@ -28,6 +28,7 @@
 
     MyFrame *mainframe = new MyFrame( NULL, ID_MAIN, wxT("Searcher v2") );
     mainframe->SetSize( rect );
+    mainframe->SetMinSize( wxSize( 580, 680 ) );
     mainframe->Show(true);
 
     return true;
--- a/src/myframe.cpp	Wed Jul 27 21:27:56 2011 +0900
+++ b/src/myframe.cpp	Thu Jul 28 23:04:36 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.cpp
-// Last Change: 27-Jul-2011.
+// Last Change: 28-Jul-2011.
 //
 #include "wx/html/htmprint.h"
 #include "wx/print.h"
@@ -433,6 +433,7 @@
 MyFrame::MyFrame( wxWindow* parent, wxWindowID id, const wxString& title )
     : wxFrame( parent, id, title )
 {
+    this->SetSizeHints( wxDefaultSize, wxDefaultSize );
     // set the frame icon
     SetIcon(wxICON(sample));
 	
@@ -477,15 +478,13 @@
     m_statusBar->SetStatusText( wxEmptyString, 0 );
 	
 	wxBoxSizer* TopSizer = new wxBoxSizer( wxVERTICAL );
-	wxBoxSizer* bSizerPanel = new wxBoxSizer( wxVERTICAL );
-	//m_panel = new wxPanel( this );
-    /*
-	
-    // controls here
-	m_panelHead = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
+
+    // インデックスボタン
+	m_panelHead = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 	wxBoxSizer* bSizerHead = new wxBoxSizer( wxHORIZONTAL );
-	
-	bSizerHead->AddStretchSpacer( 1 );    // spacer
+
+	bSizerHead->Add( 0, 0, 1, wxEXPAND, 5 );
+
 	m_staticTextIdx = new wxStaticText( m_panelHead, wxID_ANY, wxT("インデックス"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerHead->Add( m_staticTextIdx, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 
@@ -502,14 +501,28 @@
 	bSizerHead->Add( m_btnNextThu, 0, wxALL, 5 );
 	
 	m_btnMkIdx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerHead->Add( m_btnMkIdx, 0, wxALL, 5 );
+	bSizerHead->Add( m_btnMkIdx, 0, wxALIGN_RIGHT|wxALL, 5 );
+
+	m_panelHead->SetSizer( bSizerHead );
+	m_panelHead->Layout();
+	bSizerHead->Fit( m_panelHead );
+	TopSizer->Add( m_panelHead, 0, wxEXPAND|wxALIGN_RIGHT|wxALL, 0 );
+
+    // 検索結果HTML
+	m_panelHtml = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
+	wxBoxSizer* bSizerHtml = new wxBoxSizer( wxVERTICAL );
 
-	//m_panelHead->SetSizer( bSizerHead );
-	//m_panelHead->Layout();
-	//bSizerHead->Fit( m_panelHead );
-	
+	m_html = new wxHtmlWindow( m_panelHtml, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
+    m_html->LoadPage( wxT("html/start.html") );
+	bSizerHtml->Add( m_html, 1, wxEXPAND|wxALL, 0 );
+
+	m_panelHtml->SetSizer( bSizerHtml );
+	m_panelHtml->Layout();
+	bSizerHtml->Fit( m_panelHtml );
+	TopSizer->Add( m_panelHtml, 1, wxEXPAND|wxALL, 0 );
+
     // コマンドライン	
-	m_panelCmd = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
+	m_panelCmd = new wxPanel( this, wxID_ANY, wxDefaultPosition, wxDefaultSize );
 	wxBoxSizer* bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
 	
 	m_staticTextCmd = new wxStaticText( m_panelCmd, wxID_ANY, wxT("コマンド？"), wxDefaultPosition, wxDefaultSize, 0 );
@@ -521,25 +534,10 @@
 
 	m_panelCmd->SetSizer( bSizerCmd );
 	m_panelCmd->Layout();
-	//bSizerCmd->Fit( m_panelCmd );
-
-	bSizerPanel->Add( bSizerHead, 0, wxEXPAND|wxTOP, 1 );
-	bSizerPanel->Add( m_html,      1, wxEXPAND|wxALL, 1 );
-	bSizerPanel->Add( bSizerCmd,  0, wxEXPAND|wxALL, 0 );
+	bSizerCmd->Fit( m_panelCmd );
+	TopSizer->Add( m_panelCmd, 0, wxEXPAND|wxALL, 0 );
 	
-  	this->SetMinSize( wxSize( 550, 600 ) );
-    */
-    // 検索結果Html
-	m_html = new wxHtmlWindow( this, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
-    m_html->LoadPage( wxT("html/start.html") );
-	bSizerPanel->Add( m_html, 1, wxEXPAND|wxALL, 0 );
-
-	TopSizer->Add( bSizerPanel, 1, wxEXPAND|wxALL, 0 );
-
 	this->SetSizer( TopSizer );
-    TopSizer->Fit(this);
-    TopSizer->SetSizeHints(this);
-	
 	this->Layout();
 }
 
@@ -570,13 +568,15 @@
 
 // Event Handlers
 /* サイズ変更 */
-void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+//void MyFrame::OnSize(wxSizeEvent& WXUNUSED(event))
+void MyFrame::OnSize(wxSizeEvent& event)
 {
+    this->Refresh( true, NULL );
     wxRect r = this->GetRect();
     int w = r.GetWidth();
     int h = r.GetHeight();
     SetStatusText( wxString::Format(wxT("%dx%d"),w,h), 2 );
-    return;
+    event.Skip();
 }
 /* ウィンドウ移動 */
 void MyFrame::OnMove(wxMoveEvent& WXUNUSED(event))