[Pkg-owncloud-commits] [owncloud-client] 145/333: Do not destroy the settings dialog when it is hidden.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit f9b82d852c6ca9647393177bc522701be4c2b7c7
Author: Olivier Goffart <ogoffart at woboq.com>
Date:   Fri Mar 14 17:39:20 2014 +0100

    Do not destroy the settings dialog when it is hidden.
    
    That way the protocol widget stay filled.
    And the state is kept
---
 src/mirall/owncloudgui.cpp    | 8 ++------
 src/mirall/settingsdialog.cpp | 4 ----
 src/mirall/settingsdialog.h   | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index dfc0116..8dcde6f 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -34,7 +34,7 @@ namespace Mirall {
 ownCloudGui::ownCloudGui(Application *parent) :
     QObject(parent),
     _tray(0),
-    _settingsDialog(0),
+    _settingsDialog(new SettingsDialog(this)),
     _logBrowser(0),
     _contextMenu(0),
     _recentActionsMenu(0),
@@ -83,7 +83,7 @@ void ownCloudGui::slotOpenSettingsDialog( bool openSettings )
     // if account is set up, start the configuration wizard.
     if( AccountManager::instance()->account() ) {
         if( openSettings ) {
-            if (_settingsDialog.isNull()) {
+            if (_settingsDialog.isNull() || !_settingsDialog->isVisible()) {
                 slotShowSettings();
             } else {
                 _settingsDialog->close();
@@ -445,13 +445,9 @@ void ownCloudGui::slotShowSettings()
 {
     if (_settingsDialog.isNull()) {
         _settingsDialog = new SettingsDialog(this);
-        _settingsDialog->setAttribute( Qt::WA_DeleteOnClose, true );
-        _settingsDialog->show();
     }
-
     _settingsDialog->setGeneralErrors( _startupFails );
     Utility::raiseDialog(_settingsDialog.data());
-    _settingsDialog->slotRefreshResultList();
 }
 
 void ownCloudGui::slotShowSyncProtocol()
diff --git a/src/mirall/settingsdialog.cpp b/src/mirall/settingsdialog.cpp
index 42b6537..ff44af8 100644
--- a/src/mirall/settingsdialog.cpp
+++ b/src/mirall/settingsdialog.cpp
@@ -168,10 +168,6 @@ void SettingsDialog::accept() {
     QDialog::accept();
 }
 
-void SettingsDialog::slotRefreshResultList() {
-
-}
-
 void SettingsDialog::showActivityPage()
 {
     _ui->labelWidget->setCurrentRow(_protocolIdx);
diff --git a/src/mirall/settingsdialog.h b/src/mirall/settingsdialog.h
index cd6d690..373f5ef 100644
--- a/src/mirall/settingsdialog.h
+++ b/src/mirall/settingsdialog.h
@@ -46,7 +46,6 @@ public:
 
 public slots:
     void slotSyncStateChange(const QString& alias = QString());
-    void slotRefreshResultList();
     void showActivityPage();
 
 protected:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git