/***************************************************************************
- * 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 *
_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);
void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
fontChanged(format.font());
+
if (format.foreground().isOpaque())
colorChanged(format.foreground().color());
else
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);
ui.underlineButton->setChecked(f.underline());
}
-void InputWidget::colorChoosen(QAction * action) {
+void InputWidget::colorChosen(QAction *action) {
QTextCharFormat fmt;
QColor color;
if (qVariantValue<QString>(action->data()) == "") {
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()) == "") {
}
}
-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);