SVN_SILENT made messages (.desktop file) - always resolve ours

[dolphin.git] / src / settings / interface / interfacesettingspage.cpp

diff --git a/src/settings/interface/interfacesettingspage.cpp b/src/settings/interface/interfacesettingspage.cpp
index 6a3fc8c905dd6636d6e684d3be18bfe7e843f891..beaf409c9d085f5bbe21df6451e9275e01daf380 100644 (file)
--- a/src/settings/interface/interfacesettingspage.cpp
+++ b/src/settings/interface/interfacesettingspage.cpp
@@ -11,8 +11,13 @@
 #include "previewssettingspage.h"
 #include "statusandlocationbarssettingspage.h"
 
 #include "previewssettingspage.h"
 #include "statusandlocationbarssettingspage.h"
 

+#if HAVE_BALOO
+#include "panelsettingspage.h"
+#endif
+

 #include <KLocalizedString>
 
 #include <KLocalizedString>
 

+#include <QTabBar>

 #include <QTabWidget>
 #include <QVBoxLayout>
 
 #include <QTabWidget>
 #include <QVBoxLayout>
 


@@ -24,6 +29,8 @@ InterfaceSettingsPage::InterfaceSettingsPage(QWidget *parent)
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(this);
     topLayout->setContentsMargins(0, 0, 0, 0);
 
     QTabWidget *tabWidget = new QTabWidget(this);

+    tabWidget->setDocumentMode(true);
+    tabWidget->tabBar()->setExpanding(true);

 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);
 
     // initialize 'Folders & Tabs' tab
     FoldersTabsSettingsPage *foldersTabsPage = new FoldersTabsSettingsPage(tabWidget);


@@ -40,6 +47,13 @@ InterfaceSettingsPage::InterfaceSettingsPage(QWidget *parent)
     tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));
     connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &InterfaceSettingsPage::changed);
 
     tabWidget->addTab(confirmationsPage, i18nc("@title:tab Confirmations settings", "Confirmations"));
     connect(confirmationsPage, &ConfirmationsSettingsPage::changed, this, &InterfaceSettingsPage::changed);
 

+#if HAVE_BALOO
+    // initialize 'Panel' tab
+    PanelSettingsPage *panelPage = new PanelSettingsPage(tabWidget);
+    tabWidget->addTab(panelPage, i18nc("@title:tab Panels settings", "Panels"));
+    connect(panelPage, &PanelSettingsPage::changed, this, &InterfaceSettingsPage::changed);
+#endif
+

     // initialize 'Status & location bars' tab
     StatusAndLocationBarsSettingsPage *statusAndLocationBarsPage = new StatusAndLocationBarsSettingsPage(tabWidget, foldersTabsPage);
     tabWidget->addTab(statusAndLocationBarsPage, i18nc("@title:tab Status & Location bars settings", "Status && Location bars"));
     // initialize 'Status & location bars' tab
     StatusAndLocationBarsSettingsPage *statusAndLocationBarsPage = new StatusAndLocationBarsSettingsPage(tabWidget, foldersTabsPage);
     tabWidget->addTab(statusAndLocationBarsPage, i18nc("@title:tab Status & Location bars settings", "Status && Location bars"));


@@ -48,6 +62,11 @@ InterfaceSettingsPage::InterfaceSettingsPage(QWidget *parent)
     m_pages.append(foldersTabsPage);
     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);
     m_pages.append(foldersTabsPage);
     m_pages.append(previewsPage);
     m_pages.append(confirmationsPage);

+
+#if HAVE_BALOO
+    m_pages.append(panelPage);
+#endif
+

     m_pages.append(statusAndLocationBarsPage);
 
     topLayout->addWidget(tabWidget, 0, {});
     m_pages.append(statusAndLocationBarsPage);
 
     topLayout->addWidget(tabWidget, 0, {});