forwardport r757231

[dolphin.git] / src / detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 23c0d9dcfd82e7c9adad6c664629428c7f017deb..ea45c9688b4429b38bac4d6a5f5ce48b95883fae 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -26,23 +26,19 @@
 #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) :
     KVBox(parent),
     m_mainWindow(mainWindow),
-    m_dateBox(0),
-    m_permissionsBox(0),
-    m_ownerBox(0),
-    m_groupBox(0),
     m_smallIconSize(0),
     m_mediumIconSize(0),
     m_largeIconSize(0),
@@ -55,55 +51,13 @@ 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);
-    m_typeBox->setChecked(settings->showType());
-
-    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);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
     iconSizeBox->setSizePolicy(sizePolicy);
 
-    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);
-    }
+    m_smallIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Small"), this);
+    m_mediumIconSize = new QRadioButton(i18nc("@option:radio Icon Size", "Medium"), this);
+    m_largeIconSize  = new QRadioButton(i18nc("@option:radio Icon Size", "Large"), this);
 
     QButtonGroup* iconSizeGroup = new QButtonGroup(this);
     iconSizeGroup->addButton(m_smallIconSize);
@@ -116,16 +70,11 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     iconSizeLayout->addWidget(m_largeIconSize);
 
     // create "Text" properties
-    QGroupBox* textBox = new QGroupBox(i18n("Text"), this);
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
     textBox->setSizePolicy(sizePolicy);
 
-    QLabel* fontLabel = new QLabel(i18n("Font:"), textBox);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "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);
@@ -135,6 +84,8 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);
+
+    loadSettings();
 }
 
 DetailsViewSettingsPage::~DetailsViewSettingsPage()
@@ -144,19 +95,12 @@ 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;
+    int iconSize = KIconLoader::SizeSmall;
     if (m_mediumIconSize->isChecked()) {
-        iconSize = K3Icon::SizeMedium;
+        iconSize = KIconLoader::SizeMedium;
     } else if (m_largeIconSize->isChecked()) {
-        iconSize = K3Icon::SizeLarge;
+        iconSize = KIconLoader::SizeLarge;
     }
     settings->setIconSize(iconSize);
 
@@ -167,4 +111,36 @@ 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();
+
+    switch (settings->iconSize()) {
+    case KIconLoader::SizeLarge:
+        m_largeIconSize->setChecked(true);
+        break;
+
+    case KIconLoader::SizeMedium:
+        m_mediumIconSize->setChecked(true);
+        break;
+
+    case KIconLoader::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"