X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Ftabcompleter.cpp;h=fbd69047c9c62a3dde1968d972660adac55ae32b;hp=b7007d042f3c18713696f0a80bd5876bd378b386;hb=f5539e2ce05f5beac9d789ec615ded695f325fc7;hpb=c5cbe5eb77fce2ab954a98399a1450803108217b

diff --git a/src/uisupport/tabcompleter.cpp b/src/uisupport/tabcompleter.cpp
index b7007d04..fbd69047 100644
--- a/src/uisupport/tabcompleter.cpp
+++ b/src/uisupport/tabcompleter.cpp
@@ -27,6 +27,9 @@
 #include "network.h"
 #include "ircchannel.h"
 #include "ircuser.h"
+#include "uisettings.h"
+
+#include <QRegExp>
 
 TabCompleter::TabCompleter(InputLine *inputLine_)
   : QObject(inputLine_),
@@ -34,15 +37,17 @@ TabCompleter::TabCompleter(InputLine *inputLine_)
     enabled(false),
     nickSuffix(": ")
 {
+  inputLine->installEventFilter(this);
 }
 
 void TabCompleter::buildCompletionList() {
   completionList.clear();
-  nextCompletion = completionList.begin();
   // this is the first time tab is pressed -> build up the completion list and it's iterator
   QModelIndex currentIndex = Client::bufferModel()->currentIndex();
-  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid())
+  if(!currentIndex.data(NetworkModel::BufferIdRole).isValid()) {
+    nextCompletion = completionList.begin();
     return;
+  }
   
   NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
   QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
@@ -55,21 +60,27 @@ void TabCompleter::buildCompletionList() {
   if(!channel)
     return;
 
+  // FIXME commented for debugging
+  /*
   disconnect(this, SLOT(ircUserJoinedOrParted(IrcUser *)));
   connect(channel, SIGNAL(ircUserJoined(IrcUser *)),
 	  this, SLOT(ircUserJoinedOrParted(IrcUser *)));
   connect(channel, SIGNAL(ircUserParted(IrcUser *)),
 	  this, SLOT(ircUserJoinedOrParted(IrcUser *)));
-	     
-  completionList.clear();
+  */
+
   QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
-  completionList.clear();
+  QRegExp regex(QString("^[^a-zA-Z]*").append(tabAbbrev), Qt::CaseInsensitive);
+  QMap<QString, QString> sortMap;
+
   foreach(IrcUser *ircUser, channel->ircUsers()) {
-    if(ircUser->nick().toLower().startsWith(tabAbbrev.toLower())) {
-      completionList << ircUser->nick();
+    if(regex.indexIn(ircUser->nick()) > -1) {
+      sortMap[ircUser->nick().toLower()] = ircUser->nick();
     }
   }
-  completionList.sort();
+  foreach (QString str, sortMap)
+    completionList << str;
+
   nextCompletion = completionList.begin();
   lastCompletionLength = tabAbbrev.length();
 }
@@ -80,6 +91,9 @@ void TabCompleter::ircUserJoinedOrParted(IrcUser *ircUser) {
 }
 
 void TabCompleter::complete() {
+  UiSettings uiSettings;
+  nickSuffix = uiSettings.value("CompletionSuffix", QString(": ")).toString();
+  
   if(!enabled) {
     buildCompletionList();
     enabled = true;
@@ -115,3 +129,18 @@ void TabCompleter::reset() {
   enabled = false;
 }
 
+bool TabCompleter::eventFilter(QObject *obj, QEvent *event) {
+  if(obj != inputLine || event->type() != QEvent::KeyPress)
+    return QObject::eventFilter(obj, event);
+
+  QKeyEvent *keyEvent = static_cast<QKeyEvent *>(event);
+  
+  if(keyEvent->key() == Qt::Key_Tab) {
+    complete();
+    return true;
+  } else {
+    reset();
+    return false;
+  }
+}
+