Merge branch 'ivan/dolphin-activities'

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

diff --git a/src/settings/viewmodes/viewsettingstab.h b/src/settings/viewmodes/viewsettingstab.h
index 1561df6c9e35a1057206692d6fe31dcc2782fb00..6bea95b903c3a921b310e829ff7dab4ef9562357 100644 (file)
--- a/src/settings/viewmodes/viewsettingstab.h
+++ b/src/settings/viewmodes/viewsettingstab.h
@@ -21,9 +21,11 @@
 #define VIEWSETTINGSTAB_H
 
 #include <QWidget>
+#include <settings/viewmodes/viewmodesettings.h>
 
 class DolphinFontRequester;
 class KComboBox;
+class QCheckBox;
 class QSlider;
 
 /**
@@ -50,8 +52,15 @@ public:
 signals:
     void changed();
 
+private slots:
+
+    void slotDefaultSliderMoved(int value);
+    void slotPreviewSliderMoved(int value);
 private:
     void loadSettings();
+    void showToolTip(QSlider* slider, int value);
+
+    ViewModeSettings::ViewMode viewMode() const;
 
 private:
     Mode m_mode;
@@ -59,7 +68,9 @@ private:
     QSlider* m_previewSizeSlider;
 
     DolphinFontRequester* m_fontRequester;
-    KComboBox* m_textWidthBox;
+    KComboBox* m_widthBox;
+    KComboBox* m_maxLinesBox;
+    QCheckBox* m_expandableFolders;
 };
 
 #endif