From 477953f965f0f9f5e4903a138e92b97aad067e37 Mon Sep 17 00:00:00 2001 From: Manuel Padron Martinez Date: Fri, 31 May 2013 04:30:36 +0100 Subject: Put wizard url customization before connect signals Signed-off-by: Manuel Padron Martinez --- src/mirall/owncloudwizard.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 7e6e20fa4..508e331a9 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -58,19 +58,11 @@ OwncloudSetupPage::OwncloudSetupPage() setSubTitle( tr("Enter user credentials") .arg(theme->wizardHeaderTitleColor().name())); - connect(_ui.leUrl, SIGNAL(textChanged(QString)), SLOT(slotUrlChanged(QString))); - connect( _ui.leUsername, SIGNAL(textChanged(QString)), this, SLOT(slotUserChanged(QString))); - registerField( QLatin1String("OCUrl"), _ui.leUrl ); registerField( QLatin1String("OCUser"), _ui.leUsername ); registerField( QLatin1String("OCPasswd"), _ui.lePassword); registerField( QLatin1String("OCSyncFromScratch"), _ui.cbSyncFromScratch); - connect( _ui.lePassword, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); - connect( _ui.leUsername, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); - connect( _ui.cbAdvanced, SIGNAL(stateChanged (int)), SLOT(slotToggleAdvanced(int))); - connect( _ui.pbSelectLocalFolder, SIGNAL(clicked()), SLOT(slotSelectFolder())); - _ui.errorLabel->setVisible(true); _ui.advancedBox->setVisible(false); @@ -91,6 +83,14 @@ OwncloudSetupPage::OwncloudSetupPage() _checking = false; setupCustomization(); + + connect(_ui.leUrl, SIGNAL(textChanged(QString)), SLOT(slotUrlChanged(QString))); + connect( _ui.leUsername, SIGNAL(textChanged(QString)), this, SLOT(slotUserChanged(QString))); + + connect( _ui.lePassword, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); + connect( _ui.leUsername, SIGNAL(textChanged(QString)), this, SIGNAL(completeChanged())); + connect( _ui.cbAdvanced, SIGNAL(stateChanged (int)), SLOT(slotToggleAdvanced(int))); + connect( _ui.pbSelectLocalFolder, SIGNAL(clicked()), SLOT(slotSelectFolder())); } OwncloudSetupPage::~OwncloudSetupPage() -- cgit v1.2.3 From b6ed959f98f94ca72c055c7cb142deb46526df7f Mon Sep 17 00:00:00 2001 From: Manuel Padron Martinez Date: Fri, 31 May 2013 04:34:56 +0100 Subject: Removes server url label if a custom url is defined Signed-off-by: Manuel Padron Martinez --- src/mirall/owncloudwizard.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mirall/owncloudwizard.cpp b/src/mirall/owncloudwizard.cpp index 508e331a9..950929404 100644 --- a/src/mirall/owncloudwizard.cpp +++ b/src/mirall/owncloudwizard.cpp @@ -148,6 +148,7 @@ void OwncloudSetupPage::setupCustomization() QString fixUrl = theme->overrideServerUrl(); if( !fixUrl.isEmpty() ) { + _ui.label_2->hide(); setServerUrl( fixUrl ); _ui.leUrl->setEnabled( false ); _ui.leUrl->hide(); -- cgit v1.2.3