From: Dirk Rettschlag Date: Tue, 9 Feb 2010 16:08:48 +0000 (+0100) Subject: use clicked() signal instead of toggled() X-Git-Tag: 0.6-beta1~32 X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d4463e3b2ea9f364e2222528cd863e6d2fbeb0f8 use clicked() signal instead of toggled() --- diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index 16523937..a8771721 100644 --- a/src/qtui/inputwidget.cpp +++ b/src/qtui/inputwidget.cpp @@ -396,6 +396,7 @@ QTextCharFormat InputWidget::getFormatOfWordOrSelection() { void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) { fontChanged(format.font()); + if (format.foreground().isOpaque()) colorChanged(format.foreground().color()); else @@ -406,19 +407,19 @@ void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) { colorHighlightChanged(Qt::transparent); } -void InputWidget::on_boldButton_toggled(bool checked) { +void InputWidget::on_boldButton_clicked(bool checked) { QTextCharFormat fmt; fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal); mergeFormatOnWordOrSelection(fmt); } -void InputWidget::on_underlineButton_toggled(bool checked) { +void InputWidget::on_underlineButton_clicked(bool checked) { QTextCharFormat fmt; fmt.setFontUnderline(checked); mergeFormatOnWordOrSelection(fmt); } -void InputWidget::on_italicButton_toggled(bool checked) { +void InputWidget::on_italicButton_clicked(bool checked) { QTextCharFormat fmt; fmt.setFontItalic(checked); mergeFormatOnWordOrSelection(fmt); diff --git a/src/qtui/inputwidget.h b/src/qtui/inputwidget.h index da014c38..c29b3ed6 100644 --- a/src/qtui/inputwidget.h +++ b/src/qtui/inputwidget.h @@ -73,9 +73,9 @@ private slots: void currentCharFormatChanged(const QTextCharFormat &format); void on_showStyleButton_toggled(bool checked); - void on_boldButton_toggled(bool checked); - void on_italicButton_toggled(bool checked); - void on_underlineButton_toggled(bool checked); + void on_boldButton_clicked(bool checked); + void on_italicButton_clicked(bool checked); + void on_underlineButton_clicked(bool checked); void colorChoosen(QAction * action); void colorHighlightChoosen(QAction * action);