X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Finputwidget.cpp;h=be18830b0795eb1938c4f91cbed24e0e2a00adaf;hp=11e3ec35a4ffa5152b317a0741b7b35d0643c61b;hb=a9c2f4157175cfb775980eb72c8312cdffcbfe00;hpb=f116598348bc1439ffb5df2e52e2e63ce5765bd2

diff --git a/src/qtui/inputwidget.cpp b/src/qtui/inputwidget.cpp
index 11e3ec35..be18830b 100644
--- a/src/qtui/inputwidget.cpp
+++ b/src/qtui/inputwidget.cpp
@@ -37,7 +37,6 @@ InputWidget::InputWidget(QWidget *parent)
     _networkId(0)
 {
   ui.setupUi(this);
-  connect(ui.inputEdit, SIGNAL(textEntered(QString)), this, SLOT(sendText(QString)));
   connect(ui.ownNick, SIGNAL(activated(QString)), this, SLOT(changeNick(QString)));
 
   layout()->setAlignment(ui.ownNick, Qt::AlignBottom);
@@ -54,12 +53,15 @@ InputWidget::InputWidget(QWidget *parent)
   ui.inputEdit->setMinHeight(1);
   ui.inputEdit->setMaxHeight(5);
   ui.inputEdit->setMode(MultiLineEdit::MultiLine);
+  ui.inputEdit->setPasteProtectionEnabled(true);
 
   new TabCompleter(ui.inputEdit);
 
   UiStyleSettings fs("Fonts");
+  fs.notify("UseCustomInputWidgetFont", this, SLOT(setUseCustomFont(QVariant)));
   fs.notify("InputWidget", this, SLOT(setCustomFont(QVariant)));
-  setCustomFont(fs.value("InputWidget", QFont()));
+  if(fs.value("UseCustomInputWidgetFont", false).toBool())
+    setCustomFont(fs.value("InputWidget", QFont()));
 
   UiSettings s("InputWidget");
 
@@ -74,8 +76,11 @@ InputWidget::InputWidget(QWidget *parent)
   s.notify("MaxNumLines", this, SLOT(setMaxLines(QVariant)));
   setMaxLines(s.value("MaxNumLines", 5));
 
-  s.notify("EnableScrollBars", this, SLOT(setEnableScrollBars(QVariant)));
-  setEnableScrollBars(s.value("EnableScrollBars", true));
+  s.notify("EnableScrollBars", this, SLOT(setScrollBarsEnabled(QVariant)));
+  setScrollBarsEnabled(s.value("EnableScrollBars", true));
+
+  s.notify("EnableMultiLine", this, SLOT(setMultiLineEnabled(QVariant)));
+  setMultiLineEnabled(s.value("EnableMultiLine", true));
 
   ActionCollection *coll = QtUi::actionCollection();
 
@@ -83,11 +88,48 @@ InputWidget::InputWidget(QWidget *parent)
   connect(activateInputline, SIGNAL(triggered()), SLOT(setFocus()));
   activateInputline->setText(tr("Focus Input Line"));
   activateInputline->setShortcut(tr("Ctrl+L"));
+
+  actionTextBold = coll->add<Action>("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<Action>("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<Action>("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)));
 }
 
 InputWidget::~InputWidget() {
 }
 
+void InputWidget::setUseCustomFont(const QVariant &v) {
+  if(v.toBool()) {
+    UiStyleSettings fs("Fonts");
+    setCustomFont(fs.value("InputWidget"));
+  } else
+    setCustomFont(QFont());
+}
+
 void InputWidget::setCustomFont(const QVariant &v) {
   QFont font = v.value<QFont>();
   if(font.family().isEmpty())
@@ -107,10 +149,14 @@ void InputWidget::setMaxLines(const QVariant &v) {
   ui.inputEdit->setMaxHeight(v.toInt());
 }
 
-void InputWidget::setEnableScrollBars(const QVariant &v) {
+void InputWidget::setScrollBarsEnabled(const QVariant &v) {
   ui.inputEdit->setScrollBarsEnabled(v.toBool());
 }
 
+void InputWidget::setMultiLineEnabled(const QVariant &v) {
+  ui.inputEdit->setMode(v.toBool()? MultiLineEdit::MultiLine : MultiLineEdit::SingleLine);
+}
+
 bool InputWidget::eventFilter(QObject *watched, QEvent *event) {
   if(event->type() != QEvent::KeyPress)
     return false;
@@ -305,10 +351,66 @@ void InputWidget::changeNick(const QString &newNick) const {
   Client::userInput(BufferInfo::fakeStatusBuffer(net->networkId()), QString("/NICK %1").arg(newNick));
 }
 
-void InputWidget::sendText(const QString &text) 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);
+}
+
+void InputWidget::mergeFormatOnWordOrSelection(const QTextCharFormat &format) {
+  QTextCursor cursor = inputLine()->textCursor();
+  if (!cursor.hasSelection())
+    cursor.select(QTextCursor::WordUnderCursor);
+  cursor.mergeCharFormat(format);
+  inputLine()->mergeCurrentCharFormat(format);
+}
+
+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::textUnderline()
+{
+  if (inputLine()->hasFocus()) {
+    QTextCharFormat fmt;
+    fmt.setFontUnderline(actionTextUnderline->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+  }
+}
+
+void InputWidget::textItalic()
+{
+  if (inputLine()->hasFocus()) {
+    QTextCharFormat fmt;
+    fmt.setFontItalic(actionTextItalic->isChecked());
+    mergeFormatOnWordOrSelection(fmt);
+  }
+}
+
+void InputWidget::fontChanged(const QFont &f)
+{
+  actionTextBold->setChecked(f.bold());
+  actionTextItalic->setChecked(f.italic());
+  actionTextUnderline->setChecked(f.underline());
+}
+
+void InputWidget::colorChanged(const QColor &fg, const QColor &bg) {
+  //TODO update colorpicker
+}
 
 // MOUSE WHEEL FILTER
 MouseWheelFilter::MouseWheelFilter(QObject *parent)