From 3eb7acde255d754bb330ece4df8d606972c32164 Mon Sep 17 00:00:00 2001
From: Daniel Molkentin <danimo@owncloud.com>
Date: Tue, 11 Jun 2013 18:18:38 +0200
Subject: [PATCH] Folder wizard: use native separators in path lineedit

---
 src/mirall/folderwizard.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/mirall/folderwizard.cpp b/src/mirall/folderwizard.cpp
index 253a2f30f5..0885ad5394 100644
--- a/src/mirall/folderwizard.cpp
+++ b/src/mirall/folderwizard.cpp
@@ -36,7 +36,8 @@ FolderWizardSourcePage::FolderWizardSourcePage()
 {
     _ui.setupUi(this);
     registerField(QLatin1String("sourceFolder*"), _ui.localFolderLineEdit);
-    _ui.localFolderLineEdit->setText( QString::fromLatin1( "%1/%2").arg( QDir::homePath() ).arg(Theme::instance()->appName() ) );
+    QString defaultPath = QString::fromLatin1( "%1/%2").arg( QDir::homePath() ).arg(Theme::instance()->appName() );
+    _ui.localFolderLineEdit->setText( QDir::toNativeSeparators( defaultPath ) );
     registerField(QLatin1String("alias*"), _ui.aliasLineEdit);
     _ui.aliasLineEdit->setText( Theme::instance()->appNameGUI() );
 
@@ -64,7 +65,7 @@ void FolderWizardSourcePage::cleanupPage()
 
 bool FolderWizardSourcePage::isComplete() const
 {
-  QFileInfo selFile( _ui.localFolderLineEdit->text() );
+  QFileInfo selFile( QDir::fromNativeSeparators(_ui.localFolderLineEdit->text()) );
   QString   userInput = selFile.canonicalFilePath();
 
   QString warnString;
@@ -94,7 +95,8 @@ bool FolderWizardSourcePage::isComplete() const
       qDebug() << "Checking local path: " << folderDir << " <-> " << userInput;
       if( QFileInfo( f->path() ) == userInput ) {
         isOk = false;
-        warnString.append( tr("The local path %1 is already an upload folder.<br/>Please pick another one!").arg(userInput) );
+        warnString.append( tr("The local path %1 is already an upload folder.<br/>Please pick another one!")
+                           .arg(QDir::toNativeSeparators(userInput)) );
       }
       if( isOk && folderDir.startsWith( userInput )) {
         qDebug() << "A already configured folder is child of the current selected";
@@ -148,7 +150,7 @@ void FolderWizardSourcePage::on_localFolderChooseBtn_clicked()
                                                     tr("Select the source folder"),
                                                     QDesktopServices::storageLocation(QDesktopServices::HomeLocation));
     if (!dir.isEmpty()) {
-        _ui.localFolderLineEdit->setText(dir);
+        _ui.localFolderLineEdit->setText(QDir::toNativeSeparators(dir));
     }
 }