From 756fe3dc87152f4d7647f0e379657dbd26b5cae0 Mon Sep 17 00:00:00 2001
From: sirakaba <sirakaba@9df91469-1e22-0410-86e7-ea8537beb833>
Date: Tue, 2 Mar 2010 01:55:14 +0000
Subject: [PATCH] =?utf8?q?=E8=BF=BD=E5=8A=A0/=E6=A0=BC=E7=B4=8D=E6=99=82?=
 =?utf8?q?=E3=80=81=E6=9C=80=E5=88=9D=E3=81=ABFiles=E3=82=BF=E3=83=96?=
 =?utf8?q?=E3=82=92=E8=A1=A8=E7=A4=BA=E3=81=97=E3=81=9F=E6=99=82=E3=81=AB?=
 =?utf8?q?=E3=83=95=E3=82=A1=E3=82=A4=E3=83=AB=E3=81=8C=E8=A1=A8=E7=A4=BA?=
 =?utf8?q?=E3=81=95=E3=82=8C=E3=81=AA=E3=81=84=E3=83=90=E3=82=B0=E3=82=92?=
 =?utf8?q?=E4=BF=AE=E6=AD=A3=E3=80=82=20=E5=B1=95=E9=96=8B=E6=99=82?=
 =?utf8?q?=E3=81=AB=E4=B8=8D=E6=AD=A3=E7=B5=82=E4=BA=86=E3=81=97=E3=81=A6?=
 =?utf8?q?=E3=81=84=E3=81=9F=E3=83=90=E3=82=B0=E3=82=92=E4=BF=AE=E6=AD=A3?=
 =?utf8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

git-svn-id: svn+ssh://svn.sourceforge.jp/svnroot/tpi/tpi@270 9df91469-1e22-0410-86e7-ea8537beb833
---
 src/lychee/dlg_make.cpp | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 8a60918..d8c992e 100644
--- 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);
 	this->cbUnmask          = XRCCTRL(* this, "cbUnmask",     wxCheckBox);
 	this->cbEncryptHeader   = XRCCTRL(* this, "cbEncryptHeader", wxCheckBox);
+	this->chEncryptMethod   = XRCCTRL(* this, "chEncryptMethod", wxChoice);
 	// "Files"タブ
 	this->lcFiles           = XRCCTRL(* this, "lcFiles",      myListCtrl2);
 
@@ -145,14 +146,6 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
 		this->SetTitle(_("Extract"));
 		this->tcComment->SetValue(frm_main->aiArchive.szComment);
 
-		// 展開先を予測。ただしDTVスキャンに時間がかかる場合はスキップ可能。
-		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)
-		{
-			wxNotebookEvent e;
-			e.SetSelection(3);
-			this->OnTabChanged(e);
-		}
-
 		// コントロールを無効化。
 		this->scLevel->Disable();
 		this->scRR->Disable();
@@ -176,8 +169,6 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
 		// 書庫形式欄を設定。
 		this->afInfo.Add(frm_main->aiArchive.fiInfo);
 		this->chType->Append(frm_main->aiArchive.fiInfo.szTypeName);
-
-		// とりあえず最初の形式にしておく。
 		this->chType->SetSelection(0);
 		{
 			wxCommandEvent e;
@@ -248,6 +239,14 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
 		this->OnChoice(e);
 		break;
 	}
+
+	// 展開/格納先を予測。ただしDTVスキャンに時間がかかる場合はスキップ可能。
+	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)
+	{
+		wxNotebookEvent e;
+		e.SetSelection(3);
+		this->OnTabChanged(e);
+	}
 }
 
 void MakeDialog::OnBtnDefault(wxCommandEvent&)
-- 
2.11.0