X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/blobdiff_plain/fd74aa8e2057158d2eadb835eb61564854c81020..5c1420fec990f268b9abbbaedbe45b9388f1fddd:/src/settings/viewmodes/dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index 09bc63e61..278fb0933 100644
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -25,28 +25,34 @@
 #include <KComboBox>
 
 #include <QEvent>
+#include <QHBoxLayout>
 #include <QPushButton>
+#include <QFontDatabase>
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
-    KHBox(parent),
+    QWidget(parent),
     m_modeCombo(0),
     m_chooseFontButton(0),
     m_mode(SystemFont),
     m_customFont()
 {
-    setSpacing(KDialog::spacingHint());
+    QHBoxLayout* topLayout = new QHBoxLayout(this);
+    topLayout->setMargin(0);
 
     m_modeCombo = new KComboBox(this);
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "System Font"));
     m_modeCombo->addItem(i18nc("@item:inlistbox Font", "Custom Font"));
-    connect(m_modeCombo, SIGNAL(activated(int)),
-            this, SLOT(changeMode(int)));
+    connect(m_modeCombo, static_cast<void(KComboBox::*)(int)>(&KComboBox::activated),
+            this, &DolphinFontRequester::changeMode);
 
     m_chooseFontButton = new QPushButton(i18nc("@action:button Choose font", "Choose..."), this);
-    connect(m_chooseFontButton, SIGNAL(clicked()),
-            this, SLOT(openFontDialog()));
+    connect(m_chooseFontButton, &QPushButton::clicked,
+            this, &DolphinFontRequester::openFontDialog);
 
     changeMode(m_modeCombo->currentIndex());
+
+    topLayout->addWidget(m_modeCombo);
+    topLayout->addWidget(m_chooseFontButton);
 }
 
 DolphinFontRequester::~DolphinFontRequester()
@@ -57,7 +63,6 @@ void DolphinFontRequester::setMode(Mode mode)
 {
     m_mode = mode;
     m_modeCombo->setCurrentIndex(m_mode);
-    m_modeCombo->setFont(font());
     m_chooseFontButton->setEnabled(m_mode == CustomFont);
 }
 
@@ -66,9 +71,9 @@ DolphinFontRequester::Mode DolphinFontRequester::mode() const
     return m_mode;
 }
 
-QFont DolphinFontRequester::font() const
+QFont DolphinFontRequester::currentFont() const
 {
-    return (m_mode == CustomFont) ? m_customFont : KGlobalSettings::generalFont();
+    return (m_mode == CustomFont) ? m_customFont : QFontDatabase::systemFont(QFontDatabase::GeneralFont);
 }
 
 void DolphinFontRequester::setCustomFont(const QFont& font)
@@ -81,14 +86,6 @@ QFont DolphinFontRequester::customFont() const
     return m_customFont;
 }
 
-bool DolphinFontRequester::event(QEvent* event)
-{
-    if (event->type() == QEvent::Polish) {
-        m_modeCombo->setFont(font());
-    }
-    return KHBox::event(event);
-}
-
 void DolphinFontRequester::openFontDialog()
 {
     QFont font = m_customFont;
@@ -108,4 +105,3 @@ void DolphinFontRequester::changeMode(int index)
     emit changed();
 }
 
-#include "dolphinfontrequester.moc"