* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
#include "iconsviewsettingspage.h"
+#include "iconsmodesettings.h"
+#include "dolphinsettings.h"
+#include "pixmapviewer.h"
+
+#include <assert.h>
#include <qlabel.h>
#include <qslider.h>
#include <q3buttongroup.h>
#include <qradiobutton.h>
#include <qspinbox.h>
+#include <qfontcombobox.h>
+
#include <kiconloader.h>
-#include <kfontcombo.h>
#include <kdialog.h>
+#include <kglobalsettings.h>
#include <klocale.h>
-#include <assert.h>
-
-#include "iconsmodesettings.h"
-#include "dolphinsettings.h"
-#include "pixmapviewer.h"
+#include <kvbox.h>
#define GRID_SPACING_BASE 8
#define GRID_SPACING_INC 12
-IconsViewSettingsPage::IconsViewSettingsPage(DolphinIconsView::LayoutMode mode,
+IconsViewSettingsPage::IconsViewSettingsPage(DolphinMainWindow* mainWindow,
QWidget* parent) :
- Q3VBox(parent),
- m_mode(mode),
+ KVBox(parent),
+ m_mainWindow(mainWindow),
m_iconSizeSlider(0),
m_previewSizeSlider(0),
m_textWidthBox(0),
- m_gridSpacingBox(0),
m_fontFamilyBox(0),
m_fontSizeBox(0),
m_textlinesCountBox(0),
- m_arrangementBox(0)
+ m_additionalInfo(0),
+ m_arrangementBox(0),
+ m_gridSpacingBox(0)
{
const int spacing = KDialog::spacingHint();
const int margin = KDialog::marginHint();
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
assert(settings != 0);
- Q3HBox* sizesLayout = new Q3HBox(this);
+ KHBox* sizesLayout = new KHBox(this);
sizesLayout->setSpacing(spacing);
sizesLayout->setSizePolicy(sizePolicy);
const QColor iconBackgroundColor(KGlobalSettings::baseColor());
- Q3HBox* iconSizeVBox = new Q3HBox(iconSizeGroup);
+ 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::Below);
+ 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(KIcon::SizeEnormous);
- m_iconSizeViewer->setFixedHeight(KIcon::SizeEnormous);
+ m_iconSizeViewer->setMinimumWidth(K3Icon::SizeEnormous);
+ m_iconSizeViewer->setFixedHeight(K3Icon::SizeEnormous);
m_iconSizeViewer->setEraseColor(iconBackgroundColor);
slotIconSizeChanged(m_iconSizeSlider->value());
- if (m_mode == DolphinIconsView::Previews) {
- // 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);
-
- Q3HBox* previewSizeVBox = new Q3HBox(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::Below);
- connect(m_previewSizeSlider, SIGNAL(valueChanged(int)),
- this, SLOT(slotPreviewSizeChanged(int)));
- new QLabel(i18n("Large"), previewSizeVBox);
-
- m_previewSizeViewer = new PixmapViewer(previewSizeGroup);
- m_previewSizeViewer->setMinimumWidth(KIcon::SizeEnormous);
- m_previewSizeViewer->setFixedHeight(KIcon::SizeEnormous);
- m_previewSizeViewer->setEraseColor(iconBackgroundColor);
-
- slotPreviewSizeChanged(m_previewSizeSlider->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);
textGroup->setSizePolicy(sizePolicy);
textGroup->setMargin(margin);
new QLabel(i18n("Font family:"), textGroup);
- m_fontFamilyBox = new KFontCombo(textGroup);
+ m_fontFamilyBox = new QFontComboBox(textGroup);
m_fontFamilyBox->setCurrentFont(settings->fontFamily());
new QLabel(i18n("Font size:"), textGroup);
new QLabel(i18n("Text width:"), textGroup);
m_textWidthBox = new QComboBox(textGroup);
- m_textWidthBox->insertItem(i18n("Small"));
- m_textWidthBox->insertItem(i18n("Medium"));
- m_textWidthBox->insertItem(i18n("Large"));
+ 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() == Q3IconView::LeftToRight);
+ const bool leftToRightArrangement = (settings->arrangement() == "LeftToRight");
new QLabel(i18n("Arrangement:"), gridGroup);
m_arrangementBox = new QComboBox(gridGroup);
- m_arrangementBox->insertItem(i18n("Left to right"));
- m_arrangementBox->insertItem(i18n("Top to bottom"));
- m_arrangementBox->setCurrentItem(leftToRightArrangement ? 0 : 1);
+ m_arrangementBox->addItem(i18n("Left to right"));
+ m_arrangementBox->addItem(i18n("Top to bottom"));
+ m_arrangementBox->setCurrentIndex(leftToRightArrangement ? 0 : 1);
new QLabel(i18n("Grid spacing:"), gridGroup);
m_gridSpacingBox = new QComboBox(gridGroup);
- m_gridSpacingBox->insertItem(i18n("Small"));
- m_gridSpacingBox->insertItem(i18n("Medium"));
- m_gridSpacingBox->insertItem(i18n("Large"));
- m_gridSpacingBox->setCurrentItem((settings->gridSpacing() - GRID_SPACING_BASE) / GRID_SPACING_INC);
+ 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);
// Add a dummy widget with no restriction regarding
// a vertical resizing. This assures that the dialog layout
const int defaultSize = iconSize(m_iconSizeSlider->value());
settings->setIconSize(defaultSize);
- int previewSize = (m_mode == DolphinIconsView::Previews) ?
- iconSize(m_previewSizeSlider->value()) :
+ 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
const int fontSize = m_fontSizeBox->value();
- QString arrangement = (m_arrangementBox->currentItem() == 0) ?
+ QString arrangement = (m_arrangementBox->currentIndex() == 0) ?
"LeftToRight" :
"TopToBottom";
settings->setArrangement(arrangement);
- DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentItem());
+ //DolphinSettings::instance().calculateGridSize(m_textWidthBox->currentIndex());
- settings->setFontFamily(m_fontFamilyBox->currentFont());
+ settings->setFontFamily(m_fontFamilyBox->currentFont().family());
settings->setFontSize(fontSize);
settings->setNumberOfTexlines(m_textlinesCountBox->value());
settings->setGridSpacing(GRID_SPACING_BASE +
- m_gridSpacingBox->currentItem() * GRID_SPACING_INC);
+ m_gridSpacingBox->currentIndex() * GRID_SPACING_INC);
}
void IconsViewSettingsPage::slotIconSizeChanged(int value)
{
KIconLoader iconLoader;
- m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", KIcon::Desktop, iconSize(value)));
+ m_iconSizeViewer->setPixmap(iconLoader.loadIcon("folder", K3Icon::Desktop, iconSize(value)));
if (m_previewSizeSlider != 0) {
int previewSizeValue = m_previewSizeSlider->value();
// assure that the preview size is never smaller than the icon size
value = iconSizeValue;
}
- m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", KIcon::Desktop, iconSize(value)));
+ m_previewSizeViewer->setPixmap(iconLoader.loadIcon("preview", K3Icon::Desktop, iconSize(value)));
}
int IconsViewSettingsPage::iconSize(int sliderValue) const
{
- int size = KIcon::SizeMedium;
+ int size = K3Icon::SizeMedium;
switch (sliderValue) {
- case 0: size = KIcon::SizeSmall; break;
- case 1: size = KIcon::SizeSmallMedium; break;
- case 2: size = KIcon::SizeMedium; break;
- case 3: size = KIcon::SizeLarge; break;
- case 4: size = KIcon::SizeHuge; break;
- case 5: size = KIcon::SizeEnormous; break;
+ 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;
}
return size;
}
{
int value = 0;
switch (iconSize) {
- case KIcon::SizeSmall: value = 0; break;
- case KIcon::SizeSmallMedium: value = 1; break;
- case KIcon::SizeMedium: value = 2; break;
- case KIcon::SizeLarge: value = 3; break;
- case KIcon::SizeHuge: value = 4; break;
- case KIcon::SizeEnormous: value = 5; break;
+ 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;
}
return value;
{
IconsModeSettings* settings = DolphinSettings::instance().iconsModeSettings();
assert(settings != 0);
- m_textWidthBox->setCurrentItem(DolphinSettings::instance().textWidthHint());
+ //m_textWidthBox->setCurrentIndex(DolphinSettings::instance().textWidthHint());
}
#include "iconsviewsettingspage.moc"
projects / dolphin.git / blobdiff