retronetworking
/
yate
12
0
Fork 2
Code Issues Pull Requests Projects Releases Wiki Activity

The custom contact list can now handle chat room contacts. 

git-svn-id: http://yate.null.ro/svn/yate/trunk@4208 acf43c95-373e-0410-b603-e72c3f656dc1
This commit is contained in:
marian 2011-03-24 12:08:50 +00:00
parent fdcfb42460
commit 8fa7fcf95a
2 changed files with 45 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
modules/qt4/customtree.cpp
View File

@ -874,11 +874,13 @@ ContactList::ContactList(const char* name, const NamedList& params, QWidget* par
m_flatList(true),
m_showOffline(true),
m_hideEmptyGroups(true),
m_menuContact(0)
m_menuContact(0),
m_menuChatRoom(0)
{
XDebug(ClientDriver::self(),DebugAll,"ContactList(%s) [%p]",name,this);
// Add item props translation
m_itemPropsType.addParam(String((int)TypeContact),"contact");
m_itemPropsType.addParam(String((int)TypeChatRoom),"chatroom");
m_itemPropsType.addParam(String((int)TypeGroup),"group");
m_savedIndent = indentation();
m_groupCountWidget = params["groupcount"];
@ -895,6 +897,7 @@ bool ContactList::setParams(const NamedList& params)
{
bool ok = QtCustomTree::setParams(params);
buildMenu(m_menuContact,params.getParam("contactmenu"));
buildMenu(m_menuChatRoom,params.getParam("chatroommenu"));
return ok;
}
@ -909,7 +912,7 @@ bool ContactList::setTableRow(const String& item, const NamedList* data)
if (!data)
return true;
SafeTree tree(this);
bool ok = it->type() == TypeContact && updateContact(item,*data,false);
bool ok = isContactType(it->type()) && updateContact(item,*data,false);
listChanged();
return ok;
}
@ -980,11 +983,15 @@ bool ContactList::updateTableRows(const NamedList* data, bool atStart)
void ContactList::countContacts(QtTreeItem* grp, int& total, int& online)
{
QList<QtTreeItem*> c = findItems(TypeContact,grp,true,false);
total = c.size();
QList<QtTreeItem*> r = findItems(TypeChatRoom,grp,true,false);
total = c.size() + r.size();
online = 0;
for (int i = 0; i < total; i++)
for (int i = 0; i < c.size(); i++)
if (!(static_cast<ContactItem*>(c[i]))->offline())
online++;
for (int j = 0; j < r.size(); j++)
if (!(static_cast<ContactItem*>(r[j]))->offline())
online++;
}
// Contact list changed notification
@ -1166,7 +1173,7 @@ bool ContactList::updateContact(const String& id, const NamedList& params,
if (!groups || m_flatList) {
// No group changes or not shown by group. Update all contacts
for (int i = 0; i < list.size(); i++)
if (list[i]->type() == TypeContact && list[i]->id() == id) {
if (isContactType(list[i]->type()) && list[i]->id() == id) {
ok = updateContact(*(static_cast<ContactItem*>(list[i])),params) || ok;
found = true;
}
@ -1175,7 +1182,7 @@ bool ContactList::updateContact(const String& id, const NamedList& params,
// Groups changed while shown by group
ContactItem* c = 0;
for (int i = 0; i < list.size(); i++)
if (list[i]->type() == TypeContact && list[i]->id() == id) {
if (isContactType(list[i]->type()) && list[i]->id() == id) {
c = static_cast<ContactItem*>(list[i]);
break;
}
@ -1220,7 +1227,7 @@ bool ContactList::updateContact(const String& id, const NamedList& params,
TelEngine::destruct(newList);
TelEngine::destruct(cgroups);
for (int i = 0; i < list.size(); i++) {
if (list[i]->type() != TypeContact || list[i]->id() != id)
if (!isContactType(list[i]->type()) || list[i]->id() != id)
continue;
ok = updateContact(*(static_cast<ContactItem*>(list[i])),params) || ok;
found = true;
@ -1328,7 +1335,7 @@ bool ContactList::updateContact(ContactItem& c, const NamedList& params, bool al
// Update a contact
bool ContactList::updateItem(QtTreeItem& item, const NamedList& params)
{
if (item.type() == TypeContact)
if (isContactType(item.type()))
return updateContact(*static_cast<ContactItem*>(&item),params);
return QtCustomTree::updateItem(item,params);
}
@ -1351,6 +1358,10 @@ QMenu* ContactList::contextMenu(QtTreeItem* item)
if (m_menuContact)
return m_menuContact;
}
if (item->type() == TypeChatRoom) {
if (m_menuChatRoom)
return m_menuChatRoom;
}
else if (item->type() == TypeGroup)
return m_menu;
return QtCustomTree::contextMenu(item);
@ -1362,7 +1373,7 @@ void ContactList::itemAdded(QtTreeItem& item, QtTreeItem* parent)
QtCustomTree::itemAdded(item,parent);
DDebug(ClientDriver::self(),DebugAll,"ContactList(%s)::itemAdded(%p,%p) type=%d id=%s",
name().c_str(),&item,parent,item.type(),item.id().c_str(),parent);
if (item.type() == TypeContact) {
if (isContactType(item.type())) {
ContactItem* c = static_cast<ContactItem*>(&item);
updateContact(*c,*c);
return;
@ -1473,7 +1484,7 @@ void ContactList::removeContactFromGroup(QList<ContactItem*> list, const String&
if (!g)
return;
QtTreeItem* it = find(id,g,false,false);
if (!(it && it->type() == TypeContact))
if (!(it && isContactType(it->type())))
return;
g->removeChild(it);
list.append(static_cast<ContactItem*>(it));

26
modules/qt4/customtree.h
View File

@ -670,6 +670,7 @@ public:
*/
enum ItemType {
TypeContact = QtCustomTree::TypeCount,
TypeChatRoom = QtCustomTree::TypeCount + 1,
TypeGroup,
};
@ -800,6 +801,25 @@ public:
showEmptyChildren(!m_hideEmptyGroups);
}
/**
* Check if a given type is a contact or chat room
* @param type Type to check
* @return True if the type is contact or chat room
*/
static inline bool isContactType(int type)
{ return type == TypeContact || type == TypeChatRoom; }
/**
* Get contact type from a string value
* @param val The string
* @return Contact type value
*/
static inline int contactType(const String& val) {
if (!val || val != "chatroom")
return TypeContact;
return TypeChatRoom;
}
protected:
// Update contact count in a group
void updateGroupCountContacts(QtTreeItem& item);
@ -874,6 +894,7 @@ private:
String m_noGroupText; // Group text to show for contacts not belonging to any group
QMap<QString,QString> m_statusOrder; // Status order (names are mapped to status icons)
QMenu* m_menuContact;
QMenu* m_menuChatRoom;
};
/**
@ -884,8 +905,9 @@ class ContactItem : public QtTreeItem
{
YCLASS(ContactItem,QtTreeItem)
public:
inline ContactItem(const char* id, const NamedList& p = NamedList::empty())
: QtTreeItem(id,ContactList::TypeContact,p.getValue("name"))
inline ContactItem(const char* id, const NamedList& p = NamedList::empty(),
bool contact = true)
: QtTreeItem(id,ContactList::contactType(p["type"]),p.getValue("name"))
{}
// Build and return a list of groups
inline ObjList* groups() const