diff src/myframe.cpp @ 40:ce5b61376fd0 v2.7 tip

complete dirview.
author pyon@macmini
date Fri, 25 Nov 2011 22:08:47 +0900
parents 044cc2f5af81
children
line wrap: on
line diff
--- a/src/myframe.cpp	Fri Nov 25 22:08:10 2011 +0900
+++ b/src/myframe.cpp	Fri Nov 25 22:08:47 2011 +0900
@@ -1,5 +1,5 @@
 // Filename   : myframe.cpp
-// Last Change: 24-Nov-2011.
+// Last Change: 25-Nov-2011.
 //
 
 #include "main.h"
@@ -216,7 +216,7 @@
 	
 	this->Centre( wxBOTH );
 
-    autodetect_mode = true;
+    autodetect_mode = false;
     m_timer.SetOwner( this, ID_TIMER );
 
     pd = new wxProgressDialog( wxT("進行状況"), wxT("処理開始..."), 100, this, wxPD_APP_MODAL|wxPD_REMAINING_TIME|wxPD_AUTO_HIDE );
@@ -538,15 +538,16 @@
     }
 
     by_autodetect = false;
-    SetStatusText( wxEmptyString, 2 );
+    int m = m_listCtrlView->GetSelectedItemCount();
+    if ( m != 1 ) SetStatusText( wxString::Format(wxT("%d files selected."),m), 2 );
 }
 
 /* 画像を選択したとき画像の情報をステータスバーに表示 */
 void MyFrame::OnItemSelected(wxListEvent& event)
 {
     int i = event.GetIndex();
-    int m = m_listCtrlView->GetItemCount();
-    m_listCtrlView->SetItemImage( i, i+m );    // 青い画像
+    int m = m_listCtrlView->GetSelectedItemCount();
+    m_listCtrlView->SetItemImage( i, i+m_listCtrlView->GetItemCount() );    // 青い画像
 
     if ( m != 1 ) {
         SetStatusText( wxString::Format(wxT("%d files selected."),m), 2 );
@@ -564,7 +565,6 @@
 {
     int i = event.GetIndex();
     m_listCtrlView->SetItemImage( i, i );
-    SetStatusText( wxString::Format(wxT("%d files selected."),m_listCtrlView->GetSelectedItemCount()), 2 );
 }
 
 /* 画像のスクリーン表示*/
@@ -677,7 +677,7 @@
 
     m_buttonDetect->Enable(true);
     SetStatusText( wxEmptyString, 0 );
-    m_timer.Start( 2*1000, wxTIMER_ONE_SHOT ); // restart
+    m_timer.Start( 10*1000, wxTIMER_ONE_SHOT ); // restart
 }
 
 /* 被保険者フォルダを列挙 */
@@ -720,8 +720,9 @@
     m_listCtrlHhsDir->GetItem( item );
     hhsdir.Append( item.GetText() );
 
-    DirViewFrame* dvf = new DirViewFrame( this, wxID_ANY, wxEmptyString );
+    DirViewFrame* dvf = new DirViewFrame( (wxWindow*)this, wxID_ANY, wxEmptyString );
     dvf->m_dir = hhsdir;
+    dvf->LoadListImage();
     dvf->Show(true);
 }