Merge branch 'master' into frameworks

[dolphin.git] / src / settings / viewmodes / viewsettingstab.cpp

diff --git a/src/settings/viewmodes/viewsettingstab.cpp b/src/settings/viewmodes/viewsettingstab.cpp
index 743f042caf5acdd40e58c2753973321b880cc8d5..6f442099fc16e9a4632f5b971d47097d7d45ba71 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.cpp
+++ b/src/settings/viewmodes/viewsettingstab.cpp
@@ -27,55 +27,25 @@
 #include <KComboBox>
 #include <KLocale>
 
 #include <KComboBox>
 #include <KLocale>
 

+#include <QCheckBox>

 #include <QGroupBox>
 #include <QLabel>
 #include <QSlider>
 #include <QVBoxLayout>
 #include <QGroupBox>
 #include <QLabel>
 #include <QSlider>
 #include <QVBoxLayout>

+#include <QHelpEvent>
+#include <QApplication>

 
 #include <views/zoomlevelinfo.h>
 
 
 #include <views/zoomlevelinfo.h>
 

-template<class T>
-void apply(int iconSizeValue, int previewSizeValue, const QFont& font, bool useSystemFont)
-{
-    const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(iconSizeValue);
-    const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(previewSizeValue);
-    T::setIconSize(iconSize);
-    T::setPreviewSize(previewSize);
-
-    T::setUseSystemFont(useSystemFont);
-    T::setFontFamily(font.family());
-    T::setFontSize(font.pointSizeF());
-    T::setItalicFont(font.italic());
-    T::setFontWeight(font.weight());
-
-    T::self()->writeConfig();
-}
-
-template<class T>
-void load(int* iconSizeValue, int* previewSizeValue, QFont* font, bool* useSystemFont)
-{
-    const QSize iconSize(T::iconSize(), T::iconSize());
-    *iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize);
-
-    const QSize previewSize(T::previewSize(), T::previewSize());
-    *previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize);
-
-    *useSystemFont = T::useSystemFont();
-
-    *font = QFont(T::fontFamily(), qRound(T::fontSize()));
-    font->setItalic(T::italicFont());
-    font->setWeight(T::fontWeight());
-    font->setPointSizeF(T::fontSize());
-}
-
-

 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     QWidget(parent),
     m_mode(mode),
     m_defaultSizeSlider(0),
     m_previewSizeSlider(0),
     m_fontRequester(0),
 ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     QWidget(parent),
     m_mode(mode),
     m_defaultSizeSlider(0),
     m_previewSizeSlider(0),
     m_fontRequester(0),

-    m_textWidthBox(0)
+    m_widthBox(0),
+    m_maxLinesBox(0),
+    m_expandableFolders(0)

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


@@ -91,12 +61,16 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     m_defaultSizeSlider->setPageStep(1);
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_defaultSizeSlider->setRange(minRange, maxRange);
     m_defaultSizeSlider->setPageStep(1);
     m_defaultSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_defaultSizeSlider->setRange(minRange, maxRange);

+    connect(m_defaultSizeSlider, &QSlider::valueChanged,
+            this, &ViewSettingsTab::slotDefaultSliderMoved);

 
     QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
     m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_previewSizeSlider->setRange(minRange, maxRange);
 
     QLabel* previewLabel = new QLabel(i18nc("@label:listbox", "Preview:"), this);
     m_previewSizeSlider = new QSlider(Qt::Horizontal, this);
     m_previewSizeSlider->setPageStep(1);
     m_previewSizeSlider->setTickPosition(QSlider::TicksBelow);
     m_previewSizeSlider->setRange(minRange, maxRange);

+    connect(m_previewSizeSlider, &QSlider::valueChanged,
+            this, &ViewSettingsTab::slotPreviewSliderMoved);

 
     QGridLayout* layout = new QGridLayout(iconSizeGroup);
     layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);
 
     QGridLayout* layout = new QGridLayout(iconSizeGroup);
     layout->addWidget(defaultLabel, 0, 0, Qt::AlignRight);


@@ -114,29 +88,73 @@ ViewSettingsTab::ViewSettingsTab(Mode mode, QWidget* parent) :
     textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
     textGroupLayout->addWidget(m_fontRequester, 0, 1);
 
     textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight);
     textGroupLayout->addWidget(m_fontRequester, 0, 1);
 

-    if (m_mode == IconsMode) {
-        QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup);
-        m_textWidthBox = new KComboBox(textGroup);
-        m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
-        m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
-        m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
-        m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
-
-        textGroupLayout->addWidget(textWidthLabel, 2, 0, Qt::AlignRight);
-        textGroupLayout->addWidget(m_textWidthBox, 2, 1);
+    switch (m_mode) {
+    case IconsMode: {
+        QLabel* widthLabel = new QLabel(i18nc("@label:listbox", "Width:"), textGroup);
+        m_widthBox = new KComboBox(textGroup);
+        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Small"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Medium"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Large"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Text width", "Huge"));
+
+        QLabel* maxLinesLabel = new QLabel(i18nc("@label:listbox", "Maximum lines:"), textGroup);
+        m_maxLinesBox = new KComboBox(textGroup);
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "Unlimited"));
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "1"));
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "2"));
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "3"));
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "4"));
+        m_maxLinesBox->addItem(i18nc("@item:inlistbox Maximum lines", "5"));
+
+        textGroupLayout->addWidget(widthLabel, 2, 0, Qt::AlignRight);
+        textGroupLayout->addWidget(m_widthBox, 2, 1);
+        textGroupLayout->addWidget(maxLinesLabel, 3, 0, Qt::AlignRight);
+        textGroupLayout->addWidget(m_maxLinesBox, 3, 1);
+        break;
+    }
+    case CompactMode: {
+        QLabel* maxWidthLabel = new QLabel(i18nc("@label:listbox", "Maximum width:"), textGroup);
+        m_widthBox = new KComboBox(textGroup);
+        m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Unlimited"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Small"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Medium"));
+        m_widthBox->addItem(i18nc("@item:inlistbox Maximum width", "Large"));
+
+        textGroupLayout->addWidget(maxWidthLabel, 2, 0, Qt::AlignRight);
+        textGroupLayout->addWidget(m_widthBox, 2, 1);
+        break;
+    }
+    case DetailsMode:
+        m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this);
+        break;
+    default:
+        break;

     }
 
     topLayout->addWidget(iconSizeGroup);
     topLayout->addWidget(textGroup);
     }
 
     topLayout->addWidget(iconSizeGroup);
     topLayout->addWidget(textGroup);

+    topLayout->addWidget(m_expandableFolders);

     topLayout->addStretch(1);
 
     loadSettings();
 
     topLayout->addStretch(1);
 
     loadSettings();
 

-    connect(m_defaultSizeSlider, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_previewSizeSlider, SIGNAL(valueChanged(int)), this, SIGNAL(changed()));
-    connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed()));
-    if (m_mode == IconsMode) {
-        connect(m_textWidthBox, SIGNAL(currentIndexChanged(int)), this, SIGNAL(changed()));
+    connect(m_defaultSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
+    connect(m_previewSizeSlider, &QSlider::valueChanged, this, &ViewSettingsTab::changed);
+    connect(m_fontRequester, &DolphinFontRequester::changed, this, &ViewSettingsTab::changed);
+
+    switch (m_mode) {
+    case IconsMode:
+        connect(m_widthBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        connect(m_maxLinesBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        break;
+    case CompactMode:
+        connect(m_widthBox, static_cast<void(KComboBox::*)(int)>(&KComboBox::currentIndexChanged), this, &ViewSettingsTab::changed);
+        break;
+    case DetailsMode:
+        connect(m_expandableFolders, &QCheckBox::toggled, this, &ViewSettingsTab::changed);
+        break;
+    default:
+        break;

     }
 }
 
     }
 }
 


@@ -146,26 +164,38 @@ ViewSettingsTab::~ViewSettingsTab()
 
 void ViewSettingsTab::applySettings()
 {
 
 void ViewSettingsTab::applySettings()
 {

-    const int defaultSize = m_defaultSizeSlider->value();
-    const int previewSize = m_previewSizeSlider->value();

     const QFont font = m_fontRequester->currentFont();
     const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont);
 
     switch (m_mode) {
     case IconsMode:
     const QFont font = m_fontRequester->currentFont();
     const bool useSystemFont = (m_fontRequester->mode() == DolphinFontRequester::SystemFont);
 
     switch (m_mode) {
     case IconsMode:

-        IconsModeSettings::setTextWidthIndex(m_textWidthBox->currentIndex());
-        apply<IconsModeSettings>(defaultSize, previewSize, font, useSystemFont);
+        IconsModeSettings::setTextWidthIndex(m_widthBox->currentIndex());
+        IconsModeSettings::setMaximumTextLines(m_maxLinesBox->currentIndex());

         break;
     case CompactMode:
         break;
     case CompactMode:

-        apply<CompactModeSettings>(defaultSize, previewSize, font, useSystemFont);
+        CompactModeSettings::setMaximumTextWidthIndex(m_widthBox->currentIndex());

         break;
     case DetailsMode:
         break;
     case DetailsMode:

-        apply<DetailsModeSettings>(defaultSize, previewSize, font, useSystemFont);
+        DetailsModeSettings::setExpandableFolders(m_expandableFolders->isChecked());

         break;
     default:
         break;
     default:

-        Q_ASSERT(false);

         break;
     }
         break;
     }

+
+    ViewModeSettings settings(viewMode());
+
+    const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_defaultSizeSlider->value());
+    const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_previewSizeSlider->value());
+    settings.setIconSize(iconSize);
+    settings.setPreviewSize(previewSize);
+
+    settings.setUseSystemFont(useSystemFont);
+    settings.setFontFamily(font.family());
+    settings.setFontSize(font.pointSizeF());
+    settings.setItalicFont(font.italic());
+    settings.setFontWeight(font.weight());
+
+    settings.writeConfig();

 }
 
 void ViewSettingsTab::restoreDefaultSettings()
 }
 
 void ViewSettingsTab::restoreDefaultSettings()


@@ -185,31 +215,78 @@ void ViewSettingsTab::restoreDefaultSettings()
 
 void ViewSettingsTab::loadSettings()
 {
 
 void ViewSettingsTab::loadSettings()
 {

-    int iconSizeValue = 0;
-    int previewSizeValue = 0;
-    QFont font;
-    bool useSystemFont = false;
-

     switch (m_mode) {
     case IconsMode:
     switch (m_mode) {
     case IconsMode:

-        m_textWidthBox->setCurrentIndex(IconsModeSettings::textWidthIndex());
-        load<IconsModeSettings>(&iconSizeValue, &previewSizeValue, &font, &useSystemFont);
+        m_widthBox->setCurrentIndex(IconsModeSettings::textWidthIndex());
+        m_maxLinesBox->setCurrentIndex(IconsModeSettings::maximumTextLines());

         break;
     case CompactMode:
         break;
     case CompactMode:

-        load<CompactModeSettings>(&iconSizeValue, &previewSizeValue, &font, &useSystemFont);
+        m_widthBox->setCurrentIndex(CompactModeSettings::maximumTextWidthIndex());

         break;
     case DetailsMode:
         break;
     case DetailsMode:

-        load<DetailsModeSettings>(&iconSizeValue, &previewSizeValue, &font, &useSystemFont);
+        m_expandableFolders->setChecked(DetailsModeSettings::expandableFolders());

         break;
     default:
         break;
     default:

-        Q_ASSERT(false);

         break;
     }
 
         break;
     }
 

-    m_defaultSizeSlider->setValue(iconSizeValue);
-    m_previewSizeSlider->setValue(previewSizeValue);
-    m_fontRequester->setMode(useSystemFont ? DolphinFontRequester::SystemFont : DolphinFontRequester::CustomFont);
+    ViewModeSettings settings(viewMode());
+    settings.readConfig();
+
+    const QSize iconSize(settings.iconSize(), settings.iconSize());
+    m_defaultSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(iconSize));
+
+    const QSize previewSize(settings.previewSize(), settings.previewSize());
+    m_previewSizeSlider->setValue(ZoomLevelInfo::zoomLevelForIconSize(previewSize));
+
+    m_fontRequester->setMode(settings.useSystemFont()
+                             ? DolphinFontRequester::SystemFont
+                             : DolphinFontRequester::CustomFont);
+
+    QFont font(settings.fontFamily(), qRound(settings.fontSize()));
+    font.setItalic(settings.italicFont());
+    font.setWeight(settings.fontWeight());
+    font.setPointSizeF(settings.fontSize());

     m_fontRequester->setCustomFont(font);
 }
 
     m_fontRequester->setCustomFont(font);
 }
 

-#include "viewsettingstab.moc"
+ViewModeSettings::ViewMode ViewSettingsTab::viewMode() const
+{
+    ViewModeSettings::ViewMode mode;
+
+    switch (m_mode) {
+    case ViewSettingsTab::IconsMode:   mode = ViewModeSettings::IconsMode; break;
+    case ViewSettingsTab::CompactMode: mode = ViewModeSettings::CompactMode; break;
+    case ViewSettingsTab::DetailsMode: mode = ViewModeSettings::DetailsMode; break;
+    default:                           mode = ViewModeSettings::IconsMode;
+                                       Q_ASSERT(false);
+                                       break;
+    }
+
+    return mode;
+}
+
+
+void ViewSettingsTab::slotDefaultSliderMoved(int value)
+{
+    showToolTip(m_defaultSizeSlider, value);
+}
+
+void ViewSettingsTab::slotPreviewSliderMoved(int value)
+{
+    showToolTip(m_previewSizeSlider, value);
+}
+
+void ViewSettingsTab::showToolTip(QSlider* slider, int value)
+{
+    const int size = ZoomLevelInfo::iconSizeForZoomLevel(value);
+    slider->setToolTip(i18ncp("@info:tooltip", "Size: 1 pixel", "Size: %1 pixels", size));
+    if (!slider->isVisible()) {
+        return;
+    }
+    QPoint global = slider->rect().topLeft();
+    global.ry() += slider->height() / 2;
+    QHelpEvent toolTipEvent(QEvent::ToolTip, QPoint(0, 0), slider->mapToGlobal(global));
+    QApplication::sendEvent(slider, &toolTipEvent);
+}
+