上書き確認画面の実装準備。進捗状況をファイルごとと書庫全体の二つに分離。

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

diff --git a/src/lychee/dlg_process.cpp b/src/lychee/dlg_process.cpp
index d0f29a7..6acff50 100644 (file)
--- a/src/lychee/dlg_process.cpp
+++ b/src/lychee/dlg_process.cpp
@@ -57,7 +57,8 @@ void ProcessDialog::OnInit(wxInitDialogEvent &)
        // XRCと結びつけ。\r
        this->ebSource          = XRCCTRL(* this, "ebSource",     wxTextCtrl);\r
        this->ebTarget          = XRCCTRL(* this, "ebTarget",     wxTextCtrl);\r
-       this->gauge             = XRCCTRL(* this, "gauge",        wxGauge);\r
+       this->gFile             = XRCCTRL(* this, "gFile",        wxGauge);\r
+       this->gArchive          = XRCCTRL(* this, "gArchive",     wxGauge);\r
        this->fCancel           = false;\r
        g_procDlg = this;\r
 \r
@@ -101,8 +102,8 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
                        this->ebTarget->ChangeValue(piInfo->fnDestination.GetFullPath());\r
                        if (piInfo->fiInfo.nUnpackedSize > 10000)\r
                        {\r
-                               this->gauge->SetRange(piInfo->fiInfo.nUnpackedSize);\r
-                               this->gauge->SetValue(0);\r
+                               this->gFile->SetRange(piInfo->fiInfo.nUnpackedSize);\r
+                               this->gFile->SetValue(0);\r
                        }\r
                        ::wxSafeYield(this, true);\r
                        break;\r
@@ -111,27 +112,28 @@ int ProcessDialog::CallbackProc(unsigned int _uMsg, void * _pStructure)
                        {\r
                                if (piInfo->fiInfo.nUnpackedSize > 10000)\r
                                {\r
-                                       this->gauge->SetValue(piInfo->nProcessedSize);\r
+                                       this->gFile->SetValue(piInfo->nProcessedSize);\r
                                }\r
                                ::wxSafeYield(this, true);\r
                                s_nGaugeCounter = 0;\r
                        }\r
                        break;\r
                case TPI_STATUS_ENDPROCESS:\r
-//                     this->gauge->SetValue(piInfo->fiInfo.nUnpackedSize.ToULong());\r
+//                     this->gFile->SetValue(piInfo->fiInfo.nUnpackedSize.ToULong());\r
+                       this->gArchive->SetValue(this->gArchive->GetValue() + 1);\r
                        break;\r
                // 書庫ロード時用の独自仕様。\r
                case 0x1000:\r
                        this->ebSource->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
-                       this->gauge->SetRange(piInfo->fiInfo.nUnpackedSize);\r
-                       this->gauge->SetValue(0);\r
+                       this->gArchive->SetRange(piInfo->fiInfo.nUnpackedSize);\r
+                       this->gArchive->SetValue(0);\r
                        break;\r
                case 0x1001:\r
                        // 更新しすぎると低速なので100ファイル毎に更新する。\r
-                       if (piInfo->nProcessedSize > this->gauge->GetValue() + 100)\r
+                       if (piInfo->nProcessedSize > this->gArchive->GetValue() + 100)\r
                        {\r
                                this->ebTarget->ChangeValue(piInfo->fiInfo.fnFileName.GetFullPath());\r
-                               this->gauge->SetValue(piInfo->nProcessedSize);\r
+                               this->gArchive->SetValue(piInfo->nProcessedSize);\r
                                ::wxSafeYield(this, true);\r
                        }\r
                        break;\r

diff --git a/src/lychee/dlg_process.h b/src/lychee/dlg_process.h
index 8412858..9d31833 100644 (file)
--- a/src/lychee/dlg_process.h
+++ b/src/lychee/dlg_process.h
@@ -24,11 +24,6 @@
 \r
 class ProcessDialog: public wxDialog {\r
 public:\r
-    wxTextCtrl* ebSource;\r
-    wxTextCtrl* ebTarget;\r
-    wxGauge* gauge;\r
-    bool fCancel;\r
-\r
     void OnInit(wxInitDialogEvent &);\r
        void OnClose(wxCloseEvent &);\r
        int CallbackProc(unsigned int, void *);\r
@@ -37,6 +32,13 @@ public:
        ~ProcessDialog();\r
 \r
        DECLARE_EVENT_TABLE()\r
+\r
+private:\r
+       bool fCancel;\r
+       wxTextCtrl* ebSource;\r
+       wxTextCtrl* ebTarget;\r
+       wxGauge* gFile;\r
+       wxGauge* gArchive;\r
 };\r
 \r
 //******************************************************************************\r

diff --git a/src/lychee/ui/dlg_process.fbp b/src/lychee/ui/dlg_process.fbp
index def201c..0934670 100644 (file)
--- a/src/lychee/ui/dlg_process.fbp
+++ b/src/lychee/ui/dlg_process.fbp
@@ -99,7 +99,7 @@
                                 <property name="label">Source:</property>
                                 <property name="maximum_size"></property>
                                 <property name="minimum_size"></property>
-                                <property name="name">label_3</property>
+                                <property name="name"></property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
                                 <property name="size">50, 14</property>
@@ -216,7 +216,7 @@
                                 <property name="label">Target:</property>
                                 <property name="maximum_size"></property>
                                 <property name="minimum_size"></property>
-                                <property name="name">label_4</property>
+                                <property name="name"></property>
                                 <property name="permission">protected</property>
                                 <property name="pos"></property>
                                 <property name="size">50, 14</property>
@@ -311,7 +311,7 @@
                 </object>
                 <object class="sizeritem" expanded="1">
                     <property name="border">5</property>
-                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="flag">wxEXPAND|wxLEFT|wxRIGHT</property>
                     <property name="proportion">0</property>
                     <object class="wxGauge" expanded="1">
                         <property name="bg"></property>
@@ -319,15 +319,15 @@
                         <property name="enabled">1</property>
                         <property name="fg"></property>
                         <property name="font"></property>
-                        <property name="hidden"></property>
+                        <property name="hidden">0</property>
                         <property name="id">wxID_ANY</property>
                         <property name="maximum_size"></property>
                         <property name="minimum_size"></property>
-                        <property name="name">gauge</property>
+                        <property name="name">gFile</property>
                         <property name="permission">protected</property>
                         <property name="pos"></property>
-                        <property name="range">10</property>
-                        <property name="size">246, 20</property>
+                        <property name="range">100</property>
+                        <property name="size">-1,20</property>
                         <property name="style">wxGA_HORIZONTAL</property>
                         <property name="subclass"></property>
                         <property name="tooltip"></property>
@@ -360,6 +360,334 @@
                         <event name="OnUpdateUI"></event>
                     </object>
                 </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxALL|wxEXPAND</property>
+                    <property name="proportion">0</property>
+                    <object class="wxGauge" expanded="1">
+                        <property name="bg"></property>
+                        <property name="context_help"></property>
+                        <property name="enabled">1</property>
+                        <property name="fg"></property>
+                        <property name="font"></property>
+                        <property name="hidden">0</property>
+                        <property name="id">wxID_ANY</property>
+                        <property name="maximum_size"></property>
+                        <property name="minimum_size"></property>
+                        <property name="name">gArchive</property>
+                        <property name="permission">protected</property>
+                        <property name="pos"></property>
+                        <property name="range">100</property>
+                        <property name="size">-1,20</property>
+                        <property name="style">wxGA_HORIZONTAL</property>
+                        <property name="subclass"></property>
+                        <property name="tooltip"></property>
+                        <property name="value"></property>
+                        <property name="window_extra_style"></property>
+                        <property name="window_name"></property>
+                        <property name="window_style"></property>
+                        <event name="OnChar"></event>
+                        <event name="OnEnterWindow"></event>
+                        <event name="OnEraseBackground"></event>
+                        <event name="OnKeyDown"></event>
+                        <event name="OnKeyUp"></event>
+                        <event name="OnKillFocus"></event>
+                        <event name="OnLeaveWindow"></event>
+                        <event name="OnLeftDClick"></event>
+                        <event name="OnLeftDown"></event>
+                        <event name="OnLeftUp"></event>
+                        <event name="OnMiddleDClick"></event>
+                        <event name="OnMiddleDown"></event>
+                        <event name="OnMiddleUp"></event>
+                        <event name="OnMotion"></event>
+                        <event name="OnMouseEvents"></event>
+                        <event name="OnMouseWheel"></event>
+                        <event name="OnPaint"></event>
+                        <event name="OnRightDClick"></event>
+                        <event name="OnRightDown"></event>
+                        <event name="OnRightUp"></event>
+                        <event name="OnSetFocus"></event>
+                        <event name="OnSize"></event>
+                        <event name="OnUpdateUI"></event>
+                    </object>
+                </object>
+                <object class="sizeritem" expanded="1">
+                    <property name="border">5</property>
+                    <property name="flag">wxEXPAND</property>
+                    <property name="proportion">1</property>
+                    <object class="wxFlexGridSizer" expanded="1">
+                        <property name="cols">3</property>
+                        <property name="flexible_direction">wxBOTH</property>
+                        <property name="growablecols"></property>
+                        <property name="growablerows"></property>
+                        <property name="hgap">0</property>
+                        <property name="minimum_size"></property>
+                        <property name="name">fgSizer1</property>
+                        <property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
+                        <property name="permission">none</property>
+                        <property name="rows">2</property>
+                        <property name="vgap">0</property>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALL</property>
+                            <property name="proportion">0</property>
+                            <object class="wxStaticText" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Do you want to continue?</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name"></property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size">200,-1</property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <property name="wrap">-1</property>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag"></property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="default">1</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Continue</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">btnContinue</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size">70,25</property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick"></event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxLEFT|wxRIGHT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="default">1</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Skip</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">btnSkip</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size">70,25</property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick"></event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag">wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT</property>
+                            <property name="proportion">0</property>
+                            <object class="wxCheckBox" expanded="1">
+                                <property name="bg"></property>
+                                <property name="checked">0</property>
+                                <property name="context_help"></property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Always apply this choice</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">cbAlways</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size"></property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnChar"></event>
+                                <event name="OnCheckBox"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                        <object class="sizeritem" expanded="1">
+                            <property name="border">5</property>
+                            <property name="flag"></property>
+                            <property name="proportion">0</property>
+                            <object class="wxButton" expanded="1">
+                                <property name="bg"></property>
+                                <property name="context_help"></property>
+                                <property name="default">1</property>
+                                <property name="enabled">1</property>
+                                <property name="fg"></property>
+                                <property name="font"></property>
+                                <property name="hidden">1</property>
+                                <property name="id">wxID_ANY</property>
+                                <property name="label">Rename</property>
+                                <property name="maximum_size"></property>
+                                <property name="minimum_size"></property>
+                                <property name="name">btnRename</property>
+                                <property name="permission">protected</property>
+                                <property name="pos"></property>
+                                <property name="size">70,25</property>
+                                <property name="style"></property>
+                                <property name="subclass"></property>
+                                <property name="tooltip"></property>
+                                <property name="window_extra_style"></property>
+                                <property name="window_name"></property>
+                                <property name="window_style"></property>
+                                <event name="OnButtonClick"></event>
+                                <event name="OnChar"></event>
+                                <event name="OnEnterWindow"></event>
+                                <event name="OnEraseBackground"></event>
+                                <event name="OnKeyDown"></event>
+                                <event name="OnKeyUp"></event>
+                                <event name="OnKillFocus"></event>
+                                <event name="OnLeaveWindow"></event>
+                                <event name="OnLeftDClick"></event>
+                                <event name="OnLeftDown"></event>
+                                <event name="OnLeftUp"></event>
+                                <event name="OnMiddleDClick"></event>
+                                <event name="OnMiddleDown"></event>
+                                <event name="OnMiddleUp"></event>
+                                <event name="OnMotion"></event>
+                                <event name="OnMouseEvents"></event>
+                                <event name="OnMouseWheel"></event>
+                                <event name="OnPaint"></event>
+                                <event name="OnRightDClick"></event>
+                                <event name="OnRightDown"></event>
+                                <event name="OnRightUp"></event>
+                                <event name="OnSetFocus"></event>
+                                <event name="OnSize"></event>
+                                <event name="OnUpdateUI"></event>
+                            </object>
+                        </object>
+                    </object>
+                </object>
             </object>
         </object>
     </object>