Mercurial > mercurial > hgweb_searcher2.cgi

changeset 5:0f566397974e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add Edit button.
author pyon@macmini
date Wed, 13 Apr 2011 18:30:41 +0900
parents d924b09ea2f3
children 3e756069f215
files TODO include/common.h include/preview.h src/preview.cpp
diffstat 4 files changed, 45 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/TODO	Sat Apr 09 15:03:03 2011 +0900
+++ b/TODO	Wed Apr 13 18:30:41 2011 +0900
@@ -1,8 +1,12 @@
 ===========================================================================
  TODO
 ===========================================================================
-* create Edit-button.
+* add Explore button.
+* change cursor.
+* close window by ESC.
 * change preview-image when listctrl is selected.
+* implement mask image.
+* implement edit image by other program.
 * implement print selected image.
 * implement print all images.
 * implement change-view-size by slidebar.
--- a/include/common.h	Sat Apr 09 15:03:03 2011 +0900
+++ b/include/common.h	Wed Apr 13 18:30:41 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : common.h
-// Last Change: 07-Apr-2011.
+// Last Change: 13-Apr-2011.
 //
 #ifndef __COMMON__
 #define __COMMON__
@@ -36,18 +36,20 @@
 
     // preview
     ID_IMGFRM  = wxID_HIGHEST + 30,
-    ID_IMG1    = wxID_HIGHEST + 31,
-    ID_IMG2	   = wxID_HIGHEST + 32,
-    ID_IMG3	   = wxID_HIGHEST + 33,
-    ID_IMG4    = wxID_HIGHEST + 34,
-    ID_IMG5    = wxID_HIGHEST + 35,
-    ID_IMG     = wxID_HIGHEST + 36,
-    ID_MGNFY   = wxID_HIGHEST + 37,
-    ID_SLDR    = wxID_HIGHEST + 38,
-    ID_PRINT   = wxID_HIGHEST + 39,
-    ID_PRTALL  = wxID_HIGHEST + 30,
-    ID_CLSFRM  = wxID_HIGHEST + 41,
-
+    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,
 
     // hhs-db
     ID_HHSDB   = wxID_HIGHEST + 50,
--- a/include/preview.h	Sat Apr 09 15:03:03 2011 +0900
+++ b/include/preview.h	Wed Apr 13 18:30:41 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : hhsdb.h
-// Last Change: 09-Apr-2011.
+// Last Change: 13-Apr-2011.
 //
 #ifndef __PREVIEW__
 #define __PREVIEW__
@@ -45,16 +45,18 @@
 		wxStaticText*		m_staticTextLarge;
 		wxSlider*	    	m_slider;
 		wxStaticText*		m_staticTextSmall;
+		wxButton*	        m_buttonEdit;
+		wxButton*	        m_buttonMask;
 		wxButton*	        m_buttonPrint;
 		wxButton*       	m_buttonPrintAll;
 		wxButton*       	m_buttonClose;
 	
 	public:
-		
 		FramePreview( wxWindow* parent, wxWindowID id = ID_IMGFRM, const wxString& title = wxEmptyString, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 512,394 ), long style = wxCAPTION|wxFRAME_NO_TASKBAR|wxMAXIMIZE_BOX|wxRESIZE_BORDER|wxTAB_TRAVERSAL );
 		~FramePreview();
 
         void CloseFrame(wxCommandEvent&);
+        void ChageImage(wxCommandEvent&);
         void LoadImages(wxString);
 };
 
--- a/src/preview.cpp	Sat Apr 09 15:03:03 2011 +0900
+++ b/src/preview.cpp	Wed Apr 13 18:30:41 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : preview.cpp
-// Last Change: 09-Apr-2011.
+// Last Change: 13-Apr-2011.
 //
 
 #include "preview.h"
@@ -15,7 +15,8 @@
 // constructor
 FramePreview::FramePreview( wxWindow* parent, wxWindowID id, const wxString& title, const wxPoint& pos, const wxSize& size, long style ) : wxFrame( parent, id, title, pos, size, style )
 {
-	this->SetSize( 1600, 950 );
+	this->SetSize( 1400, 1000 );
+    this->SetBackgroundColour( wxColour(wxT("WHEAT")) );
 	
 	wxBoxSizer* bSizer;
 	bSizer = new wxBoxSizer( wxHORIZONTAL );
@@ -24,8 +25,8 @@
 	wxBoxSizer* bSizerL;
 	bSizerL = new wxBoxSizer( wxVERTICAL );
 	
-	m_listCtrl = new wxListCtrl( this, wxID_ANY, wxDefaultPosition, wxSize( 140, 900 ), wxLC_ICON|wxLC_SINGLE_SEL );
-	bSizerL->Add( m_listCtrl, 1, wxEXPAND|wxALL|wxALIGN_CENTRE, 5 );
+	m_listCtrl = new wxListCtrl( this, ID_LSTCTRL, wxDefaultPosition, wxSize( 160, 900 ), wxLC_ICON|wxLC_SINGLE_SEL );
+	bSizerL->Add( m_listCtrl, 1, wxEXPAND|wxALL|wxALIGN_CENTRE, 0 );
     m_imageList = new wxImageList( 105, 148 );
     m_listCtrl->AssignImageList( m_imageList, wxIMAGE_LIST_NORMAL );
 	
@@ -36,8 +37,7 @@
     m_scrolledWindow->SetScrollbars( 10, 10, 83, 117 );
 	//m_scrolledWindow->SetScrollRate( 5, 5 );
 	m_bitmap = new wxStaticBitmap( m_scrolledWindow, ID_IMG, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
-	bSizer->Add( m_scrolledWindow, 1, wxEXPAND | wxALL, 5 );
-	//bSizer->Add( m_bitmap, 0, wxALL, 5 );
+	bSizer->Add( m_scrolledWindow, 1, wxEXPAND|wxALL, 0 );
 	
     // RightPain ( manip )
 	wxBoxSizer* bSizerR;
@@ -57,12 +57,16 @@
 	
 	bSizerR->Add( 0, 0, 1, wxEXPAND, 5 );
 	
+	m_buttonEdit = new wxButton( this, ID_PRINT, wxT("編集"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerR->Add( m_buttonEdit, 0, wxALL|wxALIGN_CENTRE, 5 );
+	m_buttonMask = new wxButton( this, ID_PRINT, wxT("マスク"), wxDefaultPosition, wxDefaultSize, 0 );
+	bSizerR->Add( m_buttonMask, 0, wxALL|wxALIGN_CENTRE, 5 );
 	m_buttonPrint = new wxButton( this, ID_PRINT, wxT("印刷"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerR->Add( m_buttonPrint, 0, wxALL, 5 );
+	bSizerR->Add( m_buttonPrint, 0, wxALL|wxALIGN_CENTRE, 5 );
 	m_buttonPrintAll = new wxButton( this, ID_PRTALL, wxT("一括印刷"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerR->Add( m_buttonPrintAll, 0, wxALL, 5 );
+	bSizerR->Add( m_buttonPrintAll, 0, wxALL|wxALIGN_CENTRE, 5 );
 	m_buttonClose = new wxButton( this, ID_CLSFRM, wxT("閉じる"), wxDefaultPosition, wxDefaultSize, 0 );
-	bSizerR->Add( m_buttonClose, 0, wxALL, 5 );
+	bSizerR->Add( m_buttonClose, 0, wxALL|wxALIGN_CENTRE, 5 );
 	
 	bSizer->Add( bSizerR, 0, wxEXPAND, 5 );
 	
@@ -81,6 +85,7 @@
 
 // Event Table
 BEGIN_EVENT_TABLE( FramePreview, wxFrame )
+    //EVT_LIST_ITEM_SELECTED( ID_LSTCTRL, FramePreview::ChageImage )
     //EVT_BUTTON( ID_PRINT,  FramePreview::PrintImage )
     //EVT_BUTTON( ID_PRTALL, FramePreview::PrintAllImages )
     EVT_BUTTON( ID_CLSFRM, FramePreview::CloseFrame )
@@ -93,6 +98,11 @@
     return;
 }
 
+void FramePreview::ChageImage(wxCommandEvent& WXUNUSED(event))
+{
+    return;
+}
+
 // Functions
 void FramePreview::LoadImages(wxString path)
 {
@@ -102,12 +112,14 @@
     if ( !dir.IsOpened() ) return;
 
     bool cout = dir.GetFirst( &file, wxT("*.jpg"), wxDIR_FILES );
+    // preview
     if ( cout ) {
         wxString mfile = path + wxFILE_SEP_PATH + file;
         wxImage img( mfile, wxBITMAP_TYPE_JPEG );
         wxBitmap bmp( img.Scale( 640, 877, wxIMAGE_QUALITY_HIGH ) );
         m_bitmap->SetBitmap( bmp);
     }
+    // thumbnail
     int i=0;
     while ( cout ) {
         m_listCtrl->InsertItem( i, file, i );