From 830a2f62ee6c895256972ea451dd494c487194ab Mon Sep 17 00:00:00 2001
From: "craig.p.drummond" <craig.p.drummond@gmail.com>
Date: Tue, 28 Oct 2014 22:45:45 +0000
Subject: [PATCH] Show correct separators for windows builds.

---
 ChangeLog                 | 4 ++++
 support/pathrequester.cpp | 6 +++---
 support/pathrequester.h   | 5 +++--
 support/utils.cpp         | 2 +-
 4 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8f20f86b6..ad0c9ec34 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1.5.1
+-----
+1. Show correct separators for windows builds.
+
 1.5.0.1
 -------
 1. Add missing libtag.dll to windows setup.
diff --git a/support/pathrequester.cpp b/support/pathrequester.cpp
index 391ad282b..50b1347c5 100644
--- a/support/pathrequester.cpp
+++ b/support/pathrequester.cpp
@@ -47,10 +47,10 @@ PathRequester::PathRequester(QWidget *parent)
 void PathRequester::choose()
 {
     QString item=dirMode
-                    ? QFileDialog::getExistingDirectory(this, i18n("Select Folder"), edit->text())
-                    : QFileDialog::getOpenFileName(this, i18n("Select File"), Utils::getDir(edit->text()), filter);
+                    ? QFileDialog::getExistingDirectory(this, i18n("Select Folder"), text())
+                    : QFileDialog::getOpenFileName(this, i18n("Select File"), Utils::getDir(text()), filter);
     if (!item.isEmpty()) {
-        edit->setText(item);
+        setText(item);
     }
 }
 
diff --git a/support/pathrequester.h b/support/pathrequester.h
index ac4710eac..2aa84fb2f 100644
--- a/support/pathrequester.h
+++ b/support/pathrequester.h
@@ -43,6 +43,7 @@ public:
 #else
 #include "lineedit.h"
 #include "flattoolbutton.h"
+#include <QDir>
 
 class PathRequester : public QWidget
 {
@@ -51,8 +52,8 @@ public:
     PathRequester(QWidget *parent);
     virtual ~PathRequester() { }
 
-    QString text() const { return edit->text(); }
-    void setText(const QString &t) { edit->setText(t); }
+    QString text() const { return QDir::fromNativeSeparators(edit->text()); }
+    void setText(const QString &t) { edit->setText(QDir::toNativeSeparators(t)); }
     void setButtonVisible(bool v) { btn->setVisible(v); }
     void setFocus() { edit->setFocus(); }
     void setDirMode(bool m) { dirMode=m; }
diff --git a/support/utils.cpp b/support/utils.cpp
index d7cfadf2a..46524a5c3 100644
--- a/support/utils.cpp
+++ b/support/utils.cpp
@@ -161,7 +161,7 @@ QString Utils::convertPathForDisplay(const QString &path, bool isFolder)
     /* TODO: Display ~/Music or /home/user/Music / /Users/user/Music ???
     p=homeToTilda(QDir::toNativeSeparators(p));
     */
-    return isFolder && p.endsWith(constDirSep) ? p.left(p.length()-1) : p;
+    return QDir::toNativeSeparators(isFolder && p.endsWith(constDirSep) ? p.left(p.length()-1) : p);
 }
 
 QString Utils::convertPathFromDisplay(const QString &path, bool isFolder)