From 02b7879bc795780c2ae1fce27ca2d03e853ead19 Mon Sep 17 00:00:00 2001 From: sirakaba Date: Mon, 1 Mar 2010 02:28:53 +0000 Subject: [PATCH] =?utf8?q?=E3=83=98=E3=83=83=E3=83=80=E5=9C=A7=E7=B8=AE?= =?utf8?q?=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=92=E8=BF=BD=E5=8A=A0=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@266 9df91469-1e22-0410-86e7-ea8537beb833 --- share/locale/ja/lychee.po | 91 +- src/common/handle/TPIHandle.cpp | 3 + src/common/header/plugin.h | 5 +- src/common/library/library.cpp | 2 + src/common/library/library.h | 1 + src/lychee/ui/dlg_make.fbp | 4621 ++++++++++++++++++++------------------- src/plugin/7zArc/7zArc.cpp | 6 +- 7 files changed, 2473 insertions(+), 2256 deletions(-) diff --git a/share/locale/ja/lychee.po b/share/locale/ja/lychee.po index 2b112c9..eec1557 100644 --- a/share/locale/ja/lychee.po +++ b/share/locale/ja/lychee.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Lychee\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-02-20 16:38+0900\n" -"PO-Revision-Date: 2010-02-20 17:22+0900\n" +"POT-Creation-Date: 2010-03-01 11:21+0900\n" +"PO-Revision-Date: 2010-03-01 11:26+0900\n" "Last-Translator: Silky \n" "Language-Team: Silky \n" "MIME-Version: 1.0\n" @@ -21,36 +21,36 @@ msgstr "" msgid "%Y/%m/%d %H:%M:%S" msgstr "" -#: dlg_make.cpp:99 +#: dlg_make.cpp:101 msgid "Input" msgstr "入力" -#: dlg_make.cpp:100 +#: dlg_make.cpp:102 msgid "Output" msgstr "出力" -#: dlg_make.cpp:139 +#: dlg_make.cpp:143 #: 標準入力:11 #: 標準入力:34 msgid "Extract" msgstr "展開" -#: dlg_make.cpp:143 +#: dlg_make.cpp:147 msgid "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?" msgstr "この書庫には非常に多くのファイルが含まれているため、ディレクトリ横断脆弱性(DTV)の危険性を調べるために時間がかかります。もしこの書庫が安全だと確信できるなら、この検査を省略できます。DTV検査を行いますか?" -#: dlg_make.cpp:184 +#: dlg_make.cpp:188 #: 標準入力:28 msgid "Add" msgstr "追加" -#: dlg_make.cpp:191 +#: dlg_make.cpp:195 #: 標準入力:3 #: 標準入力:22 msgid "Create" msgstr "新規作成" -#: dlg_make.cpp:400 +#: dlg_make.cpp:396 msgid "This archive may have Directory Traversal Vulnerability(DTV) problem, and some danger files may be extracted to the unexpected system directory! It is strongly recommended to ignore file path. Would you like to do so?" msgstr "この書庫にはディレクトリ横断脆弱性(DTV)の危険性があり、ユーザが意図しないシステムディレクトリに危険なファイルが展開されるかもしれません!ファイルのパス情報を無視することを強く推奨します。パス情報を無視しますか?" @@ -199,20 +199,20 @@ msgstr "選択したファイルを本当に削除しますか?" msgid "This is a correct archive." msgstr "これは正常な書庫です。" -#: frm_main.cpp:988 +#: frm_main.cpp:989 msgid "Sorry, this function is not supported yet." msgstr "申し訳ありませんが、この機能には未対応です。" -#: frm_main.cpp:992 +#: frm_main.cpp:993 msgid "This operation is canceled by the user." msgstr "この操作はユーザにより取り消されました。" -#: frm_main.cpp:995 +#: frm_main.cpp:996 #, c-format msgid "Error code: %d" msgstr "エラーコード: %d" -#: functions.cpp:225 +#: functions.cpp:226 msgid "file" msgstr "ファイル" @@ -395,7 +395,7 @@ msgid "Current" msgstr "処理元" #: 標準入力:48 -#: 標準入力:70 +#: 標準入力:77 msgid "Browse" msgstr "参照" @@ -468,66 +468,75 @@ msgid "%" msgstr "" #: 標準入力:66 -msgid "Encryption" -msgstr "暗号化" +msgid "Misc." +msgstr "その他" #: 標準入力:67 -msgid "Password:" -msgstr "パスワード:" +msgid "Solid compression" +msgstr "ファイル連結圧縮を行う" #: 標準入力:68 -msgid "Unmask" -msgstr "可視化" +msgid "Multimedia optimization" +msgstr "マルチメディア最適化を行う" #: 標準入力:69 -msgid "Keyfile:" -msgstr "キーファイル:" +msgid "Header compression" +msgstr "ヘッダ圧縮を行う" + +#: 標準入力:70 +msgid "Self-extracting archive" +msgstr "自己展開書庫を作成" #: 標準入力:71 -msgid "Header encryption" -msgstr "ヘッダを暗号化する" +msgid "Comment" +msgstr "コメント" #: 標準入力:72 -msgid "Misc." -msgstr "その他" - #: 標準入力:73 -msgid "Solid compression" -msgstr "ファイル連結圧縮を行う" +msgid "Encryption" +msgstr "暗号化" #: 標準入力:74 -msgid "Multimedia optimization" -msgstr "マルチメディア最適化を行う" +msgid "Password:" +msgstr "パスワード:" #: 標準入力:75 -msgid "Self-extracting archive" -msgstr "自己展開書庫を作成" +msgid "Unmask" +msgstr "可視化" #: 標準入力:76 -msgid "Comment" -msgstr "コメント" +msgid "Keyfile:" +msgstr "キーファイル:" -#: 標準入力:77 +#: 標準入力:78 +msgid "Method:" +msgstr "方式:" + +#: 標準入力:79 +msgid "Header encryption" +msgstr "ヘッダを暗号化する" + +#: 標準入力:80 msgid "Files" msgstr "ファイル" -#: 標準入力:78 +#: 標準入力:81 msgid "OK" msgstr "" -#: 標準入力:79 +#: 標準入力:82 msgid "Cancel" msgstr "中止" -#: 標準入力:80 +#: 標準入力:83 msgid "Lychee is processing ..." msgstr "" -#: 標準入力:81 +#: 標準入力:84 msgid "Source:" msgstr "処理元:" -#: 標準入力:82 +#: 標準入力:85 msgid "Target:" msgstr "処理先:" diff --git a/src/common/handle/TPIHandle.cpp b/src/common/handle/TPIHandle.cpp index 635535e..baed0e5 100644 --- a/src/common/handle/TPIHandle.cpp +++ b/src/common/handle/TPIHandle.cpp @@ -105,6 +105,7 @@ bool TPIHandle::GetFormatInformation(TPI_FORMATINFO * _fiInfo, bool _bFirst) // Initialization. _fiInfo->fArchive = false; _fiInfo->fComment = false; + _fiInfo->fCompressHeader = false; _fiInfo->fEncryptKeyFile = false; _fiInfo->fEncryptPassword = false; _fiInfo->fEncryptHeader = false; @@ -197,6 +198,7 @@ bool TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo) _aiInfo->fMMOptimize = false; _aiInfo->fEncryptData = false; _aiInfo->fEncryptHeader = false; + _aiInfo->fCompressHeader= false; _aiInfo->nCompressLevel = 0; _aiInfo->nRecoveryRecord= 0; _aiInfo->tmAccess = 0; @@ -214,6 +216,7 @@ bool TPIHandle::GetArchiveInformation(TPI_ARCHIVEINFO * _aiInfo) _aiInfo->pCustomInfo = NULL; // FORMATINFO _aiInfo->fiInfo.fComment = false; + _aiInfo->fiInfo.fCompressHeader = false; _aiInfo->fiInfo.fEncryptKeyFile = false; _aiInfo->fiInfo.fEncryptPassword = false; _aiInfo->fiInfo.fEncryptHeader = false; diff --git a/src/common/header/plugin.h b/src/common/header/plugin.h index 6793e73..9151c22 100644 --- a/src/common/header/plugin.h +++ b/src/common/header/plugin.h @@ -251,9 +251,10 @@ typedef struct _TPI_tagFORMATINFO { bool fArchive; /**< 複数ファイル格納対応ならtrue */ bool fComment; /**< コメント付加対応ならtrue */ + bool fCompressHeader; /**< ヘッダ圧縮対応ならtrue */ bool fEncryptKeyFile; /**< キーファイルによるデータ暗号化に対応しているならtrue */ bool fEncryptPassword; /**< パスワードによるデータ暗号化に対応しているならtrue */ - bool fEncryptHeader; /**< ヘッダ暗号化に対応しているならtrue */ + bool fEncryptHeader; /**< ヘッダ暗号化対応ならtrue */ bool fMMOptimize; /**< マルチメディアファイル最適化対応ならtrue */ bool fMultiVolume; /**< 分割圧縮対応ならtrue */ bool fSFX; /**< SFX作成対応ならtrue */ @@ -302,6 +303,7 @@ typedef struct _TPI_tagARCHIVEINFO bool fMMOptimize; /**< マルチメディアファイルに最適化されているならtrue */ bool fEncryptData; /**< データが暗号化されているならtrue */ bool fEncryptHeader; /**< ヘッダが暗号化されているならtrue */ + bool fCompressHeader; /**< ヘッダが圧縮されているならtrue */ unsigned short eOSType; /**< 作成元OS */ unsigned short nCompressLevel; /**< 圧縮レベル */ unsigned short nRecoveryRecord; /**< リカバリーレコード(0-100) */ @@ -328,6 +330,7 @@ typedef struct _TPI_tagSWITCHES bool fSolid; /**< Solid圧縮をするならtrue */ bool fMMOptimize; /**< マルチメディアファイルに最適化するならtrue */ bool fEncryptHeader; /**< ヘッダを暗号化するならtrue */ + bool fCompressHeader; /**< ヘッダを圧縮するならtrue */ unsigned short nCompressLevel; /**< 圧縮レベル */ unsigned short nRecoveryRecord; /**< リカバリーレコード(0-100) */ wxULongLong_t nArchiveType; /**< 書庫形式を表す一意の数値 */ diff --git a/src/common/library/library.cpp b/src/common/library/library.cpp index c8ddea0..8282c03 100644 --- a/src/common/library/library.cpp +++ b/src/common/library/library.cpp @@ -114,6 +114,7 @@ wxString MakeCommandLineSend(wxString szCommandLine, wxString szArcName, TPI_SWI // 5: パスワード // 6: キーファイル // 7: 分割サイズ + // 8: ヘッダ圧縮 case wxT('0'): szCommandLineSend += ProcessBool(swInfo->fStoreDirectoryPathes, szCommandLine, & i); break; case wxT('1'): szCommandLineSend += ProcessBool(swInfo->fMakeSFX, szCommandLine, & i); break; case wxT('2'): szCommandLineSend += ProcessBool(swInfo->fSolid, szCommandLine, & i); break; @@ -122,6 +123,7 @@ wxString MakeCommandLineSend(wxString szCommandLine, wxString szArcName, TPI_SWI case wxT('5'): szCommandLineSend += ProcessBool(! swInfo->szPassword.IsEmpty(), szCommandLine, & i, swInfo->szPassword); break; case wxT('6'): szCommandLineSend += ProcessBool(! swInfo->szKeyFile.IsEmpty(), szCommandLine, & i, swInfo->szKeyFile); break; case wxT('7'): szCommandLineSend += ProcessBool(swInfo->nSplitSize != 0, szCommandLine, & i, wxString::Format(wxT("%d"), swInfo->nSplitSize)); break; + case wxT('8'): szCommandLineSend += ProcessBool(swInfo->fCompressHeader, szCommandLine, & i); break; } break; } diff --git a/src/common/library/library.h b/src/common/library/library.h index a825ea9..59d907b 100644 --- a/src/common/library/library.h +++ b/src/common/library/library.h @@ -88,6 +88,7 @@ inline void MakeFormatInfo(wxString szTPIName, TPI_FORMATINFO * _fiInfo, wxXmlNo CheckSupportedSwitch("a5", _fiInfo->fEncryptPassword); CheckSupportedSwitch("a6", _fiInfo->fEncryptKeyFile); CheckSupportedSwitch("a7", _fiInfo->fMultiVolume); + CheckSupportedSwitch("a8", _fiInfo->fCompressHeader); _fiInfo->nCompressLevelMin = GetNumValue(xmlLibrary, wxT("level-min")); _fiInfo->nCompressLevelMax = GetNumValue(xmlLibrary, wxT("level-max")); diff --git a/src/lychee/ui/dlg_make.fbp b/src/lychee/ui/dlg_make.fbp index 55cb467..66bfbf2 100644 --- a/src/lychee/ui/dlg_make.fbp +++ b/src/lychee/ui/dlg_make.fbp @@ -1,2212 +1,2409 @@ - - - - - - XRC - 1 - UTF-8 - connect - dlg_make - 1000 - none - 0 - dlg_make - - ../../../share/xrc - - 1 - 0 - 0 - - - - - 1 - - - - 0 - wxID_ANY - -1,-1 - - dlg_make - - 490,250 - wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - wxVERTICAL - none - - 2 - wxEXPAND | wxALL - 7 - - - - - 1 - - - 0 - wxID_ANY - -1,-1 - - nbTabs - protected - - 480,210 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - General - 1 - - - - 1 - - - 0 - wxID_ANY - - - m_panel1 - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer1 - wxVERTICAL - none - - 0 - wxEXPAND - 0 - - - bSizer2 - wxHORIZONTAL - none - - 3 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - 1 - - - - wxID_ANY - Destination directory/filename: - - - - protected - - -1,-1 - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 3 - wxALIGN_CENTER_VERTICAL - 0 - - - - - 1 - - - - wxID_ANY - Default - - - btnDefault - protected - - 70,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxALIGN_CENTER_VERTICAL - 0 - - - - - 1 - - - - wxID_ANY - Desktop - - - btnDesktop - protected - - 70,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL - 0 - - - - - 1 - - - - wxID_ANY - Current - - - btnCurrent - protected - - 70,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxLEFT|wxRIGHT|wxTOP - 0 - - - - - 1 - - - - wxID_ANY - Browse - - - btnBrowse - protected - - 70,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxEXPAND - 0 - - - bSizer3 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT - 7 - - - - - 1 - - - - wxID_ANY - - -1,-1 - cbDir - protected - - -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT - 3 - - - - - 1 - - - - wxID_ANY - - - cbFileName - protected - - -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL|wxEXPAND - 0 - - wxID_ANY - Options - - sbSizer1 - wxHORIZONTAL - none - - - 5 - wxEXPAND - 1 - - - bSizer24 - wxVERTICAL - none - - 0 - wxEXPAND - 1 - - - bSizer5 - wxHORIZONTAL - none - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT - 0 - - - - 1 - - - - wxID_ANY - Archive type: - - - - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER|wxLEFT|wxRIGHT - 1 - - - - - 1 - - - 0 - wxID_ANY - - - chType - protected - - 0 - -1,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT|wxRIGHT - 0 - - - "Don't make directory" "Make DIR by the archive name" "Make DIR if needed" - - 0 - - - 0 - wxID_ANY - - - chDirMake - protected - - 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - wxEXPAND - 1 - - - bSizer7 - wxVERTICAL - none - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - 0 - - 1 - - - - wxID_ANY - Open the destination afterward - - - cbOpenAfter - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - - - 1 - - - - wxID_ANY - Ignore file pathes - - - cbIgnorePath - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 3 - wxALIGN_CENTER_VERTICAL|wxEXPAND - 0 - - - - - 1 - - - - wxID_ANY - Exit afterward - - - cbExitAfter - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Config - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_panel2 - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer11 - wxHORIZONTAL - none - - 5 - wxEXPAND|wxLEFT|wxRIGHT - 1 - - - bSizer21 - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - wxID_ANY - Compression Level - - sbSizer11 - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - 5 - 9 - - 0 - - scLevel - protected - - -1,-1 - wxSP_ARROW_KEYS|wxSP_WRAP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Multivolume - - sbSizer2 - wxVERTICAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - "1.44MB" "650MB" "700MB" - - 1 - - - 0 - wxID_ANY - - - cbSplitSize - protected - - -1,-1 - - - - Don't split. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Recovery Record - - sbSizer5 - wxHORIZONTAL - none - - - 5 - wxALL|wxEXPAND - 0 - - - - 1 - - - 0 - wxID_ANY - 0 - 100 - - 0 - - scRR - protected - - -1,-1 - wxSP_ARROW_KEYS|wxSP_WRAP - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER - 0 - - - - 1 - - - 0 - wxID_ANY - % - - - - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxBOTTOM|wxEXPAND|wxRIGHT - 2 - - - bSizer31 - wxVERTICAL - none - - 5 - wxEXPAND - 0 - - wxID_ANY - Encryption - - sbSizer3 - wxVERTICAL - none - - - 5 - wxEXPAND - 0 - - 3 - wxBOTH - 1 - 0,1 - 0 - - fgSizer1 - wxFLEX_GROWMODE_SPECIFIED - none - 2 - 0 - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Password: - - - - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - tcPassword - protected - - -1,22 - wxTE_PASSWORD - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Unmask - - - cbUnmask - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - Keyfile: - - - - protected - - - - - - - - - -1 - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxLEFT|wxRIGHT - 0 - - - - 1 - - - 0 - wxID_ANY - - 0 - - tcKeyfile - protected - - -1,22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - - 0 - - - - 0 - 1 - - - 0 - wxID_ANY - Browse - - - btnBrowseKF - protected - - 70,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - 0 - - 1 - - - 0 - wxID_ANY - Header encryption - - - cbEncryptHeader - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 0 - - wxID_ANY - Misc. - - sbSizer4 - wxVERTICAL - none - - - 5 - wxEXPAND|wxLEFT - 0 - - - 1 - - 1 - - - 0 - wxID_ANY - Solid compression - - - cbSolid - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - 1 - - 1 - - - 0 - wxID_ANY - Multimedia optimization - - - cbMMOptimize - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND|wxLEFT - 0 - - - 0 - - 1 - - - - wxID_ANY - Self-extracting archive - - - cbMakeSFX - protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Comment - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_panel3 - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer211 - wxVERTICAL - none - - 5 - wxALIGN_CENTER|wxALL|wxEXPAND - 1 - - - - 1 - - - 0 - wxID_ANY - - 0 - - tcComment - protected - - -1,-1 - wxTE_MULTILINE - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Files - 0 - - - - 1 - - - 0 - wxID_ANY - - - m_panel5 - protected - - - - - - - wxTAB_TRAVERSAL - - - - - - - - - - - - - - - - - - - - - - - - - - bSizer13 - wxVERTICAL - none - - 5 - wxALL|wxEXPAND - 1 - - - - 1 - - - 0 - wxID_ANY - - - lcFiles - protected - - - wxLC_REPORT|wxLC_VIRTUAL - myListCtrl2; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALIGN_CENTER_HORIZONTAL - 0 - - - bSizer23 - wxHORIZONTAL - none - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - 5 - wxALL - 0 - - - - 1 - 1 - - - - wxID_ANY - OK - - - btnOK - protected - - -1,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxALL - 0 - - - - - 1 - - - - wxID_ANY - Cancel - - - btnCancel - protected - - -1,25 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 - - - - - - - - + + + + + + XRC + 1 + UTF-8 + connect + dlg_make + 1000 + none + 0 + dlg_make + + ../../../share/xrc + + 1 + 0 + 0 + + + + + 1 + + + + 0 + wxID_ANY + -1,-1 + + dlg_make + + 490,250 + wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + wxVERTICAL + none + + 2 + wxEXPAND | wxALL + 7 + + + + + 1 + + + 0 + wxID_ANY + -1,-1 + + nbTabs + protected + + 480,210 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + General + 1 + + + + 1 + + + 0 + wxID_ANY + + + m_panel1 + protected + + + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer1 + wxVERTICAL + none + + 0 + wxEXPAND + 0 + + + bSizer2 + wxHORIZONTAL + none + + 3 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + + + 1 + + + + wxID_ANY + Destination directory/filename: + + + + protected + + -1,-1 + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 3 + wxALIGN_CENTER_VERTICAL + 0 + + + + + 1 + + + + wxID_ANY + Default + + + btnDefault + protected + + 70,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxALIGN_CENTER_VERTICAL + 0 + + + + + 1 + + + + wxID_ANY + Desktop + + + btnDesktop + protected + + 70,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL + 0 + + + + + 1 + + + + wxID_ANY + Current + + + btnCurrent + protected + + 70,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxLEFT|wxRIGHT|wxTOP + 0 + + + + + 1 + + + + wxID_ANY + Browse + + + btnBrowse + protected + + 70,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxEXPAND + 0 + + + bSizer3 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT + 7 + + + + + 1 + + + + wxID_ANY + + -1,-1 + cbDir + protected + + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT + 3 + + + + + 1 + + + + wxID_ANY + + + cbFileName + protected + + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + wxID_ANY + Options + + sbSizer1 + wxHORIZONTAL + none + + + 5 + wxEXPAND + 1 + + + bSizer24 + wxVERTICAL + none + + 0 + wxEXPAND + 1 + + + bSizer5 + wxHORIZONTAL + none + + 5 + wxALIGN_CENTER_VERTICAL|wxLEFT + 0 + + + + 1 + + + + wxID_ANY + Archive type: + + + + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER|wxLEFT|wxRIGHT + 1 + + + + + 1 + + + 0 + wxID_ANY + + + chType + protected + + 0 + -1,-1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 0 + + + "Don't make directory" "Make DIR by the archive name" "Make DIR if needed" + + 0 + + + 0 + wxID_ANY + + + chDirMake + protected + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + wxEXPAND + 1 + + + bSizer7 + wxVERTICAL + none + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + 0 + + 1 + + + + wxID_ANY + Open the destination afterward + + + cbOpenAfter + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + + + 1 + + + + wxID_ANY + Ignore file pathes + + + cbIgnorePath + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 3 + wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + + + + + 1 + + + + wxID_ANY + Exit afterward + + + cbExitAfter + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Config + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_panel2 + protected + + + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer11 + wxHORIZONTAL + none + + 5 + wxEXPAND|wxLEFT|wxRIGHT + 1 + + + bSizer21 + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + wxID_ANY + Compression Level + + sbSizer11 + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + 5 + 9 + + 0 + + scLevel + protected + + -1,-1 + wxSP_ARROW_KEYS|wxSP_WRAP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + wxID_ANY + Multivolume + + sbSizer2 + wxVERTICAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + "1.44MB" "650MB" "700MB" + + 1 + + + 0 + wxID_ANY + + + cbSplitSize + protected + + -1,-1 + + + + Don't split. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 0 + + wxID_ANY + Recovery Record + + sbSizer5 + wxHORIZONTAL + none + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + 0 + 100 + + 0 + + scRR + protected + + -1,-1 + wxSP_ARROW_KEYS|wxSP_WRAP + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER + 0 + + + + 1 + + + 0 + wxID_ANY + % + + + + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxBOTTOM|wxEXPAND|wxRIGHT + 2 + + + bSizer31 + wxVERTICAL + none + + 5 + wxEXPAND + 0 + + wxID_ANY + Misc. + + sbSizer4 + wxVERTICAL + none + + + 5 + wxEXPAND|wxLEFT + 0 + + + 1 + + 1 + + + 0 + wxID_ANY + Solid compression + + + cbSolid + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + 1 + + 1 + + + 0 + wxID_ANY + Multimedia optimization + + + cbMMOptimize + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + 1 + + 1 + + + 0 + wxID_ANY + Header compression + + + cbCompressHeader + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND|wxLEFT + 0 + + + 0 + + 1 + + + + wxID_ANY + Self-extracting archive + + + cbMakeSFX + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Comment + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_panel3 + protected + + + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer211 + wxVERTICAL + none + + 5 + wxALIGN_CENTER|wxALL|wxEXPAND + 1 + + + + 1 + + + 0 + wxID_ANY + + 0 + + tcComment + protected + + -1,-1 + wxTE_MULTILINE + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Encryption + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_panel4 + protected + + + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + wxID_ANY + Encryption + + sbSizer3 + wxVERTICAL + none + + + 5 + wxEXPAND + 0 + + 3 + wxBOTH + 1 + 0,1 + 0 + + fgSizer1 + wxFLEX_GROWMODE_SPECIFIED + none + 3 + 0 + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Password: + + + + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + tcPassword + protected + + -1,-1 + wxTE_PASSWORD + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER|wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Unmask + + + cbUnmask + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Keyfile: + + + + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL|wxEXPAND + 0 + + + + 1 + + + 0 + wxID_ANY + + 0 + + tcKeyfile + protected + + -1,22 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER|wxALL + 0 + + + + 0 + 1 + + + 0 + wxID_ANY + Browse + + + btnBrowseKF + protected + + 70,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL + 0 + + + + 1 + + + 0 + wxID_ANY + Method: + + + + protected + + + + + + + + + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 0 + + + + + 1 + + + 0 + wxID_ANY + + + chEncryptMethod + protected + + 0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_RIGHT|wxALL + 0 + + + 0 + + 1 + + + 0 + wxID_ANY + Header encryption + + + cbEncryptHeader + protected + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Files + 0 + + + + 1 + + + 0 + wxID_ANY + + + m_panel5 + protected + + + + + + + wxTAB_TRAVERSAL + + + + + + + + + + + + + + + + + + + + + + + + + + bSizer13 + wxVERTICAL + none + + 5 + wxALL|wxEXPAND + 1 + + + + 1 + + + 0 + wxID_ANY + + + lcFiles + protected + + + wxLC_REPORT|wxLC_VIRTUAL + myListCtrl2; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALIGN_CENTER_HORIZONTAL + 0 + + + bSizer23 + wxHORIZONTAL + none + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + 5 + wxALL + 0 + + + + 1 + 1 + + + + wxID_ANY + OK + + + btnOK + protected + + -1,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxALL + 0 + + + + + 1 + + + + wxID_ANY + Cancel + + + btnCancel + protected + + -1,25 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 5 + wxEXPAND + 1 + + 0 + protected + 0 + + + + + + + + diff --git a/src/plugin/7zArc/7zArc.cpp b/src/plugin/7zArc/7zArc.cpp index 178d808..0e61d53 100644 --- a/src/plugin/7zArc/7zArc.cpp +++ b/src/plugin/7zArc/7zArc.cpp @@ -110,6 +110,7 @@ int __stdcall GetFormatInformation2(TPI_FORMATINFO * _fiInfo, wxULongLong_t & nI _fiInfo->fEncryptKeyFile = false; _fiInfo->fEncryptPassword = false; _fiInfo->fEncryptHeader = false; + _fiInfo->fCompressHeader = false; _fiInfo->fMMOptimize = false; _fiInfo->fMultiVolume = false; _fiInfo->fSFX = false; @@ -170,6 +171,7 @@ int __stdcall GetFormatInformation2(TPI_FORMATINFO * _fiInfo, wxULongLong_t & nI _fiInfo->fSolid = true; _fiInfo->fEncryptPassword = true; _fiInfo->fEncryptHeader = true; + _fiInfo->fCompressHeader = true; _fiInfo->fMultiVolume = true; _fiInfo->nCompressLevelMin = 0; _fiInfo->nCompressLevelMax = 9; @@ -979,12 +981,12 @@ int __stdcall Command szProps.Add(wxT("s")); } // ヘッダ圧縮。 -/* if (fiInfo.fCompressHeader) + if (fiInfo.fCompressHeader) { propValues[szProps.Size()] = _swInfo->fCompressHeader; szProps.Add(wxT("hc")); } -*/ // ヘッダ暗号化。 + // ヘッダ暗号化。 if (fiInfo.fEncryptHeader) { propValues[szProps.Size()] = _swInfo->fEncryptHeader; -- 2.11.0