X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=d325578a21a7743e83ebea65cf61fd5b1eec0343;hp=be18830b0795eb1938c4f91cbed24e0e2a00adaf;hb=2ed35d8a6322e49ab604472a7af59592cf36ae12;hpb=a9c2f4157175cfb775980eb72c8312cdffcbfe00 diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp index be18830b..d325578a 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 * @@ -26,11 +26,13 @@ #include "client.h" #include "iconloader.h" #include "ircuser.h" -#include "jumpkeyhandler.h" #include "networkmodel.h" #include "qtui.h" #include "qtuisettings.h" #include "tabcompleter.h" +#include + +const int leftMargin = 3; InputWidget::InputWidget(QWidget *parent) : AbstractItemView(parent), @@ -41,13 +43,16 @@ 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); ui.ownNick->setSizeAdjustPolicy(QComboBox::AdjustToContents); ui.ownNick->installEventFilter(new MouseWheelFilter(this)); - ui.inputEdit->installEventFilter(new JumpKeyHandler(this)); ui.inputEdit->installEventFilter(this); ui.inputEdit->setMinHeight(1); @@ -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"); @@ -70,9 +104,18 @@ InputWidget::InputWidget(QWidget *parent) setEnableSpellCheck(s.value("EnableSpellCheck", false)); #endif + s.notify("EnableEmacsMode", this, SLOT(setEnableEmacsMode(QVariant))); + setEnableEmacsMode(s.value("EnableEmacsMode", false)); + 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("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant))); + setEnablePerChatHistory(s.value("EnablePerChatHistory", false)); + s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant))); setMaxLines(s.value("MaxNumLines", 5)); @@ -87,35 +130,9 @@ InputWidget::InputWidget(QWidget *parent) Action *activateInputline = coll->add("FocusInputLine"); connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus())); 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())); + activateInputline->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_L)); + connect(inputLine(), SIGNAL(textEntered(QString)), SLOT(onTextEntered(QString)), Qt::QueuedConnection); // make sure the line is already reset, bug #984 connect(inputLine(), SIGNAL(currentCharFormatChanged(QTextCharFormat)), this, SLOT(currentCharFormatChanged(QTextCharFormat))); } @@ -134,6 +151,11 @@ void InputWidget::setCustomFont(const QVariant &v) { QFont font = v.value(); if(font.family().isEmpty()) font = QApplication::font(); + // we don't want font styles as this conflics with mirc code richtext editing + font.setBold(false); + font.setItalic(false); + font.setUnderline(false); + font.setStrikeOut(false); ui.inputEdit->setCustomFont(font); } @@ -141,10 +163,22 @@ void InputWidget::setEnableSpellCheck(const QVariant &v) { ui.inputEdit->setSpellCheckEnabled(v.toBool()); } +void InputWidget::setEnableEmacsMode(const QVariant &v) { + ui.inputEdit->setEmacsMode(v.toBool()); +} + void InputWidget::setShowNickSelector(const QVariant &v) { ui.ownNick->setVisible(v.toBool()); } +void InputWidget::setShowStyleButtons(const QVariant &v) { + ui.showStyleButton->setVisible(v.toBool()); +} + +void InputWidget::setEnablePerChatHistory(const QVariant &v) { + _perChatHistory = v.toBool(); +} + void InputWidget::setMaxLines(const QVariant &v) { ui.inputEdit->setMaxHeight(v.toInt()); } @@ -189,7 +223,29 @@ bool InputWidget::eventFilter(QObject *watched, QEvent *event) { } void InputWidget::currentChanged(const QModelIndex ¤t, const QModelIndex &previous) { - Q_UNUSED(previous) + BufferId currentBufferId = current.data(NetworkModel::BufferIdRole).value(); + BufferId previousBufferId = previous.data(NetworkModel::BufferIdRole).value(); + + if (_perChatHistory) { + //backup + historyMap[previousBufferId].history = inputLine()->history(); + historyMap[previousBufferId].tempHistory = inputLine()->tempHistory(); + historyMap[previousBufferId].idx = inputLine()->idx(); + historyMap[previousBufferId].inputLine = inputLine()->html(); + + //restore + inputLine()->setHistory(historyMap[currentBufferId].history); + inputLine()->setTempHistory(historyMap[currentBufferId].tempHistory); + inputLine()->setIdx(historyMap[currentBufferId].idx); + inputLine()->setHtml(historyMap[currentBufferId].inputLine); + inputLine()->moveCursor(QTextCursor::End,QTextCursor::MoveAnchor); + + // FIXME this really should be in MultiLineEdit (and the const int on top removed) + QTextBlockFormat format = inputLine()->textCursor().blockFormat(); + format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents + inputLine()->textCursor().setBlockFormat(format); + } + NetworkId networkId = current.data(NetworkModel::NetworkIdRole).value(); if(networkId == _networkId) return; @@ -222,7 +278,12 @@ void InputWidget::rowsAboutToBeRemoved(const QModelIndex &parent, int start, int } } + void InputWidget::updateEnabledState() { +// FIXME: Find a visualization for this that does not disable the widget! +// Disabling kills global action shortcuts, plus users sometimes need/want to enter text +// even in inactive channels. +#if 0 QModelIndex currentIndex = selectionModel()->currentIndex(); const Network *net = Client::networkModel()->networkByIndex(currentIndex); @@ -233,7 +294,9 @@ void InputWidget::updateEnabledState() { // ... if we're not connected to the network at all enabled &= net->isConnected(); } + ui.inputEdit->setEnabled(enabled); +#endif } const Network *InputWidget::currentNetwork() const { @@ -351,65 +414,130 @@ void InputWidget::changeNick(const QString &newNick) const { Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick)); } -void InputWidget::on_inputEdit_textEntered(const QString &text) const { +void InputWidget::onTextEntered(const QString &text) { 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); + +#ifdef HAVE_KDE + // Set highlighter back to active in case it was deactivated by too many errors. + if(ui.inputEdit->highlighter()) + ui.inputEdit->highlighter()->setActive(true); +#endif } -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