SVN_SILENT made messages (.desktop file)

[dolphin.git] / src / generalsettingspage.cpp

diff --git a/src/generalsettingspage.cpp b/src/generalsettingspage.cpp
index 5dc66cbdcf7bc437d0a27faf6e4221094ddaac74..68193b4e41b73d8733bb61fe35c51803c9b5621d 100644 (file)
--- a/src/generalsettingspage.cpp
+++ b/src/generalsettingspage.cpp
@@ -39,8 +39,11 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     m_confirmDelete(0),
     m_showDeleteCommand(0),
     m_showCopyMoveMenu(0),
+    m_showZoomSlider(0),
+    m_showSpaceInfo(0),
     m_browseThroughArchives(0),
-    m_renameInline(0)
+    m_renameInline(0),
+    m_autoExpandFolders(0)
 {
     Q_UNUSED(mainWin);
 
@@ -76,12 +79,27 @@ GeneralSettingsPage::GeneralSettingsPage(DolphinMainWindow* mainWin, QWidget* pa
     contextMenuBoxLayout->addWidget(m_showDeleteCommand);
     contextMenuBoxLayout->addWidget(m_showCopyMoveMenu);
 
+    QGroupBox* statusBarBox = new QGroupBox(i18nc("@title:group", "Status Bar"), vBox);
+
+    m_showZoomSlider = new QCheckBox(i18nc("@option:check", "Show zoom slider"), statusBarBox);
+    connect(m_showZoomSlider, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+
+    m_showSpaceInfo = new QCheckBox(i18nc("@option:check", "Show space information"), statusBarBox);
+    connect(m_showSpaceInfo, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+
+    QVBoxLayout* statusBarBoxLayout = new QVBoxLayout(statusBarBox);
+    statusBarBoxLayout->addWidget(m_showZoomSlider);
+    statusBarBoxLayout->addWidget(m_showSpaceInfo);
+
     m_browseThroughArchives = new QCheckBox(i18nc("@option:check", "Browse through archives"), vBox);
     connect(m_browseThroughArchives, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     m_renameInline = new QCheckBox(i18nc("@option:check", "Rename inline"), vBox);
     connect(m_renameInline, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
+    m_autoExpandFolders = new QCheckBox(i18nc("option:check", "Open folders during drag operations"), vBox);
+    connect(m_autoExpandFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
@@ -112,8 +130,11 @@ void GeneralSettingsPage::applySettings()
     configGroup.sync();
 
     settings->setShowCopyMoveMenu(m_showCopyMoveMenu->isChecked());
+    settings->setShowZoomSlider(m_showZoomSlider->isChecked());
+    settings->setShowSpaceInfo(m_showSpaceInfo->isChecked());
     settings->setBrowseThroughArchives(m_browseThroughArchives->isChecked());
     settings->setRenameInline(m_renameInline->isChecked());
+    settings->setAutoExpandFolders(m_autoExpandFolders->isChecked());
 }
 
 void GeneralSettingsPage::restoreDefaults()
@@ -136,11 +157,14 @@ void GeneralSettingsPage::loadSettings()
     KSharedConfig::Ptr globalConfig = KSharedConfig::openConfig("kdeglobals", KConfig::IncludeGlobals);
     KConfigGroup configGroup(globalConfig, "KDE");
     m_showDeleteCommand->setChecked(configGroup.readEntry("ShowDeleteCommand", false));
-    
+
     GeneralSettings* settings = DolphinSettings::instance().generalSettings();
     m_showCopyMoveMenu->setChecked(settings->showCopyMoveMenu());
+    m_showZoomSlider->setChecked(settings->showZoomSlider());
+    m_showSpaceInfo->setChecked(settings->showSpaceInfo());
     m_browseThroughArchives->setChecked(settings->browseThroughArchives());
     m_renameInline->setChecked(settings->renameInline());
+    m_autoExpandFolders->setChecked(settings->autoExpandFolders());
 }
 
 #include "generalsettingspage.moc"