Hide the "Sort by Rating" and "Sort by Tags" menu entries for KDE 4.0, as currently...

[dolphin.git] / src / detailsviewsettingspage.cpp

diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp
index 7b0265d26f3c6daa8f83d49bc7488b314fcbda94..ea45c9688b4429b38bac4d6a5f5ce48b95883fae 100644 (file)
--- a/src/detailsviewsettingspage.cpp
+++ b/src/detailsviewsettingspage.cpp
@@ -1,6 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2006 by Peter Penz                                      *
- *   peter.penz@gmx.at                                                     *
+ *   Copyright (C) 2006 by Peter Penz <peter.penz@gmx.at>                  *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -19,35 +18,31 @@
  ***************************************************************************/
 
 #include "detailsviewsettingspage.h"
  ***************************************************************************/
 
 #include "detailsviewsettingspage.h"

-#include <qcheckbox.h>
-#include <klocale.h>
-#include <kdialog.h>
-#include <qfontcombobox.h>
-#include <qspinbox.h>
-#include <qlabel.h>
-#include <q3grid.h>
-#include <assert.h>
-#include <q3buttongroup.h>
-#include <qradiobutton.h>
-#include <qcombobox.h>
-#include <q3groupbox.h>
-#include <q3groupbox.h>
-#include <kvbox.h>
+

 #include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"
 #include "dolphinsettings.h"
 #include "dolphin_detailsmodesettings.h"

-#include "dolphindetailsview.h"
+
+#include <kdialog.h>
+#include <kfontrequester.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 <QtGui/QSpinBox>

 
 DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
                                                  QWidget* parent) :
     KVBox(parent),
     m_mainWindow(mainWindow),
 
 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_smallIconSize(0),
     m_mediumIconSize(0),

-    m_largeIconSize(0)
+    m_largeIconSize(0),
+    m_fontRequester(0)

 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();
 {
     const int spacing = KDialog::spacingHint();
     const int margin = KDialog::marginHint();


@@ -56,73 +51,42 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow,
     setSpacing(spacing);
     setMargin(margin);
 
     setSpacing(spacing);
     setMargin(margin);
 

-    DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
-    assert(settings != 0);
-
-    // create "Columns" properties
-    Q3GroupBox* columnsGroup = new Q3GroupBox(4, Qt::Vertical, i18n("Columns"), this);
-    columnsGroup->setSizePolicy(sizePolicy);
-    columnsGroup->setMargin(margin);
-
-    KHBox* visibleColumnsLayout = new KHBox(columnsGroup);
-    m_dateBox = new QCheckBox(i18n("Date"), visibleColumnsLayout);
-    m_dateBox->setChecked(settings->showDate());
-
-    m_permissionsBox = new QCheckBox(i18n("Permissions"), visibleColumnsLayout);
-    m_permissionsBox->setChecked(settings->showPermissions());
-
-    m_ownerBox = new QCheckBox(i18n("Owner"), visibleColumnsLayout);
-    m_ownerBox->setChecked(settings->showOwner());
-
-    m_groupBox = new QCheckBox(i18n("Group"), visibleColumnsLayout);
-    m_groupBox->setChecked(settings->showGroup());
-

     // Create "Icon" properties
     // Create "Icon" properties

-    Q3ButtonGroup* iconSizeGroup = new Q3ButtonGroup(3, Qt::Horizontal, i18n("Icon Size"), this);
-    iconSizeGroup->setSizePolicy(sizePolicy);
-    iconSizeGroup->setMargin(margin);
-    m_smallIconSize  = new QRadioButton(i18n("Small"), iconSizeGroup);
-    m_mediumIconSize = new QRadioButton(i18n("Medium"), iconSizeGroup);
-    m_largeIconSize  = new QRadioButton(i18n("Large"), iconSizeGroup);
-    switch (settings->iconSize()) {
-        case K3Icon::SizeLarge:
-            m_largeIconSize->setChecked(true);
-            break;
+    QGroupBox* iconSizeBox = new QGroupBox(i18nc("@title:group", "Icon Size"), this);
+    iconSizeBox->setSizePolicy(sizePolicy);

 
 

-        case K3Icon::SizeMedium:
-            m_mediumIconSize->setChecked(true);
-            break;
+    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);

 
 

-        case K3Icon::SizeSmall:
-        default:
-            m_smallIconSize->setChecked(true);
-    }
+    QButtonGroup* iconSizeGroup = new QButtonGroup(this);
+    iconSizeGroup->addButton(m_smallIconSize);
+    iconSizeGroup->addButton(m_mediumIconSize);
+    iconSizeGroup->addButton(m_largeIconSize);

 
 

-    //new QLabel(i18n("Icon size:"), iconGroup);
-    //m_iconSizeBox = new QComboBox(iconGroup);
-    //m_iconSizeBox->insertItem(i18n("Small"));
-    //m_iconSizeBox->insertItem(i18n("Medium"));
-    //m_iconSizeBox->insertItem(i18n("Large"));
+    QHBoxLayout* iconSizeLayout = new QHBoxLayout(iconSizeBox);
+    iconSizeLayout->addWidget(m_smallIconSize);
+    iconSizeLayout->addWidget(m_mediumIconSize);
+    iconSizeLayout->addWidget(m_largeIconSize);

 
     // create "Text" properties
 
     // create "Text" properties

-    Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this);
-    textGroup->setSizePolicy(sizePolicy);
-    textGroup->setMargin(margin);
+    QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this);
+    textBox->setSizePolicy(sizePolicy);

 
 

-    new QLabel(i18n("Font family:"), textGroup);
-    m_fontFamilyBox = new QFontComboBox(textGroup);
-    m_fontFamilyBox->setCurrentFont(settings->fontFamily());
+    QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox);
+    m_fontRequester = new KFontRequester(textBox);

 
 

-    new QLabel(i18n("Font size:"), textGroup);
-    m_fontSizeBox = new QSpinBox(6, 99, 1, textGroup);
-    m_fontSizeBox->setValue(settings->fontSize());
+    QHBoxLayout* textLayout = new QHBoxLayout(textBox);
+    textLayout->addWidget(fontLabel);
+    textLayout->addWidget(m_fontRequester);

 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);
 
     // Add a dummy widget with no restriction regarding
     // a vertical resizing. This assures that the dialog layout
     // is not stretched vertically.
     new QWidget(this);

-}

 
 

+    loadSettings();
+}

 
 DetailsViewSettingsPage::~DetailsViewSettingsPage()
 {
 
 DetailsViewSettingsPage::~DetailsViewSettingsPage()
 {


@@ -131,24 +95,52 @@ DetailsViewSettingsPage::~DetailsViewSettingsPage()
 void DetailsViewSettingsPage::applySettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();
 void DetailsViewSettingsPage::applySettings()
 {
     DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings();

-    assert(settings != 0);
-
-    settings->setShowDate(m_dateBox->isChecked());
-    settings->setShowPermissions(m_permissionsBox->isChecked());
-    settings->setShowOwner(m_ownerBox->isChecked());
-    settings->setShowGroup(m_groupBox->isChecked());

 
 

-    int iconSize = K3Icon::SizeSmall;
+    int iconSize = KIconLoader::SizeSmall;

     if (m_mediumIconSize->isChecked()) {
     if (m_mediumIconSize->isChecked()) {

-        iconSize = K3Icon::SizeMedium;
-    }
-    else if (m_largeIconSize->isChecked()) {
-        iconSize = K3Icon::SizeLarge;
+        iconSize = KIconLoader::SizeMedium;
+    } else if (m_largeIconSize->isChecked()) {
+        iconSize = KIconLoader::SizeLarge;

     }
     settings->setIconSize(iconSize);
 
     }
     settings->setIconSize(iconSize);
 

-    settings->setFontFamily(m_fontFamilyBox->currentFont().family());
-    settings->setFontSize(m_fontSizeBox->value());
+    const QFont font = m_fontRequester->font();
+    settings->setFontFamily(font.family());
+    settings->setFontSize(font.pointSize());
+    settings->setItalicFont(font.italic());
+    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"
 }
 
 #include "detailsviewsettingspage.moc"