Make use of the error messages coming from the places model.

[dolphin.git] / src / detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 9a9d550936062ad70b4c593cd05757101303097c..c84c8b61aa87fb32ba73b750adefb21c8437cd74 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -26,14 +26,14 @@
 #include <kfontrequester.h>
 #include <klocale.h>
 
-#include <QButtonGroup>
-#include <QCheckBox>
-#include <QComboBox>
-#include <QGroupBox>
-#include <QGridLayout>
-#include <QLabel>
-#include <QRadioButton>
-#include <QSpinBox>
+#include <QtGui/QButtonGroup>
+#include <QtGui/QCheckBox>
+#include <QtGui/QComboBox>
+#include <QtGui/QGroupBox>
+#include <QtGui/QGridLayout>
+#include <QtGui/QLabel>
+#include <QtGui/QRadioButton>
+#include <QtGui/QSpinBox>
 
 DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
                                                  QWidget* parent) :
@@ -55,30 +55,22 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    Q_ASSERT(settings != 0);
-
     // create "Columns" properties
     QGroupBox* columnsBox = new QGroupBox(i18n("Columns"), this);
     columnsBox->setSizePolicy(sizePolicy);
 
     m_dateBox = new QCheckBox(i18n("Date"), this);
-    m_dateBox->setChecked(settings->showDate());
-
     m_permissionsBox = new QCheckBox(i18n("Permissions"), this);
-    m_permissionsBox->setChecked(settings->showPermissions());
-
     m_ownerBox = new QCheckBox(i18n("Owner"), this);
-    m_ownerBox->setChecked(settings->showOwner());
-
     m_groupBox = new QCheckBox(i18n("Group"), this);
-    m_groupBox->setChecked(settings->showGroup());
+    m_typeBox = new QCheckBox(i18n("Type"), this);
 
     QHBoxLayout* columnsLayout = new QHBoxLayout(columnsBox);
     columnsLayout->addWidget(m_dateBox);
     columnsLayout->addWidget(m_permissionsBox);
     columnsLayout->addWidget(m_ownerBox);
     columnsLayout->addWidget(m_groupBox);
+    columnsLayout->addWidget(m_typeBox);
 
     // Create "Icon" properties
     QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
@@ -87,19 +79,6 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     m_smallIconSize  = new QRadioButton(i18n("Small"), this);
     m_mediumIconSize = new QRadioButton(i18n("Medium"), this);
     m_largeIconSize  = new QRadioButton(i18n("Large"), this);
-    switch (settings->iconSize()) {
-        case K3Icon::SizeLarge:
-            m_largeIconSize->setChecked(true);
-            break;
-
-        case K3Icon::SizeMedium:
-            m_mediumIconSize->setChecked(true);
-            break;
-
-        case K3Icon::SizeSmall:
-        default:
-            m_smallIconSize->setChecked(true);
-    }
 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);
@@ -117,11 +96,6 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
 
     QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
     m_fontRequester = new KFontRequester(textBox);
-    QFont font(settings->fontFamily(),
-               settings->fontSize());
-    font.setItalic(settings->italicFont());
-    font.setBold(settings->boldFont());
-    m_fontRequester->setFont(font);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);
     textLayout->addWidget(fontLabel);
@@ -131,6 +105,8 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);
+
+    loadSettings();
 }
 
 DetailsViewSettingsPage::~DetailsViewSettingsPage()
@@ -140,18 +116,17 @@ DetailsViewSettingsPage::~DetailsViewSettingsPage()
 void DetailsViewSettingsPage::applySettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    Q_ASSERT(settings != 0);
 
     settings->setShowDate(m_dateBox->isChecked());
     settings->setShowPermissions(m_permissionsBox->isChecked());
     settings->setShowOwner(m_ownerBox->isChecked());
     settings->setShowGroup(m_groupBox->isChecked());
+    settings->setShowType(m_typeBox->isChecked());
 
     int iconSize = K3Icon::SizeSmall;
     if (m_mediumIconSize->isChecked()) {
         iconSize = K3Icon::SizeMedium;
-    }
-    else if (m_largeIconSize->isChecked()) {
+    } else if (m_largeIconSize->isChecked()) {
         iconSize = K3Icon::SizeLarge;
     }
     settings->setIconSize(iconSize);
@@ -163,4 +138,42 @@ void DetailsViewSettingsPage::applySettings()
     settings->setBoldFont(font.bold());
 }
 
+void DetailsViewSettingsPage::restoreDefaults()
+{
+    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+    settings->setDefaults();
+    loadSettings();
+}
+
+void DetailsViewSettingsPage::loadSettings()
+{
+    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
+
+    m_dateBox->setChecked(settings->showDate());
+    m_permissionsBox->setChecked(settings->showPermissions());
+    m_ownerBox->setChecked(settings->showOwner());
+    m_groupBox->setChecked(settings->showGroup());
+    m_typeBox->setChecked(settings->showType());
+
+    switch (settings->iconSize()) {
+    case K3Icon::SizeLarge:
+        m_largeIconSize->setChecked(true);
+        break;
+
+    case K3Icon::SizeMedium:
+        m_mediumIconSize->setChecked(true);
+        break;
+
+    case K3Icon::SizeSmall:
+    default:
+        m_smallIconSize->setChecked(true);
+    }
+
+    QFont font(settings->fontFamily(),
+               settings->fontSize());
+    font.setItalic(settings->italicFont());
+    font.setBold(settings->boldFont());
+    m_fontRequester->setFont(font);
+}
+
 #include "detailsviewsettingspage.moc"