X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/d511752c9de4d9adc30a15ddf9bf89efc1924a7b..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/detailsviewsettingspage.cpp diff --git a/src/detailsviewsettingspage.cpp b/src/detailsviewsettingspage.cpp index 26a7d7367..8d67287c7 100644 --- a/src/detailsviewsettingspage.cpp +++ b/src/detailsviewsettingspage.cpp @@ -19,34 +19,29 @@ #include "detailsviewsettingspage.h" +#include "iconsizegroupbox.h" #include "dolphinsettings.h" #include "dolphin_detailsmodesettings.h" +#include "zoomlevelinfo.h" #include -#include +#include #include -#include -#include -#include -#include -#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), - m_fontRequester(0) +DetailsViewSettingsPage::DetailsViewSettingsPage(QWidget* parent) : + ViewSettingsPageBase(parent), + m_iconSizeGroupBox(0), + m_fontRequester(0), + m_expandableFolders(0) { const int spacing = KDialog::spacingHint(); const int margin = KDialog::marginHint(); @@ -55,51 +50,35 @@ DetailsViewSettingsPage::DetailsViewSettingsPage(DolphinMainWindow* mainWindow, setSpacing(spacing); setMargin(margin); - // create "Columns" properties - QGroupBox* columnsBox = new QGroupBox(i18nc("@title:group", "Columns"), this); - columnsBox->setSizePolicy(sizePolicy); - - m_dateBox = new QCheckBox(i18nc("@option:check Columns", "Date"), this); - m_permissionsBox = new QCheckBox(i18nc("@option:check Columns", "Permissions"), this); - m_ownerBox = new QCheckBox(i18nc("@option:check Columns", "Owner"), this); - m_groupBox = new QCheckBox(i18nc("@option:check Columns", "Group"), this); - m_typeBox = new QCheckBox(i18nc("@option:check Columns", "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(i18nc("@title:group", "Icon Size"), this); - iconSizeBox->setSizePolicy(sizePolicy); - - 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); - 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); + m_iconSizeGroupBox = new IconSizeGroupBox(this); + m_iconSizeGroupBox->setSizePolicy(sizePolicy); + + const int min = ZoomLevelInfo::minimumLevel(); + const int max = ZoomLevelInfo::maximumLevel(); + m_iconSizeGroupBox->setDefaultSizeRange(min, max); + m_iconSizeGroupBox->setPreviewSizeRange(min, max); + + connect(m_iconSizeGroupBox, SIGNAL(defaultSizeChanged(int)), + this, SIGNAL(changed())); + connect(m_iconSizeGroupBox, SIGNAL(previewSizeChanged(int)), + this, SIGNAL(changed())); // create "Text" properties - QGroupBox* textBox = new QGroupBox(i18nc("@title:group", "Text"), this); - textBox->setSizePolicy(sizePolicy); - - QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textBox); - m_fontRequester = new KFontRequester(textBox); - - QHBoxLayout* textLayout = new QHBoxLayout(textBox); - textLayout->addWidget(fontLabel); + QWidget* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this); + textGroup->setSizePolicy(sizePolicy); + + QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup); + m_fontRequester = new DolphinFontRequester(textGroup); + connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed())); + + QHBoxLayout* textLayout = new QHBoxLayout(textGroup); + textLayout->addWidget(fontLabel, 0, Qt::AlignRight); textLayout->addWidget(m_fontRequester); + + // create "Expandable Folders" checkbox + m_expandableFolders = new QCheckBox(i18nc("@option:check", "Expandable folders"), this); + connect(m_expandableFolders, SIGNAL(toggled(bool)), this, SIGNAL(changed())); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout @@ -117,25 +96,19 @@ 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; - if (m_mediumIconSize->isChecked()) { - iconSize = K3Icon::SizeMedium; - } else if (m_largeIconSize->isChecked()) { - iconSize = K3Icon::SizeLarge; - } + const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->defaultSizeValue()); + const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->previewSizeValue()); settings->setIconSize(iconSize); + settings->setPreviewSize(previewSize); 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 +122,26 @@ 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: - m_largeIconSize->setChecked(true); - break; - - case K3Icon::SizeMedium: - m_mediumIconSize->setChecked(true); - break; - - case K3Icon::SizeSmall: - default: - m_smallIconSize->setChecked(true); + const QSize iconSize(settings->iconSize(), settings->iconSize()); + const int iconSizeValue = ZoomLevelInfo::zoomLevelForIconSize(iconSize); + m_iconSizeGroupBox->setDefaultSizeValue(iconSizeValue); + + const QSize previewSize(settings->previewSize(), settings->previewSize()); + const int previewSizeValue = ZoomLevelInfo::zoomLevelForIconSize(previewSize); + m_iconSizeGroupBox->setPreviewSizeValue(previewSizeValue); + + 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); } - QFont font(settings->fontFamily(), - settings->fontSize()); - font.setItalic(settings->italicFont()); - font.setBold(settings->boldFont()); - m_fontRequester->setFont(font); + m_expandableFolders->setChecked(settings->expandableFolders()); } #include "detailsviewsettingspage.moc"