From 5dd5eaf08da4b7d11e53c90096c2ea0e6a19e840 Mon Sep 17 00:00:00 2001 From: Emmanuel Pescosta Date: Sat, 10 Oct 2015 15:09:48 +0200 Subject: Allow home directories with non-local file paths. Paths like file:/home/me work now instead of showing an error message. BUG: 352743 BUG: 353550 FIXED-IN: 15.08.3 REVIEW: 125586 --- src/settings/startup/startupsettingspage.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'src/settings/startup/startupsettingspage.cpp') diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp index 48d2a7b75..03258cf04 100644 --- a/src/settings/startup/startupsettingspage.cpp +++ b/src/settings/startup/startupsettingspage.cpp @@ -19,6 +19,7 @@ #include "startupsettingspage.h" +#include "global.h" #include "dolphinmainwindow.h" #include "dolphinviewcontainer.h" @@ -128,7 +129,7 @@ void StartupSettingsPage::applySettings() { GeneralSettings* settings = GeneralSettings::self(); - const QUrl url(QUrl::fromLocalFile(m_homeUrl->text())); + const QUrl url(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile)); KFileItem fileItem(url); if ((url.isValid() && fileItem.isDir()) || (url.scheme() == QLatin1String("timeline"))) { settings->setHomeUrl(url.toDisplayString(QUrl::PreferLocalFile)); @@ -163,8 +164,8 @@ void StartupSettingsPage::slotSettingsChanged() void StartupSettingsPage::selectHomeUrl() { - const QString homeUrl = m_homeUrl->text(); - QUrl url = QFileDialog::getExistingDirectoryUrl(this, QString(), QUrl::fromLocalFile(homeUrl)); + const QUrl homeUrl(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile)); + QUrl url = QFileDialog::getExistingDirectoryUrl(this, QString(), homeUrl); if (!url.isEmpty()) { m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile)); slotSettingsChanged(); @@ -183,7 +184,7 @@ void StartupSettingsPage::useDefaultLocation() void StartupSettingsPage::loadSettings() { - const QUrl url(QUrl::fromLocalFile(GeneralSettings::homeUrl())); + const QUrl url(Dolphin::homeUrl()); m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile)); m_splitView->setChecked(GeneralSettings::splitView()); m_editableUrl->setChecked(GeneralSettings::editableUrl()); -- cgit v1.3