X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=1b01c21dd468f176fd823a8141216a2034feca11;hp=a87717212a2e9922b56b74f95e3f374fe4e70568;hb=f033a6c23d48561d064eeb6aaeb6eea1190cc4af;hpb=d4463e3b2ea9f364e2222528cd863e6d2fbeb0f8

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index a8771721..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  *
@@ -85,9 +85,9 @@ InputWidget::InputWidget(QWidget *parent)
   _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);
 
@@ -107,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));
 
@@ -152,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());
 }
@@ -373,18 +380,14 @@ void InputWidget::on_inputEdit_textEntered(const QString &text) const {
   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);
 }
@@ -396,33 +399,24 @@ QTextCharFormat InputWidget::getFormatOfWordOrSelection() {
 
 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_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::on_underlineButton_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontUnderline(checked);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::on_italicButton_clicked(bool checked) {
   QTextCharFormat fmt;
   fmt.setFontItalic(checked);
-  mergeFormatOnWordOrSelection(fmt);
+  mergeFormatOnSelection(fmt);
 }
 
 void InputWidget::fontChanged(const QFont &f)
@@ -432,60 +426,42 @@ 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) {
@@ -496,7 +472,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);