Mercurial > mercurial > hgweb_searcher2.cgi

comparison src/myframe.cpp @ 23:a10c2fe880f8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sizers.
author pyon@macmini
date Wed, 27 Jul 2011 21:27:56 +0900
parents 05f76f9f9186
children cbdfda601609
comparison
equal deleted inserted replaced
22:05f76f9f9186 23:a10c2fe880f8
431 ////////////////////////////////////////////////////////////////////////// 431 //////////////////////////////////////////////////////////////////////////
432 // frame constructor 432 // frame constructor
433 MyFrame::MyFrame( wxWindow* parent, wxWindowID id, const wxString& title ) 433 MyFrame::MyFrame( wxWindow* parent, wxWindowID id, const wxString& title )
434 : wxFrame( parent, id, title ) 434 : wxFrame( parent, id, title )
435 { 435 {
436 this->SetSizeHints( wxDefaultSize, wxDefaultSize );
437 // set the frame icon 436 // set the frame icon
438 SetIcon(wxICON(sample)); 437 SetIcon(wxICON(sample));
439 438
440 // メニューバー 439 // メニューバー
441 m_menubar = new wxMenuBar(); 440 m_menubar = new wxMenuBar();
475 int widths[] = { -1, 120, 100 }; 474 int widths[] = { -1, 120, 100 };
476 m_statusBar = this->CreateStatusBar( WXSIZEOF(widths), wxST_SIZEGRIP ); 475 m_statusBar = this->CreateStatusBar( WXSIZEOF(widths), wxST_SIZEGRIP );
477 m_statusBar->SetStatusWidths( WXSIZEOF(widths), widths ); 476 m_statusBar->SetStatusWidths( WXSIZEOF(widths), widths );
478 m_statusBar->SetStatusText( wxEmptyString, 0 ); 477 m_statusBar->SetStatusText( wxEmptyString, 0 );
479 478
480 wxBoxSizer* bSizer; 479 wxBoxSizer* TopSizer = new wxBoxSizer( wxVERTICAL );
481 bSizer = new wxBoxSizer( wxVERTICAL ); 480 wxBoxSizer* bSizerPanel = new wxBoxSizer( wxVERTICAL );
482 m_panel = new wxPanel( this ); 481 //m_panel = new wxPanel( this );
483 482 /*
484 wxBoxSizer* bSizerPanel; 483
485 bSizerPanel = new wxBoxSizer( wxVERTICAL );
486
487 // controls here 484 // controls here
488 m_panelHead = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize ); 485 m_panelHead = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
489 wxBoxSizer* bSizerHead; 486 wxBoxSizer* bSizerHead = new wxBoxSizer( wxHORIZONTAL );
490 bSizerHead = new wxBoxSizer( wxHORIZONTAL );
491 487
492 bSizerHead->AddStretchSpacer( 1 ); // spacer 488 bSizerHead->AddStretchSpacer( 1 ); // spacer
493 m_staticTextIdx = new wxStaticText( m_panelHead, wxID_ANY, wxT("インデックス"), wxDefaultPosition, wxDefaultSize, 0 ); 489 m_staticTextIdx = new wxStaticText( m_panelHead, wxID_ANY, wxT("インデックス"), wxDefaultPosition, wxDefaultSize, 0 );
494 bSizerHead->Add( m_staticTextIdx, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); 490 bSizerHead->Add( m_staticTextIdx, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
495 491
506 bSizerHead->Add( m_btnNextThu, 0, wxALL, 5 ); 502 bSizerHead->Add( m_btnNextThu, 0, wxALL, 5 );
507 503
508 m_btnMkIdx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 ); 504 m_btnMkIdx = new wxButton( m_panelHead, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
509 bSizerHead->Add( m_btnMkIdx, 0, wxALL, 5 ); 505 bSizerHead->Add( m_btnMkIdx, 0, wxALL, 5 );
510 506
511 m_panelHead->SetSizer( bSizerHead ); 507 //m_panelHead->SetSizer( bSizerHead );
512 m_panelHead->Layout(); 508 //m_panelHead->Layout();
513 bSizerHead->Fit( m_panelHead ); 509 //bSizerHead->Fit( m_panelHead );
514
515 // 検索結果Html
516 m_html = new wxHtmlWindow( m_panel, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
517 m_html->LoadPage( wxT("html/start.html") );
518 510
519 // コマンドライン 511 // コマンドライン
520 m_panelCmd = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize ); 512 m_panelCmd = new wxPanel( m_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize );
521 wxBoxSizer* bSizerCmd; 513 wxBoxSizer* bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
522 bSizerCmd = new wxBoxSizer( wxHORIZONTAL );
523 514
524 m_staticTextCmd = new wxStaticText( m_panelCmd, wxID_ANY, wxT("コマンド？"), wxDefaultPosition, wxDefaultSize, 0 ); 515 m_staticTextCmd = new wxStaticText( m_panelCmd, wxID_ANY, wxT("コマンド？"), wxDefaultPosition, wxDefaultSize, 0 );
525 bSizerCmd->Add( m_staticTextCmd, 0, wxALL, 5 ); 516 bSizerCmd->Add( m_staticTextCmd, 0, wxALL, 5 );
526 517
527 m_cmdbox = new MyCmdBox( m_panelCmd, ID_CMD, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER ); 518 m_cmdbox = new MyCmdBox( m_panelCmd, ID_CMD, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
528 bSizerCmd->Add( m_cmdbox, 1, wxALL, 3 ); 519 bSizerCmd->Add( m_cmdbox, 1, wxALL, 3 );
529 m_cmdbox->SetFocus(); 520 m_cmdbox->SetFocus();
530 521
531 m_panelCmd->SetSizer( bSizerCmd ); 522 m_panelCmd->SetSizer( bSizerCmd );
532 m_panelCmd->Layout(); 523 m_panelCmd->Layout();
533 bSizerCmd->Fit( m_panelCmd ); 524 //bSizerCmd->Fit( m_panelCmd );
534 525
535 bSizerPanel->Add( m_panelHead, 0, wxEXPAND|wxTOP, 1 ); 526 bSizerPanel->Add( bSizerHead, 0, wxEXPAND|wxTOP, 1 );
536 bSizerPanel->Add( m_html, 1, wxEXPAND|wxALL, 1 ); 527 bSizerPanel->Add( m_html, 1, wxEXPAND|wxALL, 1 );
537 bSizerPanel->Add( m_panelCmd, 0, wxEXPAND|wxALL, 0 ); 528 bSizerPanel->Add( bSizerCmd, 0, wxEXPAND|wxALL, 0 );
538 529
539 m_panel->SetSizer( bSizerPanel ); 530 this->SetMinSize( wxSize( 550, 600 ) );
540 m_panel->Layout(); 531 */
541 bSizerPanel->Fit( m_panel ); 532 // 検索結果Html
542 533 m_html = new wxHtmlWindow( this, ID_HTML, wxDefaultPosition, wxDefaultSize, wxHW_SCROLLBAR_AUTO );
543 bSizer->Add( m_panel, 1, wxEXPAND|wxALL, 0 ); 534 m_html->LoadPage( wxT("html/start.html") );
544 this->SetSizer( bSizer ); 535 bSizerPanel->Add( m_html, 1, wxEXPAND|wxALL, 0 );
536
537 TopSizer->Add( bSizerPanel, 1, wxEXPAND|wxALL, 0 );
538
539 this->SetSizer( TopSizer );
540 TopSizer->Fit(this);
541 TopSizer->SetSizeHints(this);
542
545 this->Layout(); 543 this->Layout();
546 this->SetMinSize( wxSize( 550, 600 ) );
547 } 544 }
548 545
549 // destructor 546 // destructor
550 MyFrame::~MyFrame() 547 MyFrame::~MyFrame()
551 { 548 {
808 { 805 {
809 if ( !IsIconized() && !IsMaximized() ) { 806 if ( !IsIconized() && !IsMaximized() ) {
810 wxGetApp().rect = this->GetRect(); 807 wxGetApp().rect = this->GetRect();
811 } 808 }
812 809
810 /*
813 int i = m_cmdbox->hist.GetCount(); 811 int i = m_cmdbox->hist.GetCount();
814 for ( int j=0; j<5; j++ ) { 812 for ( int j=0; j<10; j++ ) {
815 wxGetApp().searchhist[j] = m_cmdbox->hist[--i]; 813 wxGetApp().searchhist[j] = m_cmdbox->hist[--i];
816 } 814 }
817 815 */
818 Destroy(); 816 Destroy();
819 } 817 }
820 818