projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some cleanups, debug output--
[quassel.git]
/
src
/
qtui
/
inputwidget.cpp
diff --git
a/src/qtui/inputwidget.cpp
b/src/qtui/inputwidget.cpp
index
a877172
..
9fab60c
100644
(file)
--- 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 *
* 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);
_colorFillMenu->addAction(pix, tr("Clear Color"))->setData("");
ui.textcolorButton->setMenu(_colorMenu);
- connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorCho
o
sen(QAction*)));
+ connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChosen(QAction*)));
ui.highlightcolorButton->setMenu(_colorFillMenu);
ui.highlightcolorButton->setMenu(_colorFillMenu);
- connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightCho
o
sen(QAction*)));
+ connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChosen(QAction*)));
new TabCompleter(ui.inputEdit);
new TabCompleter(ui.inputEdit);
@@
-432,7
+432,7
@@
void InputWidget::fontChanged(const QFont &f)
ui.underlineButton->setChecked(f.underline());
}
ui.underlineButton->setChecked(f.underline());
}
-void InputWidget::colorCho
osen(QAction *
action) {
+void InputWidget::colorCho
sen(QAction *
action) {
QTextCharFormat fmt;
QColor color;
if (qVariantValue<QString>(action->data()) == "") {
QTextCharFormat fmt;
QColor color;
if (qVariantValue<QString>(action->data()) == "") {
@@
-450,7
+450,7
@@
void InputWidget::colorChoosen(QAction * action) {
ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color));
}
ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color));
}
-void InputWidget::colorHighlightCho
osen(QAction *
action) {
+void InputWidget::colorHighlightCho
sen(QAction *
action) {
QTextCharFormat fmt;
QColor color;
if (qVariantValue<QString>(action->data()) == "") {
QTextCharFormat fmt;
QColor color;
if (qVariantValue<QString>(action->data()) == "") {
@@
-496,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);
QPixmap pixmap(16, 16);
pixmap.fill(Qt::transparent);
QPainter painter(&pixmap);