追加/格納時、最初にFilesタブを表示した時にファイルが表示されないバグを修正。

展開時に不正終了していたバグを修正。

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

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 8a60918..d8c992e 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -88,6 +88,7 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        this->cbSplitSize       = XRCCTRL(* this, "cbSplitSize",  wxComboBox);\r
        this->cbUnmask          = XRCCTRL(* this, "cbUnmask",     wxCheckBox);\r
        this->cbEncryptHeader   = XRCCTRL(* this, "cbEncryptHeader", wxCheckBox);\r
+       this->chEncryptMethod   = XRCCTRL(* this, "chEncryptMethod", wxChoice);\r
        // "Files"タブ\r
        this->lcFiles           = XRCCTRL(* this, "lcFiles",      myListCtrl2);\r
 \r
@@ -145,14 +146,6 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                this->SetTitle(_("Extract"));\r
                this->tcComment->SetValue(frm_main->aiArchive.szComment);\r
 \r
-               // 展開先を予測。ただしDTVスキャンに時間がかかる場合はスキップ可能。\r
-               if (this->lcFiles->asInput.GetCount() < 3000 || ::AskDlg(_("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)\r
-               {\r
-                       wxNotebookEvent e;\r
-                       e.SetSelection(3);\r
-                       this->OnTabChanged(e);\r
-               }\r
-\r
                // コントロールを無効化。\r
                this->scLevel->Disable();\r
                this->scRR->Disable();\r
@@ -176,8 +169,6 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                // 書庫形式欄を設定。\r
                this->afInfo.Add(frm_main->aiArchive.fiInfo);\r
                this->chType->Append(frm_main->aiArchive.fiInfo.szTypeName);\r
-\r
-               // とりあえず最初の形式にしておく。\r
                this->chType->SetSelection(0);\r
                {\r
                        wxCommandEvent e;\r
@@ -248,6 +239,14 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                this->OnChoice(e);\r
                break;\r
        }\r
+\r
+       // 展開/格納先を予測。ただしDTVスキャンに時間がかかる場合はスキップ可能。\r
+       if (this->lcFiles->asInput.GetCount() < 3000 || ::AskDlg(_("This archive contains so many files that it takes long to check Directory Traversal Vulnerability(DTV) problem. If you are sure this archive is safe, you can skip this scanning process. Do you want to scan for DTV problem?"), this) == wxYES)\r
+       {\r
+               wxNotebookEvent e;\r
+               e.SetSelection(3);\r
+               this->OnTabChanged(e);\r
+       }\r
 }\r
 \r
 void MakeDialog::OnBtnDefault(wxCommandEvent&)\r