Merge branch 'master' into mainwindow

1 files changed, 11 insertions, 2 deletions

diff --git a/src/settings.cpp b/src/settings.cpp
index 462874f9..7ab6e3dc 100644
--- a/src/settings.cpp
+++ b/src/settings.cpp
@@ -131,10 +131,19 @@ void SettingsDialog::readConfig()
     connect(d->generalUi.downloadDirUrlRequester, SIGNAL(textChanged(QString)),this, SLOT(saveSettings()));
 
     // ======= Fonts
-    d->fontsUi.standardFontChooser->setFont(ReKonfig::standardFont(), false);
+    QFont stdFont = ReKonfig::standardFont();
+    d->fontsUi.standardFontChooser->setFont(stdFont, false);
+    d->fontsUi.standardFontChooser->setSampleText( stdFont.family() + " " + QString::number(stdFont.pointSize()) );
     connect(d->fontsUi.standardFontChooser, SIGNAL(fontSelected(QFont)),this, SLOT(saveSettings()));
-    d->fontsUi.fixedFontChooser->setFont(ReKonfig::fixedFont(), true);
+    QFont fxFont = ReKonfig::fixedFont();
+    d->fontsUi.fixedFontChooser->setFont(fxFont, true);
+    d->fontsUi.fixedFontChooser->setSampleText( fxFont.family() + " " + QString::number(fxFont.pointSize()) );
     connect(d->fontsUi.fixedFontChooser, SIGNAL(fontSelected(QFont)),this, SLOT(saveSettings()));
+
+    // ======= Proxy
+    bool proxyEnabled = ReKonfig::isProxyEnabled();
+    d->proxyUi.groupBox->setEnabled(proxyEnabled);
+    connect(d->proxyUi.kcfg_isProxyEnabled, SIGNAL(clicked(bool)), d->proxyUi.groupBox, SLOT(setEnabled(bool)));
 }