tech-bash/squawk
1
0
Fork 0
forked from blue/squawk
Code Pull requests Activity

icon and tooltip information in participants, saving bookmarks, subscription and unsubscription, deletion of MUCs

Browse source
This commit is contained in:
Blue 2019-09-03 23:28:58 +03:00
parent 5547d78608
commit 5f8d38bd9a
19 changed files with 216 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
ui/models/room.cpp
View file

@ -26,6 +26,7 @@ Models::Room::Room(const QString& p_jid, const QMap<QString, QVariant>& data, Mo
joined(false),
jid(p_jid),
nick(""),
subject(""),
messages(),
participants()
{
@ -43,6 +44,11 @@ Models::Room::Room(const QString& p_jid, const QMap<QString, QVariant>& data, Mo
if (itr != data.end()) {
setNick(itr.value().toString());
}
itr = data.find("subject");
if (itr != data.end()) {
setSubject(itr.value().toString());
}
}
Models::Room::~Room()
@ -56,7 +62,7 @@ unsigned int Models::Room::getUnreadMessagesCount() const
int Models::Room::columnCount() const
{
return 6;
return 7;
}
QString Models::Room::getJid() const
@ -103,6 +109,8 @@ QVariant Models::Room::data(int column) const
return getNick();
case 5:
return getMessagesCount();
case 6:
return getSubject();
default:
return QVariant();
}
@ -155,6 +163,8 @@ void Models::Room::update(const QString& field, const QVariant& value)
setAutoJoin(value.toBool());
} else if (field == "nick") {
setNick(value.toString());
} else if (field == "subject") {
setSubject(value.toString());
}
}
@ -286,3 +296,16 @@ void Models::Room::handleParticipantUpdate(std::map<QString, Participant*>::cons
participants.insert(std::make_pair(part->getName(), part));
}
}
QString Models::Room::getSubject() const
{
return subject;
}
void Models::Room::setSubject(const QString& sub)
{
if (sub != subject) {
subject = sub;
changed(6);
}
}

3
ui/models/room.h
View file

@ -45,6 +45,7 @@ public:
QString getJid() const;
QString getNick() const;
QString getRoomName() const;
QString getSubject() const;
QIcon getStatusIcon(bool big = false) const;
QString getStatusText() const;
@ -53,6 +54,7 @@ public:
void setAutoJoin(bool p_autoJoin);
void setJid(const QString& p_jid);
void setNick(const QString& p_nick);
void setSubject(const QString& sub);
void update(const QString& field, const QVariant& value);
@ -75,6 +77,7 @@ private:
bool joined;
QString jid;
QString nick;
QString subject;
Messages messages;
std::map<QString, Participant*> participants;

25
ui/models/roster.cpp
View file

@ -112,6 +112,11 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
result = room->getStatusIcon(false);
}
break;
case Item::participant: {
Participant* p = static_cast<Participant*>(item);
result = p->getStatusIcon(false);
}
break;
default:
break;
}
@ -148,6 +153,7 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
if (mc > 0) {
str += QString("New messages: ") + std::to_string(mc).c_str() + "\n";
}
str += "Jabber ID: " + contact->getJid();
Shared::SubscriptionState ss = contact->getState();
if (ss == Shared::both) {
Shared::Availability av = contact->getAvailability();
@ -180,6 +186,22 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
str += "\nStatus: " + s;
}
result = str;
}
break;
case Item::participant: {
Participant* p = static_cast<Participant*>(item);
QString str("");
Shared::Availability av = p->getAvailability();
str += "Availability: " + Shared::availabilityNames[av] + "\n";
QString s = p->getStatus();
if (s.size() > 0) {
str += "Status: " + s + "\n";
}
str += "Affiliation: " + Shared::affiliationNames[static_cast<unsigned int>(p->getAffiliation())] + "\n";
str += "Role: " + Shared::roleNames[static_cast<unsigned int>(p->getRole())];
result = str;
}
break;
@ -203,6 +225,9 @@ QVariant Models::Roster::data (const QModelIndex& index, int role) const
str += QString("New messages: ") + std::to_string(count).c_str() + "\n";
}
str += QString("Subscription: ") + rm->getStatusText();
if (rm->getJoined()) {
str += QString("\nMembers: ") + std::to_string(rm->childCount()).c_str();
}
result = str;
}
break;