一部の無駄なメッセージを削除。ProcessDialogのコンストラクタで初期化を行うよう変更。

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@539 9df91469-1e22-0410-86e7-ea8537beb833

diff --git a/doc/history.html b/doc/history.html
index 4c94509..09afb53 100644 (file)
--- a/doc/history.html
+++ b/doc/history.html
@@ -17,6 +17,7 @@
    <li><a href="license.txt">License</a></li>\r
    <li><br /></li>\r
    <li>History:</li>\r
+   <li><a href="#0.01beta13">0.01&beta;13</a></li>\r
    <li><a href="#0.01beta12">0.01&beta;12</a></li>\r
    <li><a href="#0.01beta11">0.01&beta;11</a></li>\r
    <li><a href="#0.01beta10">0.01&beta;10</a></li>\r
@@ -37,6 +38,18 @@
 \r
   <h2>History</h2>\r
   <dl id="history">\r
+   <dt id="0.01beta13">2011/05/--</dt>\r
+   <dd>\r
+    Ver.0.01&beta;13\r
+    <dl>\r
+     <dt>Lychee</dt>\r
+     <dd>\r
+      <ul>\r
+       <li class="chg">一部の無駄なメッセージを削除。</li>\r
+      </ul>\r
+     </dd>\r
+    </dl>\r
+   </dd>\r
    <dt id="0.01beta12">2011/04/16</dt>\r
    <dd>\r
     Ver.0.01&beta;12\r

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index 574bea7..b681ec2 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -31,7 +31,7 @@ ProcessDialog * g_procDlg = NULL;
 // ProcessDialog\r
 //******************************************************************************\r
 \r
-ProcessDialog::ProcessDialog(): wxDialog()\r
+ProcessDialog::ProcessDialog(wxFileName * fn, wxULongLong_t n): wxDialog(), fnArchive(fn), nFileCount(n)\r
 {\r
        ::wxXmlResource::Get()->Load(L_DIR_S_XRC wxT("dlg_process.xrc"));\r
        ::wxXmlResource::Get()->LoadDialog(this, this->GetParent(), wxT("dlg_process"));        \r

diff --git a/src/lychee/dlg_process.h b/src/lychee/dlg_process.h
index 03f892c..15214bc 100644 (file)
--- a/src/lychee/dlg_process.h
+++ b/src/lychee/dlg_process.h
@@ -28,7 +28,7 @@ public:
        void OnClose(wxCloseEvent &);\r
        int CallbackProc(unsigned int, void *);\r
 \r
-       ProcessDialog();\r
+       ProcessDialog(wxFileName * fn = NULL, wxULongLong_t n = 0);\r
        ~ProcessDialog();\r
 \r
        wxFileName * fnArchive;\r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index fb70750..8d7e62f 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -276,9 +276,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg;\r
-               procDlg.fnArchive  = & this->fnArchive;\r
-               procDlg.nFileCount = mkDlg.files.GetCount();\r
+               ProcessDialog procDlg(& this->fnArchive, mkDlg.files.GetCount());\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_CREATE, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -321,8 +319,7 @@ void MainFrame::OnArcOpen(wxCommandEvent& e)
        }\r
 \r
        // 進捗ダイアログ表示。\r
-       ProcessDialog procDlg;\r
-       procDlg.fnArchive  = & this->fnArchive;\r
+       ProcessDialog procDlg(& this->fnArchive);\r
        procDlg.Show(true);\r
 \r
        // DnD以外で書庫を開く場合、TPIを読み込み。\r
@@ -679,9 +676,7 @@ void MainFrame::OnArcAdd(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg;\r
-               procDlg.fnArchive  = & this->fnArchive;\r
-               procDlg.nFileCount = mkDlg.files.GetCount();\r
+               ProcessDialog procDlg(& this->fnArchive, mkDlg.files.GetCount());\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_ADD, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -796,9 +791,7 @@ void MainFrame::OnArcExtract(wxCommandEvent& e)
 \r
        // 処理を行う。\r
        {\r
-               ProcessDialog procDlg;\r
-               procDlg.fnArchive  = & this->fnArchive;\r
-               procDlg.nFileCount = mkDlg.files.GetCount();\r
+               ProcessDialog procDlg(& this->fnArchive, mkDlg.files.GetCount());\r
                procDlg.Show(true);\r
 \r
                tpi.Command(TPI_COMMAND_EXTRACT, & swInfo, this->fnArchive.GetFullPath(), mkDlg.files);\r
@@ -937,9 +930,7 @@ void MainFrame::OnArcDelete(wxCommandEvent& e)
        // 処理を行う。\r
        {\r
                wxArrayString asFiles = MakeTargetFileList(this);\r
-               ProcessDialog procDlg;\r
-               procDlg.fnArchive  = & this->fnArchive;\r
-               procDlg.nFileCount = asFiles.GetCount();\r
+               ProcessDialog procDlg(& this->fnArchive, asFiles.GetCount());\r
                procDlg.Show(true);\r
 \r
                TPI_SWITCHES swInfo;\r
@@ -956,32 +947,20 @@ void MainFrame::OnArcTest(wxCommandEvent&)
 {\r
        // 処理を行う。\r
        wxArrayString asFiles = MakeTargetFileList(this);\r
-       ProcessDialog procDlg;\r
-       procDlg.fnArchive  = & this->fnArchive;\r
-       procDlg.nFileCount = asFiles.GetCount();\r
+       ProcessDialog procDlg(& this->fnArchive, asFiles.GetCount());\r
        procDlg.Show(true);\r
 \r
        TPI_SWITCHES swInfo;\r
-       bool bIsCorrect = tpi.Command(TPI_COMMAND_TEST, & swInfo, this->fnArchive.GetFullPath(), asFiles);\r
+       tpi.Command(TPI_COMMAND_TEST, & swInfo, this->fnArchive.GetFullPath(), asFiles);\r
+       this->ErrorCheck(tpi.nErrorCode);\r
        procDlg.Show(false);\r
-\r
-       if (bIsCorrect)\r
-       {\r
-               wxLogMessage(_("This is a correct archive."));\r
-       }\r
-       else\r
-       {\r
-               this->ErrorCheck(tpi.nErrorCode);\r
-       }\r
 }\r
 \r
 void MainFrame::OnArcRepair(wxCommandEvent&)\r
 {\r
        // 処理を行う。\r
        wxArrayString asFiles = MakeTargetFileList(this);\r
-       ProcessDialog procDlg;\r
-       procDlg.fnArchive  = & this->fnArchive;\r
-       procDlg.nFileCount = asFiles.GetCount();\r
+       ProcessDialog procDlg(& this->fnArchive, asFiles.GetCount());\r
        procDlg.Show(true);\r
 \r
        TPI_SWITCHES swInfo;\r
@@ -1191,7 +1170,6 @@ int MainFrame::ErrorCheck(int nErrorCode, const wxString & szAPIName)
                break;\r
        case TPI_ERROR_D_SKIPPED:\r
        case TPI_CALLBACK_CANCEL:\r
-               wxLogError(_("This operation is canceled by the user."));\r
                break;\r
        default:\r
                wxLogError(_("Error: %s()!\nError code: %d"), szAPIName.c_str(), nErrorCode);\r