ヘッダ圧縮の設定を追加。

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

diff --git a/doc/history.html b/doc/history.html
index 80e8cb2..b4bb15b 100644 (file)
--- a/doc/history.html
+++ b/doc/history.html
@@ -40,6 +40,7 @@
        <li class="chg">フォルダを格納する際に、TPIに送る名前を&quot;xxx\&quot;から&quot;xxx&quot;に変更。</li>\r
        <li class="chg">DnDされたものが書庫であるか判定する際に、それがファイルであるかを先に確認するよう変更。</li>\r
        <li class="chg">コマンドライン経由で書庫を展開した後にLycheeのウインドウが表示されないように改良。</li>\r
+       <li class="chg">暗号化設定を独立したタブに移動。</li>\r
        <li class="fix">TPIを適切に解放していなかったために、書庫を開けなくなることがあったバグを修正。</li>\r
        <li class="fix">履歴を最新のものとして記録できない場合があったバグを修正。</li>\r
        <li class="fix">ウインドウの座標が-1であった場合、次回起動時にウインドウがずれていたバグを修正。</li>\r

diff --git a/src/lychee/dlg_make.cpp b/src/lychee/dlg_make.cpp
index 7e866a3..8a60918 100644 (file)
--- a/src/lychee/dlg_make.cpp
+++ b/src/lychee/dlg_make.cpp
@@ -76,16 +76,18 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
        // "Config"タブ\r
        this->scLevel           = XRCCTRL(* this, "scLevel",      wxSpinCtrl);\r
        this->scRR              = XRCCTRL(* this, "scRR",         wxSpinCtrl);\r
-       this->tcPassword        = XRCCTRL(* this, "tcPassword",   wxTextCtrl);\r
-       this->tcKeyfile         = XRCCTRL(* this, "tcKeyfile",    wxTextCtrl);\r
-       this->cbSplitSize       = XRCCTRL(* this, "cbSplitSize",  wxComboBox);\r
-       this->cbUnmask          = XRCCTRL(* this, "cbUnmask",     wxCheckBox);\r
-       this->cbEncryptHeader   = XRCCTRL(* this, "cbEncryptHeader", wxCheckBox);\r
        this->cbSolid           = XRCCTRL(* this, "cbSolid",      wxCheckBox);\r
        this->cbMMOptimize      = XRCCTRL(* this, "cbMMOptimize", wxCheckBox);\r
+       this->cbCompressHeader  = XRCCTRL(* this, "cbCompressHeader", wxCheckBox);\r
        this->cbMakeSFX         = XRCCTRL(* this, "cbMakeSFX",    wxCheckBox);\r
        // "Comment"タブ\r
        this->tcComment         = XRCCTRL(* this, "tcComment",    wxTextCtrl);\r
+       // "Encryption"タブ\r
+       this->tcPassword        = XRCCTRL(* this, "tcPassword",   wxTextCtrl);\r
+       this->tcKeyfile         = XRCCTRL(* this, "tcKeyfile",    wxTextCtrl);\r
+       this->cbSplitSize       = XRCCTRL(* this, "cbSplitSize",  wxComboBox);\r
+       this->cbUnmask          = XRCCTRL(* this, "cbUnmask",     wxCheckBox);\r
+       this->cbEncryptHeader   = XRCCTRL(* this, "cbEncryptHeader", wxCheckBox);\r
        // "Files"タブ\r
        this->lcFiles           = XRCCTRL(* this, "lcFiles",      myListCtrl2);\r
 \r
@@ -154,16 +156,18 @@ void MakeDialog::OnInit(wxInitDialogEvent&)
                // コントロールを無効化。\r
                this->scLevel->Disable();\r
                this->scRR->Disable();\r
-               this->cbEncryptHeader->Disable();\r
                this->cbSolid->Disable();\r
                this->cbMMOptimize->Disable();\r
                this->tcComment->SetEditable(false);\r
+               this->cbEncryptHeader->Disable();\r
+               this->chEncryptMethod->Disable();\r
        case TPI_COMMAND_ADD:\r
                // コントロールを無効化(展開時も)。\r
                this->cbFileName->Disable();\r
                this->chType->Disable();\r
                this->chDirMake->Enable();\r
                this->cbSplitSize->Disable();\r
+               this->cbCompressHeader->Disable();\r
                this->cbMakeSFX->Disable();\r
 \r
                // 書庫名を設定。\r
@@ -322,6 +326,7 @@ void MakeDialog::OnChoice(wxCommandEvent& e)
        this->scRR->SetValue(fiInfo->nRecoveryRecordMin);\r
        this->scRR->Enable(fiInfo->nRecoveryRecordMin != fiInfo->nRecoveryRecordMax);\r
        this->cbEncryptHeader->Enable(fiInfo->fEncryptHeader);\r
+       this->cbCompressHeader->Enable(fiInfo->fCompressHeader);\r
        this->cbSolid->Enable(fiInfo->fSolid);\r
        this->cbMMOptimize->Enable(fiInfo->fMMOptimize);\r
        this->tcComment->Enable(fiInfo->fComment);\r

diff --git a/src/lychee/dlg_make.h b/src/lychee/dlg_make.h
index a211747..129de72 100644 (file)
--- a/src/lychee/dlg_make.h
+++ b/src/lychee/dlg_make.h
@@ -54,26 +54,29 @@ public:
 class MakeDialog: public wxDialog {\r
 public:\r
        // "General"タブ\r
-    wxComboBox* cbDir;\r
-    wxComboBox* cbFileName;\r
-    wxCheckBox* cbOpenAfter;\r
-    wxCheckBox* cbIgnorePath;\r
-    wxCheckBox* cbExitAfter;\r
+       wxComboBox* cbDir;\r
+       wxComboBox* cbFileName;\r
+       wxCheckBox* cbOpenAfter;\r
+       wxCheckBox* cbIgnorePath;\r
+       wxCheckBox* cbExitAfter;\r
        wxChoice* chType;\r
        wxChoice* chDirMake;\r
        // "Config"タブ\r
        wxSpinCtrl* scLevel;\r
        wxSpinCtrl* scRR;\r
-       wxTextCtrl* tcPassword;\r
-       wxTextCtrl* tcKeyfile;\r
-    wxComboBox* cbSplitSize;\r
-    wxCheckBox* cbUnmask;\r
-    wxCheckBox* cbEncryptHeader;\r
-    wxCheckBox* cbSolid;\r
-    wxCheckBox* cbMMOptimize;\r
+       wxComboBox* cbSplitSize;\r
+       wxCheckBox* cbSolid;\r
+       wxCheckBox* cbMMOptimize;\r
+       wxCheckBox* cbCompressHeader;\r
        wxCheckBox* cbMakeSFX;\r
        // "Comment"タブ\r
        wxTextCtrl* tcComment;\r
+       // "Encryption"タブ\r
+       wxTextCtrl* tcPassword;\r
+       wxTextCtrl* tcKeyfile;\r
+       wxCheckBox* cbUnmask;\r
+       wxChoice*   chEncryptMethod;\r
+       wxCheckBox* cbEncryptHeader;\r
        // "Files"タブ\r
        myListCtrl2* lcFiles;\r
 \r

diff --git a/src/lychee/frm_main.cpp b/src/lychee/frm_main.cpp
index aa02c8c..ad53595 100644 (file)
--- a/src/lychee/frm_main.cpp
+++ b/src/lychee/frm_main.cpp
@@ -252,6 +252,7 @@ void MainFrame::OnArcCreate(wxCommandEvent& e)
        swInfo.fSolid               = mkDlg.cbSolid->IsChecked();\r
        swInfo.fMMOptimize          = mkDlg.cbMMOptimize->IsChecked();\r
        swInfo.fEncryptHeader       = mkDlg.cbEncryptHeader->IsChecked();\r
+       swInfo.fCompressHeader      = mkDlg.cbCompressHeader->IsChecked();\r
        swInfo.nCompressLevel       = mkDlg.scLevel->GetValue();\r
        swInfo.nRecoveryRecord      = mkDlg.scRR->GetValue();\r
        swInfo.szPassword           = mkDlg.tcPassword->GetValue();\r