X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ffontselector.cpp;h=d4a341c3215213191f2b3c80873613b503e8f756;hp=8a53551bcca12535385d257aed554830c4ba6d14;hb=e2188dc438be6f3eb0d9cdf47d28821aefe9835e;hpb=7a30024fa1fe4e09902f2fd7fc9022b427376dd4

diff --git a/src/uisupport/fontselector.cpp b/src/uisupport/fontselector.cpp
index 8a53551b..d4a341c3 100644
--- a/src/uisupport/fontselector.cpp
+++ b/src/uisupport/fontselector.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include <QEvent>
@@ -26,53 +26,45 @@
 
 #include "fontselector.h"
 
-FontSelector::FontSelector(QWidget *parent) : QWidget(parent) {
-  init();
-}
-
-FontSelector::FontSelector(const QString &label, QWidget *parent) : QWidget(parent) {
-  init(label);
-}
-
-void FontSelector::init(const QString &label) {
-  QHBoxLayout *layout = new QHBoxLayout(this);
-  QPushButton *chooseButton = new QPushButton(tr("Choose..."), this);
-  connect(chooseButton, SIGNAL(clicked()), SLOT(chooseFont()));
+FontSelector::FontSelector(QWidget *parent) : QWidget(parent)
+{
+    auto *layout = new QHBoxLayout(this);
+    QPushButton *chooseButton = new QPushButton(tr("Choose..."), this);
+    connect(chooseButton, SIGNAL(clicked()), SLOT(chooseFont()));
 
-  layout->addWidget(_label = new QLabel(label));
-  layout->addWidget(_demo = new QLabel("Font"));
-  layout->addWidget(chooseButton);
-  layout->setContentsMargins(0, 0, 0, 0);
+    layout->addWidget(_demo = new QLabel("Font"));
+    layout->addWidget(chooseButton);
+    layout->setContentsMargins(0, 0, 0, 0);
 
-  _demo->setFrameStyle(QFrame::StyledPanel);
-  _demo->setFrameShadow(QFrame::Sunken);
-  _demo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
-  _font = font();
+    _demo->setFrameStyle(QFrame::StyledPanel);
+    _demo->setFrameShadow(QFrame::Sunken);
+    _demo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+    _font = font();
 }
 
-void FontSelector::setText(const QString &label) {
-  _label->setText(label);
-}
 
-void FontSelector::setSelectedFont(const QFont &font) {
-  _font = font;
-  _demo->setText(QString("%1 %2pt").arg(font.family()).arg(font.pointSize()));
-  _demo->setFont(font);
-  emit fontChanged(font);
+void FontSelector::setSelectedFont(const QFont &font)
+{
+    _font = font;
+    _demo->setText(QString("%1 %2pt").arg(font.family()).arg(font.pointSize()));
+    _demo->setFont(font);
+    emit fontChanged(font);
 }
 
-void FontSelector::chooseFont() {
-  bool ok;
-  QFont font = QFontDialog::getFont(&ok, _demo->font());
-  if(ok) {
-    setSelectedFont(font);
-  }
-}
 
-void FontSelector::changeEvent(QEvent *e) {
-  if(e->type() == QEvent::StyleChange) {
-    _demo->setFont(_font);
-  }
+void FontSelector::chooseFont()
+{
+    bool ok;
+    QFont font = QFontDialog::getFont(&ok, _demo->font(), nullptr, QString(), QFontDialog::DontUseNativeDialog);
+    if (ok) {
+        setSelectedFont(font);
+    }
 }
 
 
+void FontSelector::changeEvent(QEvent *e)
+{
+    if (e->type() == QEvent::StyleChange) {
+        _demo->setFont(_font);
+    }
+}