From 1330b2b97a6feeb87bef736cca7c2b41c83ec5a5 Mon Sep 17 00:00:00 2001
From: Kostas <Kostas@noemail.net>
Date: Sat, 12 Sep 2015 18:34:26 +0000
Subject: [PATCH] Fixed issue where the RemoteDialog was displaying local paths
 as Urls when editing existing remotes

FossilOrigin-Name: 96e4a4d8642ec96578155bb8762a1772b9351e3c
---
 manifest             | 12 ++++++------
 manifest.uuid        |  2 +-
 src/RemoteDialog.cpp | 16 +++++++++++-----
 3 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/manifest b/manifest
index eb86baa..e3dddfb 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fixed\sissue\swhere\ssetting\sa\sdefault\sremote\soccasionally\sfails
-D 2015-09-12T18:13:03.779
+C Fixed\sissue\swhere\sthe\sRemoteDialog\swas\sdisplaying\slocal\spaths\sas\sUrls\swhen\sediting\sexisting\sremotes\n
+D 2015-09-12T18:34:26.565
 F .fossil-settings/manifest a09a968bf05a50058f3ad50132730b719bc39e76
 F .travis.yml 77966888a81c4ceee1fcc79bce842c9667ad8a35
 F debian/changelog eb4304dfcb6bb66850ec740838090eb50ce1249b
@@ -234,7 +234,7 @@ F src/LoggedProcess.cpp 2a1e5c94bc1e57c8984563e66c210e43a14dc60c
 F src/LoggedProcess.h 85df7c635c807a5a0e8c4763f17a0752aaff7261
 F src/MainWindow.cpp d5adcea39c5cdad6acbf9557a6f6ef7e6bf19901
 F src/MainWindow.h fd8bb12f0bf49a6cb5ce9b875ad5277426380e3f
-F src/RemoteDialog.cpp d5d39871f319bb760405736ba0caa9e83ec51ea3
+F src/RemoteDialog.cpp 1a57a15465f689057d5354a29ad3015e54582343
 F src/RemoteDialog.h 5e0438c2bd7c79b1bb44bfbd58c2181b544a9e5d
 F src/RevisionDialog.cpp e58c4f8a704f00addebb15d521b76620fdafda79
 F src/RevisionDialog.h b718c3009342eaabad39c8a11a253a4e4fef7a73
@@ -261,7 +261,7 @@ F ui/MainWindow.ui ad04643d071fe513b46ef413749a493909a90ad1
 F ui/RemoteDialog.ui 424b2d4a3d0162f84fdccf6af02c1cfce07a06f5
 F ui/RevisionDialog.ui 27c3b98c665fec014a50cbf3352c0627f75e68cd
 F ui/SettingsDialog.ui 2e1b6ce7a49100088c5649292c1319e62e0302e1
-P ca5602f8b3e7a0eba8e0a8afc1e60f3b4e2d8646
-R 8a09e505d515925772d771ed4d746d16
+P 6850f2915d4dfb3760de45d7bdb3f8d1c5658dc6
+R d7fa0057ae23e4534aea0daf38489c8a
 U Kostas
-Z 202ea39a6d74dc4b2a228c395fd2332d
+Z 622c72220b0e85085ac47a3fed4228ae
diff --git a/manifest.uuid b/manifest.uuid
index da7b5d3..a085e2d 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-6850f2915d4dfb3760de45d7bdb3f8d1c5658dc6
\ No newline at end of file
+96e4a4d8642ec96578155bb8762a1772b9351e3c
\ No newline at end of file
diff --git a/src/RemoteDialog.cpp b/src/RemoteDialog.cpp
index 38fbd73..bf6ab7c 100644
--- a/src/RemoteDialog.cpp
+++ b/src/RemoteDialog.cpp
@@ -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);