各種の処理の際に進捗ダイアログを初期状態で表示せず、メインウインドウの進捗バーで通知するよう変更。

[tpi/lychee.git] / src / lychee / dlg_process.h

diff --git a/src/lychee/dlg_process.h b/src/lychee/dlg_process.h
index 9d31833..8ba113b 100644 (file)
--- a/src/lychee/dlg_process.h
+++ b/src/lychee/dlg_process.h
@@ -21,6 +21,9 @@
 \r
 #ifndef H_LOADED_DLG_PROCESS\r
 #define H_LOADED_DLG_PROCESS\r
+#ifdef __WINDOWS__\r
+#include <Shobjidl.h>\r
+#endif\r
 \r
 class ProcessDialog: public wxDialog {\r
 public:\r
@@ -28,17 +31,51 @@ public:
        void OnClose(wxCloseEvent &);\r
        int CallbackProc(unsigned int, void *);\r
 \r
-       ProcessDialog();\r
+       ProcessDialog(wxWindow * parent, wxULongLong_t n = 0, wxString szPassword = wxEmptyString);\r
        ~ProcessDialog();\r
 \r
+       wxULongLong_t nFileCount;\r
+       wxString szPassword;\r
+\r
        DECLARE_EVENT_TABLE()\r
 \r
 private:\r
-       bool fCancel;\r
-       wxTextCtrl* ebSource;\r
+       bool fCancel, fOpen;\r
+       int nOverwriteMode;\r
+       wxFileName fnFormer;\r
        wxTextCtrl* ebTarget;\r
+       wxTextCtrl* ebSource;\r
        wxGauge* gFile;\r
        wxGauge* gArchive;\r
+       wxWindow* hParent;\r
+#ifdef __WINDOWS__\r
+       HWND hTBWnd;\r
+       ITaskbarList3 * tlTaskbar;\r
+#endif\r
+};\r
+\r
+extern ProcessDialog * g_procDlg;\r
+\r
+class OverwriteDialog: public wxDialog {\r
+public:\r
+    void OnInit(wxInitDialogEvent &);\r
+       void OnClose(wxCloseEvent &);\r
+    void OnBtnOverwrite(wxCommandEvent&);\r
+    void OnBtnSkip(     wxCommandEvent&);\r
+    void OnBtnAuto(     wxCommandEvent&);\r
+    void OnBtnBrowse(   wxCommandEvent&);\r
+\r
+       OverwriteDialog();\r
+\r
+       wxFileName * fnExist;\r
+       wxDateTime * tmWrite;\r
+       wxULongLong_t nWriteSize;\r
+       wxCheckBox* cbApplyAll;\r
+\r
+       DECLARE_EVENT_TABLE()\r
+\r
+private:\r
+       wxTextCtrl* ebTarget;\r
 };\r
 \r
 //******************************************************************************\r