X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=9fab60cbeaea599ea8307944fb73b58c0994d31c;hp=16523937cc94684634843050b3c72e27e17249cf;hb=580662426b8b734566b37de61deccf5b89970c6e;hpb=27921f7bb1ae86aabc13a5a279624a2d61cc3f2a

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 16523937..9fab60cb 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2010 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -85,9 +85,9 @@ InputWidget::InputWidget(QWidget *parent)
   _colorFillMenu->addAction(pix, tr("Clear Color"))->setData("");
 
   ui.textcolorButton->setMenu(_colorMenu);
-  connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChoosen(QAction*)));
+  connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChosen(QAction*)));
   ui.highlightcolorButton->setMenu(_colorFillMenu);
-  connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChoosen(QAction*)));
+  connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChosen(QAction*)));
 
   new TabCompleter(ui.inputEdit);
 
@@ -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);
@@ -431,7 +432,7 @@ void InputWidget::fontChanged(const QFont &f)
   ui.underlineButton->setChecked(f.underline());
 }
 
-void InputWidget::colorChoosen(QAction * action) {
+void InputWidget::colorChosen(QAction *action) {
   QTextCharFormat fmt;
   QColor color;
   if (qVariantValue<QString>(action->data()) == "") {
@@ -449,7 +450,7 @@ void InputWidget::colorChoosen(QAction * action) {
   ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color));
 }
 
-void InputWidget::colorHighlightChoosen(QAction * action) {
+void InputWidget::colorHighlightChosen(QAction *action) {
   QTextCharFormat fmt;
   QColor color;
   if (qVariantValue<QString>(action->data()) == "") {
@@ -495,7 +496,7 @@ void InputWidget::on_showStyleButton_toggled(bool checked) {
   }
 }
 
-QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, QColor color) {
+QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, const QColor &color) {
   QPixmap pixmap(16, 16);
   pixmap.fill(Qt::transparent);
   QPainter painter(&pixmap);