Mercurial > mercurial > hgweb_searcher2.cgi

changeset 19:710be7b6a873

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
arranged FrameCnn's controls.
author pyon@macmini
date Mon, 18 Jul 2011 22:08:04 +0900
parents 2221c7aa5958
children 39f9f1c7618c
files include/ccnframe.h include/common.h src/ccnframe.cpp src/main.cpp
diffstat 4 files changed, 170 insertions(+), 77 deletions(-) [+]
line wrap: on
line diff
--- a/include/ccnframe.h	Wed Jul 13 21:11:26 2011 +0900
+++ b/include/ccnframe.h	Mon Jul 18 22:08:04 2011 +0900
@@ -1,1 +1,50 @@
-///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 12 2010)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////

#ifndef __noname__
#define __noname__

#include <wx/string.h>
#include <wx/stattext.h>
#include <wx/gdicmn.h>
#include <wx/font.h>
#include <wx/colour.h>
#include <wx/settings.h>
#include <wx/listctrl.h>
#include <wx/sizer.h>
#include <wx/button.h>
#include <wx/datectrl.h>
#include <wx/dateevt.h>
#include <wx/gbsizer.h>
#include <wx/frame.h>

///////////////////////////////////////////////////////////////////////////

///////////////////////////////////////////////////////////////////////////////
/// Class FrameCcn
///////////////////////////////////////////////////////////////////////////////
class FrameCcn : public wxFrame 
{
	private:
	
	protected:
		enum
		{
			ID_FRAMECCN = 1000,
			ID_M_STATICTEXT1,
			ID_M_STATICTEXT2,
			ID_M_STATICTEXT3,
			ID_YMD,
			ID_CCN,
			ID_M_STATICTEXT5,
			ID_HHS,
			ID_PRVTHU,
			ID_NXTTHU,
			ID_DTPICKER,
			ID_MKIDX,
			ID_CLOSE,
		};
		
		wxStaticText* m_staticText1;
		
		wxStaticText* m_staticText2;
		
		wxStaticText* m_staticText3;
		wxListCtrl* m_listCtrlYmd;
		wxStaticText* m_staticText4;
		wxListCtrl* m_listCtrlCcn;
		wxStaticText* m_staticText5;
		wxListCtrl* m_listCtrlHhs;
		wxButton* m_btnPrevThu;
		wxButton* m_btnNextThu;
		wxDatePickerCtrl* m_datePicker;
		wxButton* m_btnMkIdX;
		wxButton* m_btnClose;
	
	public:
		
		FrameCcn( wxWindow* parent, wxWindowID id = ID_FRAMECCN, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 762,300 ), long style = wxDEFAULT_FRAME_STYLE|wxTAB_TRAVERSAL );
		~FrameCcn();
	
};

#endif //__noname__
\ No newline at end of file
+// Filename   : ccnframe.h
+// Last Change: 18-Jul-2011.
+//
+
+#ifndef __ccnframe__
+#define __ccnframe__
+#include "wx/wxprec.h"
+
+#ifndef WX_PRECOMP
+    #include "wx/wx.h"
+    #include <wx/listctrl.h>
+    #include <wx/sizer.h>
+    #include <wx/button.h>
+    #include <wx/datectrl.h>
+    #include <wx/gbsizer.h>
+#endif
+
+///////////////////////////////////////////////////////////////////////////
+
+///////////////////////////////////////////////////////////////////////////////
+/// Class FrameCcn
+///////////////////////////////////////////////////////////////////////////////
+class FrameCcn : public wxFrame 
+{
+    DECLARE_EVENT_TABLE()
+	private:
+		wxPanel*          m_Panel;
+		wxStaticText*     m_staticText1;
+		wxStaticText*     m_staticText2;
+		wxStaticText*     m_staticText3;
+		wxListCtrl*       m_listCtrlYmd;
+		wxStaticText*     m_staticText4;
+		wxListCtrl*       m_listCtrlCcn;
+		wxStaticText*     m_staticText5;
+		wxListCtrl*       m_listCtrlHhs;
+		wxButton*         m_btnPrevThu;
+		wxButton*         m_btnNextThu;
+		wxDatePickerCtrl* m_datePicker;
+		wxButton*         m_btnMkIdX;
+		wxButton*         m_btnClose;
+	
+	public:
+		FrameCcn( wxWindow* parent, wxWindowID id = ID_FRAMECCN, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxDefaultSize, long style = wxFRAME_NO_TASKBAR|wxCAPTION|wxCLOSE_BOX|wxRESIZE_BORDER|wxSTAY_ON_TOP|wxTAB_TRAVERSAL );
+		~FrameCcn();
+
+        void InitListCtrl(void);
+};
+
+#endif //__ccnframe__
+
--- a/include/common.h	Wed Jul 13 21:11:26 2011 +0900
+++ b/include/common.h	Mon Jul 18 22:08:04 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : common.h
-// Last Change: 13-Apr-2011.
+// Last Change: 14-Jul-2011.
 //
 #ifndef __COMMON__
 #define __COMMON__
@@ -25,31 +25,25 @@
 
     ID_SRCHHHS = wxID_HIGHEST + 20,
     ID_DTIDX   = wxID_HIGHEST + 21,
-    ID_MKIDX   = wxID_HIGHEST + 22,
+    ID_MKIDXx  = wxID_HIGHEST + 22,
 
     ID_SPLT    = wxID_HIGHEST + 23,
     ID_HTML    = wxID_HIGHEST + 24,
     ID_HLST    = wxID_HIGHEST + 25,
-    ID_CCN     = wxID_HIGHEST + 26,
+    ID_CCNx    = wxID_HIGHEST + 26,
 
     ID_CMD     = wxID_HIGHEST + 27,
 
-    // preview
-    ID_IMGFRM  = wxID_HIGHEST + 30,
-    ID_LSTCTRL = wxID_HIGHEST + 31,
-    ID_IMG1    = wxID_HIGHEST + 32,
-    ID_IMG2	   = wxID_HIGHEST + 33,
-    ID_IMG3	   = wxID_HIGHEST + 34,
-    ID_IMG4    = wxID_HIGHEST + 35,
-    ID_IMG5    = wxID_HIGHEST + 36,
-    ID_IMG     = wxID_HIGHEST + 37,
-    ID_MGNFY   = wxID_HIGHEST + 38,
-    ID_SLDR    = wxID_HIGHEST + 39,
-    ID_EDIT    = wxID_HIGHEST + 40,
-    ID_MASK    = wxID_HIGHEST + 41,
-    ID_PRINT   = wxID_HIGHEST + 42,
-    ID_PRTALL  = wxID_HIGHEST + 43,
-    ID_CLSFRM  = wxID_HIGHEST + 44,
+    // ccn
+    ID_FRAMECCN = wxID_HIGHEST + 30,
+    ID_YMD  	= wxID_HIGHEST + 31,
+    ID_CCN  	= wxID_HIGHEST + 32,
+    ID_HHS  	= wxID_HIGHEST + 33,
+    ID_PRVTHU	= wxID_HIGHEST + 34,
+    ID_NXTTHU	= wxID_HIGHEST + 35,
+    ID_DTPICKER	= wxID_HIGHEST + 36,
+    ID_MKIDX	= wxID_HIGHEST + 37,
+    ID_CLOSE	= wxID_HIGHEST + 38,
 
     // hhs-db
     ID_HHSDB   = wxID_HIGHEST + 50,
@@ -60,6 +54,24 @@
     // html-help
     ID_HELP    = wxID_HIGHEST + 60,
 
+		
+    // preview
+    ID_IMGFRM  = wxID_HIGHEST + 70,
+    ID_LSTCTRL = wxID_HIGHEST + 71,
+    ID_IMG1    = wxID_HIGHEST + 72,
+    ID_IMG2	   = wxID_HIGHEST + 73,
+    ID_IMG3	   = wxID_HIGHEST + 74,
+    ID_IMG4    = wxID_HIGHEST + 75,
+    ID_IMG5    = wxID_HIGHEST + 76,
+    ID_IMG     = wxID_HIGHEST + 77,
+    ID_MGNFY   = wxID_HIGHEST + 78,
+    ID_SLDR    = wxID_HIGHEST + 79,
+    ID_EDIT    = wxID_HIGHEST + 80,
+    ID_MASK    = wxID_HIGHEST + 81,
+    ID_PRINT   = wxID_HIGHEST + 82,
+    ID_PRTALL  = wxID_HIGHEST + 83,
+    ID_CLSFRM  = wxID_HIGHEST + 84,
+
 };
 #endif
 
--- a/src/ccnframe.cpp	Wed Jul 13 21:11:26 2011 +0900
+++ b/src/ccnframe.cpp	Mon Jul 18 22:08:04 2011 +0900
@@ -1,89 +1,120 @@
-///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version Sep 12 2010)
-// http://www.wxformbuilder.org/
+// Filename   : ccnframe.cpp
+// Last Change: 18-Jul-2011.
 //
-// PLEASE DO "NOT" EDIT THIS FILE!
-///////////////////////////////////////////////////////////////////////////
 
-#include "noname.h"
+#include "common.h"
+#include "ccnframe.h"
 
-///////////////////////////////////////////////////////////////////////////
-
-FrameCcn::FrameCcn( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
+FrameCcn::FrameCcn( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style )
+    : wxFrame( parent, id, title, pos, size, style )
 {
 	this->SetSizeHints( wxDefaultSize, wxDefaultSize );
+    m_Panel = new wxPanel( this );
 	
 	wxBoxSizer* bSizer;
 	bSizer = new wxBoxSizer( wxHORIZONTAL );
 	
-	wxGridSizer* gSizer;
-	gSizer = new wxGridSizer( 2, 5, 0, 0 );
+    // DB表示
+	wxFlexGridSizer* fgSizer = new wxFlexGridSizer( 2, 5, 0, 0 );
+    fgSizer->AddGrowableRow(1);
 	
-	m_staticText1 = new wxStaticText( this, ID_M_STATICTEXT1, wxT("開催年月日"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText1->Wrap( -1 );
-	gSizer->Add( m_staticText1, 0, wxALL, 5 );
+	m_staticText1 = new wxStaticText( m_Panel, wxID_ANY, wxT("開催年月日"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText1, 0, wxALL, 5 );
 	
-	
-	gSizer->Add( 0, 0, 1, wxEXPAND, 5 );
+	fgSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	m_staticText2 = new wxStaticText( this, ID_M_STATICTEXT2, wxT("合議体"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText2->Wrap( -1 );
-	gSizer->Add( m_staticText2, 0, wxALL, 5 );
+	m_staticText2 = new wxStaticText( m_Panel, wxID_ANY, wxT("合議体"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText2, 0, wxALL, 5 );
 	
+	fgSizer->Add( 0, 0, 1, wxEXPAND, 5 );
 	
-	gSizer->Add( 0, 0, 1, wxEXPAND, 5 );
+	m_staticText3 = new wxStaticText( m_Panel, wxID_ANY, wxT("被保険者"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText3, 0, wxALL, 5 );
 	
-	m_staticText3 = new wxStaticText( this, ID_M_STATICTEXT3, wxT("被保険者"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText3->Wrap( -1 );
-	gSizer->Add( m_staticText3, 0, wxALL, 5 );
+	m_listCtrlYmd = new wxListCtrl( m_Panel, ID_YMD, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL );
+	fgSizer->Add( m_listCtrlYmd, 1, wxALL|wxEXPAND, 5 );
 	
-	m_listCtrlYmd = new wxListCtrl( this, ID_YMD, wxDefaultPosition, wxDefaultSize, wxLC_LIST );
-	gSizer->Add( m_listCtrlYmd, 0, wxALL|wxEXPAND, 5 );
+	m_staticText4 = new wxStaticText( m_Panel, wxID_ANY, wxT("→"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_staticText4 = new wxStaticText( this, wxID_ANY, wxT("→"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText4->Wrap( -1 );
-	gSizer->Add( m_staticText4, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 5 );
+	m_listCtrlCcn = new wxListCtrl( m_Panel, ID_CCN, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL );
+	fgSizer->Add( m_listCtrlCcn, 1, wxALL|wxEXPAND, 5 );
 	
-	m_listCtrlCcn = new wxListCtrl( this, ID_CCN, wxDefaultPosition, wxDefaultSize, wxLC_LIST );
-	gSizer->Add( m_listCtrlCcn, 0, wxALL|wxEXPAND, 5 );
+	m_staticText5 = new wxStaticText( m_Panel, wxID_ANY, wxT("→"), wxDefaultPosition, wxDefaultSize, 0 );
+	fgSizer->Add( m_staticText5, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
-	m_staticText5 = new wxStaticText( this, ID_M_STATICTEXT5, wxT("→"), wxDefaultPosition, wxDefaultSize, 0 );
-	m_staticText5->Wrap( -1 );
-	gSizer->Add( m_staticText5, 0, wxALL, 5 );
+	m_listCtrlHhs = new wxListCtrl( m_Panel, ID_HHS, wxDefaultPosition, wxDefaultSize, wxLC_REPORT|wxLC_SINGLE_SEL );
+	fgSizer->Add( m_listCtrlHhs, 1, wxALL|wxEXPAND, 5 );
 	
-	m_listCtrlHhs = new wxListCtrl( this, ID_HHS, wxDefaultPosition, wxDefaultSize, wxLC_LIST );
-	gSizer->Add( m_listCtrlHhs, 0, wxALL|wxEXPAND, 5 );
+	bSizer->Add( fgSizer, 1, wxEXPAND, 5 );
 	
-	bSizer->Add( gSizer, 1, wxEXPAND, 5 );
+    // Index作成
+	wxGridBagSizer* gbSizer = new wxGridBagSizer( 0, 0 );
+	gbSizer->SetFlexibleDirection( wxVERTICAL );
+	gbSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+    gbSizer->AddGrowableRow(3);
 	
-	wxGridBagSizer* gbSizer;
-	gbSizer = new wxGridBagSizer( 0, 0 );
-	gbSizer->SetFlexibleDirection( wxBOTH );
-	gbSizer->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
-	
-	m_btnPrevThu = new wxButton( this, ID_PRVTHU, wxT("前木"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnPrevThu = new wxButton( m_Panel, ID_PRVTHU, wxT("<< 前木"), wxDefaultPosition, wxDefaultSize, 0 );
 	gbSizer->Add( m_btnPrevThu, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALL, 5 );
 	
-	m_btnNextThu = new wxButton( this, ID_NXTTHU, wxT("次木"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_btnNextThu = new wxButton( m_Panel, ID_NXTTHU, wxT("次木 >>"), wxDefaultPosition, wxDefaultSize, 0 );
 	gbSizer->Add( m_btnNextThu, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 );
 	
-	m_datePicker = new wxDatePickerCtrl( this, ID_DTPICKER, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT|wxDP_SHOWCENTURY );
-	gbSizer->Add( m_datePicker, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+	m_datePicker = new wxDatePickerCtrl( m_Panel, ID_DTPICKER, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT|wxDP_SHOWCENTURY );
+	gbSizer->Add( m_datePicker, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER|wxALL, 5 );
 	
-	m_btnMkIdX = new wxButton( this, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer->Add( m_btnMkIdX, wxGBPosition( 0, 3 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+	m_btnMkIdX = new wxButton( m_Panel, ID_MKIDX, wxT("作成"), wxDefaultPosition, wxDefaultSize, 0 );
+	gbSizer->Add( m_btnMkIdX, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 );
 	
-	m_btnClose = new wxButton( this, ID_CLOSE, wxT("閉じる"), wxDefaultPosition, wxDefaultSize, 0 );
-	gbSizer->Add( m_btnClose, wxGBPosition( 0, 4 ), wxGBSpan( 1, 1 ), wxALL, 5 );
+	m_btnClose = new wxButton( m_Panel, ID_CLOSE, wxT("閉じる"), wxDefaultPosition, wxDefaultSize, 0 );
+	gbSizer->Add( m_btnClose, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_BOTTOM|wxALL, 5 );
 	
-	bSizer->Add( gbSizer, 1, wxEXPAND, 5 );
+	bSizer->Add( gbSizer, 0, wxEXPAND, 5 );
 	
-	this->SetSizer( bSizer );
-	this->Layout();
+	m_Panel->SetSizer( bSizer );
+	m_Panel->Layout();
 	
 	this->Centre( wxBOTH );
+    InitListCtrl();
 }
 
+// Destructor
 FrameCcn::~FrameCcn()
 {
 }
+
+// Event Table
+BEGIN_EVENT_TABLE( FrameCcn, wxFrame )
+	//EVT_TEXT_ENTER( ID_CMD, MyCmdBox::OnCmd )
+END_EVENT_TABLE()
+
+// Event Handlers
+
+// Functions
+void FrameCcn::InitListCtrl()
+{
+    wxListItem itemCol;
+    itemCol.SetText( wxT("年-月-日") );
+    m_listCtrlYmd->InsertColumn( 0, itemCol );
+    m_listCtrlYmd->SetColumnWidth( 0, 100 );
+
+    itemCol.SetText( wxT("合議体名") );
+    m_listCtrlCcn->InsertColumn( 0, itemCol );
+    m_listCtrlCcn->SetColumnWidth( 0, 100 );
+    itemCol.SetText( wxT("件数") );
+    m_listCtrlCcn->InsertColumn( 1, itemCol );
+    m_listCtrlCcn->SetColumnWidth( 1, 100 );
+    itemCol.SetText( wxT("更新時刻") );
+    m_listCtrlCcn->InsertColumn( 2, itemCol );
+    m_listCtrlCcn->SetColumnWidth( 2, 100 );
+
+    itemCol.SetText( wxT("被保険者番号") );
+    m_listCtrlHhs->InsertColumn( 0, itemCol );
+    m_listCtrlHhs->SetColumnWidth( 0, 100 );
+    itemCol.SetText( wxT("氏名") );
+    m_listCtrlHhs->InsertColumn( 1, itemCol );
+    m_listCtrlHhs->SetColumnWidth( 1, 100 );
+
+    m_listCtrlYmd->InsertItem( 0, wxT("aaa") );
+}
+
--- a/src/main.cpp	Wed Jul 13 21:11:26 2011 +0900
+++ b/src/main.cpp	Mon Jul 18 22:08:04 2011 +0900
@@ -1,11 +1,11 @@
 // Filename   : main.cpp
-// Last Change: 06-Jul-2011.
+// Last Change: 18-Jul-2011.
 //
 
 #include "common.h"
 #include "main.h"
 #include "myframe.h"
-#include "preview.h"
+#include "ccnframe.h"
 
 IMPLEMENT_APP(MyApp)
 
@@ -26,14 +26,15 @@
 
     ConfInit();
 
+    /*
     MyFrame *mainframe = new MyFrame( NULL, ID_MAIN, wxT("Searcher v2") );
     mainframe->SetSize( rect );
     mainframe->Show(true);
+    */
 
-    /*
-    FramePreview *a = new FramePreview( NULL, ID_IMGFRM, wxEmptyString, wxDefaultPosition, wxSize( 512,394 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
+    //FrameCcn *a = new FrameCcn( NULL, ID_CCN, wxEmptyString, wxDefaultPosition, wxSize( 512,394 ), wxCAPTION|wxFRAME_NO_TASKBAR|wxTAB_TRAVERSAL );
+    FrameCcn *a = new FrameCcn( NULL, ID_CCN, wxEmptyString );
     a->Show(true);
-    */
 
     return true;
 }