mirror of
https://github.com/nextcloud/desktop.git
synced 2024-11-26 23:28:14 +03:00
Merge pull request #3 from kyle-f/master
Owncloud client wizard setup page doesn't handle back button presses.
This commit is contained in:
commit
55e1ef2cc5
2 changed files with 19 additions and 2 deletions
|
@ -57,6 +57,9 @@ void setupCustomMedia( QVariant variant, QLabel *label )
|
|||
OwncloudSetupPage::OwncloudSetupPage()
|
||||
{
|
||||
_ui.setupUi(this);
|
||||
|
||||
connect(_ui.leUrl, SIGNAL(textChanged(QString)), SLOT(handleNewOcUrl(QString)));
|
||||
|
||||
registerField( QLatin1String("OCUrl"), _ui.leUrl );
|
||||
registerField( QLatin1String("OCUser"), _ui.leUsername );
|
||||
registerField( QLatin1String("OCPasswd"), _ui.lePassword);
|
||||
|
@ -147,6 +150,21 @@ void OwncloudSetupPage::slotSecureConChanged( int state )
|
|||
}
|
||||
}
|
||||
|
||||
void OwncloudSetupPage::handleNewOcUrl(const QString& ocUrl)
|
||||
{
|
||||
QUrl url(ocUrl);
|
||||
|
||||
QString urlMinusScheme = url.toString(QUrl::RemoveScheme);
|
||||
|
||||
// QUrl::RemoveScheme leaves the beginning slashes. Remove them
|
||||
// if they're present.
|
||||
if (urlMinusScheme.startsWith("//")) {
|
||||
urlMinusScheme.remove(0, 2);
|
||||
}
|
||||
|
||||
_ui.leUrl->setText(urlMinusScheme);
|
||||
}
|
||||
|
||||
bool OwncloudSetupPage::isComplete() const
|
||||
{
|
||||
if( _ui.leUrl->text().isEmpty() ) return false;
|
||||
|
|
|
@ -45,10 +45,10 @@ public:
|
|||
protected slots:
|
||||
void slotPwdStoreChanged( int );
|
||||
void slotSecureConChanged( int );
|
||||
void handleNewOcUrl(const QString& ocUrl);
|
||||
void setupCustomization();
|
||||
private:
|
||||
Ui_OwncloudSetupPage _ui;
|
||||
|
||||
};
|
||||
|
||||
class OwncloudWizard: public QWizard
|
||||
|
@ -112,7 +112,6 @@ public:
|
|||
|
||||
private:
|
||||
Ui_OwncloudWizardSelectTypePage _ui;
|
||||
|
||||
};
|
||||
|
||||
class CreateAnOwncloudPage: public QWizardPage
|
||||
|
|
Loading…
Reference in a new issue