From afcbe61a6c964f45a043d1a9508738476610559b Mon Sep 17 00:00:00 2001 From: Peter Penz Date: Sun, 3 Aug 2008 14:53:30 +0000 Subject: [PATCH] Allow to configure in the startup configuration whether the URL Navigator should show the full path in the breadcrumb view. svn path=/trunk/KDE/kdebase/apps/; revision=841571 --- src/dolphin_generalsettings.kcfg | 4 ++++ src/dolphinviewcontainer.cpp | 1 + src/startupsettingspage.cpp | 11 ++++++++--- src/startupsettingspage.h | 1 + 4 files changed, 14 insertions(+), 3 deletions(-) diff --git a/src/dolphin_generalsettings.kcfg b/src/dolphin_generalsettings.kcfg index 504fa5bd9..f7677ffa0 100644 --- a/src/dolphin_generalsettings.kcfg +++ b/src/dolphin_generalsettings.kcfg @@ -8,6 +8,10 @@ false + + + false + true diff --git a/src/dolphinviewcontainer.cpp b/src/dolphinviewcontainer.cpp index 84192239b..4ff9ab0e4 100644 --- a/src/dolphinviewcontainer.cpp +++ b/src/dolphinviewcontainer.cpp @@ -87,6 +87,7 @@ DolphinViewContainer::DolphinViewContainer(DolphinMainWindow* mainWindow, const GeneralSettings* settings = DolphinSettings::instance().generalSettings(); m_urlNavigator->setUrlEditable(settings->editableUrl()); + m_urlNavigator->setShowFullPath(settings->showFullPath()); m_urlNavigator->setHomeUrl(settings->homeUrl()); m_dirLister = new DolphinDirLister(); diff --git a/src/startupsettingspage.cpp b/src/startupsettingspage.cpp index 532c6e606..35fc47a57 100644 --- a/src/startupsettingspage.cpp +++ b/src/startupsettingspage.cpp @@ -45,6 +45,7 @@ StartupSettingsPage::StartupSettingsPage(DolphinMainWindow* mainWin, QWidget* pa m_homeUrl(0), m_splitView(0), m_editableUrl(0), + m_showFullPath(0), m_filterBar(0) { const int spacing = KDialog::spacingHint(); @@ -84,10 +85,12 @@ StartupSettingsPage::StartupSettingsPage(DolphinMainWindow* mainWin, QWidget* pa // create 'Split view', 'Editable location' and 'Filter bar' checkboxes m_splitView = new QCheckBox(i18nc("@option:check Startup Settings", "Split view mode"), vBox); m_editableUrl = new QCheckBox(i18nc("@option:check Startup Settings", "Editable location bar"), vBox); + m_showFullPath = new QCheckBox(i18nc("@option:check Startup Settings", "Show full path inside location 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_filterBar, SIGNAL(toggled(bool)), this, SIGNAL(changed())); + 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())); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -121,6 +124,7 @@ void StartupSettingsPage::applySettings() settings->setSplitView(m_splitView->isChecked()); settings->setEditableUrl(m_editableUrl->isChecked()); + settings->setShowFullPath(m_showFullPath->isChecked()); settings->setFilterBar(m_filterBar->isChecked()); } @@ -158,6 +162,7 @@ void StartupSettingsPage::loadSettings() m_homeUrl->setText(settings->homeUrl()); m_splitView->setChecked(settings->splitView()); m_editableUrl->setChecked(settings->editableUrl()); + m_showFullPath->setChecked(settings->showFullPath()); m_filterBar->setChecked(settings->filterBar()); } diff --git a/src/startupsettingspage.h b/src/startupsettingspage.h index bee24b15f..a56869cd4 100644 --- a/src/startupsettingspage.h +++ b/src/startupsettingspage.h @@ -59,6 +59,7 @@ private: QCheckBox* m_splitView; QCheckBox* m_editableUrl; + QCheckBox* m_showFullPath; QCheckBox* m_filterBar; }; -- 2.47.3