X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=756d06415bf48a149244545fbb3e3491471dc1a7;hb=a888a2886dc1466eb0b1bb3591f43350623c6330;hp=a664b6af523616b5337961075521cb8e468bae03;hpb=97e06500c62eccc20c50d10e6ed09bc3fcebcde4;p=quassel.git

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index a664b6af..756d0641 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -47,7 +47,7 @@ InputWidget::InputWidget(QWidget *parent)
     layout()->setAlignment(ui.showStyleButton, Qt::AlignBottom);
     layout()->setAlignment(ui.styleFrame, Qt::AlignBottom);
 
-    ui.styleFrame->setVisible(false);
+    setStyleOptionsExpanded(false);
 
     setFocusProxy(ui.inputEdit);
     ui.ownNick->setFocusProxy(ui.inputEdit);
@@ -64,8 +64,7 @@ InputWidget::InputWidget(QWidget *parent)
     ui.boldButton->setIcon(QIcon::fromTheme("format-text-bold"));
     ui.italicButton->setIcon(QIcon::fromTheme("format-text-italic"));
     ui.underlineButton->setIcon(QIcon::fromTheme("format-text-underline"));
-    ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color"));
-    ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color"));
+    ui.clearButton->setIcon(QIcon::fromTheme("edit-clear"));
     ui.encryptionIconLabel->hide();
 
     _colorMenu = new QMenu();
@@ -87,10 +86,25 @@ InputWidget::InputWidget(QWidget *parent)
     _colorFillMenu->addAction(pix, tr("Clear Color"))->setData("");
 
     ui.textcolorButton->setMenu(_colorMenu);
+    // Set the default action to clear color (last added action)
+    ui.textcolorButton->setDefaultAction(_colorMenu->actions().last());
     connect(_colorMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorChosen(QAction *)));
+
     ui.highlightcolorButton->setMenu(_colorFillMenu);
+    // Set the default action to clear fill color (last added action)
+    ui.highlightcolorButton->setDefaultAction(_colorFillMenu->actions().last());
     connect(_colorFillMenu, SIGNAL(triggered(QAction *)), this, SLOT(colorHighlightChosen(QAction *)));
 
+    // Needs to be done after adding the menu, otherwise the icon mysteriously vanishes until clicked
+    ui.textcolorButton->setIcon(QIcon::fromTheme("format-text-color"));
+    ui.highlightcolorButton->setIcon(QIcon::fromTheme("format-fill-color"));
+
+    // Show/hide style button
+    connect(ui.showStyleButton, SIGNAL(toggled(bool)), this, SLOT(setStyleOptionsExpanded(bool)));
+
+    // Clear formatting button
+    connect(ui.clearButton, SIGNAL(clicked()), this, SLOT(clearFormat()));
+
     new TabCompleter(ui.inputEdit);
 
     UiStyleSettings fs("Fonts");
@@ -101,7 +115,7 @@ InputWidget::InputWidget(QWidget *parent)
 
     UiSettings s("InputWidget");
 
-#ifdef HAVE_KDE
+#ifdef HAVE_KDE4
     s.notify("EnableSpellCheck", this, SLOT(setEnableSpellCheck(QVariant)));
     setEnableSpellCheck(s.value("EnableSpellCheck", false));
 #endif
@@ -116,7 +130,7 @@ InputWidget::InputWidget(QWidget *parent)
     setShowStyleButtons(s.value("ShowStyleButtons", true));
 
     s.notify("EnablePerChatHistory", this, SLOT(setEnablePerChatHistory(QVariant)));
-    setEnablePerChatHistory(s.value("EnablePerChatHistory", false));
+    setEnablePerChatHistory(s.value("EnablePerChatHistory", true));
 
     s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
     setMaxLines(s.value("MaxNumLines", 5));
@@ -125,7 +139,7 @@ InputWidget::InputWidget(QWidget *parent)
     setScrollBarsEnabled(s.value("EnableScrollBars", true));
 
     s.notify("EnableLineWrap", this, SLOT(setLineWrapEnabled(QVariant)));
-    setLineWrapEnabled(s.value("EnableLineWrap", false));
+    setLineWrapEnabled(s.value("EnableLineWrap", true));
 
     s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant)));
     setMultiLineEnabled(s.value("EnableMultiLine", true));
@@ -370,6 +384,50 @@ BufferInfo InputWidget::currentBufferInfo() const
     return selectionModel()->currentIndex().data(NetworkModel::BufferInfoRole).value<BufferInfo>();
 };
 
+
+void InputWidget::applyFormatActiveColor()
+{
+    if (!ui.textcolorButton->defaultAction()) {
+        return;
+    }
+    colorChosen(ui.textcolorButton->defaultAction());
+}
+
+
+void InputWidget::applyFormatActiveColorFill()
+{
+    if (!ui.highlightcolorButton->defaultAction()) {
+        return;
+    }
+    colorHighlightChosen(ui.highlightcolorButton->defaultAction());
+}
+
+
+void InputWidget::toggleFormatBold()
+{
+    setFormatBold(!ui.boldButton->isChecked());
+}
+
+
+void InputWidget::toggleFormatItalic()
+{
+    setFormatItalic(!ui.italicButton->isChecked());
+}
+
+
+void InputWidget::toggleFormatUnderline()
+{
+    setFormatUnderline(!ui.underlineButton->isChecked());
+}
+
+
+void InputWidget::clearFormat()
+{
+    // Clear all formatting for selection (not global)
+    setFormatClear(false);
+}
+
+
 void InputWidget::setNetwork(NetworkId networkId)
 {
     if (_networkId == networkId)
@@ -497,13 +555,47 @@ void InputWidget::onTextEntered(const QString &text)
     ui.underlineButton->setChecked(false);
     ui.italicButton->setChecked(false);
 
+    setFormatClear(true);
+}
+
+
+void InputWidget::setFormatClear(const bool global)
+{
     QTextCharFormat fmt;
     fmt.setFontWeight(QFont::Normal);
     fmt.setFontUnderline(false);
     fmt.setFontItalic(false);
     fmt.clearForeground();
     fmt.clearBackground();
-    inputLine()->setCurrentCharFormat(fmt);
+    if (global) {
+        inputLine()->setCurrentCharFormat(fmt);
+    } else {
+        setFormatOnSelection(fmt);
+    }
+}
+
+
+void InputWidget::setFormatBold(const bool bold)
+{
+    QTextCharFormat fmt;
+    fmt.setFontWeight(bold ? QFont::Bold : QFont::Normal);
+    mergeFormatOnSelection(fmt);
+}
+
+
+void InputWidget::setFormatItalic(const bool italic)
+{
+    QTextCharFormat fmt;
+    fmt.setFontItalic(italic);
+    mergeFormatOnSelection(fmt);
+}
+
+
+void InputWidget::setFormatUnderline(const bool underline)
+{
+    QTextCharFormat fmt;
+    fmt.setFontUnderline(underline);
+    mergeFormatOnSelection(fmt);
 }
 
 
@@ -530,6 +622,19 @@ QTextCharFormat InputWidget::getFormatOfWordOrSelection()
 }
 
 
+void InputWidget::setStyleOptionsExpanded(bool expanded)
+{
+    ui.styleFrame->setVisible(expanded);
+    if (expanded) {
+        ui.showStyleButton->setArrowType(Qt::LeftArrow);
+        ui.showStyleButton->setToolTip(tr("Hide formatting options"));
+    } else {
+        ui.showStyleButton->setArrowType(Qt::RightArrow);
+        ui.showStyleButton->setToolTip(tr("Show formatting options"));
+    }
+}
+
+
 void InputWidget::currentCharFormatChanged(const QTextCharFormat &format)
 {
     fontChanged(format.font());
@@ -538,25 +643,19 @@ void InputWidget::currentCharFormatChanged(const QTextCharFormat &format)
 
 void InputWidget::on_boldButton_clicked(bool checked)
 {
-    QTextCharFormat fmt;
-    fmt.setFontWeight(checked ? QFont::Bold : QFont::Normal);
-    mergeFormatOnSelection(fmt);
+    setFormatBold(checked);
 }
 
 
 void InputWidget::on_underlineButton_clicked(bool checked)
 {
-    QTextCharFormat fmt;
-    fmt.setFontUnderline(checked);
-    mergeFormatOnSelection(fmt);
+    setFormatUnderline(checked);
 }
 
 
 void InputWidget::on_italicButton_clicked(bool checked)
 {
-    QTextCharFormat fmt;
-    fmt.setFontItalic(checked);
-    mergeFormatOnSelection(fmt);
+    setFormatItalic(checked);
 }
 
 
@@ -610,13 +709,7 @@ void InputWidget::colorHighlightChosen(QAction *action)
 
 void InputWidget::on_showStyleButton_toggled(bool checked)
 {
-    ui.styleFrame->setVisible(checked);
-    if (checked) {
-        ui.showStyleButton->setArrowType(Qt::LeftArrow);
-    }
-    else {
-        ui.showStyleButton->setArrowType(Qt::RightArrow);
-    }
+    setStyleOptionsExpanded(checked);
 }