projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
A 100% french translation with the Buffer word not translated.
[quassel.git]
/
src
/
uisupport
/
tabcompleter.cpp
diff --git
a/src/uisupport/tabcompleter.cpp
b/src/uisupport/tabcompleter.cpp
index
87a745a
..
33c0dfb
100644
(file)
--- a/
src/uisupport/tabcompleter.cpp
+++ b/
src/uisupport/tabcompleter.cpp
@@
-41,12
+41,13
@@
TabCompleter::TabCompleter(InputLine *inputLine_)
}
void TabCompleter::buildCompletionList() {
}
void TabCompleter::buildCompletionList() {
- completionList.clear();
- nextCompletion = completionList.begin();
+ completionMap.clear();
// this is the first time tab is pressed -> build up the completion list and it's iterator
QModelIndex currentIndex = Client::bufferModel()->currentIndex();
// 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 = completionMap.begin();
return;
return;
+ }
NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
NetworkId networkId = currentIndex.data(NetworkModel::NetworkIdRole).value<NetworkId>();
QString channelName = currentIndex.sibling(currentIndex.row(), 0).data().toString();
@@
-68,21
+69,16
@@
void TabCompleter::buildCompletionList() {
this, SLOT(ircUserJoinedOrParted(IrcUser *)));
*/
this, SLOT(ircUserJoinedOrParted(IrcUser *)));
*/
- completionList.clear();
QString tabAbbrev = inputLine->text().left(inputLine->cursorPosition()).section(' ',-1,-1);
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;
+ QRegExp regex(QString("^[^a-zA-Z]*").append(QRegExp::escape(tabAbbrev)), Qt::CaseInsensitive);
foreach(IrcUser *ircUser, channel->ircUsers()) {
if(regex.indexIn(ircUser->nick()) > -1) {
foreach(IrcUser *ircUser, channel->ircUsers()) {
if(regex.indexIn(ircUser->nick()) > -1) {
-
sort
Map[ircUser->nick().toLower()] = ircUser->nick();
+
completion
Map[ircUser->nick().toLower()] = ircUser->nick();
}
}
}
}
- foreach (QString str, sortMap)
- completionList << str;
- nextCompletion = completion
List
.begin();
+ nextCompletion = completion
Map
.begin();
lastCompletionLength = tabAbbrev.length();
}
lastCompletionLength = tabAbbrev.length();
}
@@
-100,7
+96,7
@@
void TabCompleter::complete() {
enabled = true;
}
enabled = true;
}
- if (nextCompletion != completion
List
.end()) {
+ if (nextCompletion != completion
Map
.end()) {
// clear previous completion
for (int i = 0; i < lastCompletionLength; i++) {
inputLine->backspace();
// clear previous completion
for (int i = 0; i < lastCompletionLength; i++) {
inputLine->backspace();
@@
-121,7
+117,10
@@
void TabCompleter::complete() {
// we're at the end of the list -> start over again
} else {
// we're at the end of the list -> start over again
} else {
- nextCompletion = completionList.begin();
+ if(!completionMap.isEmpty()) {
+ nextCompletion = completionMap.begin();
+ complete();
+ }
}
}
}
}