3.17

1 files changed, 9 insertions, 75 deletions

diff --git a/ui/batch_config.h b/ui/batch_config.h
index 88d5e4eb..574fef66 100644
--- a/ui/batch_config.h
+++ b/ui/batch_config.h
@@ -7,89 +7,23 @@
 #ifndef BATCHCONFIG_H_INCLUDED
 #define BATCHCONFIG_H_INCLUDED
 
-#include "gui_generated.h"
 #include "../library/process_xml.h"
 
 
-namespace ffs3
+namespace zen
 {
-class DirectoryName;
-}
-
-class DirectoryPairBatch;
-class DirectoryPairBatchFirst;
-
-
-class BatchDialog: public BatchDlgGenerated
+struct ReturnBatchConfig
 {
-    friend class BatchFileDropEvent;
-    template <class GuiPanel>
-    friend class FolderPairCallback;
-
-public:
-    BatchDialog(wxWindow* window, const xmlAccess::XmlBatchConfig& batchCfg);
-    BatchDialog(wxWindow* window, const wxString& filename);
-    ~BatchDialog();
-
-    enum
+    enum ButtonPressed
     {
-        BATCH_FILE_SAVED = 15
+        BUTTON_CANCEL,
+        BATCH_FILE_SAVED = 1
     };
+};
 
-private:
-    void init();
-
-    virtual void OnCmpSettings(        wxCommandEvent& event);
-    virtual void OnSyncSettings(       wxCommandEvent& event);
-    virtual void OnConfigureFilter(    wxCommandEvent& event);
-
-    virtual void OnHelp(               wxCommandEvent& event);
-
-    void OnGlobalFilterOpenContext(wxCommandEvent& event);
-    void OnGlobalFilterRemConfirm(wxCommandEvent& event);
-    virtual void OnCheckSilent(        wxCommandEvent& event);
-    virtual void OnChangeMaxLogCountTxt(wxCommandEvent& event);
-    virtual void OnClose(              wxCloseEvent&   event);
-    virtual void OnCancel(             wxCommandEvent& event);
-    virtual void OnSaveBatchJob(       wxCommandEvent& event);
-    virtual void OnLoadBatchJob(       wxCommandEvent& event);
-    virtual void OnAddFolderPair(      wxCommandEvent& event);
-    virtual void OnRemoveFolderPair(   wxCommandEvent& event);
-    virtual void OnRemoveTopFolderPair(wxCommandEvent& event);
-
-    void addFolderPair(const std::vector<ffs3::FolderPairEnh>& newPairs, bool addFront = false);
-    void removeAddFolderPair(const int pos);
-    void clearAddFolderPairs();
-
-    void updateGuiForFolderPair();
-
-    void updateGui(); //re-evaluate gui after config changes
-
-    void showNotebookpage(wxWindow* page, const wxString& pageName, bool show);
-
-    //error handling
-    xmlAccess::OnError getSelectionHandleError() const;
-    void setSelectionHandleError(const xmlAccess::OnError value);
-    void OnChangeErrorHandling(wxCommandEvent& event);
-    void updateToolTipErrorHandling(const xmlAccess::OnError value);
-
-    bool saveBatchFile(const wxString& filename);
-    void loadBatchFile(const wxString& filename);
-    void loadBatchCfg(const xmlAccess::XmlBatchConfig& batchCfg);
-
-    xmlAccess::XmlBatchConfig getCurrentConfiguration() const;
-
-    boost::shared_ptr<DirectoryPairBatchFirst> firstFolderPair; //always bound!!!
-    std::vector<DirectoryPairBatch*> additionalFolderPairs;
-
-    //used when saving batch file
-    wxString proposedBatchFileName;
-
-    xmlAccess::XmlBatchConfig localBatchCfg;
-
-    std::auto_ptr<wxMenu> contextMenu;
+ReturnBatchConfig::ButtonPressed showSyncBatchDlg(const wxString& filename);
+ReturnBatchConfig::ButtonPressed showSyncBatchDlg(const xmlAccess::XmlBatchConfig& batchCfg);
+}
 
-    std::auto_ptr<ffs3::DirectoryName> logfileDir;
-};
 
 #endif // BATCHCONFIG_H_INCLUDED