From c0cdb2ad99a1e2a6ade5ce76c91177a79258e669 Mon Sep 17 00:00:00 2001
From: Daniel Wilhelm <daniel@wili.li>
Date: Fri, 18 Apr 2014 17:10:11 +0200
Subject: 3.14

---
 ui/main_dlg.h | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'ui/main_dlg.h')

diff --git a/ui/main_dlg.h b/ui/main_dlg.h
index 3559aff8..ca466240 100644
--- a/ui/main_dlg.h
+++ b/ui/main_dlg.h
@@ -23,6 +23,7 @@ class IconUpdater;
 class DirectoryPair;
 class DirectoryPairFirst;
 class CompareStatus;
+class SyncStatusHandler;
 class PanelMoveWindow;
 
 
@@ -47,6 +48,7 @@ public:
 
 private:
     friend class CompareStatusHandler;
+    friend class SyncStatusHandler;
     friend class ManualDeletionHandler;
     friend class DirectoryPairFirst;
     friend class DirectoryNameMainImpl;
@@ -205,19 +207,18 @@ private:
     void OnCmpSettings(         wxCommandEvent& event);
     void OnStartSync(           wxCommandEvent& event);
     void OnClose(               wxCloseEvent&   event);
-    void OnQuit(                wxCommandEvent& event);
 
     void OnGlobalFilterOpenContext(wxCommandEvent& event);
     void OnGlobalFilterRemConfirm(wxCommandEvent& event);
 
-    void calculatePreview();
+    void updateStatistics();
 
     void OnAddFolderPair(       wxCommandEvent& event);
     void OnRemoveFolderPair(    wxCommandEvent& event);
     void OnRemoveTopFolderPair( wxCommandEvent& event);
 
     void updateFilterConfig();
-    void updateSyncConfig();
+    void applySyncConfig();
 
     //menu events
     void OnMenuGlobalSettings(  wxCommandEvent& event);
@@ -235,7 +236,7 @@ private:
     typedef int LanguageID;
     std::map<MenuItemID, LanguageID> languageMenuItemMap; //needed to attach menu item events
 
-//***********************************************
+    //***********************************************
     //application variables are stored here:
 
     //global settings used by GUI and batch mode
@@ -244,7 +245,7 @@ private:
     //UI view of FolderComparison structure
     std::auto_ptr<ffs3::GridView> gridDataView;
 
-//-------------------------------------
+    //-------------------------------------
     //functional configuration
     xmlAccess::XmlGuiConfig currentCfg;
 
@@ -257,10 +258,10 @@ private:
     int heightNotMaximized;
     int posXNotMaximized;
     int posYNotMaximized;
-//-------------------------------------
+    //-------------------------------------
 
 
-//***********************************************
+    //***********************************************
     std::auto_ptr<wxMenu> contextMenu;
 
     //status information
@@ -279,6 +280,8 @@ private:
     //update icons periodically: one updater instance for both left and right grids
     std::auto_ptr<IconUpdater> updateFileIcons;
 
+    bool processingGlobalKeyEvent; //indicator to notify recursion in OnGlobalKeyEvent()
+
     //encapsulation of handling of sync preview
     class SyncPreview //encapsulates MainDialog functionality for synchronization preview (friend class)
     {
-- 
cgit