/***************************************************************************
- * 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);
s.notify("ShowNickSelector", this, SLOT(setShowNickSelector(QVariant)));
setShowNickSelector(s.value("ShowNickSelector", true));
+ s.notify("ShowStyleButtons", this, SLOT(setShowStyleButtons(QVariant)));
+ setShowStyleButtons(s.value("ShowStyleButtons", true));
+
s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
setMaxLines(s.value("MaxNumLines", 5));
ui.ownNick->setVisible(v.toBool());
}
+void InputWidget::setShowStyleButtons(const QVariant &v) {
+ ui.showStyleButton->setVisible(v.toBool());
+}
+
void InputWidget::setMaxLines(const QVariant &v) {
ui.inputEdit->setMaxHeight(v.toInt());
}
inputLine()->setCurrentCharFormat(fmt);
}
-void InputWidget::mergeFormatOnWordOrSelection(const QTextCharFormat &format) {
+void InputWidget::mergeFormatOnSelection(const QTextCharFormat &format) {
QTextCursor cursor = inputLine()->textCursor();
- if (!cursor.hasSelection())
- cursor.select(QTextCursor::WordUnderCursor);
cursor.mergeCharFormat(format);
inputLine()->mergeCurrentCharFormat(format);
}
-void InputWidget::setFormatOnWordOrSelection(const QTextCharFormat &format) {
+void InputWidget::setFormatOnSelection(const QTextCharFormat &format) {
QTextCursor cursor = inputLine()->textCursor();
- if (!cursor.hasSelection())
- cursor.select(QTextCursor::WordUnderCursor);
cursor.setCharFormat(format);
inputLine()->setCurrentCharFormat(format);
}
void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) {
fontChanged(format.font());
- if (format.foreground().isOpaque())
- colorChanged(format.foreground().color());
- else
- colorChanged(Qt::transparent);
- if (format.background().isOpaque())
- colorHighlightChanged(format.background().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);
+ mergeFormatOnSelection(fmt);
}
-void InputWidget::on_underlineButton_toggled(bool checked) {
+void InputWidget::on_underlineButton_clicked(bool checked) {
QTextCharFormat fmt;
fmt.setFontUnderline(checked);
- mergeFormatOnWordOrSelection(fmt);
+ mergeFormatOnSelection(fmt);
}
-void InputWidget::on_italicButton_toggled(bool checked) {
+void InputWidget::on_italicButton_clicked(bool checked) {
QTextCharFormat fmt;
fmt.setFontItalic(checked);
- mergeFormatOnWordOrSelection(fmt);
+ mergeFormatOnSelection(fmt);
}
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()) == "") {
color = Qt::transparent;
fmt = getFormatOfWordOrSelection();
fmt.clearForeground();
- setFormatOnWordOrSelection(fmt);
+ setFormatOnSelection(fmt);
}
else {
color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
fmt.setForeground(color);
- mergeFormatOnWordOrSelection(fmt);
+ mergeFormatOnSelection(fmt);
}
ui.textcolorButton->setDefaultAction(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()) == "") {
color = Qt::transparent;
fmt = getFormatOfWordOrSelection();
fmt.clearBackground();
- setFormatOnWordOrSelection(fmt);
+ setFormatOnSelection(fmt);
}
else {
color = QColor(inputLine()->rgbColorFromMirc(qVariantValue<QString>(action->data())));
fmt.setBackground(color);
- mergeFormatOnWordOrSelection(fmt);
+ mergeFormatOnSelection(fmt);
}
ui.highlightcolorButton->setDefaultAction(action);
ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), color));
}
-void InputWidget::colorChanged(const QColor &fg) {
- if (fg == Qt::transparent)
- ui.textcolorButton->setDefaultAction(_colorMenu->actions().last());
- else
- ui.textcolorButton->setDefaultAction(_colorMenu->actions().value(inputLine()->mircColorFromRGB(fg.name()).toInt()));
-
- ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), fg));
-}
-
-void InputWidget::colorHighlightChanged(const QColor &bg) {
- if (bg == Qt::transparent)
- ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last());
- else
- ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().value(inputLine()->mircColorFromRGB(bg.name()).toInt()));
-
- ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), bg));
-}
-
void InputWidget::on_showStyleButton_toggled(bool checked) {
ui.styleFrame->setVisible(checked);
if (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);