Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2014-07-30 14:18:55 +0400
committerOlivier Goffart <ogoffart@woboq.com>2014-07-30 14:36:30 +0400
commitcfdfd6a8601445f2eb29a392c1be65c4e1122c4b (patch)
tree31f47be202e632d1fb314b88f5cc738a8458220b
parent5254c9785ccef15e6b619220b9b467de5f3a97e6 (diff)
wizard: don't call initializePagev1.6.2-themefix
It is called automatically by QWizard and do not need to be called explicitly But setVisibla(false) don't really have an effect there since show() is going to be called on the page
-rw-r--r--src/wizard/owncloudsetuppage.cpp6
-rw-r--r--src/wizard/owncloudwizard.cpp1
2 files changed, 5 insertions, 2 deletions
diff --git a/src/wizard/owncloudsetuppage.cpp b/src/wizard/owncloudsetuppage.cpp
index 06cfbe6e0..e84d6dd3e 100644
--- a/src/wizard/owncloudsetuppage.cpp
+++ b/src/wizard/owncloudsetuppage.cpp
@@ -16,6 +16,7 @@
#include <QDir>
#include <QFileDialog>
#include <QUrl>
+#include <QTimer>
#include <QPushButton>
#include <QMessageBox>
@@ -145,9 +146,12 @@ void OwncloudSetupPage::initializePage()
if (Theme::instance()->overrideServerUrl().isEmpty()) {
_ui.leUrl->setFocus();
} else {
- setVisible(false);
setCommitPage(true);
validatePage();
+ setVisible(false);
+ // because the wizard will call show on us right after this call, we need to hide in the
+ // next event loop iteration.
+ QTimer::singleShot(0, this, SLOT(hide()));
}
}
diff --git a/src/wizard/owncloudwizard.cpp b/src/wizard/owncloudwizard.cpp
index 94e3559ca..4ee870d3d 100644
--- a/src/wizard/owncloudwizard.cpp
+++ b/src/wizard/owncloudwizard.cpp
@@ -161,7 +161,6 @@ void OwncloudWizard::slotCurrentPageChanged( int id )
if( id == WizardCommon::Page_ServerSetup ) {
emit clearPendingRequests();
- _setupPage->initializePage();
}
if( id == WizardCommon::Page_Result ) {