X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/bf50ced73473a225d681de6b62bc05571d969664..148282e2d856b47ceb191eeef4c834118c8cdffd:/src/iconsviewsettingspage.cpp diff --git a/src/iconsviewsettingspage.cpp b/src/iconsviewsettingspage.cpp index 3433e8532..8273234eb 100644 --- a/src/iconsviewsettingspage.cpp +++ b/src/iconsviewsettingspage.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,39 +18,35 @@ ***************************************************************************/ #include "iconsviewsettingspage.h" -#include "dolphin_iconsmodesettings.h" -#include "dolphinsettings.h" -#include "pixmapviewer.h" -#include +#include "dolphinfontrequester.h" +#include "dolphinsettings.h" +#include "iconsizegroupbox.h" +#include "zoomlevelinfo.h" -#include -#include -#include -#include -#include -#include +#include "dolphin_iconsmodesettings.h" -#include #include +#include #include #include -#include - -#define GRID_SPACING_BASE 8 -#define GRID_SPACING_INC 12 - -IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow, - QWidget* parent) : - KVBox(parent), - m_mainWindow(mainWindow), - m_iconSizeSlider(0), - m_previewSizeSlider(0), +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +IconsViewSettingsPage::IconsViewSettingsPage(QWidget* parent) : + ViewSettingsPageBase(parent), + m_iconSizeGroupBox(0), m_textWidthBox(0), - m_fontFamilyBox(0), - m_fontSizeBox(0), + m_fontRequester(0), m_textlinesCountBox(0), - m_additionalInfo(0), m_arrangementBox(0), m_gridSpacingBox(0) { @@ -62,112 +57,81 @@ IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow, setSpacing(spacing); setMargin(margin); - IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - assert(settings != 0); - - KHBox* sizesLayout = new KHBox(this); - sizesLayout->setSpacing(spacing); - sizesLayout->setSizePolicy(sizePolicy); - - // create 'Icon Size' group including slider and preview - Q3GroupBox* iconSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Icon Size"), sizesLayout); - iconSizeGroup->setSizePolicy(sizePolicy); - iconSizeGroup->setMargin(margin); - - const QColor iconBackgroundColor(KGlobalSettings::baseColor()); - - KHBox* iconSizeVBox = new KHBox(iconSizeGroup); - iconSizeVBox->setSpacing(spacing); - new QLabel(i18n("Small"), iconSizeVBox); - m_iconSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, iconSizeVBox); - m_iconSizeSlider->setValue(sliderValue(settings->iconSize())); - m_iconSizeSlider->setTickmarks(QSlider::TicksBelow); - connect(m_iconSizeSlider, SIGNAL(valueChanged(int)), - this, SLOT(slotIconSizeChanged(int))); - new QLabel(i18n("Large"), iconSizeVBox); - - m_iconSizeViewer = new PixmapViewer(iconSizeGroup); - m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); - m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous); - m_iconSizeViewer->setEraseColor(iconBackgroundColor); - slotIconSizeChanged(m_iconSizeSlider->value()); - - // create 'Preview Size' group including slider and preview - Q3GroupBox* previewSizeGroup = new Q3GroupBox(2, Qt::Vertical, i18n("Preview Size"), sizesLayout); - previewSizeGroup->setSizePolicy(sizePolicy); - previewSizeGroup->setMargin(margin); - - KHBox* previewSizeVBox = new KHBox(previewSizeGroup); - previewSizeVBox->setSpacing(spacing); - new QLabel(i18n("Small"), previewSizeVBox); - m_previewSizeSlider = new QSlider(0, 5, 1, 0, Qt::Horizontal, previewSizeVBox); - m_previewSizeSlider->setValue(sliderValue(settings->previewSize())); - m_previewSizeSlider->setTickmarks(QSlider::TicksBelow); - connect(m_previewSizeSlider, SIGNAL(valueChanged(int)), - this, SLOT(slotPreviewSizeChanged(int))); - new QLabel(i18n("Large"), previewSizeVBox); - - m_previewSizeViewer = new PixmapViewer(previewSizeGroup); - m_previewSizeViewer->setMinimumWidth(K3Icon::SizeEnormous); - m_previewSizeViewer->setFixedHeight(K3Icon::SizeEnormous); - m_previewSizeViewer->setEraseColor(iconBackgroundColor); - - slotPreviewSizeChanged(m_previewSizeSlider->value()); - - Q3GroupBox* textGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Text"), this); + // Create "Icon" properties + 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' group for selecting the font, the number of lines + // and the text width + QGroupBox* textGroup = new QGroupBox(i18nc("@title:group", "Text"), this); textGroup->setSizePolicy(sizePolicy); - textGroup->setMargin(margin); - - new QLabel(i18n("Font family:"), textGroup); - m_fontFamilyBox = new QFontComboBox(textGroup); - m_fontFamilyBox->setCurrentFont(settings->fontFamily()); - - new QLabel(i18n("Font size:"), textGroup); - m_fontSizeBox = new QSpinBox(6, 99, 1, textGroup); - m_fontSizeBox->setValue(settings->fontSize()); - - new QLabel(i18n("Number of lines:"), textGroup); - m_textlinesCountBox = new QSpinBox(1, 5, 1, textGroup); - m_textlinesCountBox->setValue(settings->numberOfTexlines()); - - new QLabel(i18n("Text width:"), textGroup); - m_textWidthBox = new QComboBox(textGroup); - m_textWidthBox->addItem(i18n("Small")); - m_textWidthBox->addItem(i18n("Medium")); - m_textWidthBox->addItem(i18n("Large")); - - new QLabel(i18n("Additional information:"), textGroup); - m_additionalInfo = new QComboBox(textGroup); - m_additionalInfo->addItem(i18n("No Information")); - m_additionalInfo->addItem(i18n("MIME Type")); - m_additionalInfo->addItem(i18n("Size")); - m_additionalInfo->addItem(i18n("Date")); - m_additionalInfo->setCurrentIndex(settings->additionalInfo()); - - Q3GroupBox* gridGroup = new Q3GroupBox(2, Qt::Horizontal, i18n("Grid"), this); - gridGroup->setSizePolicy(sizePolicy); - gridGroup->setMargin(margin); - const bool leftToRightArrangement = (settings->arrangement() == "LeftToRight"); - new QLabel(i18n("Arrangement:"), gridGroup); - m_arrangementBox = new QComboBox(gridGroup); - m_arrangementBox->addItem(i18n("Left to right")); - m_arrangementBox->addItem(i18n("Top to bottom")); - m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1); + QLabel* fontLabel = new QLabel(i18nc("@label:listbox", "Font:"), textGroup); + m_fontRequester = new DolphinFontRequester(textGroup); + connect(m_fontRequester, SIGNAL(changed()), this, SIGNAL(changed())); + + QLabel* textlinesCountLabel = new QLabel(i18nc("@label:textbox", "Number of lines:"), textGroup); + m_textlinesCountBox = new QSpinBox(textGroup); + m_textlinesCountBox->setMinimum(1); + m_textlinesCountBox->setMaximum(5); + connect(m_textlinesCountBox, SIGNAL(valueChanged(int)), this, SIGNAL(changed())); + + QLabel* textWidthLabel = new QLabel(i18nc("@label:listbox", "Text width:"), textGroup); + m_textWidthBox = new KComboBox(textGroup); + m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Small")); + m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Medium")); + m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Large")); + m_textWidthBox->addItem(i18nc("@item:inlistbox Text width", "Huge")); + connect(m_textWidthBox, SIGNAL(activated(int)), this, SIGNAL(changed())); + + QGridLayout* textGroupLayout = new QGridLayout(textGroup); + textGroupLayout->addWidget(fontLabel, 0, 0, Qt::AlignRight); + textGroupLayout->addWidget(m_fontRequester, 0, 1); + textGroupLayout->addWidget(textlinesCountLabel, 1, 0, Qt::AlignRight); + textGroupLayout->addWidget(m_textlinesCountBox, 1, 1); + textGroupLayout->addWidget(textWidthLabel, 2, 0, Qt::AlignRight); + textGroupLayout->addWidget(m_textWidthBox, 2, 1); + + // create the 'Grid' group for selecting the arrangement and the grid spacing + QGroupBox* gridGroup = new QGroupBox(i18nc("@title:group", "Grid"), this); + gridGroup->setSizePolicy(sizePolicy); - new QLabel(i18n("Grid spacing:"), gridGroup); - m_gridSpacingBox = new QComboBox(gridGroup); - m_gridSpacingBox->addItem(i18n("Small")); - m_gridSpacingBox->addItem(i18n("Medium")); - m_gridSpacingBox->addItem(i18n("Large")); - m_gridSpacingBox->setCurrentIndex((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC); + QLabel* arrangementLabel = new QLabel(i18nc("@label:listbox", "Arrangement:"), gridGroup); + m_arrangementBox = new KComboBox(gridGroup); + m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Columns")); + m_arrangementBox->addItem(i18nc("@item:inlistbox Arrangement", "Rows")); + connect(m_arrangementBox, SIGNAL(activated(int)), this, SIGNAL(changed())); + + QLabel* gridSpacingLabel = new QLabel(i18nc("@label:listbox", "Grid spacing:"), gridGroup); + m_gridSpacingBox = new KComboBox(gridGroup); + m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "None")); + m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Small")); + m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Medium")); + m_gridSpacingBox->addItem(i18nc("@item:inlistbox Grid spacing", "Large")); + connect(m_gridSpacingBox, SIGNAL(activated(int)), this, SIGNAL(changed())); + + QGridLayout* gridGroupLayout = new QGridLayout(gridGroup); + gridGroupLayout->addWidget(arrangementLabel, 0, 0, Qt::AlignRight); + gridGroupLayout->addWidget(m_arrangementBox, 0, 1); + gridGroupLayout->addWidget(gridSpacingLabel, 1, 0, Qt::AlignRight); + gridGroupLayout->addWidget(m_gridSpacingBox, 1, 1); // Add a dummy widget with no restriction regarding // a vertical resizing. This assures that the dialog layout // is not stretched vertically. new QWidget(this); - adjustTextWidthSelection(); + loadSettings(); } IconsViewSettingsPage::~IconsViewSettingsPage() @@ -177,96 +141,103 @@ IconsViewSettingsPage::~IconsViewSettingsPage() void IconsViewSettingsPage::applySettings() { IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - assert(settings != 0); - const int defaultSize = iconSize(m_iconSizeSlider->value()); - settings->setIconSize(defaultSize); - - int previewSize = //(m_mode == DolphinIconsView::Previews) ? - //iconSize(m_previewSizeSlider->value()) : - defaultSize; - if (previewSize < defaultSize) { - // assure that the preview size is never smaller than the icon size - previewSize = defaultSize; - } + const int iconSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->defaultSizeValue()); + const int previewSize = ZoomLevelInfo::iconSizeForZoomLevel(m_iconSizeGroupBox->previewSizeValue()); + settings->setIconSize(iconSize); settings->setPreviewSize(previewSize); - const int fontSize = m_fontSizeBox->value(); + const QFont font = m_fontRequester->font(); + const int fontHeight = QFontMetrics(font).height(); - QString arrangement = (m_arrangementBox->currentIndex() == 0) ? - "LeftToRight" : - "TopToBottom"; + const int arrangement = (m_arrangementBox->currentIndex() == 0) ? + QListView::LeftToRight : + QListView::TopToBottom; settings->setArrangement(arrangement); - //DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex()); - settings->setFontFamily(m_fontFamilyBox->currentFont().family()); - settings->setFontSize(fontSize); - settings->setNumberOfTexlines(m_textlinesCountBox->value()); + const int numberOfTextlines = m_textlinesCountBox->value(); + + const int defaultSize = settings->iconSize(); + int itemWidth = defaultSize; + int itemHeight = defaultSize; + const int textSizeIndex = m_textWidthBox->currentIndex(); + if (arrangement == QListView::TopToBottom) { + itemWidth += TopToBottomBase + textSizeIndex * TopToBottomInc; + itemHeight += fontHeight * numberOfTextlines + 10; + } else { + itemWidth += LeftToRightBase + textSizeIndex * LeftToRightInc; + } + + settings->setItemWidth(itemWidth); + settings->setItemHeight(itemHeight); - settings->setGridSpacing(GRID_SPACING_BASE + - m_gridSpacingBox->currentIndex() * GRID_SPACING_INC); -} + settings->setUseSystemFont(m_fontRequester->mode() == DolphinFontRequester::SystemFont); + settings->setFontFamily(font.family()); + settings->setFontSize(font.pointSize()); + settings->setItalicFont(font.italic()); + settings->setFontWeight(font.weight()); -void IconsViewSettingsPage::slotIconSizeChanged(int value) -{ - KIconLoader iconLoader; - m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value))); - - if (m_previewSizeSlider != 0) { - int previewSizeValue = m_previewSizeSlider->value(); - if (previewSizeValue < value) { - // assure that the preview size is never smaller than the icon size - previewSizeValue = value; - } - slotPreviewSizeChanged(previewSizeValue); + settings->setNumberOfTextlines(numberOfTextlines); + + const int index = m_gridSpacingBox->currentIndex(); + if (index == 0) { + // No grid spacing + settings->setGridSpacing(0); + } else { + settings->setGridSpacing(GridSpacingBase + (index - 1) * GridSpacingInc); } } -void IconsViewSettingsPage::slotPreviewSizeChanged(int value) +void IconsViewSettingsPage::restoreDefaults() { - KIconLoader iconLoader; - const int iconSizeValue = m_iconSizeSlider->value(); - if (value < iconSizeValue) { - // assure that the preview size is never smaller than the icon size - value = iconSizeValue; - } - m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value))); + IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + settings->setDefaults(); + loadSettings(); } -int IconsViewSettingsPage::iconSize(int sliderValue) const +void IconsViewSettingsPage::loadSettings() { - int size = K3Icon::SizeMedium; - switch (sliderValue) { - case 0: size = K3Icon::SizeSmall; break; - case 1: size = K3Icon::SizeSmallMedium; break; - case 2: size = K3Icon::SizeMedium; break; - case 3: size = K3Icon::SizeLarge; break; - case 4: size = K3Icon::SizeHuge; break; - case 5: size = K3Icon::SizeEnormous; break; + IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); + + 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); } - return size; -} -int IconsViewSettingsPage::sliderValue(int iconSize) const -{ - int value = 0; - switch (iconSize) { - case K3Icon::SizeSmall: value = 0; break; - case K3Icon::SizeSmallMedium: value = 1; break; - case K3Icon::SizeMedium: value = 2; break; - case K3Icon::SizeLarge: value = 3; break; - case K3Icon::SizeHuge: value = 4; break; - case K3Icon::SizeEnormous: value = 5; break; - default: break; + m_textlinesCountBox->setValue(settings->numberOfTextlines()); + + const bool leftToRightArrangement = (settings->arrangement() == QListView::LeftToRight); + int textWidthIndex = 0; + const int remainingWidth = settings->itemWidth() - settings->iconSize(); + if (leftToRightArrangement) { + textWidthIndex = (remainingWidth - LeftToRightBase) / LeftToRightInc; + } else { + textWidthIndex = (remainingWidth - TopToBottomBase) / TopToBottomInc; } - return value; -} + // ensure that chosen index is always valid + textWidthIndex = qMax(textWidthIndex, 0); + textWidthIndex = qMin(textWidthIndex, m_textWidthBox->count() - 1); -void IconsViewSettingsPage::adjustTextWidthSelection() -{ - IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings(); - assert(settings != 0); - //m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint()); + m_textWidthBox->setCurrentIndex(textWidthIndex); + m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1); + + const int spacing = settings->gridSpacing(); + const int index = (spacing <= 0) ? 0 : 1 + (spacing - GridSpacingBase) / GridSpacingInc; + m_gridSpacingBox->setCurrentIndex(index); } #include "iconsviewsettingspage.moc"