diff options
Diffstat (limited to 'src/settings')
| -rw-r--r-- | src/settings/appearancewidget.cpp | 46 | ||||
| -rw-r--r-- | src/settings/generalwidget.cpp | 2 | ||||
| -rw-r--r-- | src/settings/settingsdialog.cpp | 6 | ||||
| -rw-r--r-- | src/settings/settingsdialog.h | 2 |
4 files changed, 28 insertions, 28 deletions
diff --git a/src/settings/appearancewidget.cpp b/src/settings/appearancewidget.cpp index 7700652f..eb486c90 100644 --- a/src/settings/appearancewidget.cpp +++ b/src/settings/appearancewidget.cpp @@ -40,22 +40,22 @@ AppearanceWidget::AppearanceWidget(QWidget *parent) , _changed(false) { setupUi(this); - + fixedFontChooser->setOnlyFixed(true); - - standardFontChooser->setCurrentFont( QFont( ReKonfig::standardFontFamily() ) ); - fixedFontChooser->setCurrentFont( QFont( ReKonfig::fixedFontFamily() ) ); - serifFontChooser->setCurrentFont( QFont( ReKonfig::serifFontFamily() ) ); - sansSerifFontChooser->setCurrentFont( QFont( ReKonfig::sansSerifFontFamily() ) ); - cursiveFontChooser->setCurrentFont( QFont( ReKonfig::cursiveFontFamily() ) ); - fantasyFontChooser->setCurrentFont( QFont( ReKonfig::fantasyFontFamily() ) ); - - connect(standardFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); - connect(fixedFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); - connect(serifFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT( hasChanged() )); - 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() )); + + standardFontChooser->setCurrentFont(QFont(ReKonfig::standardFontFamily())); + fixedFontChooser->setCurrentFont(QFont(ReKonfig::fixedFontFamily())); + serifFontChooser->setCurrentFont(QFont(ReKonfig::serifFontFamily())); + sansSerifFontChooser->setCurrentFont(QFont(ReKonfig::sansSerifFontFamily())); + cursiveFontChooser->setCurrentFont(QFont(ReKonfig::cursiveFontFamily())); + fantasyFontChooser->setCurrentFont(QFont(ReKonfig::fantasyFontFamily())); + + connect(standardFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged())); + connect(fixedFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged())); + connect(serifFontChooser, SIGNAL(currentFontChanged(const QFont &)), this, SLOT(hasChanged())); + 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(); } @@ -63,12 +63,12 @@ AppearanceWidget::AppearanceWidget(QWidget *parent) void AppearanceWidget::save() { - ReKonfig::setStandardFontFamily( standardFontChooser->currentFont().family() ); - ReKonfig::setFixedFontFamily( fixedFontChooser->currentFont().family() ); - ReKonfig::setSerifFontFamily( serifFontChooser->currentFont().family() ); - ReKonfig::setSansSerifFontFamily( sansSerifFontChooser->currentFont().family() ); - ReKonfig::setCursiveFontFamily( cursiveFontChooser->currentFont().family() ); - ReKonfig::setFantasyFontFamily( fantasyFontChooser->currentFont().family() ); + ReKonfig::setStandardFontFamily(standardFontChooser->currentFont().family()); + ReKonfig::setFixedFontFamily(fixedFontChooser->currentFont().family()); + ReKonfig::setSerifFontFamily(serifFontChooser->currentFont().family()); + ReKonfig::setSansSerifFontFamily(sansSerifFontChooser->currentFont().family()); + ReKonfig::setCursiveFontFamily(cursiveFontChooser->currentFont().family()); + ReKonfig::setFantasyFontFamily(fantasyFontChooser->currentFont().family()); } @@ -101,8 +101,8 @@ void AppearanceWidget::populateEncodingMenu() 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.") ); + 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())); diff --git a/src/settings/generalwidget.cpp b/src/settings/generalwidget.cpp index dbda5f70..b86e7aec 100644 --- a/src/settings/generalwidget.cpp +++ b/src/settings/generalwidget.cpp @@ -95,7 +95,7 @@ void GeneralWidget::checkKGetPresence() kcfg_kgetDownload->setDisabled(true); kcfg_kgetList->setDisabled(true); kcfg_kgetDownload->setToolTip(i18n("Install KGet to enable rekonq to use KGet as download manager")); - + } else { diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index 3d5f0a3a..4947d19f 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -138,7 +138,7 @@ Private::Private(SettingsDialog *parent) } pageItem->setIcon(wsIcon); - // WARNING + // WARNING // remember wheh changing here that the smallest netbooks // have a 1024x576 resolution. So DON'T bother that limits!! parent->setMinimumSize(700, 525); @@ -229,8 +229,8 @@ bool SettingsDialog::hasChanged() bool SettingsDialog::isDefault() { bool isDef = KConfigDialog::isDefault(); - - if(isDef) + + if (isDef) { // check our private widget values isDef = d->appearanceWidg->isDefault(); diff --git a/src/settings/settingsdialog.h b/src/settings/settingsdialog.h index d48e1f7c..486ce88c 100644 --- a/src/settings/settingsdialog.h +++ b/src/settings/settingsdialog.h @@ -52,7 +52,7 @@ public: protected: virtual bool isDefault(); - + private: Private* const d; |