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 aabf21c90c85eed2f3d27c2b6db7a2ab2b04c77e..49536dcc7b48cd85d20b2bd4a7430ab36147007c 100644 (file)
--- a/src/settings/viewpropertiesdialog.h
+++ b/src/settings/viewpropertiesdialog.h
@@ -1,22 +1,9 @@
-/***************************************************************************
- *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *
- *   Copyright (C) 2018 by Elvis Angelaccio <elvis.angelaccio@kde.org>     *
- *                                                                         *
- *   This program is free software; you can redistribute it and/or modify  *
- *   it under the terms of the GNU General Public License as published by  *
- *   the Free Software Foundation; either version 2 of the License, or     *
- *   (at your option) any later version.                                   *
- *                                                                         *
- *   This program is distributed in the hope that it will be useful,       *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with this program; if not, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
- ***************************************************************************/
+/*
+ * SPDX-FileCopyrightText: 2006 Peter Penz <peter.penz@gmx.at>
+ * SPDX-FileCopyrightText: 2018 Elvis Angelaccio <elvis.angelaccio@kde.org>
+ *
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
 
 #ifndef VIEWPROPERTIESDIALOG_H
 #define VIEWPROPERTIESDIALOG_H
@@ -46,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:
@@ -73,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