Mercurial > mercurial > hgweb_madnm.cgi

changeset 2:45d4fd954c31 default tip

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change layout.
author pyon@macmini
date Mon, 10 Jun 2019 22:17:33 +0900
parents f40a65687079
children
files Makefile include/mainframe.h src/custom.cpp src/mainframe.cpp
diffstat 4 files changed, 56 insertions(+), 22 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Mon Jun 10 05:56:36 2019 +0900
+++ b/Makefile	Mon Jun 10 22:17:33 2019 +0900
@@ -1,5 +1,5 @@
 # Makefile for wxWidgets Application
-# Last Change: 2019-06-10 Mon 05:55:50.
+# Last Change: 2019-06-10 Mon 22:12:11.
 # by Takayuki Mutoh
 #
 
@@ -38,8 +38,8 @@
 	  $(OBJDIR)/appconf.o \
 	  $(OBJDIR)/util.o \
 	  $(OBJDIR)/custom.o \
+	  $(OBJDIR)/mainframe.o
 	  #$(OBJDIR)/wxsqlite3.o \
-	  $(OBJDIR)/mainframe.o
 
 ifdef COMSPEC
 OBJMSW = $(OBJ) $(OBJDIR)/sample_rc.o
@@ -49,31 +49,37 @@
 ### Targets ###
 
 all: $(EXECUTABLE)
-
-
-$(PROGNAME): $(OBJ) $(OBJMSW)
-	$(CXX) $^ -o $@ $(LIBS)
 	@echo "----------------------------"
 	@echo " making $(ARCH) bit program "
 	@echo "----------------------------"
 
+$(PROGNAME): $(OBJ) $(OBJMSW)
+	@echo "=> $(EXECUTABLE) <="
+	$(CXX) $^ -o $@ $(LIBS)
+
 $(OBJDIR)/main.o: main.cpp main.h mainframe.h appconf.h id.h
+	@echo "=> main.o <="
 	-mkdir -p $(OBJDIR)
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 $(OBJDIR)/custom.o: custom.cpp custom.h id.h
+	@echo "=> custom.o <="
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 $(OBJDIR)/util.o: util.cpp util.h
+	@echo "=> util.o <="
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 $(OBJDIR)/appconf.o: appconf.cpp appconf.h
+	@echo "=> appfonf.o <="
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 $(OBJDIR)/mainframe.o: mainframe.cpp mainframe.h custom.h appconf.h id.h
+	@echo "=> mainframe.o <="
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 $(OBJDIR)/wxsqlite3.o: wxsqlite3.cpp wx/wxsqlite3.h
+	@echo "=> wxsqlite3.o <="
 	$(CXX) -c $< -o $@ $(CXXFLAGS)
 
 
@@ -105,13 +111,16 @@
 	open $(PROGNAME).app
 endif
 
+# for archive
+TARFILE=$(shell date "+del_%Y%m%d.tgz")
 tgz:
-	tar cvfz a.tgz src include Makefile memo.txt
+	tar cvfz $(TARFILE) src include Makefile TODO app.conf
 
+# clean
 clean:
 	rm -f $(PROGNAME) $(PROGNAME).exe
 	rm -f $(OBJDIR)/*.o
 	rm -rf $(PROGNAME).app
 
-.PHONY:	all clean
+.PHONY:	all tgz clean
 
--- a/include/mainframe.h	Mon Jun 10 05:56:36 2019 +0900
+++ b/include/mainframe.h	Mon Jun 10 22:17:33 2019 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.h
-// Last Change: 2019-06-09 Sun 16:31:59.
+// Last Change: 2019-06-10 ŒŽ 12:47:23.
 //
 #pragma once
 
@@ -139,6 +139,8 @@
 		void OnSpinH4( wxSpinEvent& event );
 
 		void OnMakeDir( wxCommandEvent& event );
+		void OnFilingMove( wxCommandEvent& event );
+
 		void OnPrint( wxCommandEvent& event );
 
 		void OnHno( wxCommandEvent& event );
--- a/src/custom.cpp	Mon Jun 10 05:56:36 2019 +0900
+++ b/src/custom.cpp	Mon Jun 10 22:17:33 2019 +0900
@@ -1,5 +1,5 @@
 // Filename   : custom.cpp
-// Last Change: 2019-06-09 Sun 16:57:44.
+// Last Change: 2019-06-10 ŒŽ 12:52:05.
 //
 
 #include "id.h"
@@ -29,6 +29,8 @@
 void LookWindow::OnPaint( wxPaintEvent &event )
 {
 	LoadImage();
+	DoMask1();
+	if ( m_masknum == 2 ) DoMask2();
 }
 
 void LookWindow::OnMotion( wxMouseEvent &event )
--- a/src/mainframe.cpp	Mon Jun 10 05:56:36 2019 +0900
+++ b/src/mainframe.cpp	Mon Jun 10 22:17:33 2019 +0900
@@ -1,5 +1,5 @@
 // Filename   : mainframe.cpp
-// Last Change: 2019-06-09 Sun 17:05:28.
+// Last Change: 2019-06-10 月 12:48:48.
 //
 
 #include "id.h"
@@ -46,9 +46,16 @@
     EVT_BUTTON( ID_RST4,    MainFrame::OnReset4 )
     EVT_BUTTON( ID_PRINT,   MainFrame::OnPrint )
 	EVT_SPINCTRL( ID_SPNW1, MainFrame::OnSpinW1 )
+
+    EVT_BUTTON( ID_MKDIR,   MainFrame::OnMakeDir )
+    EVT_BUTTON( ID_FMOVE,   MainFrame::OnFilingMove )
+
     EVT_TEXT(       ID_HNO, MainFrame::OnHno )
     EVT_TEXT_ENTER( ID_HNO, MainFrame::OnHno )
-    EVT_BUTTON( ID_UPDT,    MainFrame::OnUpdate )
+    EVT_BUTTON( ID_PRINT,   MainFrame::OnPrint )
+
+    EVT_BUTTON( ID_MOVE,    MainFrame::OnMove )
+
 	EVT_CLOSE( MainFrame::OnClose )
 	/*
     EVT_LIST_ITEM_SELECTED(   ID_THUMB, MoverFrame::OnThumbItemSelected )
@@ -89,6 +96,18 @@
 	m_lookWindow3->ResetMask2();
 }
 
+void MainFrame::OnMakeDir( wxCommandEvent& WXUNUSED(event) )
+{
+}
+
+void MainFrame::OnFilingMove( wxCommandEvent& WXUNUSED(event) )
+{
+}
+
+void MainFrame::OnMove( wxCommandEvent& WXUNUSED(event) )
+{
+}
+
 void MainFrame::OnPrint( wxCommandEvent& WXUNUSED(event) )
 {
 	wxArrayString files = m_filelist->GetFiles();
@@ -318,19 +337,19 @@
 	fgSizerSetup->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
 
 	m_staticTextDate = new wxStaticText( sbSizerDir->GetStaticBox(), wxID_ANY, wxT("Date"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-	sbSizerDir->Add( m_staticTextDate, 0, wxALL, 5 );
+	fgSizerSetup->Add( m_staticTextDate, 0, wxALL, 5 );
 
 	m_datePicker = new wxDatePickerCtrl( sbSizerDir->GetStaticBox(), wxID_ANY, wxDefaultDateTime, wxDefaultPosition, wxDefaultSize, wxDP_DROPDOWN|wxDP_SHOWCENTURY );
-	sbSizerDir->Add( m_datePicker, 0, wxALL, 5 );
+	fgSizerSetup->Add( m_datePicker, 0, wxALL, 5 );
 
 	m_staticTextCcn = new wxStaticText( sbSizerDir->GetStaticBox(), wxID_ANY, wxT("CCN"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-	sbSizerDir->Add( m_staticTextCcn, 0, wxALL, 5 );
+	fgSizerSetup->Add( m_staticTextCcn, 0, wxALL, 5 );
 
-	m_comboBox = new wxComboBox( sbSizerDir->GetStaticBox(), wxID_ANY, wxT("Combo!"), wxDefaultPosition, wxSize( 100, -1 ), 0, NULL, 0 );
-	sbSizerDir->Add( m_comboBox, 0, wxALL, 5 );
+	m_comboBox = new wxComboBox( sbSizerDir->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxSize( 100, -1 ), 0, NULL, 0 );
+	fgSizerSetup->Add( m_comboBox, 0, wxALL, 5 );
 
 	m_staticTextDrive = new wxStaticText( sbSizerDir->GetStaticBox(), wxID_ANY, wxT("Drive"), wxDefaultPosition, wxDefaultSize, wxALIGN_RIGHT );
-	sbSizerDir->Add( m_staticTextDrive, 0, wxALL, 5 );
+	fgSizerSetup->Add( m_staticTextDrive, 0, wxALL, 5 );
 
 	wxString m_checkListChoices[] = { wxT("C:\\"), wxT("Y:\\"), wxT("Z:\\") };
 	int m_checkListNChoices = sizeof( m_checkListChoices ) / sizeof( wxString );
@@ -343,7 +362,7 @@
 	fgSizerSetup->Add( 0, 0, 1, wxEXPAND, 5 );
 
 	m_buttonMkdir = new wxButton( sbSizerDir->GetStaticBox(), ID_MKDIR, wxT("Mkdir"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizerDir->Add( m_buttonMkdir, 0, wxALL, 5 );
+	fgSizerSetup->Add( m_buttonMkdir, 0, wxALL, 5 );
 
 	sbSizerDir->Add( fgSizerSetup, 1, wxEXPAND, 5 );
 
@@ -354,9 +373,11 @@
 	sbSizerDir->Add( m_checkBox, 0, wxALL|wxALIGN_LEFT, 5 );
 
 	m_button30 = new wxButton( sbSizerDir->GetStaticBox(), wxID_ANY, wxT("MyButton"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_button30->Enable( false );
 	sbSizerDir->Add( m_button30, 0, wxALL|wxALIGN_RIGHT, 5 );
 
 	m_buttonFMove = new wxButton( sbSizerDir->GetStaticBox(), ID_FMOVE, wxT("Move"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_buttonFMove->Enable( false );
 	sbSizerDir->Add( m_buttonFMove, 0, wxALL|wxALIGN_RIGHT, 5 );
 
 	fgSizerMain->Add( sbSizerDir, 1, wxEXPAND, 5 );
@@ -406,9 +427,9 @@
 	m_dataViewListColumnHno  = m_dataViewListCtrl->AppendTextColumn( wxT("Hno"),    wxDATAVIEW_CELL_INERT, 80, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE );
 	m_dataViewListColumnName = m_dataViewListCtrl->AppendTextColumn( wxT("Name"),   wxDATAVIEW_CELL_INERT, 80, static_cast<wxAlignment>(wxALIGN_LEFT),   wxDATAVIEW_COL_RESIZABLE|wxDATAVIEW_COL_SORTABLE );
 	m_dataViewListColumnN    = m_dataViewListCtrl->AppendTextColumn( wxT("N"),      wxDATAVIEW_CELL_INERT, 40, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
-	m_dataViewListColumnDrv1 = m_dataViewListCtrl->AppendTextColumn( wxT("C:"),     wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
-	m_dataViewListColumnDrv2 = m_dataViewListCtrl->AppendTextColumn( wxT("Y:"),     wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
-	m_dataViewListColumnDrv3 = m_dataViewListCtrl->AppendTextColumn( wxT("Z:"),     wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
+	m_dataViewListColumnDrv1 = m_dataViewListCtrl->AppendTextColumn( wxT("C:\\"),   wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
+	m_dataViewListColumnDrv2 = m_dataViewListCtrl->AppendTextColumn( wxT("Y:\\"),   wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
+	m_dataViewListColumnDrv3 = m_dataViewListCtrl->AppendTextColumn( wxT("Z:\\"),   wxDATAVIEW_CELL_INERT, 30, static_cast<wxAlignment>(wxALIGN_CENTER), wxDATAVIEW_COL_RESIZABLE );
 	m_dataViewListColumnEtc  = m_dataViewListCtrl->AppendTextColumn( wxT("Status"), wxDATAVIEW_CELL_INERT, -1, static_cast<wxAlignment>(wxALIGN_LEFT),   wxDATAVIEW_COL_RESIZABLE );
 	sbSizerMove->Add( m_dataViewListCtrl, 1, wxALL|wxEXPAND, 5 );