forwardport r757231

[dolphin.git] / src / viewpropertiesdialog.h

diff --git a/src/viewpropertiesdialog.h b/src/viewpropertiesdialog.h
index 6cbae0fe7ccd3cf6e4088d7ae49d5197ffd1afb9..a0a933f557123b27374483d8826273ec33bd5e66 100644 (file)
--- a/src/viewpropertiesdialog.h
+++ b/src/viewpropertiesdialog.h
@@ -15,8 +15,9 @@
  *   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.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
+
 #ifndef VIEWPROPERTIESDIALOG_H
 #define VIEWPROPERTIESDIALOG_H
 
@@ -24,6 +25,7 @@
 
 class QCheckBox;
 class QComboBox;
+class QPushButton;
 class QRadioButton;
 class ViewProperties;
 class DolphinView;
@@ -31,16 +33,16 @@ class DolphinView;
 /**
  * @brief Dialog for changing the current view properties of a directory.
  *
- * It is possible to specify the view mode and whether hidden files
- * should be shown. The properties can be assigned to the current folder,
- * recursively to all sub folders or to all folders.
+ * It is possible to specify the view mode, the sorting order, whether hidden files
+ * and previews should be shown. The properties can be assigned to the current folder,
+ * or recursively to all sub folders.
  */
 class ViewPropertiesDialog : public KDialog
 {
     Q_OBJECT
 
 public:
-    ViewPropertiesDialog(DolphinView* dolphinView);
+    explicit ViewPropertiesDialog(DolphinView* dolphinView);
     virtual ~ViewPropertiesDialog();
 
 private slots:
@@ -49,9 +51,15 @@ private slots:
     void slotViewModeChanged(int index);
     void slotSortingChanged(int index);
     void slotSortOrderChanged(int index);
+    void slotCategorizedSortingChanged();
     void slotShowPreviewChanged();
     void slotShowHiddenFilesChanged();
     void markAsDirty();
+    void configureAdditionalInfo();
+
+private:
+    void applyViewProperties();
+    void loadSettings();
 
 private:
     bool m_isDirty;
@@ -59,14 +67,16 @@ private:
     ViewProperties* m_viewProps;
 
     QComboBox* m_viewMode;
-    QComboBox* m_sorting;
     QComboBox* m_sortOrder;
+    QComboBox* m_sorting;
     QCheckBox* m_showPreview;
+    QCheckBox* m_showInGroups;
     QCheckBox* m_showHiddenFiles;
-    QCheckBox* m_applyToSubFolders;
+    QPushButton* m_additionalInfo;
+    QRadioButton* m_applyToCurrentFolder;
+    QRadioButton* m_applyToSubFolders;
+    QRadioButton* m_applyToAllFolders;
     QCheckBox* m_useAsDefault;
-
-    void applyViewProperties();
 };
 
 #endif