Correct searchbox, split view transitions between tabs

[dolphin.git] / src / settings / viewpropertiesdialog.h

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index d2170f33181978ee4a32debc888dff2ad9598386..5490be85bfa555d4d1cb42df77d8b0ac29d35c66 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -21,9 +21,9 @@
 #ifndef VIEWPROPERTIESDIALOG_H
 #define VIEWPROPERTIESDIALOG_H
 
-#include "libdolphin_export.h"
+#include "dolphin_export.h"
 
-#include <KDialog>
+#include <QDialog>
 
 class QCheckBox;
 class KComboBox;
@@ -39,7 +39,7 @@ class DolphinView;
  * and previews should be shown. The properties can be assigned to the current folder,
  * or recursively to all sub folders.
  */
-class LIBDOLPHINPRIVATE_EXPORT ViewPropertiesDialog : public KDialog
+class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog
 {
     Q_OBJECT
 
@@ -47,19 +47,24 @@ public:
     explicit ViewPropertiesDialog(DolphinView* dolphinView);
     virtual ~ViewPropertiesDialog();
 
+public slots:
+    void accept() Q_DECL_OVERRIDE;
+
 private slots:
-    void slotOk();
     void slotApply();
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
-    void slotCategorizedSortingChanged();
+    void slotGroupedSortingChanged();
     void slotSortFoldersFirstChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
     void markAsDirty(bool isDirty);
     void configureAdditionalInfo();
 
+signals:
+    void isDirtyChanged(bool isDirty);
+
 private:
     void applyViewProperties();
     void loadSettings();
@@ -73,7 +78,7 @@ private:
     KComboBox* m_sortOrder;
     KComboBox* m_sorting;
     QCheckBox* m_sortFoldersFirst;
-    QCheckBox* m_showPreview;
+    QCheckBox* m_previewsShown;
     QCheckBox* m_showInGroups;
     QCheckBox* m_showHiddenFiles;
     QPushButton* m_additionalInfo;