From 237aedc590b58c0e69d7dfcac92b5f767b7c004a Mon Sep 17 00:00:00 2001 From: Daniel Wilhelm Date: Fri, 18 Apr 2014 17:17:51 +0200 Subject: 4.6 --- ui/main_dlg.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'ui/main_dlg.h') diff --git a/ui/main_dlg.h b/ui/main_dlg.h index 94edbcce..0d0239da 100644 --- a/ui/main_dlg.h +++ b/ui/main_dlg.h @@ -51,6 +51,8 @@ public: void disableAllElements(bool enableAbort); //dis-/enables all elements (except abort button) that might receive user input void enableAllElements(); //during long-running processes: comparison, deletion + void onQueryEndSession(); //last chance to do something before getting killed! + private: friend class CompareStatusHandler; friend class SyncStatusHandler; @@ -63,12 +65,10 @@ private: MainDialog(); - void init(const xmlAccess::XmlGuiConfig guiCfg, + void init(const xmlAccess::XmlGuiConfig& guiCfg, xmlAccess::XmlGlobalSettings& settings, bool startComparison); - void cleanUp(bool saveLastUsedConfig); - //configuration load/save void setLastUsedConfig(const wxString& filename, const xmlAccess::XmlGuiConfig& guiConfig); void setLastUsedConfig(const std::vector& filenames, const xmlAccess::XmlGuiConfig& guiConfig); @@ -79,7 +79,7 @@ private: void loadConfiguration(const wxString& filename); void loadConfiguration(const std::vector& filenames); - bool trySaveConfig(); //return true if saved successfully + bool trySaveConfig(const wxString* fileName); //return true if saved successfully bool saveOldConfig(); //return false on user abort static const wxString& lastRunConfigName(); -- cgit