Convert hard coded shortcuts to standard keys

[dolphin.git] / src / settings / startup / startupsettingspage.cpp

diff --git a/src/settings/startup/startupsettingspage.cpp b/src/settings/startup/startupsettingspage.cpp
index d891558e1bf5dd603e3a47f66a145f4346b9c95d..4071ee04f58fb5b80d47c0e3695b898bae762af1 100644 (file)
--- a/src/settings/startup/startupsettingspage.cpp
+++ b/src/settings/startup/startupsettingspage.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2008 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2008 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -19,65 +19,74 @@
 
 #include "startupsettingspage.h"
 
 
 #include "startupsettingspage.h"
 

-#include "settings/dolphinsettings.h"
+#include "dolphin_generalsettings.h"

 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"
 #include "dolphinmainwindow.h"
 #include "dolphinviewcontainer.h"

+#include "global.h"

 
 

-#include "dolphin_generalsettings.h"
-
-#include <kdialog.h>
-#include <kfiledialog.h>
-#include <klocale.h>
-#include <klineedit.h>
-#include <kmessagebox.h>
-#include <kvbox.h>
+#include <KLocalizedString>
+#include <KMessageBox>

 
 #include <QCheckBox>
 
 #include <QCheckBox>

+#include <QFileDialog>

 #include <QGroupBox>
 #include <QLabel>
 #include <QGroupBox>
 #include <QLabel>

+#include <QLineEdit>

 #include <QPushButton>
 #include <QPushButton>

-#include <QRadioButton>
+#include <QVBoxLayout>

 
 

-#include "views/dolphinview.h"
-
-StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
+StartupSettingsPage::StartupSettingsPage(const QUrl& url, QWidget* parent) :

     SettingsPageBase(parent),
     m_url(url),
     SettingsPageBase(parent),
     m_url(url),

-    m_homeUrl(0),
-    m_splitView(0),
-    m_editableUrl(0),
-    m_showFullPath(0),
-    m_filterBar(0)
+    m_homeUrl(nullptr),
+    m_splitView(nullptr),
+    m_editableUrl(nullptr),
+    m_showFullPath(nullptr),
+    m_filterBar(nullptr),
+    m_showFullPathInTitlebar(nullptr)

 {
 {

-    const int spacing = KDialog::spacingHint();
-

     QVBoxLayout* topLayout = new QVBoxLayout(this);
     QVBoxLayout* topLayout = new QVBoxLayout(this);

-    KVBox* vBox = new KVBox(this);
-    vBox->setSpacing(spacing);
+    QWidget* vBox = new QWidget(this);
+    QVBoxLayout *vBoxLayout = new QVBoxLayout(vBox);
+    vBoxLayout->setMargin(0);
+    vBoxLayout->setAlignment(Qt::AlignTop);

 
     // create 'Home URL' editor
     QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);
 
     // create 'Home URL' editor
     QGroupBox* homeBox = new QGroupBox(i18nc("@title:group", "Home Folder"), vBox);

+    vBoxLayout->addWidget(homeBox);
+
+    QWidget* homeUrlBox = new QWidget(homeBox);
+    QHBoxLayout *homeUrlBoxLayout = new QHBoxLayout(homeUrlBox);
+    homeUrlBoxLayout->setMargin(0);

 
 

-    KHBox* homeUrlBox = new KHBox(homeBox);
-    homeUrlBox->setSpacing(spacing);
+    QLabel* homeUrlLabel = new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
+    homeUrlBoxLayout->addWidget(homeUrlLabel);
+    m_homeUrl = new QLineEdit(homeUrlBox);
+    homeUrlBoxLayout->addWidget(m_homeUrl);
+    m_homeUrl->setClearButtonEnabled(true);

 
 

-    new QLabel(i18nc("@label:textbox", "Location:"), homeUrlBox);
-    m_homeUrl = new KLineEdit(homeUrlBox);
-    m_homeUrl->setClearButtonShown(true);
+    QPushButton* selectHomeUrlButton = new QPushButton(QIcon::fromTheme(QStringLiteral("folder-open")), QString(), homeUrlBox);
+    homeUrlBoxLayout->addWidget(selectHomeUrlButton);

 
 

-    QPushButton* selectHomeUrlButton = new QPushButton(KIcon("folder-open"), QString(), homeUrlBox);
-    connect(selectHomeUrlButton, SIGNAL(clicked()),
-            this, SLOT(selectHomeUrl()));
+#ifndef QT_NO_ACCESSIBILITY
+    selectHomeUrlButton->setAccessibleName(i18nc("@action:button", "Select Home Location"));
+#endif

 
 

-    KHBox* buttonBox = new KHBox(homeBox);
-    buttonBox->setSpacing(spacing);
+    connect(selectHomeUrlButton, &QPushButton::clicked,
+            this, &StartupSettingsPage::selectHomeUrl);
+
+    QWidget* buttonBox = new QWidget(homeBox);
+    QHBoxLayout *buttonBoxLayout = new QHBoxLayout(buttonBox);
+    buttonBoxLayout->setMargin(0);

 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);
 
     QPushButton* useCurrentButton = new QPushButton(i18nc("@action:button", "Use Current Location"), buttonBox);

-    connect(useCurrentButton, SIGNAL(clicked()),
-            this, SLOT(useCurrentLocation()));
+    buttonBoxLayout->addWidget(useCurrentButton);
+    connect(useCurrentButton, &QPushButton::clicked,
+            this, &StartupSettingsPage::useCurrentLocation);

     QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);
     QPushButton* useDefaultButton = new QPushButton(i18nc("@action:button", "Use Default Location"), buttonBox);

-    connect(useDefaultButton, SIGNAL(clicked()),
-            this, SLOT(useDefaultLocation()));
+    buttonBoxLayout->addWidget(useDefaultButton);
+    connect(useDefaultButton, &QPushButton::clicked,
+            this, &StartupSettingsPage::useDefaultLocation);

 
     QVBoxLayout* homeBoxLayout = new QVBoxLayout(homeBox);
     homeBoxLayout->addWidget(homeUrlBox);
 
     QVBoxLayout* homeBoxLayout = new QVBoxLayout(homeBox);
     homeBoxLayout->addWidget(homeUrlBox);


@@ -85,13 +94,15 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
 
     // create 'Split view', 'Show full path', 'Editable location' and 'Filter bar' checkboxes
     m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), vBox);
 
     // create 'Split view', 'Show full path', 'Editable location' and 'Filter bar' checkboxes
     m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), vBox);

+    vBoxLayout->addWidget(m_splitView);

     m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox);
     m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox);

+    vBoxLayout->addWidget(m_editableUrl);

     m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location bar"), vBox);
     m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location bar"), vBox);

+    vBoxLayout->addWidget(m_showFullPath);

     m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"), vBox);
     m_filterBar = new QCheckBox(i18nc("@option:check Startup Settings", "Show filter bar"), vBox);

-    connect(m_splitView,    SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_editableUrl,  SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_showFullPath, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
-    connect(m_filterBar,    SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+    vBoxLayout->addWidget(m_filterBar);
+    m_showFullPathInTitlebar = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path in title bar"), vBox);
+    vBoxLayout->addWidget(m_showFullPathInTitlebar);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout


@@ -102,9 +113,12 @@ StartupSettingsPage::StartupSettingsPage(const KUrl& url, QWidget* parent) :
 
     loadSettings();
 
 
     loadSettings();
 

-    // it's important connecting 'textChanged' after loadSettings(), as loadSettings()
-    // invokes m_homeUrl->setText()
-    connect(m_homeUrl, SIGNAL(textChanged(const QString&)), this, SIGNAL(changed()));
+    connect(m_homeUrl, &QLineEdit::textChanged, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_splitView,    &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_editableUrl,  &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_showFullPath, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_filterBar,    &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);
+    connect(m_showFullPathInTitlebar, &QCheckBox::toggled, this, &StartupSettingsPage::slotSettingsChanged);

 }
 
 StartupSettingsPage::~StartupSettingsPage()
 }
 
 StartupSettingsPage::~StartupSettingsPage()


@@ -113,12 +127,12 @@ StartupSettingsPage::~StartupSettingsPage()
 
 void StartupSettingsPage::applySettings()
 {
 
 void StartupSettingsPage::applySettings()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();

 
 

-    const KUrl url(m_homeUrl->text());
-    KFileItem fileItem(KFileItem::Unknown, KFileItem::Unknown, url);
-    if (url.isValid() && fileItem.isDir()) {
-        settings->setHomeUrl(url.prettyUrl());
+    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));

     } else {
         KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid or does not exist, it will not be applied."));
     }
     } else {
         KMessageBox::error(this, i18nc("@info", "The location for the home folder is invalid or does not exist, it will not be applied."));
     }


@@ -127,48 +141,55 @@ void StartupSettingsPage::applySettings()
     settings->setEditableUrl(m_editableUrl->isChecked());
     settings->setShowFullPath(m_showFullPath->isChecked());
     settings->setFilterBar(m_filterBar->isChecked());
     settings->setEditableUrl(m_editableUrl->isChecked());
     settings->setShowFullPath(m_showFullPath->isChecked());
     settings->setFilterBar(m_filterBar->isChecked());

+    settings->setShowFullPathInTitlebar(m_showFullPathInTitlebar->isChecked());

 
 

-    settings->writeConfig();
+    settings->save();

 }
 
 void StartupSettingsPage::restoreDefaults()
 {
 }
 
 void StartupSettingsPage::restoreDefaults()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
+    GeneralSettings* settings = GeneralSettings::self();

     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
 }
 
     settings->useDefaults(true);
     loadSettings();
     settings->useDefaults(false);
 }
 

+void StartupSettingsPage::slotSettingsChanged()
+{
+    // Provide a hint that the startup settings have been changed. This allows the views
+    // to apply the startup settings only if they have been explicitly changed by the user
+    // (see bug #254947).
+    GeneralSettings::setModifiedStartupSettings(true);
+    emit changed();
+}
+

 void StartupSettingsPage::selectHomeUrl()
 {
 void StartupSettingsPage::selectHomeUrl()
 {

-    const QString homeUrl = m_homeUrl->text();
-    KUrl url = KFileDialog::getExistingDirectoryUrl(homeUrl, this);
+    const QUrl homeUrl(QUrl::fromUserInput(m_homeUrl->text(), QString(), QUrl::AssumeLocalFile));
+    QUrl url = QFileDialog::getExistingDirectoryUrl(this, QString(), homeUrl);

     if (!url.isEmpty()) {
     if (!url.isEmpty()) {

-        m_homeUrl->setText(url.prettyUrl());
-        emit changed();
+        m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile));
+        slotSettingsChanged();

     }
 }
 
 void StartupSettingsPage::useCurrentLocation()
 {
     }
 }
 
 void StartupSettingsPage::useCurrentLocation()
 {

-    m_homeUrl->setText(m_url.prettyUrl());
+    m_homeUrl->setText(m_url.toDisplayString(QUrl::PreferLocalFile));

 }
 
 void StartupSettingsPage::useDefaultLocation()
 {
 }
 
 void StartupSettingsPage::useDefaultLocation()
 {

-   KUrl url(QDir::homePath());
-    m_homeUrl->setText(url.prettyUrl());
+    m_homeUrl->setText(QDir::homePath());

 }
 
 void StartupSettingsPage::loadSettings()
 {
 }
 
 void StartupSettingsPage::loadSettings()
 {

-    GeneralSettings* settings = DolphinSettings::instance().generalSettings();
-    KUrl url(settings->homeUrl());
-    m_homeUrl->setText(url.prettyUrl());
-    m_splitView->setChecked(settings->splitView());
-    m_editableUrl->setChecked(settings->editableUrl());
-    m_showFullPath->setChecked(settings->showFullPath());
-    m_filterBar->setChecked(settings->filterBar());
+    const QUrl url(Dolphin::homeUrl());
+    m_homeUrl->setText(url.toDisplayString(QUrl::PreferLocalFile));
+    m_splitView->setChecked(GeneralSettings::splitView());
+    m_editableUrl->setChecked(GeneralSettings::editableUrl());
+    m_showFullPath->setChecked(GeneralSettings::showFullPath());
+    m_filterBar->setChecked(GeneralSettings::filterBar());
+    m_showFullPathInTitlebar->setChecked(GeneralSettings::showFullPathInTitlebar());

 }
 }

-
-#include "startupsettingspage.moc"