Konq popupmenu fix: we don't show the "Create new" submenu over subdirs in an iconvie...

[dolphin.git] / src / generalviewsettingspage.cpp

diff --git a/src/generalviewsettingspage.cpp b/src/generalviewsettingspage.cpp
index 15a985cf3015f1762c4e5f39f3b1bfdc17eb0904..639a878575bc4ac2498aaa936f077fbcec450ec0 100644 (file)
--- a/src/generalviewsettingspage.cpp
+++ b/src/generalviewsettingspage.cpp
@@ -39,15 +39,17 @@
 #include <klocale.h>
 #include <khbox.h>
 
-GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
+GeneralViewSettingsPage::GeneralViewSettingsPage(const KUrl& url,
                                                  QWidget* parent) :
-    KVBox(parent),
-    m_mainWindow(mainWindow),
+    ViewSettingsPageBase(parent),
+    m_url(url),
     m_localProps(0),
     m_globalProps(0),
     m_maxPreviewSize(0),
     m_spinBox(0),
-    m_useFileThumbnails(0)
+    m_useFileThumbnails(0),
+    m_showSelectionToggle(0),
+    m_showToolTips(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -59,7 +61,10 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     QGroupBox* propsBox = new QGroupBox(i18nc("@title:group", "View Properties"), this);
 
     m_localProps = new QRadioButton(i18nc("@option:radio", "Remember view properties for each folder"), propsBox);
+    connect(m_localProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+
     m_globalProps = new QRadioButton(i18nc("@option:radio", "Use common view properties for all folders"), propsBox);
+    connect(m_globalProps, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     QVBoxLayout* propsBoxLayout = new QVBoxLayout(propsBox);
     propsBoxLayout->addWidget(m_localProps);
@@ -68,10 +73,10 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     // create 'File Previews' box
     QGroupBox* previewBox = new QGroupBox(i18nc("@title:group", "File Previews"), this);
 
-    QLabel* maxFileSize = new QLabel(i18nc("@label:slider", "Maximum file size:"), previewBox);
-
     KHBox* vBox = new KHBox(previewBox);
     vBox->setSpacing(spacing);
+
+    new QLabel(i18nc("@label:slider", "Maximum file size:"), vBox);
     m_maxPreviewSize = new QSlider(Qt::Horizontal, vBox);
 
     m_spinBox = new QSpinBox(vBox);
@@ -81,13 +86,24 @@ GeneralViewSettingsPage::GeneralViewSettingsPage(DolphinMainWindow* mainWindow,
     connect(m_spinBox, SIGNAL(valueChanged(int)),
             m_maxPreviewSize, SLOT(setValue(int)));
 
-    m_useFileThumbnails = new QCheckBox(i18n("Use thumbnails embedded in files"), previewBox);
+    connect(m_maxPreviewSize, SIGNAL(valueChanged(int)),
+            this, SIGNAL(changed()));
+    connect(m_spinBox, SIGNAL(valueChanged(int)),
+            this, SIGNAL(changed()));
+
+    m_useFileThumbnails = new QCheckBox(i18nc("@option:check", "Use thumbnails embedded in files"), previewBox);
+    connect(m_useFileThumbnails, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
 
     QVBoxLayout* previewBoxLayout = new QVBoxLayout(previewBox);
-    previewBoxLayout->addWidget(maxFileSize);
     previewBoxLayout->addWidget(vBox);
     previewBoxLayout->addWidget(m_useFileThumbnails);
 
+    m_showSelectionToggle = new QCheckBox(i18nc("@option:check", "Show selection toggle"), this);
+    connect(m_showSelectionToggle, SIGNAL(toggled(bool)), this, SIGNAL(changed()));
+
+    m_showToolTips = new QCheckBox(i18nc("@option:check", "Show tooltips"), this);
+    connect(m_showToolTips, 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.
@@ -103,8 +119,7 @@ GeneralViewSettingsPage::~GeneralViewSettingsPage()
 
 void GeneralViewSettingsPage::applySettings()
 {
-    const KUrl& url = m_mainWindow->activeViewContainer()->url();
-    ViewProperties props(url);  // read current view properties
+    ViewProperties props(m_url);  // read current view properties
 
     const bool useGlobalProps = m_globalProps->isChecked();
 
@@ -116,7 +131,7 @@ void GeneralViewSettingsPage::applySettings()
         // It is important that GeneralSettings::globalViewProps() is set before
         // the class ViewProperties is used, as ViewProperties uses this setting
         // to find the destination folder for storing the view properties.
-        ViewProperties globalProps(url);
+        ViewProperties globalProps(m_url);
         globalProps.setDirProperties(props);
     }
 
@@ -129,6 +144,9 @@ void GeneralViewSettingsPage::applySettings()
                             m_useFileThumbnails->isChecked(),
                             KConfigBase::Normal | KConfigBase::Global);
     globalConfig.sync();
+
+    settings->setShowSelectionToggle(m_showSelectionToggle->isChecked());
+    settings->setShowToolTips(m_showToolTips->isChecked());
 }
 
 void GeneralViewSettingsPage::restoreDefaults()
@@ -155,6 +173,9 @@ void GeneralViewSettingsPage::loadSettings()
     m_maxPreviewSize->setTickPosition(QSlider::TicksBelow);
 
     KConfigGroup globalConfig(KGlobal::config(), "PreviewSettings");
+    // TODO: The default value of 5 MB must match with the default value inside
+    // kdelibs/kio/kio/previewjob.cpp. Maybe a static getter method in PreviewJob
+    // should be added for getting the default size?
     const int maxByteSize = globalConfig.readEntry("MaximumSize", 5 * 1024 * 1024 /* 5 MB */);
     int maxMByteSize = maxByteSize / (1024 * 1024);
     if (maxMByteSize < 1) {
@@ -172,6 +193,9 @@ void GeneralViewSettingsPage::loadSettings()
 
     const bool useFileThumbnails = globalConfig.readEntry("UseFileThumbnails", true);
     m_useFileThumbnails->setChecked(useFileThumbnails);
+
+    m_showSelectionToggle->setChecked(settings->showSelectionToggle());
+    m_showToolTips->setChecked(settings->showToolTips());
 }
 
 #include "generalviewsettingspage.moc"