Let the user chose whether view properties should be remembered for each directory or whether they should be valid globally. Per default the view properties are remembered for each directory. For testing purposes the MIME type information is shown per default in the icons mode (thanks to Fredrik for the cool implementation in KFileItemDelegate!).

svn path=/trunk/playground/utils/dolphin/; revision=615232

1 files changed, 14 insertions, 6 deletions

diff --git a/src/viewsettingspage.cpp b/src/viewsettingspage.cpp
index a052d84f6..837aed835 100644
--- a/src/viewsettingspage.cpp
+++ b/src/viewsettingspage.cpp
@@ -19,19 +19,22 @@
  ***************************************************************************/
 
 #include "viewsettingspage.h"
-#include <qtabwidget.h>
-#include <qlayout.h>
-#include <qlabel.h>
-//Added by qt3to4:
+#include "generalviewsettingspage.h"
+#include "iconsviewsettingspage.h"
+#include "detailsviewsettingspage.h"
+
 #include <Q3VBoxLayout>
+#include <QTabWidget>
+#include <QLayout>
+#include <QLabel>
+
 #include <kdialog.h>
 #include <klocale.h>
 #include <kiconloader.h>
-#include "iconsviewsettingspage.h"
-#include "detailsviewsettingspage.h"
 
 ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
     SettingsPageBase(parent),
+    m_generalPage(0),
     m_iconsPage(0),
     m_detailsPage(0)
 {
@@ -39,6 +42,10 @@ ViewSettingsPage::ViewSettingsPage(QWidget *parent) :
 
     QTabWidget* tabWidget = new QTabWidget(this);
 
+    // initialize 'General' tab
+    m_generalPage = new GeneralViewSettingsPage(tabWidget);
+    tabWidget->addTab(m_generalPage, SmallIcon("view_choose"), i18n("General"));
+
     // initialize 'Icons' tab
     m_iconsPage = new IconsViewSettingsPage(tabWidget);
     tabWidget->addTab(m_iconsPage, SmallIcon("view_icon"), i18n("Icons"));
@@ -56,6 +63,7 @@ ViewSettingsPage::~ViewSettingsPage()
 
 void ViewSettingsPage::applySettings()
 {
+    m_generalPage->applySettings();
     m_iconsPage->applySettings();
     m_detailsPage->applySettings();
 }