projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove redundant parameter check from IrcEventCap
[quassel.git]
/
src
/
uisupport
/
fontselector.cpp
diff --git
a/src/uisupport/fontselector.cpp
b/src/uisupport/fontselector.cpp
index
6330693
..
cc15655
100644
(file)
--- 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-
2016 by the Quassel Project
*
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-15,56
+15,56
@@
* 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., *
* 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., *
- * 5
9 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*
+ * 5
1 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
***************************************************************************/
***************************************************************************/
-#include <Q
HBoxLayou
t>
+#include <Q
Even
t>
#include <QFontDialog>
#include <QFontDialog>
+#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include "fontselector.h"
#include <QLabel>
#include <QPushButton>
#include "fontselector.h"
-FontSelector::FontSelector(QWidget *parent) : QWidget(parent) {
- init();
-}
+FontSelector::FontSelector(QWidget *parent) : QWidget(parent)
+{
+ QHBoxLayout *layout = new QHBoxLayout(this);
+ QPushButton *chooseButton = new QPushButton(tr("Choose..."), this);
+ connect(chooseButton, SIGNAL(clicked()), SLOT(chooseFont()));
-FontSelector::FontSelector(const QString &label, QWidget *parent) : QWidget(parent) {
-
init(label
);
-}
+ layout->addWidget(_demo = new QLabel("Font"));
+
layout->addWidget(chooseButton
);
+ layout->setContentsMargins(0, 0, 0, 0);
-void FontSelector::init(const QString &label) {
- QHBoxLayout *layout = new QHBoxLayout(this);
- QPushButton *chooseButton = new QPushButton(tr("Choose..."), this);
- connect(chooseButton, SIGNAL(clicked()), SLOT(chooseFont()));
+ _demo->setFrameStyle(QFrame::StyledPanel);
+ _demo->setFrameShadow(QFrame::Sunken);
+ _demo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Preferred);
+ _font = font();
+}
- layout->addWidget(_label = new QLabel(label));
- 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();
+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::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::chooseFont()
+{
+ bool ok;
+ QFont font = QFontDialog::getFont(&ok, _demo->font());
+ if (ok) {
+ setSelectedFont(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);
+ }
+}