mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Respect the override URL properly

Browse Source
This commit is contained in:
Daniel Molkentin 2013-12-12 16:20:01 +01:00
parent bc5f7d899a
commit 5b2c734fe5
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/mirall/account.cpp
View File

@ -59,6 +59,7 @@ void AccountManager::setAccount(Account *account)
Account::Account(AbstractSslErrorHandler *sslErrorHandler, QObject *parent)
: QObject(parent)
, _url(Theme::instance()->overrideServerUrl())
, _sslErrorHandler(sslErrorHandler)
, _am(0)
, _credentials(0)

15
src/wizard/owncloudsetuppage.cpp
View File

@ -78,14 +78,6 @@ void OwncloudSetupPage::setupCustomization()
variant = theme->customMedia( Theme::oCSetupBottom );
WizardCommon::setupCustomMedia( variant, _ui.bottomLabel );
QString fixUrl = theme->overrideServerUrl();
if( !fixUrl.isEmpty() ) {
_ui.label_2->hide();
setServerUrl( fixUrl );
_ui.leUrl->setEnabled( false );
_ui.leUrl->hide();
}
}
// slot hit from textChanged of the url entry field.
@ -138,12 +130,13 @@ void OwncloudSetupPage::initializePage()
if (pushButton)
pushButton->setDefault(true);
// URL entry is disabled when url is overriden by theme. In that
// case we just check the server type and switch to second page
// If url is overriden by theme, it's already set and
// we just check the server type and switch to second page
// immediately.
if (_ui.leUrl->isEnabled()) {
if (Theme::instance()->overrideServerUrl().isEmpty()) {
_ui.leUrl->setFocus();
} else {
setEnabled(false);
validatePage();
}
}