From 9731934d1c45b7e6f27b58b9083b23ecbc084288 Mon Sep 17 00:00:00 2001 From: Andrea Diamantini Date: Mon, 14 Feb 2011 23:33:39 +0100 Subject: This patch cleans up encoding management, moving code to its real position: The appearance settings widget. In fact our code is actually changing "default" text encoding, not the page one "on the fly" --- src/settings/appearancewidget.cpp | 33 +- src/settings/appearancewidget.h | 11 +- src/settings/settings_appearance.ui | 587 ++++++++++++++++++++---------------- 3 files changed, 364 insertions(+), 267 deletions(-) (limited to 'src/settings') diff --git a/src/settings/appearancewidget.cpp b/src/settings/appearancewidget.cpp index c444f724..f07f7b8b 100644 --- a/src/settings/appearancewidget.cpp +++ b/src/settings/appearancewidget.cpp @@ -31,6 +31,9 @@ // Auto Includes #include "rekonq.h" +// KDE Includes +#include +#include AppearanceWidget::AppearanceWidget(QWidget *parent) : QWidget(parent) @@ -53,6 +56,8 @@ AppearanceWidget::AppearanceWidget(QWidget *parent) connect(sansSerifFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); connect(cursiveFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); connect(fantasyFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); + + populateEncodingMenu(); } @@ -83,8 +88,32 @@ void AppearanceWidget::hasChanged() bool AppearanceWidget::isDefault() { bool def = true; - + // TODO: implement me!! - + return def; } + + +void AppearanceWidget::populateEncodingMenu() +{ + encodingCombo->setEditable(false); + QStringList encodings = KGlobal::charsets()->availableEncodingNames(); + encodingCombo->addItems(encodings); + + encodingCombo->setWhatsThis( i18n( "Select the default encoding to be used; normally, you will be fine with 'Use language encoding' " + "and should not have to change this.") ); + + connect(encodingCombo, SIGNAL(activated(const QString &)), this, SLOT(setEncoding(const QString &))); + connect(encodingCombo, SIGNAL(activated(const QString &)), this, SLOT(hasChanged())); + + QString enc = ReKonfig::defaultEncoding(); + int indexOfEnc = encodings.indexOf(enc); + encodingCombo->setCurrentIndex(indexOfEnc); +} + + +void AppearanceWidget::setEncoding(const QString &enc) +{ + ReKonfig::setDefaultEncoding(enc); +} diff --git a/src/settings/appearancewidget.h b/src/settings/appearancewidget.h index e2696172..5dd78517 100644 --- a/src/settings/appearancewidget.h +++ b/src/settings/appearancewidget.h @@ -48,14 +48,17 @@ public: void save(); bool changed(); bool isDefault(); - -signals: + +Q_SIGNALS: void changed(bool); -private slots: +private Q_SLOTS: void hasChanged(); - + void setEncoding(const QString &); + private: + void populateEncodingMenu(); + bool _changed; }; diff --git a/src/settings/settings_appearance.ui b/src/settings/settings_appearance.ui index b25af436..0a8692d9 100644 --- a/src/settings/settings_appearance.ui +++ b/src/settings/settings_appearance.ui @@ -6,277 +6,342 @@ 0 0 - 364 - 457 + 494 + 472 Appearance - + - - - Fonts + + + 0 - - - - - - - - 0 - 0 - + + + Fonts + + + + + + Fonts + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Standard font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Fixed font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Sans Serif font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + + Cursive font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Fantasy font: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + + + Size + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Default font size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + 0 + 0 + + + + + 150 + 0 + + + + Minimal font size: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + + Encodings + + + + + + Default Encodings + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 84 + + + + + + + + + Stylesheets + + + + + + User Style Sheet + + + + QFormLayout::ExpandingFieldsGrow - - - 150 - 0 - - - - Standard font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Fixed font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Sans Serif font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Cursive font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Fantasy font: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - Qt::Horizontal - - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Default font size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - 0 - 0 - - - - - 150 - 0 - - - - Minimal font size: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - - - - User Style Sheet - - - - - - - 150 - 0 - - - - User CSS path: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - *.css - - - - + + + + + 150 + 0 + + + + User CSS path: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + *.css + + + + + + + + + + Qt::Vertical + + + + 20 + 527 + + + + + + + + + Misc + + + + + + Toggle automatic scrolling on middle click in a web page + + + Auto-scroll on middle-click + + + true + + + + + + + Scroll pages with an eye candy effect + + + Enable smooth scrolling + + + true + + + + + + + Use favicon of the open website + + + + + + + Qt::Vertical + + + + 20 + 513 + + + + + + - - - - Misc - - - - - - Toggle automatic scrolling on middle click in a web page - - - Auto-scroll on middle-click - - - true - - - - - - - Scroll pages with an eye candy effect - - - Enable smooth scrolling - - - true - - - - - - - Use favicon of the open website - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - -- cgit v1.2.1