From 55351ee633ba54dcea9da73021cc121b9b5d72b2 Mon Sep 17 00:00:00 2001 From: sirakaba Date: Sun, 3 Apr 2011 09:25:43 +0000 Subject: [PATCH] =?utf8?q?=E3=83=80=E3=82=A4=E3=82=A2=E3=83=AD=E3=82=B0?= =?utf8?q?=E3=81=AE=E7=84=A1=E9=A7=84=E3=81=AA=E9=A0=98=E5=9F=9F=E3=82=92?= =?utf8?q?=E5=89=8A=E9=99=A4=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@523 9df91469-1e22-0410-86e7-ea8537beb833 --- doc/history.html | 1 + src/lychee/ui/dlg_make.fbp | 4 +- src/lychee/ui/dlg_overwrite.fbp | 1348 +++++++++++++++++++++------------------ src/lychee/ui/dlg_process.fbp | 6 +- 4 files changed, 722 insertions(+), 637 deletions(-) diff --git a/doc/history.html b/doc/history.html index be828f7..10c79bb 100644 --- a/doc/history.html +++ b/doc/history.html @@ -48,6 +48,7 @@
  • 閲覧時にShiftを押しながらDnDすることで、ファイルやフォルダを書庫に追加する機能を追加。
  • 巨大書庫を開く際の処理を高速化するため、DTV検査を省略できる機能を追加。
  • 巨大書庫を開く際、全ファイル表示ではなく書庫のルートを表示するなどして処理を高速化。
    • +
  • ダイアログの無駄な領域を削除。
    • calLibrary
    diff --git a/src/lychee/ui/dlg_make.fbp b/src/lychee/ui/dlg_make.fbp index 403e259..bc1e0ea 100644 --- a/src/lychee/ui/dlg_make.fbp +++ b/src/lychee/ui/dlg_make.fbp @@ -2488,7 +2488,7 @@ 5 - wxALL + wxLEFT|wxRIGHT 0 @@ -2545,7 +2545,7 @@ 5 - wxALL + wxLEFT|wxRIGHT 0 diff --git a/src/lychee/ui/dlg_overwrite.fbp b/src/lychee/ui/dlg_overwrite.fbp index 13b1e16..b2edc9b 100644 --- a/src/lychee/ui/dlg_overwrite.fbp +++ b/src/lychee/ui/dlg_overwrite.fbp @@ -2,9 +2,11 @@ - + XRC 1 + source_name + 0 UTF-8 connect dlg_overwrite @@ -12,66 +14,73 @@ none 0 dlg_overwrite - + ../../../share/xrc - + 1 + 1 0 0 - - - + + + + 1 1 - - - - + impl_virtual + + + + wxID_ANY - - + + dlg_overwrite - - + + wxDEFAULT_DIALOG_STYLE ProcessDialog Overwrite confirmation - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + bSizer4 wxVERTICAL none @@ -80,114 +89,124 @@ wxEXPAND|wxLEFT|wxRIGHT 0 - + bSizer12 wxHORIZONTAL none 5 wxALIGN_CENTER_VERTICAL|wxLEFT - 0 + 1 - - + + + 1 1 - + ,90,90,-1,70,0 - + wxID_ANY Target: - - - 1 + + + protected - + 50,-1 - - - - - - + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 3 - wxALIGN_CENTER_VERTICAL|wxALL - 0 + wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND + 6 - - + + + 1 1 - + ,90,90,-1,70,0 - + wxID_ANY - + 0 - + ebTarget protected - - 300,-1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + -1,-1 + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -197,7 +216,7 @@ wxEXPAND 0 - + bSizer7 wxHORIZONTAL none @@ -206,48 +225,53 @@ wxALIGN_CENTER|wxALL 0 - - - + + + + 1 1 - - + + 0 wxID_ANY - - + + sbIcon protected - + 32,32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -255,110 +279,120 @@ wxEXPAND 0 - + bSizer9 wxVERTICAL none 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY Existing: - - + + stExist protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY Writing: - - + + stWrite protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -368,110 +402,120 @@ wxEXPAND 3 - + bSizer10 wxVERTICAL none 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY - - - + + + stExistTime protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY - - - + + + stWriteTime protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -481,110 +525,120 @@ wxEXPAND 2 - + bSizer102 wxVERTICAL none 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY - - - + + + stExistSize protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 0 - - + + + 1 1 - - + + 0 wxID_ANY - - - + + + stWriteSize protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -596,111 +650,121 @@ wxEXPAND 0 - + bSizer101 wxHORIZONTAL none 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 3 - - + + + 1 1 - - + + 0 wxID_ANY Would you like to overwrite? - - - + + + protected - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + -1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + 5 - wxALL|wxEXPAND + wxEXPAND|wxLEFT|wxRIGHT 2 - + 0 - + + 1 1 - - + + 0 wxID_ANY Apply to all - - + + cbApplyAll protected - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -710,7 +774,7 @@ wxEXPAND 0 - + bSizer8 wxHORIZONTAL none @@ -729,51 +793,56 @@ wxEXPAND 0 - - + + + 1 1 1 - - + + 0 wxID_ANY Overwrite - - + + btnOverwrite protected - + -1,22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -781,51 +850,56 @@ wxEXPAND 0 - - + + + 1 0 1 - - + + 0 wxID_ANY Skip - - + + btnSkip protected - + -1,22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -833,51 +907,56 @@ wxEXPAND 0 - - + + + 1 0 1 - - + + 0 wxID_ANY Auto-rename - - + + btnAuto protected - + -1,22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -885,51 +964,56 @@ wxEXPAND 0 - - + + + 1 0 1 - - + + 0 wxID_ANY Browse - - + + btnBrowse protected - + -1,22 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + wxFILTER_NONE + wxDefaultValidator + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/lychee/ui/dlg_process.fbp b/src/lychee/ui/dlg_process.fbp index b3b912f..0442067 100644 --- a/src/lychee/ui/dlg_process.fbp +++ b/src/lychee/ui/dlg_process.fbp @@ -278,7 +278,7 @@ 3 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT|wxRIGHT 0 @@ -357,7 +357,7 @@ protected 100 - -1,20 + -1,10 wxGA_HORIZONTAL @@ -413,7 +413,7 @@ protected 100 - -1,20 + -1,10 wxGA_HORIZONTAL -- 2.11.0