[Pkg-owncloud-commits] [owncloud-client] 296/498: Wizard: remove the configExists state
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue Aug 11 14:49:00 UTC 2015
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 247771fbbac1548974d57716a60d6b36aa0e4b9e
Author: Olivier Goffart <ogoffart at woboq.com>
Date: Mon Jul 13 15:10:05 2015 +0200
Wizard: remove the configExists state
The wizard is now only used to create new account, not update existing ones
---
src/gui/owncloudsetupwizard.cpp | 2 --
src/gui/wizard/owncloudadvancedsetuppage.cpp | 10 ----------
src/gui/wizard/owncloudadvancedsetuppage.h | 2 --
src/gui/wizard/owncloudhttpcredspage.cpp | 9 ---------
src/gui/wizard/owncloudhttpcredspage.h | 2 --
src/gui/wizard/owncloudsetuppage.cpp | 9 ---------
src/gui/wizard/owncloudsetuppage.h | 2 --
src/gui/wizard/owncloudwizard.cpp | 16 +---------------
src/gui/wizard/owncloudwizard.h | 3 ---
9 files changed, 1 insertion(+), 54 deletions(-)
diff --git a/src/gui/owncloudsetupwizard.cpp b/src/gui/owncloudsetupwizard.cpp
index 606d62e..a62dc83 100644
--- a/src/gui/owncloudsetupwizard.cpp
+++ b/src/gui/owncloudsetupwizard.cpp
@@ -79,9 +79,7 @@ void OwncloudSetupWizard::runWizard(QObject* obj, const char* amember, QWidget *
void OwncloudSetupWizard::startWizard()
{
FolderMan *folderMan = FolderMan::instance();
- // ###
AccountPtr account = Account::create();
- _ocWizard->setConfigExists(false);
account->setCredentials(CredentialsFactory::create("dummy"));
account->setSslErrorHandler(new SslDialogErrorHandler);
_ocWizard->setAccount(account);
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.cpp b/src/gui/wizard/owncloudadvancedsetuppage.cpp
index 08f75c4..0369c63 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.cpp
+++ b/src/gui/wizard/owncloudadvancedsetuppage.cpp
@@ -38,7 +38,6 @@ OwncloudAdvancedSetupPage::OwncloudAdvancedSetupPage()
_ui(),
_checking(false),
_created(false),
- _configExists(false),
_progressIndi(new QProgressIndicator (this)),
_oldLocalFolder(),
_remoteFolder()
@@ -245,15 +244,6 @@ void OwncloudAdvancedSetupPage::slotSelectFolder()
}
}
-void OwncloudAdvancedSetupPage::setConfigExists(bool config)
-{
- _configExists = config;
-
- if (config == true) {
- setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Update advanced setup")));
- }
-}
-
void OwncloudAdvancedSetupPage::slotSelectiveSyncClicked()
{
// Because clicking on it also changes it, restore it to the previous state in case the user cancel the dialog
diff --git a/src/gui/wizard/owncloudadvancedsetuppage.h b/src/gui/wizard/owncloudadvancedsetuppage.h
index 03feec9..2ccc9a1 100644
--- a/src/gui/wizard/owncloudadvancedsetuppage.h
+++ b/src/gui/wizard/owncloudadvancedsetuppage.h
@@ -44,7 +44,6 @@ public:
void setRemoteFolder( const QString& remoteFolder);
void setMultipleFoldersExist( bool exist );
void directoriesCreated();
- void setConfigExists(bool config);
signals:
void createLocalAndRemoteFolders(const QString&, const QString&);
@@ -68,7 +67,6 @@ private:
Ui_OwncloudAdvancedSetupPage _ui;
bool _checking;
bool _created;
- bool _configExists;
QProgressIndicator* _progressIndi;
QString _oldLocalFolder;
QString _remoteFolder;
diff --git a/src/gui/wizard/owncloudhttpcredspage.cpp b/src/gui/wizard/owncloudhttpcredspage.cpp
index c74d164..ff75edc 100644
--- a/src/gui/wizard/owncloudhttpcredspage.cpp
+++ b/src/gui/wizard/owncloudhttpcredspage.cpp
@@ -31,7 +31,6 @@ OwncloudHttpCredsPage::OwncloudHttpCredsPage(QWidget* parent)
_ui(),
_connected(false),
_checking(false),
- _configExists(false),
_progressIndi(new QProgressIndicator (this))
{
_ui.setupUi(this);
@@ -155,13 +154,5 @@ AbstractCredentials* OwncloudHttpCredsPage::getCredentials() const
return new HttpCredentialsGui(_ui.leUsername->text(), _ui.lePassword->text(), _ocWizard->ownCloudCertificatePath, _ocWizard->ownCloudCertificatePasswd);
}
-void OwncloudHttpCredsPage::setConfigExists(bool config)
-{
- _configExists = config;
-
- if (config == true) {
- setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Update user credentials")));
- }
-}
} // namespace OCC
diff --git a/src/gui/wizard/owncloudhttpcredspage.h b/src/gui/wizard/owncloudhttpcredspage.h
index 255b288..2a40b54 100644
--- a/src/gui/wizard/owncloudhttpcredspage.h
+++ b/src/gui/wizard/owncloudhttpcredspage.h
@@ -42,7 +42,6 @@ public:
int nextId() const Q_DECL_OVERRIDE;
void setConnected(bool connected);
void setErrorString( const QString& err );
- void setConfigExists(bool config);
Q_SIGNALS:
void connectToOCUrl(const QString&);
@@ -55,7 +54,6 @@ private:
Ui_OwncloudHttpCredsPage _ui;
bool _connected;
bool _checking;
- bool _configExists;
QProgressIndicator* _progressIndi;
OwncloudWizard* _ocWizard;
};
diff --git a/src/gui/wizard/owncloudsetuppage.cpp b/src/gui/wizard/owncloudsetuppage.cpp
index 445867c..838ab4b 100644
--- a/src/gui/wizard/owncloudsetuppage.cpp
+++ b/src/gui/wizard/owncloudsetuppage.cpp
@@ -290,15 +290,6 @@ void OwncloudSetupPage::stopSpinner()
_progressIndi->stopAnimation();
}
-void OwncloudSetupPage::setConfigExists( bool config )
-{
- if (config == true) {
- setSubTitle(WizardCommon::subTitleTemplate().arg(tr("Update %1 server")
- .arg(Theme::instance()->appNameGUI())));
- }
-}
-
-
void OwncloudSetupPage::slotAskSSLClientCertificate()
{
addCertDial->show();
diff --git a/src/gui/wizard/owncloudsetuppage.h b/src/gui/wizard/owncloudsetuppage.h
index ab32c5c..57a6d44 100644
--- a/src/gui/wizard/owncloudsetuppage.h
+++ b/src/gui/wizard/owncloudsetuppage.h
@@ -57,7 +57,6 @@ public:
public slots:
void setErrorString( const QString&, bool retryHTTPonly );
- void setConfigExists( bool );
void startSpinner();
void stopSpinner();
void slotAskSSLClientCertificate();
@@ -81,7 +80,6 @@ private:
QString _ocUser;
bool _authTypeKnown;
bool _checking;
- bool _configExists;
bool _multipleFoldersExist;
WizardCommon::AuthType _authType;
diff --git a/src/gui/wizard/owncloudwizard.cpp b/src/gui/wizard/owncloudwizard.cpp
index 4080118..a7daa08 100644
--- a/src/gui/wizard/owncloudwizard.cpp
+++ b/src/gui/wizard/owncloudwizard.cpp
@@ -45,8 +45,7 @@ OwncloudWizard::OwncloudWizard(QWidget *parent)
_credentialsPage(0),
_configFile(),
_oCUser(),
- _setupLog(),
- _configExists(false)
+ _setupLog()
{
setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint);
setPage(WizardCommon::Page_ServerSetup, _setupPage);
@@ -211,19 +210,6 @@ void OwncloudWizard::setOCUrl( const QString& url )
_setupPage->setServerUrl( url );
}
-void OwncloudWizard::setConfigExists( bool config )
-{
- _configExists = config;
- _setupPage->setConfigExists( config );
- _httpCredsPage->setConfigExists(config);
- _advancedSetupPage->setConfigExists(config);
-}
-
-bool OwncloudWizard::configExists()
-{
- return _configExists;
-}
-
AbstractCredentials* OwncloudWizard::getCredentials() const
{
if (_credentialsPage) {
diff --git a/src/gui/wizard/owncloudwizard.h b/src/gui/wizard/owncloudwizard.h
index 6cafe01..1e84266 100644
--- a/src/gui/wizard/owncloudwizard.h
+++ b/src/gui/wizard/owncloudwizard.h
@@ -59,8 +59,6 @@ public:
void enableFinishOnResultWidget(bool enable);
void displayError( const QString&, bool retryHTTPonly);
- void setConfigExists( bool );
- bool configExists();
AbstractCredentials* getCredentials() const;
void raiseCertificatePopup();
@@ -98,7 +96,6 @@ private:
QString _configFile;
QString _oCUser;
QStringList _setupLog;
- bool _configExists;
};
} // namespace OCC
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list