diff src/myframe.cpp @ 3:a5bddd859104

implement delwhtie
author pyon@macmini
date Tue, 04 Oct 2011 07:43:08 +0900
parents 1ea4f7981ff5
children a505f7417742
line wrap: on
line diff
--- a/src/myframe.cpp	Sun Oct 02 18:44:03 2011 +0900
+++ b/src/myframe.cpp	Tue Oct 04 07:43:08 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.cpp
-// Last Change: 02-Oct-2011.
+// Last Change: 03-Oct-2011.
 //
 #include "symbol.h"
 #include "common.h"
@@ -39,8 +39,7 @@
 MyFrame::MyFrame( wxWindow* parent, wxWindowID id, const wxString& title )
     : wxFrame( parent, id, title )
 {
-    //this->SetSizeHints( wxDefaultSize, wxDefaultSize );
-	this->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_ACTIVEBORDER ) );
+    this->SetBackgroundColour( wxColour(wxT("WHEAT")) );
     // set the frame icon
     SetIcon(wxICON(sample));
 	
@@ -86,18 +85,29 @@
 	m_staticTextMoveTo = new wxStaticText( this, wxID_ANY, wxT("移動先フォルダ"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerMoveTo->Add( m_staticTextMoveTo, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_comboBoxMoveDrive = new wxComboBox( this, ID_DRIVE, wxT("C:"), wxDefaultPosition, wxSize( 50,-1 ), 0, NULL, 0 ); 
-	bSizerMoveTo->Add( m_comboBoxMoveDrive, 0, wxALL, 5 );
+    wxArrayString drives;
+    drives.Add(wxT("C:"));
+    drives.Add(wxT("Y:"));
+    drives.Add(wxT("Z:"));
+	m_comboBoxMoveDrive = new wxComboBox( this, ID_DRIVE, wxT("C:"), wxDefaultPosition, wxSize( 50,-1 ), drives, 0 ); 
+	bSizerMoveTo->Add( m_comboBoxMoveDrive, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_datePickerCcn = new wxDatePickerCtrl( this, ID_DATE, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DEFAULT );
+	m_datePickerCcn = new wxDatePickerCtrl( this, ID_DATE, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN );
 	bSizerMoveTo->Add( m_datePickerCcn, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	m_comboBoxCcn = new wxComboBox( this, ID_CCN, wxT("1\n2\n3\n"), wxDefaultPosition, wxSize( 100,-1 ), 0, NULL, 0 ); 
-	bSizerMoveTo->Add( m_comboBoxCcn, 0, wxALL, 5 );
+    wxArrayString ccns;
+	ccns.Add(wxT("角館1")); ccns.Add(wxT("角館2")); ccns.Add(wxT("角館3")); ccns.Add(wxT("角館4"));
+	ccns.Add(wxT("西仙1")); ccns.Add(wxT("西仙2")); ccns.Add(wxT("西仙3"));
+	ccns.Add(wxT("千畑1")); ccns.Add(wxT("千畑2")); ccns.Add(wxT("千畑3"));
+	ccns.Add(wxT("大曲1")); ccns.Add(wxT("大曲2")); ccns.Add(wxT("大曲3")); ccns.Add(wxT("大曲4")); ccns.Add(wxT("大曲5")); ccns.Add(wxT("大曲6"));
+	ccns.Add(wxT("六郷1")); ccns.Add(wxT("六郷2")); ccns.Add(wxT("六郷3"));
+	m_comboBoxCcn = new wxComboBox( this, ID_CCN, wxEmptyString, wxDefaultPosition, wxSize( 100,-1 ), ccns, 0 ); 
+	bSizerMoveTo->Add( m_comboBoxCcn, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
 	
-	bSizerMoveTo->Add( 0, 0, 0, 0, 5 );
-	
-	m_buttonMkDir = new wxButton( this, ID_MKDIR, wxT("ファルダ作成"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonSetDir = new wxButton( this, ID_STDIR, wxT("フォルダ指定"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerMoveTo->Add( m_buttonSetDir, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
+
+	m_buttonMkDir = new wxButton( this, ID_MKDIR, wxT("フォルダ作成"), wxDefaultPosition, wxDefaultSize, 0 );
 	bSizerMoveTo->Add( m_buttonMkDir, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
 	
 	bSizerTop->Add( bSizerMoveTo, 0, 0, 5 );
@@ -145,6 +155,8 @@
     EVT_MENU( wxID_EXIT,  MyFrame::OnQuit )
     EVT_MENU( wxID_ABOUT, MyFrame::OnAbout )
     EVT_BUTTON( ID_DTWHITE, MyFrame::OnDetectWhite )
+    EVT_BUTTON( ID_STDIR, MyFrame::SetDir )
+    EVT_BUTTON( ID_MKDIR, MyFrame::MakeDir )
     EVT_CLOSE( MyFrame::SaveConfig )
 END_EVENT_TABLE()
 
@@ -204,6 +216,23 @@
     dw->Show(true);
 }
 
+/* 移動先フォルダセット */
+void MyFrame::SetDir(wxCommandEvent& WXUNUSED(event))
+{
+    wxString dir;
+    dir.Append( m_comboBoxMoveDrive->GetValue() );
+    dir.Append( wxFILE_SEP_PATH );
+    wxDateTime dt = m_datePickerCcn->GetValue();
+    dir.Append( dt.Format(wxT("%Y%m%d")) );
+    dir.Append( wxFILE_SEP_PATH );
+    dir.Append( m_comboBoxCcn->GetValue() );
+    m_textCtrlMoveDir->SetValue( dir );
+}
+
+void MyFrame::MakeDir(wxCommandEvent& WXUNUSED(event))
+{
+}
+
 /* アプリケーションフォルダを開く */
 /*
 void MyFrame::OnOpenAppDir(wxCommandEvent& WXUNUSED(event))