Fix includes

[dolphin.git] / src / settings / viewmodes / dolphinfontrequester.cpp

diff --git a/src/settings/viewmodes/dolphinfontrequester.cpp b/src/settings/viewmodes/dolphinfontrequester.cpp
index db0b2725918ae4c63f0654959e45f4895b8b5415..e5427f9f3d4ea32ddcc306ce120409eb81efffa0 100644 (file)
--- a/src/settings/viewmodes/dolphinfontrequester.cpp
+++ b/src/settings/viewmodes/dolphinfontrequester.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2008 by Peter Penz <peter.penz@gmx.at>                  *
+ *   Copyright (C) 2008 by Peter Penz <peter.penz19@gmail.com>             *

  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *


@@ -21,32 +21,38 @@
 
 #include <KFontDialog>
 #include <KGlobalSettings>
 
 #include <KFontDialog>
 #include <KGlobalSettings>

-#include <KLocale>
+#include <KLocalizedString>

 #include <KComboBox>
 
 #include <QEvent>
 #include <KComboBox>
 
 #include <QEvent>

+#include <QHBoxLayout>

 #include <QPushButton>
 #include <QPushButton>

+#include <QFontDatabase>

 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :
 
 DolphinFontRequester::DolphinFontRequester(QWidget* parent) :

-    KHBox(parent),
+    QWidget(parent),

     m_modeCombo(0),
     m_chooseFontButton(0),
     m_mode(SystemFont),
     m_customFont()
 {
     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"));
 
     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);
 
     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());
 
     changeMode(m_modeCombo->currentIndex());

+
+    topLayout->addWidget(m_modeCombo);
+    topLayout->addWidget(m_chooseFontButton);

 }
 
 DolphinFontRequester::~DolphinFontRequester()
 }
 
 DolphinFontRequester::~DolphinFontRequester()


@@ -57,7 +63,6 @@ void DolphinFontRequester::setMode(Mode mode)
 {
     m_mode = mode;
     m_modeCombo->setCurrentIndex(m_mode);
 {
     m_mode = mode;
     m_modeCombo->setCurrentIndex(m_mode);

-    m_modeCombo->setFont(font());

     m_chooseFontButton->setEnabled(m_mode == CustomFont);
 }
 
     m_chooseFontButton->setEnabled(m_mode == CustomFont);
 }
 


@@ -66,9 +71,9 @@ DolphinFontRequester::Mode DolphinFontRequester::mode() const
     return m_mode;
 }
 
     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)
 }
 
 void DolphinFontRequester::setCustomFont(const QFont& font)


@@ -81,14 +86,6 @@ QFont DolphinFontRequester::customFont() const
     return m_customFont;
 }
 
     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;
 void DolphinFontRequester::openFontDialog()
 {
     QFont font = m_customFont;


@@ -108,4 +105,3 @@ void DolphinFontRequester::changeMode(int index)
     emit changed();
 }
 
     emit changed();
 }
 

-#include "dolphinfontrequester.moc"