Fix a couple of crashes. First was to avoid problem caused by KIconLoader::global...

[dolphin.git] / src / columnviewsettingspage.cpp

diff --git a/src/columnviewsettingspage.cpp b/src/columnviewsettingspage.cpp
index 5d9ee34f7936fe34ec2b878fb40af2fd4dec821c..25150b212eaa0501748e0a31273bf5254e921f12 100644 (file)
--- a/src/columnviewsettingspage.cpp
+++ b/src/columnviewsettingspage.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>
 
 ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
                                                QWidget* parent) :
@@ -51,29 +51,13 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
-
-    // Create "Icon" properties
-    QGroupBox* iconSizeBox = new QGroupBox(i18n("Icon Size"), this);
+    // Create 'Icon' properties
+    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);
@@ -86,16 +70,11 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(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);
@@ -105,6 +84,8 @@ ColumnViewSettingsPage::ColumnViewSettingsPage(DolphinMainWindow* mainWindow,
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);
+
+    loadSettings();
 }
 
 ColumnViewSettingsPage::~ColumnViewSettingsPage()
@@ -114,13 +95,11 @@ ColumnViewSettingsPage::~ColumnViewSettingsPage()
 void ColumnViewSettingsPage::applySettings()
 {
     ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
-    Q_ASSERT(settings != 0);
 
     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);
@@ -132,4 +111,36 @@ void ColumnViewSettingsPage::applySettings()
     settings->setBoldFont(font.bold());
 }
 
+void ColumnViewSettingsPage::restoreDefaults()
+{
+    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+    settings->setDefaults();
+    loadSettings();
+}
+
+void ColumnViewSettingsPage::loadSettings()
+{
+    ColumnModeSettings* settings = DolphinSettings::instance().columnModeSettings();
+
+    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 "columnviewsettingspage.moc"