Merge remote-tracking branch 'fork/work/zakharafoniam/useful-groups'

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

diff --git a/src/settings/viewpropertiesdialog.h b/src/settings/viewpropertiesdialog.h
index b03d3c75ad360c352ce0df070bc0557af541045a..49536dcc7b48cd85d20b2bd4a7430ab36147007c 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -33,25 +33,28 @@ class DOLPHIN_EXPORT ViewPropertiesDialog : public QDialog
     Q_OBJECT
 
 public:
-    explicit ViewPropertiesDialog(DolphinView* dolphinView);
+    explicit ViewPropertiesDialog(DolphinView *dolphinView);
     ~ViewPropertiesDialog() override;
 
-public slots:
+public Q_SLOTS:
     void accept() override;
 
-private slots:
+private Q_SLOTS:
     void slotApply();
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
+    void slotGroupingChanged(int index);
+    void slotGroupOrderChanged(int index);
     void slotGroupedSortingChanged();
     void slotSortFoldersFirstChanged();
+    void slotSortHiddenLastChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
     void slotItemChanged(QListWidgetItem *item);
     void markAsDirty(bool isDirty);
 
-signals:
+Q_SIGNALS:
     void isDirtyChanged(bool isDirty);
 
 private:
@@ -60,21 +63,24 @@ private:
 
 private:
     bool m_isDirty;
-    DolphinView* m_dolphinView;
-    ViewProperties* m_viewProps;
+    DolphinView *m_dolphinView;
+    ViewProperties *m_viewProps;
 
-    QComboBox* m_viewMode;
-    QComboBox* m_sortOrder;
-    QComboBox* m_sorting;
-    QCheckBox* m_sortFoldersFirst;
-    QCheckBox* m_previewsShown;
-    QCheckBox* m_showInGroups;
-    QCheckBox* m_showHiddenFiles;
-    QRadioButton* m_applyToCurrentFolder;
-    QRadioButton* m_applyToSubFolders;
-    QRadioButton* m_applyToAllFolders;
-    QCheckBox* m_useAsDefault;
-    QListWidget* m_listWidget;
+    QComboBox *m_viewMode;
+    QComboBox *m_sortOrder;
+    QComboBox *m_sorting;
+    QComboBox *m_groupOrder;
+    QComboBox *m_grouping;
+    QCheckBox *m_sortFoldersFirst;
+    QCheckBox *m_sortHiddenLast;
+    QCheckBox *m_previewsShown;
+    QCheckBox *m_showInGroups;
+    QCheckBox *m_showHiddenFiles;
+    QRadioButton *m_applyToCurrentFolder;
+    QRadioButton *m_applyToSubFolders;
+    QRadioButton *m_applyToAllFolders;
+    QCheckBox *m_useAsDefault;
+    QListWidget *m_listWidget;
 };
 
 #endif