* change dotted last read message indicator to a line, remove
airbrushgrenade

* sort emotes in tab completion

* implement tabbing usernames

* FeelsOkayMan

* fix emotes and usernames comparing; formatting

* remove private/personal stuff

* change lastmessageindicator back to default verpattern
This commit is contained in:
hemirt
2018-03-24 11:12:24 +01:00
committed by pajlada
parent 0423702e50
commit ab42a30108
4 changed files with 78 additions and 10 deletions
+49 -7
View File
@@ -1,11 +1,13 @@
#pragma once
#include <QAbstractListModel>
#include <QVector>
#include <set>
#include <map>
#include <string>
#include "common.hpp"
namespace chatterino {
namespace singletons {
class CompletionModel : public QAbstractListModel
@@ -21,7 +23,9 @@ public:
virtual QVariant data(const QModelIndex &index, int) const override
{
// TODO: Implement more safely
return QVariant(this->emotes.at(index.row()));
auto it = this->emotes.begin();
std::advance(it, index.row());
return QVariant(it->str);
}
virtual int rowCount(const QModelIndex &) const override
@@ -30,14 +34,52 @@ public:
}
void refresh();
private:
void addString(const std::string &str);
void addString(const QString &str);
QVector<QString> emotes;
void addUser(const QString &str);
private:
struct TaggedString {
QString str;
// emote == true
// username == false
bool isEmote = true;
bool operator<(const TaggedString &that) const
{
if (this->isEmote) {
if (that.isEmote) {
int k = QString::compare(this->str, that.str, Qt::CaseInsensitive);
if (k == 0) return this->str > that.str;
else return k < 0;
} else
return true;
} else {
if (that.isEmote)
return false;
else {
int k = QString::compare(this->str, that.str, Qt::CaseInsensitive);;
if (k == 0) return this->str > that.str;
else return k < 0;
}
}
}
};
TaggedString createEmote(const std::string &str)
{
return TaggedString{qS(str), true};
}
TaggedString createEmote(const QString &str)
{
return TaggedString{str, true};
}
TaggedString createUser(const QString &str)
{
return TaggedString{str, false};
}
std::set<TaggedString> emotes;
QString channelName;
};
}
}
} // namespace singletons
} // namespace chatterino