OS X: Fix UI glitches related to sync folder

For #2113 and #2947

diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp
index 208b11c67c3fbf70cea8804d289ca3a5c3a86b91..acd80d958195d1c59a2de9b0db964eaad1b873bb 100644 (file)
--- a/src/gui/settingsdialog.cpp
+++ b/src/gui/settingsdialog.cpp
@@ -42,6 +42,9 @@ namespace {
 
 namespace OCC {
 
+//
+// Whenever you change something here check both settingsdialog.cpp and settingsdialogmac.cpp !
+//
 SettingsDialog::SettingsDialog(ownCloudGui *gui, QWidget *parent) :
     QDialog(parent)
     , _ui(new Ui::SettingsDialog)

diff --git a/src/gui/settingsdialogmac.cpp b/src/gui/settingsdialogmac.cpp
index 261fefc6193bc566a25392d06aa9a68af862b1c6..e1113995a64d9cbac6b5770edc688b4e3ecc7158 100644 (file)
--- a/src/gui/settingsdialogmac.cpp
+++ b/src/gui/settingsdialogmac.cpp
@@ -33,6 +33,9 @@
 
 namespace OCC {
 
+//
+// Whenever you change something here check both settingsdialog.cpp and settingsdialogmac.cpp !
+//
 SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
     : MacPreferencesWindow(parent)
 {
@@ -82,6 +85,10 @@ SettingsDialogMac::SettingsDialogMac(ownCloudGui *gui, QWidget *parent)
     connect( folderMan, SIGNAL(folderSyncStateChange(QString)),
              this, SLOT(slotSyncStateChange(QString)));
 
+    connect( _accountSettings, SIGNAL(folderChanged()), gui, SLOT(slotFoldersChanged()));
+    connect( _accountSettings, SIGNAL(openFolderAlias(const QString&)),
+             gui, SLOT(slotFolderOpenAction(QString)));
+
     connect( ProgressDispatcher::instance(), SIGNAL(progressInfo(QString, Progress::Info)),
              _accountSettings, SLOT(slotSetProgress(QString, Progress::Info)) );