X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=1b01c21dd468f176fd823a8141216a2034feca11;hp=be18830b0795eb1938c4f91cbed24e0e2a00adaf;hb=f033a6c23d48561d064eeb6aaeb6eea1190cc4af;hpb=a9c2f4157175cfb775980eb72c8312cdffcbfe00 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index be18830b..1b01c21d 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 * @@ -31,6 +31,7 @@ #include "qtui.h" #include "qtuisettings.h" #include "tabcompleter.h" +#include InputWidget::InputWidget(QWidget *parent) : AbstractItemView(parent), @@ -41,6 +42,10 @@ InputWidget::InputWidget(QWidget *parent) layout()->setAlignment(ui.ownNick, Qt::AlignBottom); layout()->setAlignment(ui.inputEdit, Qt::AlignBottom); + layout()->setAlignment(ui.showStyleButton, Qt::AlignBottom); + layout()->setAlignment(ui.styleFrame, Qt::AlignBottom); + + ui.styleFrame->setVisible(false); setFocusProxy(ui.inputEdit); ui.ownNick->setFocusProxy(ui.inputEdit); @@ -55,6 +60,35 @@ InputWidget::InputWidget(QWidget *parent) ui.inputEdit->setMode(MultiLineEdit::MultiLine); ui.inputEdit->setPasteProtectionEnabled(true); + ui.boldButton->setIcon(SmallIcon("format-text-bold")); + ui.italicButton->setIcon(SmallIcon("format-text-italic")); + ui.underlineButton->setIcon(SmallIcon("format-text-underline")); + ui.textcolorButton->setIcon(SmallIcon("format-text-color")); + ui.highlightcolorButton->setIcon(SmallIcon("format-fill-color")); + + _colorMenu = new QMenu(); + _colorFillMenu = new QMenu(); + + QStringList names; + names << tr("White") << tr("Black") << tr("Dark blue") << tr("Dark green") << tr("Red") << tr("Dark red") << tr("Dark magenta") << tr("Orange") + << tr("Yellow") << tr("Green") << tr("Dark cyan") << tr("Cyan") << tr("Blue") << tr("Magenta") << tr("Dark gray") << tr("Light gray"); + + QPixmap pix(16, 16); + for (int i = 0; i < inputLine()->mircColorMap().count(); i++) { + pix.fill(inputLine()->mircColorMap().values()[i]); + _colorMenu->addAction(pix, names[i])->setData(inputLine()->mircColorMap().keys()[i]); + _colorFillMenu->addAction(pix, names[i])->setData(inputLine()->mircColorMap().keys()[i]); + } + + pix.fill(Qt::transparent); + _colorMenu->addAction(pix, tr("Clear Color"))->setData(""); + _colorFillMenu->addAction(pix, tr("Clear Color"))->setData(""); + + ui.textcolorButton->setMenu(_colorMenu); + connect(_colorMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorChosen(QAction*))); + ui.highlightcolorButton->setMenu(_colorFillMenu); + connect(_colorFillMenu, SIGNAL(triggered(QAction*)), this, SLOT(colorHighlightChosen(QAction*))); + new TabCompleter(ui.inputEdit); UiStyleSettings fs("Fonts"); @@ -73,6 +107,9 @@ InputWidget::InputWidget(QWidget *parent) 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)); @@ -89,33 +126,6 @@ InputWidget::InputWidget(QWidget *parent) activateInputline->setText(tr("Focus Input Line")); activateInputline->setShortcut(tr("Ctrl+L")); - actionTextBold = coll->add("TextBold"); - QFont bold; - bold.setBold(true); - actionTextBold->setFont(bold); - actionTextBold->setText(tr("Bold")); - actionTextBold->setShortcut(tr("Ctrl+B")); - actionTextBold->setCheckable(true); - connect(actionTextBold, SIGNAL(triggered()), SLOT(textBold())); - - actionTextUnderline = coll->add("TextUnderline"); - QFont underline; - underline.setUnderline(true); - actionTextUnderline->setFont(underline); - actionTextUnderline->setText(tr("Underline")); - actionTextUnderline->setShortcut(tr("Ctrl+U")); - actionTextUnderline->setCheckable(true); - connect(actionTextUnderline, SIGNAL(triggered()), SLOT(textUnderline())); - - actionTextItalic = coll->add("TextItalic"); - QFont italic; - italic.setItalic(true); - actionTextItalic->setFont(italic); - actionTextItalic->setText(tr("Italic")); - actionTextItalic->setShortcut(tr("Ctrl+I")); - actionTextItalic->setCheckable(true); - connect(actionTextItalic, SIGNAL(triggered()), SLOT(textItalic())); - connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat))); } @@ -145,6 +155,10 @@ void InputWidget::setShowNickSelector(const QVariant &v) { 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()); } @@ -353,63 +367,122 @@ void InputWidget::changeNick(const QString &newNick) const { void InputWidget::on_inputEdit_textEntered(const QString &text) const { Client::userInput(currentBufferInfo(), text); - actionTextBold->setChecked(false); - actionTextUnderline->setChecked(false); - actionTextItalic->setChecked(false); - inputLine()->setFontWeight(QFont::Normal); - inputLine()->setFontUnderline(false); - inputLine()->setFontItalic(false); + ui.boldButton->setChecked(false); + ui.underlineButton->setChecked(false); + ui.italicButton->setChecked(false); + + QTextCharFormat fmt; + fmt.setFontWeight(QFont::Normal); + fmt.setFontUnderline(false); + fmt.setFontItalic(false); + fmt.clearForeground(); + fmt.clearBackground(); + 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::setFormatOnSelection(const QTextCharFormat &format) { + QTextCursor cursor = inputLine()->textCursor(); + cursor.setCharFormat(format); + inputLine()->setCurrentCharFormat(format); +} + +QTextCharFormat InputWidget::getFormatOfWordOrSelection() { + QTextCursor cursor = inputLine()->textCursor(); + return cursor.charFormat(); +} + void InputWidget::currentCharFormatChanged(const QTextCharFormat &format) { fontChanged(format.font()); - colorChanged(format.foreground().color(), format.background().color()); } -void InputWidget::textBold() -{ - if (inputLine()->hasFocus()) { - QTextCharFormat fmt; - fmt.setFontWeight(actionTextBold->isChecked() ? QFont::Bold : QFont::Normal); - mergeFormatOnWordOrSelection(fmt); - } +void InputWidget::on_boldButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal); + mergeFormatOnSelection(fmt); +} + +void InputWidget::on_underlineButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontUnderline(checked); + mergeFormatOnSelection(fmt); } -void InputWidget::textUnderline() +void InputWidget::on_italicButton_clicked(bool checked) { + QTextCharFormat fmt; + fmt.setFontItalic(checked); + mergeFormatOnSelection(fmt); +} + +void InputWidget::fontChanged(const QFont &f) { - if (inputLine()->hasFocus()) { - QTextCharFormat fmt; - fmt.setFontUnderline(actionTextUnderline->isChecked()); - mergeFormatOnWordOrSelection(fmt); + ui.boldButton->setChecked(f.bold()); + ui.italicButton->setChecked(f.italic()); + ui.underlineButton->setChecked(f.underline()); +} + +void InputWidget::colorChosen(QAction *action) { + QTextCharFormat fmt; + QColor color; + if (qVariantValue(action->data()) == "") { + color = Qt::transparent; + fmt = getFormatOfWordOrSelection(); + fmt.clearForeground(); + setFormatOnSelection(fmt); + } + else { + color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + fmt.setForeground(color); + mergeFormatOnSelection(fmt); } + ui.textcolorButton->setDefaultAction(action); + ui.textcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-text-color"), color)); } -void InputWidget::textItalic() -{ - if (inputLine()->hasFocus()) { - QTextCharFormat fmt; - fmt.setFontItalic(actionTextItalic->isChecked()); - mergeFormatOnWordOrSelection(fmt); +void InputWidget::colorHighlightChosen(QAction *action) { + QTextCharFormat fmt; + QColor color; + if (qVariantValue(action->data()) == "") { + color = Qt::transparent; + fmt = getFormatOfWordOrSelection(); + fmt.clearBackground(); + setFormatOnSelection(fmt); + } + else { + color = QColor(inputLine()->rgbColorFromMirc(qVariantValue(action->data()))); + fmt.setBackground(color); + mergeFormatOnSelection(fmt); } + ui.highlightcolorButton->setDefaultAction(action); + ui.highlightcolorButton->setIcon(createColorToolButtonIcon(SmallIcon("format-fill-color"), color)); } -void InputWidget::fontChanged(const QFont &f) -{ - actionTextBold->setChecked(f.bold()); - actionTextItalic->setChecked(f.italic()); - actionTextUnderline->setChecked(f.underline()); +void InputWidget::on_showStyleButton_toggled(bool checked) { + ui.styleFrame->setVisible(checked); + if (checked) { + ui.showStyleButton->setArrowType(Qt::LeftArrow); + } + else { + ui.showStyleButton->setArrowType(Qt::RightArrow); + } } -void InputWidget::colorChanged(const QColor &fg, const QColor &bg) { - //TODO update colorpicker +QIcon InputWidget::createColorToolButtonIcon(const QIcon &icon, const QColor &color) { + QPixmap pixmap(16, 16); + pixmap.fill(Qt::transparent); + QPainter painter(&pixmap); + QPixmap image = icon.pixmap(16,16); + QRect target(0, 0, 16, 14); + QRect source(0, 0, 16, 14); + painter.fillRect(QRect(0, 14, 16, 16), color); + painter.drawPixmap(target, image, source); + + return QIcon(pixmap); } // MOUSE WHEEL FILTER