X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Finputline.cpp;h=501ee605e41ff8f5f663c2fe57ccb2b4b1845a72;hp=593af037b9d3a29b81985ed47e360e46ad90f947;hb=e049ffc61b5e260a49d73102a74c3821af827e77;hpb=ab16c77fe03b73a863d9b52b11919bcbac903f58

diff --git a/src/uisupport/inputline.cpp b/src/uisupport/inputline.cpp
index 593af037..501ee605 100644
--- a/src/uisupport/inputline.cpp
+++ b/src/uisupport/inputline.cpp
@@ -18,32 +18,41 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
+#include <QApplication>
+#include <QMenu>
+#include <QMessageBox>
+
 #include "bufferview.h"
 #include "graphicalui.h"
 #include "inputline.h"
 #include "tabcompleter.h"
 
+const int leftMargin = 3;
+
 InputLine::InputLine(QWidget *parent)
   :
 #ifdef HAVE_KDE
     KTextEdit(parent),
 #else
-    QLineEdit(parent),
+    QTextEdit(parent),
 #endif
     idx(0),
     tabCompleter(new TabCompleter(this))
 {
-#ifdef HAVE_KDE
-//This is done to make the KTextEdit look like a lineedit
-  setMaximumHeight(document()->size().toSize().height());
+  // Make the QTextEdit look like a QLineEdit
+#if QT_VERSION >= 0x040500
+  document()->setDocumentMargin(0); // new in Qt 4.5 and we really don't want it here
+#endif
   setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
   setAcceptRichText(false);
   setLineWrapMode(NoWrap);
+#ifdef HAVE_KDE
   enableFindReplace(false);
-  connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
 #endif
+  resetLine();
 
+  connect(this, SIGNAL(textChanged()), this, SLOT(on_textChanged()));
   connect(this, SIGNAL(returnPressed()), this, SLOT(on_returnPressed()));
   connect(this, SIGNAL(textChanged(QString)), this, SLOT(on_textChanged(QString)));
 }
@@ -53,9 +62,24 @@ InputLine::~InputLine() {
 
 void InputLine::setCustomFont(const QFont &font) {
   setFont(font);
-#ifdef HAVE_KDE
-  setMaximumHeight(document()->size().toSize().height());
-#endif
+}
+
+QSize InputLine::sizeHint() const {
+  // use the style to determine a decent size
+  QFontMetrics fm(font());
+  int h = fm.lineSpacing() + 2 * frameWidth();
+  QStyleOptionFrameV2 opt;
+  opt.initFrom(this);
+  opt.rect = QRect(0, 0, 100, h);
+  opt.lineWidth = lineWidth();
+  opt.midLineWidth = midLineWidth();
+  opt.state |= QStyle::State_Sunken;
+  QSize s = style()->sizeFromContents(QStyle::CT_LineEdit, &opt, QSize(100, h).expandedTo(QApplication::globalStrut()), this);
+  return s;
+}
+
+QSize InputLine::minimumSizeHint() const {
+  return sizeHint();
 }
 
 bool InputLine::eventFilter(QObject *watched, QEvent *event) {
@@ -80,8 +104,6 @@ bool InputLine::eventFilter(QObject *watched, QEvent *event) {
 }
 
 void InputLine::keyPressEvent(QKeyEvent * event) {
-
-#ifdef HAVE_KDE
   if(event->matches(QKeySequence::Find)) {
     QAction *act = GraphicalUi::actionCollection()->action("ToggleSearchBar");
     if(act) {
@@ -90,7 +112,6 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
       return;
     }
   }
-#endif
 
   switch(event->key()) {
   case Qt::Key_Up:
@@ -123,32 +144,15 @@ void InputLine::keyPressEvent(QKeyEvent * event) {
 
     break;
 
-  case Qt::Key_Select:		// for Qtopia
-    emit returnPressed();
-    break;
-
-#ifdef HAVE_KDE
-//Since this is a ktextedit, we don't have this signal "natively"
   case Qt::Key_Return:
-    event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
-    break;
-
   case Qt::Key_Enter:
+  case Qt::Key_Select:
     event->accept();
-    if(!text().isEmpty())
-      emit returnPressed();
+    emit returnPressed();
     break;
 
-#endif
-
   default:
-#ifdef HAVE_KDE
-    KTextEdit::keyPressEvent(event);
-#else
-    QLineEdit::keyPressEvent(event);
-#endif
+    QTextEdit::keyPressEvent(event);
   }
 }
 
@@ -158,33 +162,37 @@ bool InputLine::addToHistory(const QString &text, bool temporary) {
 
   Q_ASSERT(0 <= idx && idx <= history.count());
 
-  if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
+  if(temporary) {
     // if an entry of the history is changed, we remember it and show it again at this
     // position until a line was actually sent
     // sent lines get appended to the history
-    if(temporary) {
+    if(history.isEmpty() || text != history[idx - (int)(idx == history.count())]) {
       tempHistory[idx] = text;
-    } else {
+      return true;
+    }
+  } else {
+    if(history.isEmpty() || text != history.last()) {
       history << text;
       tempHistory.clear();
+      return true;
     }
-    return true;
-  } else {
-    return false;
   }
+  return false;
 }
 
 void InputLine::on_returnPressed() {
-  addToHistory(text());
-  emit sendText(text());
-  resetLine();
+  if(!text().isEmpty()) {
+    addToHistory(text());
+    emit sendText(text());
+    resetLine();
+  }
 }
 
 void InputLine::on_textChanged(QString newText) {
   QStringList lineSeparators;
   lineSeparators << QString("\r\n")
-		 << QString('\n')
-		 << QString('\r');
+                 << QString('\n')
+                 << QString('\r');
 
   QString lineSep;
   foreach(QString separator, lineSeparators) {
@@ -197,8 +205,7 @@ void InputLine::on_textChanged(QString newText) {
   if(lineSep.isEmpty())
     return;
 
-  QStringList lines = newText.split(lineSep);
-  clear();
+  QStringList lines = newText.split(lineSep, QString::SkipEmptyParts);
 
   if(lines.count() >= 4) {
     QString msg = tr("Do you really want to paste %n lines?", "", lines.count());
@@ -206,26 +213,29 @@ void InputLine::on_textChanged(QString newText) {
     for(int i = 0; i < 3; i++) {
       msg += lines[i].left(40);
       if(lines[i].count() > 40)
-	msg += "...";
+        msg += "...";
       msg += "<br />";
     }
     msg += "...</p>";
     QMessageBox question(QMessageBox::NoIcon, tr("Paste Protection"), msg, QMessageBox::Yes|QMessageBox::No);
     question.setDefaultButton(QMessageBox::No);
 #ifdef Q_WS_MAC
-    question.setWindowFlags(question.windowFlags() | Qt::Sheet);
+    question.setWindowFlags(question.windowFlags() | Qt::Sheet); // Qt::Sheet is not ignored on other platforms as it should :/
 #endif
-    if(question.exec() == QMessageBox::No)
+    if(question.exec() == QMessageBox::No) {
+      clear();
       return;
+    }
   }
 
   foreach(QString line, lines) {
     if(!line.isEmpty()) {
-      clear();
+      resetLine();
       insert(line);
       emit returnPressed();
     }
   }
+
 //   if(newText.contains(lineSep)) {
 //     clear();
 //     QString line = newText.section(lineSep, 0, 0);
@@ -240,9 +250,18 @@ void InputLine::resetLine() {
   // every time the InputLine is cleared we also reset history index
   idx = history.count();
   clear();
+  QTextBlockFormat format = textCursor().blockFormat();
+  format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
+  textCursor().setBlockFormat(format);
 }
 
 void InputLine::showHistoryEntry() {
   // if the user changed the history, display the changed line
-  tempHistory.contains(idx) ? setText(tempHistory[idx]) : setText(history[idx]);
+  setPlainText(tempHistory.contains(idx) ? tempHistory[idx] : history[idx]);
+  QTextCursor cursor = textCursor();
+  QTextBlockFormat format = cursor.blockFormat();
+  format.setLeftMargin(leftMargin); // we want a little space between the frame and the contents
+  cursor.setBlockFormat(format);
+  cursor.movePosition(QTextCursor::End);
+  setTextCursor(cursor);
 }