AnotherFoxGuy/fuel-scm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed issue where the RemoteDialog was displaying local paths as Urls when editing existing remotes

Browse Source 
FossilOrigin-Name: 96e4a4d8642ec96578155bb8762a1772b9351e3c
This commit is contained in:
Kostas
2015-09-12 18:34:26 +00:00
parent bf1fc5732a
commit 1330b2b97a
3 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/RemoteDialog.cpp
View File

@ -29,11 +29,17 @@ bool RemoteDialog::run(QWidget *parent, QUrl &url, QString &name)
// Set URL components
if(!url.isEmpty())
{
QString url_no_credentials = UrlToStringNoCredentials(url);
dlg.ui->lineURL->setText(url_no_credentials);
dlg.ui->lineUserName->setText(url.userName());
dlg.ui->linePassword->setText(url.password());
dlg.ui->lineName->setText(name);
if(url.isLocalFile())
dlg.ui->lineURL->setText(QDir::toNativeSeparators(url.toLocalFile()));
else
{
QString url_no_credentials = UrlToStringNoCredentials(url);
dlg.ui->lineURL->setText(url_no_credentials);
dlg.ui->lineUserName->setText(url.userName());
dlg.ui->linePassword->setText(url.password());
}
}
if(dlg.exec() != QDialog::Accepted)
@ -60,7 +66,7 @@ bool RemoteDialog::run(QWidget *parent, QUrl &url, QString &name)
if(!dlg.ui->linePassword->text().trimmed().isEmpty())
url.setPassword(dlg.ui->linePassword->text());
name =dlg.ui->lineName->text().trimmed();
name = dlg.ui->lineName->text().trimmed();
if(name.isEmpty())
name = UrlToStringNoCredentials(url);