X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/df8f2e3646017bf6ba99bb18ef0df7defaf2eb10..bd925ea49a7e4e7c6e652f4529dcd0c4e25fd19a:/src/detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 33ae82d3e..8838ee7ec 100644
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -23,30 +23,27 @@
 #include "dolphin_detailsmodesettings.h"
 
 #include <kdialog.h>
-#include <kfontrequester.h>
+#include <dolphinfontrequester.h>
 #include <klocale.h>
 
-#include <QtGui/QButtonGroup>
-#include <QtGui/QCheckBox>
-#include <QtGui/QComboBox>
-#include <QtGui/QGroupBox>
-#include <QtGui/QGridLayout>
-#include <QtGui/QLabel>
-#include <QtGui/QRadioButton>
+#include <QButtonGroup>
+#include <QCheckBox>
+#include <QComboBox>
+#include <QGroupBox>
+#include <QGridLayout>
+#include <QLabel>
+#include <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),
-    m_fontRequester(0)
+    m_fontRequester(0),
+    m_expandableFolders(0)
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
@@ -55,30 +52,13 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
-    // create "Columns" properties
-    QGroupBox* columnsBox = new QGroupBox(i18n("Columns"), this);
-    columnsBox->setSizePolicy(sizePolicy);
-
-    m_dateBox = new QCheckBox(i18n("Date"), this);
-    m_permissionsBox = new QCheckBox(i18n("Permissions"), this);
-    m_ownerBox = new QCheckBox(i18n("Owner"), this);
-    m_groupBox = new QCheckBox(i18n("Group"), this);
-    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);
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
     iconSizeBox->setSizePolicy(sizePolicy);
 
-    m_smallIconSize  = new QRadioButton(i18nc("Size", "Small"), this);
-    m_mediumIconSize = new QRadioButton(i18nc("Size", "Medium"), this);
-    m_largeIconSize  = new QRadioButton(i18nc("Size", "Large"), this);
+    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);
@@ -91,16 +71,19 @@ 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);
-    m_fontRequester = new KFontRequester(textBox);
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
+    m_fontRequester = new DolphinFontRequester(textBox);
 
     QHBoxLayout* textLayout = new QHBoxLayout(textBox);
     textLayout->addWidget(fontLabel);
     textLayout->addWidget(m_fontRequester);
 
+    // create "Expandable Folders" checkbox
+    m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable Folders"), this);
+
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
@@ -117,25 +100,22 @@ void DetailsViewSettingsPage::applySettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 
-    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);
 
     const QFont font = m_fontRequester->font();
+    settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont);
     settings->setFontFamily(font.family());
     settings->setFontSize(font.pointSize());
     settings->setItalicFont(font.italic());
-    settings->setBoldFont(font.bold());
+    settings->setFontWeight(font.weight());
+
+    settings->setExpandableFolders(m_expandableFolders->isChecked());
 }
 
 void DetailsViewSettingsPage::restoreDefaults()
@@ -149,31 +129,32 @@ 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:
+    case KIconLoader::SizeLarge:
         m_largeIconSize->setChecked(true);
         break;
 
-    case K3Icon::SizeMedium:
+    case KIconLoader::SizeMedium:
         m_mediumIconSize->setChecked(true);
         break;
 
-    case K3Icon::SizeSmall:
+    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);
+    if (settings->useSystemFont()) {
+        m_fontRequester->setMode(DolphinFontRequester::SystemFont);
+    } else {
+        QFont font(settings->fontFamily(),
+                   settings->fontSize());
+        font.setItalic(settings->italicFont());
+        font.setWeight(settings->fontWeight());
+        m_fontRequester->setMode(DolphinFontRequester::CustomFont);
+        m_fontRequester->setCustomFont(font);
+    }
+
+    m_expandableFolders->setChecked(settings->expandableFolders());
 }
 
 #include "detailsviewsettingspage.moc"