X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bf50ced73473a225d681de6b62bc05571d969664..da3bc09d21b43837873c899e2fbda1fa6c2a2e5e:/src/detailsviewsettingspage.cpp diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 7b0265d26..7ec11b153 100644 --- 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 * * * * 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,35 @@ ***************************************************************************/ #include "detailsviewsettingspage.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + #include "dolphinsettings.h" #include "dolphin_detailsmodesettings.h" -#include "dolphindetailsview.h" + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include 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) + 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) { const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); @@ -57,65 +56,76 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow, setMargin(margin); DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - assert(settings != 0); + Q_ASSERT(settings != 0); // create "Columns" properties - Q3GroupBox* columnsGroup = new Q3GroupBox(4, Qt::Vertical, i18n("Columns"), this); - columnsGroup->setSizePolicy(sizePolicy); - columnsGroup->setMargin(margin); + QGroupBox* columnsBox = new QGroupBox(i18n("Columns"), this); + columnsBox->setSizePolicy(sizePolicy); - KHBox* visibleColumnsLayout = new KHBox(columnsGroup); - m_dateBox = new QCheckBox(i18n("Date"), visibleColumnsLayout); + m_dateBox = new QCheckBox(i18n("Date"), this); m_dateBox->setChecked(settings->showDate()); - m_permissionsBox = new QCheckBox(i18n("Permissions"), visibleColumnsLayout); + m_permissionsBox = new QCheckBox(i18n("Permissions"), this); m_permissionsBox->setChecked(settings->showPermissions()); - m_ownerBox = new QCheckBox(i18n("Owner"), visibleColumnsLayout); + m_ownerBox = new QCheckBox(i18n("Owner"), this); m_ownerBox->setChecked(settings->showOwner()); - m_groupBox = new QCheckBox(i18n("Group"), visibleColumnsLayout); + m_groupBox = new QCheckBox(i18n("Group"), this); m_groupBox->setChecked(settings->showGroup()); + QHBoxLayout* columnsLayout = new QHBoxLayout(columnsBox); + columnsLayout->addWidget(m_dateBox); + columnsLayout->addWidget(m_permissionsBox); + columnsLayout->addWidget(m_ownerBox); + columnsLayout->addWidget(m_groupBox); + // 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); + QGroupBox* iconSizeBox = new QGroupBox(i18n("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::SizeLarge: + m_largeIconSize->setChecked(true); + break; - case K3Icon::SizeMedium: - m_mediumIconSize->setChecked(true); - break; + case K3Icon::SizeMedium: + m_mediumIconSize->setChecked(true); + break; - case K3Icon::SizeSmall: - default: - m_smallIconSize->setChecked(true); + case K3Icon::SizeSmall: + default: + m_smallIconSize->setChecked(true); } - //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")); + QButtonGroup* iconSizeGroup = new QButtonGroup(this); + iconSizeGroup->addButton(m_smallIconSize); + iconSizeGroup->addButton(m_mediumIconSize); + iconSizeGroup->addButton(m_largeIconSize); + + QHBoxLayout* iconSizeLayout = new QHBoxLayout(iconSizeBox); + iconSizeLayout->addWidget(m_smallIconSize); + iconSizeLayout->addWidget(m_mediumIconSize); + iconSizeLayout->addWidget(m_largeIconSize); // create "Text" properties - Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this); - textGroup->setSizePolicy(sizePolicy); - textGroup->setMargin(margin); + QGroupBox* textBox = new QGroupBox(i18n("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(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); - 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 @@ -123,15 +133,13 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow, new QWidget(this); } - DetailsViewSettingsPage::~DetailsViewSettingsPage() -{ -} +{} void DetailsViewSettingsPage::applySettings() { DetailsModeSettings* settings = DolphinSettings::instance().detailsModeSettings(); - assert(settings != 0); + Q_ASSERT(settings != 0); settings->setShowDate(m_dateBox->isChecked()); settings->setShowPermissions(m_permissionsBox->isChecked()); @@ -141,14 +149,16 @@ void DetailsViewSettingsPage::applySettings() 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); - 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()); } #include "detailsviewsettingspage.moc"