pidgin/quail/quail-redux

Get the status icons showing in the buddy list, split the buddy list item to its own file

2013-08-29, Phil Hannent
ac6fe25ce84c
Parents af7dc857b731
Children 298217b3f296
Get the status icons showing in the buddy list, split the buddy list item to its own file
9 files changed, 644 insertions(+), 613 deletions(-)
  • +4 -2
    Quail-redux.pro
  • +1 -1
    TODO.txt
  • +1 -0
    src/QuailBListWindow.cpp
  • +488 -0
    src/QuailBlistItem.cpp
  • +45 -0
    src/QuailBlistItem.h
  • +98 -571
    src/QuailBuddyList.cpp
  • +1 -35
    src/QuailBuddyList.h
  • +2 -1
    src/QuailConvButton.cpp
  • +4 -3
    src/QuailConvWindow.cpp
    • --- a/Quail-redux.pro Thu Aug 29 14:23:23 2013 +0100
    +++ b/Quail-redux.pro Thu Aug 29 15:12:20 2013 +0100
    @@ -56,7 +56,8 @@
    src/QuailTabWidget.h \
    src/global.h \
    src/QuailConvDisplay.h \
    - src/QuailStatusSelector.h
    + src/QuailStatusSelector.h \
    + src/QuailBlistItem.h
    SOURCES = \
    @@ -84,7 +85,8 @@
    src/QuailTabWidget.cpp \
    src/main.cpp \
    src/QuailConvDisplay.cpp \
    - src/QuailStatusSelector.cpp
    + src/QuailStatusSelector.cpp \
    + src/QuailBlistItem.cpp
    DISTFILES = \
    --- a/TODO.txt Thu Aug 29 14:23:23 2013 +0100
    +++ b/TODO.txt Thu Aug 29 15:12:20 2013 +0100
    @@ -3,7 +3,6 @@
    * Use Aduim's Message Styles for the conversation window
    * Buddy icons showing up
    -* Buddy status icons showing
    * Formatting toolbar on the conversation window
    * Kill off dead code
    * Rename group
    @@ -50,3 +49,4 @@
    * Conversation text entry
    * Remember group expanded state
    * Enable double click to open a chat
    +* Buddy status icons showing
    --- a/src/QuailBListWindow.cpp Thu Aug 29 14:23:23 2013 +0100
    +++ b/src/QuailBListWindow.cpp Thu Aug 29 15:12:20 2013 +0100
    @@ -21,6 +21,7 @@
    */
    #include "QuailAccountsWindow.h"
    #include "QuailBListWindow.h"
    +#include "QuailBlistItem.h"
    #include "QuailBuddyList.h"
    #include "QuailConvButton.h"
    #include "QuailConvWindow.h"
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/src/QuailBlistItem.cpp Thu Aug 29 15:12:20 2013 +0100
    @@ -0,0 +1,488 @@
    +#include "QuailBlistItem.h"
    +#include "QuailImageUtils.h"
    +#include "QuailProtocolUtils.h"
    +
    +#include <QDebug>
    +#include <QPixmap>
    +
    +QQuailBListItem::QQuailBListItem(QTreeWidget *parent, PurpleBlistNode *node)
    + : QTreeWidgetItem(parent), node(node), dirty(true)
    +{
    + qDebug() << "QQuailBListItem::QQuailBListItem::Added to TreeWidget";
    + init();
    +}
    +
    +QQuailBListItem::QQuailBListItem(QTreeWidgetItem *parent, PurpleBlistNode *node)
    + : QTreeWidgetItem(parent), node(node), dirty(true)
    +{
    + qDebug() << "QQuailBListItem::QQuailBListItem::Added to TreeWidgetItem";
    + init();
    +}
    +
    +QQuailBListItem::~QQuailBListItem()
    +{
    + if (node != NULL)
    + node->ui_data = NULL;
    +}
    +
    +PurpleBlistNode *
    +QQuailBListItem::getBlistNode() const
    +{
    + return node;
    +}
    +
    +void
    +QQuailBListItem::updateInfo()
    +{
    + qDebug() << "QQuailBListItem::updateInfo";
    +
    + dirty = true;
    +
    + if (PURPLE_BLIST_NODE_IS_CONTACT(node))
    + {
    + qDebug() << "QQuailBListItem::updateInfo.Contact";
    + PurpleContact *contact = (PurpleContact *)node;
    + PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
    + PurplePresence *presence = purple_buddy_get_presence(buddy);
    + char *tmp;
    +
    + if (buddy == NULL)
    + return;
    +
    +
    + qDebug() << "QQuailBListItem::updateInfo.Contact.1";
    +
    + if (isExpanded())
    + {
    + setIcon(0, QIcon(QPixmap(":/data/images/logo.png")));
    + }
    + else
    + {
    + qDebug() << "QQuailBListItem::updateInfo.Contact.2";
    + QString text("");
    +
    +// if (buddy->evil > 0)
    +// text += QString("%1%").arg(buddy->evil);
    +
    + if (purple_prefs_get_bool("/quail/blist/show_idle_times"))
    + {
    + int idle_secs = 0;
    + /* Idle */
    + if (purple_presence_is_idle(presence))
    + {
    + idle_secs = purple_presence_get_idle_time(presence);
    + if (idle_secs > 0)
    + {
    + tmp = purple_str_seconds_to_string(time(NULL) - idle_secs);
    + //purple_notify_user_info_add_pair(user_info, tr("Idle"), tmp);
    +
    + g_free(tmp);
    + time_t t;
    + int ihrs, imin;
    + QString idle;
    +
    + time(&t);
    +
    + ihrs = (t - idle_secs) / 3600;
    + imin = ((t - idle_secs) / 60) % 60;
    +
    + if (ihrs > 0)
    + idle = QString("(%1:%2)").arg(ihrs).arg(imin, 2);
    + else
    + idle = QString("(%1)").arg(imin);
    +
    + if (text != "")
    + text += " ";
    +
    + text += idle;
    +
    + }
    + }
    +
    + }
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3";
    + QPixmap statusIcon = QQuailBListItem::getBuddyStatusIcon(
    + (PurpleBlistNode *)buddy);
    + if (statusIcon.size().width() > 0) {
    + setIcon(1, statusIcon);
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3a" << statusIcon.size().width();
    + } else {
    + qDebug() << "QQuailBListItem::updateInfo.Contact.3b";
    + }
    + setToolTip(1, text);
    + //setIcon(2, QImage::fromData(((PurpleBuddyIcon*)purple_buddy_get_icon(buddy))));
    + }
    + //qDebug() << "QQuailBListItem::updateInfo.Contact.1:" << buddy->server_alias;
    + setText(1, getAlias(buddy));
    + //setText(1, purple_get_buddy_alias(buddy));
    + }
    + else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    + {
    + qDebug() << "QQuailBListItem::updateInfo.Buddy";
    + PurpleBuddy *buddy = (PurpleBuddy *)node;
    + PurplePresence *presence = purple_buddy_get_presence(buddy);
    + QString text = "";
    +
    + //if (buddy->evil > 0)
    + //text += QString("%1%").arg(buddy->evil);
    +
    + if (purple_prefs_get_bool("/quail/blist/show_idle_times"))
    + {
    + int idle_secs = 0;
    + /* Idle */
    + if (purple_presence_is_idle(presence))
    + {
    + idle_secs = purple_presence_get_idle_time(presence);
    + if (idle_secs > 0)
    + {
    + //tmp = purple_str_seconds_to_string(time(NULL) - idle_secs);
    + //purple_notify_user_info_add_pair(user_info, tr("Idle"), tmp);
    +
    + //g_free(tmp);
    + time_t t;
    + int ihrs, imin;
    + QString idle;
    +
    + time(&t);
    +
    + ihrs = (t - idle_secs) / 3600;
    + imin = ((t - idle_secs) / 60) % 60;
    +
    + if (ihrs > 0)
    + idle = QString("(%1:%2)").arg(ihrs).arg(imin, 2);
    + else
    + idle = QString("(%1)").arg(imin);
    +
    + if (text != "")
    + text += " ";
    +
    + text += idle;
    +
    + }
    + }
    + }
    + qDebug() << "QQuailBListItem::updateInfo.Buddy.1" << buddy->server_alias;
    + setIcon(1, QIcon(QQuailBListItem::getBuddyStatusIcon(node)));
    + setText(1, getAlias(buddy));
    + //setIcon(2, purple_buddy_get_icon(buddy));
    + //setText(1, text);
    + }
    + else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    + {
    + qDebug() << "QQuailBListItem::updateInfo.Chat";
    + PurpleChat *chat = (PurpleChat *)node;
    +
    + setIcon(1, QIcon(QQuailProtocolUtils::getProtocolIcon(chat->account)));
    + setText(1, chat->alias);
    + }
    + else if (PURPLE_BLIST_NODE_IS_GROUP(node))
    + {
    + qDebug() << "QQuailBListItem::updateInfo.Group";
    + PurpleGroup *group = (PurpleGroup *)node;
    + setText(1, group->name);
    + }
    +}
    +
    +QString
    +QQuailBListItem::getAlias(PurpleBuddy *buddy)
    +{
    + if(!QString(buddy->alias).isEmpty())
    + return QString(buddy->alias);
    + else if(!QString(buddy->server_alias).isEmpty())
    + return QString(buddy->server_alias);
    +
    + return QString(buddy->name);
    +}
    +
    +void
    +QQuailBListItem::init()
    +{
    + updateInfo();
    +}
    +
    +QSize
    +QQuailBListItem::sizeHint ( int column ) const
    +{
    + qDebug() << "QQuailBListItem::sizeHint";
    + if (column == 0 || column == 2)
    + return QSize(50, 50);
    + else
    + return QSize(100,50);
    +}
    +
    +//void
    +//QQuailBListItem::paintBuddyInfo(QPainter *p, const QPalette &cg, int column,
    +// int width, int align, int lmarg, int itMarg)
    +//{
    +// qDebug() << "QQuailBListItem::paintBuddyInfo";
    +// PurpleBuddy *buddy;
    +// PurpleContact *contact = NULL;
    +
    +// if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    +// buddy = (PurpleBuddy *)node;
    +// else
    +// {
    +// contact = (PurpleContact *)node;
    +// buddy = purple_contact_get_priority_buddy(contact);
    +// }
    +
    +// if (purple_prefs_get_bool("/quail/blist/show_large_icons"))
    +// {
    +// if (column > 0)
    +// return;
    +
    +// if (!isExpanded())
    +// {
    +// if (dirty)
    +// {
    +// PurplePlugin *prpl = NULL;
    +// PurplePluginProtocolInfo *prplInfo = NULL;
    +// QRect topRect, bottomRect;
    +// QString statusText;
    +// QString idleTime;
    +// QString warning;
    +
    +// prpl = purple_plugins_find_with_id(
    +// purple_account_get_protocol_id(buddy->account));
    +
    +// if (prpl != NULL)
    +// prplInfo = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    +
    +// if (prpl != NULL && prplInfo->status_text != NULL &&
    +// purple_account_get_connection(buddy->account) != NULL)
    +// {
    +// char *tmp = prplInfo->status_text(buddy);
    +
    +// if (tmp != NULL)
    +// {
    +// g_strdelimit(tmp, "\n", ' ');
    +
    +// statusText = QString(tmp) + " ";
    +
    +// g_free(tmp);
    +// }
    +// }
    +
    +// if (!isExpanded() &&
    +// purple_prefs_get_bool("/quail/blist/show_idle_times"))
    +// {
    +// time_t t;
    +//// int ihrs, imin;
    +
    +// time(&t);
    +//// ihrs = (t - buddy->idle) / 3600;
    +//// imin = ((t - buddy->idle) / 60) % 60;
    +
    +//// if (ihrs)
    +//// {
    +//// idleTime = tr("Idle (%1h%2m) ").args( ihrs, imin);
    +//// }
    +//// else
    +//// idleTime = tr("Idle (%1m) ").arg(imin);
    +// }
    +
    +//// if (!isExpanded() && buddy->evil > 0 &&
    +//// purple_prefs_get_bool("/quail/blist/show_warning_levels"))
    +//// {
    +//// warning = tr("Warned (%1%) ").arg(buddy->evil);
    +//// }
    +
    +// if (!PURPLE_BUDDY_IS_ONLINE(buddy) && statusText.isEmpty())
    +// statusText = QObject::tr("Offline ");
    +
    +// if (contact != NULL && !isExpanded() && contact->alias != NULL)
    +// topText = contact->alias;
    +// else
    +// topText = purple_contact_get_alias(contact);
    +
    +// bottomText = statusText + idleTime + warning;
    +
    +// /* Get the top rect info. */
    +//// topRect = p->boundingRect(lmarg, 0, width - lmarg - itMarg,
    +//// height(), align | AlignVCenter,
    +//// topText);
    +
    +//// if (!bottomText.isEmpty())
    +//// {
    +//// bottomRect = p->boundingRect(lmarg, 0,
    +//// width - lmarg - itMarg,
    +//// height(),
    +//// align | AlignVCenter,
    +//// bottomText);
    +//// }
    +
    +//// textY1 = (height() - topRect.height() -
    +//// bottomRect.height() - 2) / 2;
    +//// textY2 = textY1 + topRect.height() + 2;
    +// }
    +
    +//// if (buddy->idle > 0 &&
    +//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    +//// {
    +//// p->setPen(cg.dark());
    +//// }
    +
    +//// p->drawText(lmarg, textY1, width - lmarg - itMarg, height(),
    +//// align, topText);
    +
    +//// p->setPen(cg.dark());
    +//// p->drawText(lmarg, textY2, width - lmarg - itMarg, height(),
    +//// align, bottomText);
    +// }
    +// else
    +// {
    +// QPalette _cg(cg);
    +
    +//// if (buddy->idle > 0 &&
    +//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    +//// {
    +//// _cg.setColor(QPalette::Text, cg.dark());
    +//// }
    +
    +//// QTreeWidgetItem::paintCell(p, _cg, column, width, align);
    +// }
    +// }
    +// else
    +// {
    +// QPalette _cg(cg);
    +
    +//// if (buddy->idle > 0 &&
    +//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    +//// {
    +//// _cg.setColor(QPalette::Text, cg.dark());
    +//// }
    +
    +//// QTreeWidgetItem::paintCell(p, _cg, column, width, align);
    +// }
    +//}
    +
    +//void
    +//QQuailBListItem::paintGroupInfo(QPainter *p, const QPalette &, int column,
    +// int width, int align, int lmarg, int itMarg)
    +//{
    +// qDebug() << "QQuailBListItem::paintGroupInfo";
    +// if (column > 0)
    +// return;
    +
    +// PurpleGroup *group = (PurpleGroup *)getBlistNode();
    +// QString groupName, detail;
    +//// QFont f = p->font();
    +
    +// groupName = group->name;
    +
    +// if (purple_prefs_get_bool("/quail/blist/show_group_count"))
    +// {
    +// groupName += " ";
    +// detail = QString("(%1/%2)").arg(
    +// purple_blist_get_group_online_count(group)).arg(
    +// purple_blist_get_group_size(group, FALSE));
    +// }
    +
    +//// f.setBold(true);
    +//// p->setFont(f);
    +//// p->drawText(lmarg, 0, width - lmarg - itMarg, height(),
    +//// align | AlignVCenter, groupName);
    +
    +//// QRect r = p->boundingRect(lmarg, 0, width - lmarg - itMarg,
    +//// height(),
    +//// align | AlignVCenter, groupName);
    +
    +//// f.setBold(false);
    +//// p->setFont(f);
    +//// p->drawText(lmarg + r.right(), 0, width - lmarg - itMarg, height(),
    +//// align | AlignVCenter, detail);
    +//}
    +
    +QPixmap
    +QQuailBListItem::getBuddyStatusIcon(PurpleBlistNode *node)
    +{
    + qDebug() << "QQuailBListItem::getBuddyStatusIcon";
    + QPixmap returnImage;
    + QQuailBListItem *qnode = (QQuailBListItem*)node->ui_data;
    + QQuailBListItem *qbuddynode = NULL;
    + PurpleBuddy *buddy = NULL;
    + PurpleChat *chat = NULL;
    +
    + if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
    + if(!qnode->isExpanded()) {
    + buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
    + if (buddy != NULL)
    + qbuddynode = (QQuailBListItem*)((PurpleBlistNode*)buddy)->ui_data;
    + }
    + } else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
    + buddy = (PurpleBuddy*)node;
    + qbuddynode = (QQuailBListItem*)node->ui_data;
    + } else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
    + chat = (PurpleChat*)node;
    + } else {
    + qDebug() << "QQuailBListItem::getBuddyStatusIcon.1";
    + return QPixmap();
    + }
    +
    + if(buddy || chat) {
    + PurpleAccount *account;
    + PurplePlugin *prpl;
    +
    + if(buddy)
    + account = buddy->account;
    + else
    + account = chat->account;
    +
    + prpl = purple_find_prpl(purple_account_get_protocol_id(account));
    + if(!prpl) {
    + qDebug() << "QQuailBListItem::getBuddyStatusIcon.2";
    + return QPixmap();
    + }
    + }
    +
    + if(buddy) {
    + PurplePresence *p;
    + gboolean trans;
    +
    + p = purple_buddy_get_presence(buddy);
    + trans = purple_presence_is_idle(p);
    +
    + if (PURPLE_BUDDY_IS_ONLINE(buddy) && qbuddynode && qbuddynode->recentSignedOnOff())
    + returnImage = QPixmap(":/data/images/status/log-in.png");
    + else if (qbuddynode && qbuddynode->recentSignedOnOff())
    + returnImage = QPixmap(":/data/images/status/log-out.png");
    + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
    + if (trans)
    + returnImage = QQuailImageUtils::greyPixmap(
    + QPixmap(":/data/images/status/busy.png"),
    + "busy.png");
    + else
    + returnImage = QPixmap(":/data/images/status/busy.png");
    + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
    + if (trans)
    + returnImage = QQuailImageUtils::greyPixmap(
    + QPixmap(":/data/images/status/away.png"),
    + "away.png");
    + else
    + returnImage = QPixmap(":/data/images/status/away.png");
    + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY))
    + if (trans)
    + returnImage = QQuailImageUtils::greyPixmap(
    + QPixmap(":/data/images/status/extended-away.png"),
    + "extended-away.png");
    + else
    + returnImage = QPixmap(":/data/images/status/extended-away.png");
    + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
    + returnImage = QPixmap(":/data/images/status/offline.png");
    + else if (trans)
    + returnImage = QQuailImageUtils::greyPixmap(
    + QPixmap(":/data/images/status/available.png"),
    + "available.png");
    + else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
    + returnImage = QPixmap(":/data/images/status/invisible.png");
    + else
    + returnImage = QPixmap(":/data/images/status/available.png");
    + } else if (chat) {
    + returnImage = QPixmap(":/data/images/status/chat.png");
    + } else {
    + returnImage = QPixmap(":/data/images/status/person.png");
    + }
    +
    + return returnImage;
    +}
    +
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/src/QuailBlistItem.h Thu Aug 29 15:12:20 2013 +0100
    @@ -0,0 +1,45 @@
    +#ifndef QUAILBLISTITEM_H
    +#define QUAILBLISTITEM_H
    +
    +#include <QTreeWidgetItem>
    +
    +#include <libpurple/blist.h>
    +
    +class QQuailBListItem : public QTreeWidgetItem
    +{
    +
    + public:
    + QQuailBListItem(QTreeWidget *parent, PurpleBlistNode *node);
    + QQuailBListItem(QTreeWidgetItem *parent, PurpleBlistNode *node);
    + ~QQuailBListItem();
    +
    + static QPixmap getBuddyStatusIcon(PurpleBlistNode *node);
    +// static QPixmap getBuddyStatusIcon2(PurpleBlistNode *node);
    +
    + PurpleBlistNode *getBlistNode() const;
    +
    + void updateInfo();
    + //TODO: Find out how to calculate this
    + bool recentSignedOnOff()
    + { return false; }
    + /*reimp*/QSize sizeHint ( int column ) const;
    +
    + protected:
    + void init();
    +
    +// void paintBuddyInfo(QPainter *p, const QPalette &cg, int column,
    +// int width, int align, int lmarg, int itMarg);
    +// void paintGroupInfo(QPainter *p, const QPalette &cg, int column,
    +// int width, int align, int lmarg, int itMarg);
    +
    + private:
    + PurpleBlistNode *node;
    + bool dirty;
    + QString topText, bottomText;
    + int textY1, textY2;
    +
    + QString getAlias(PurpleBuddy *buddy);
    +};
    +
    +
    +#endif // QUAILBLISTITEM_H
    --- a/src/QuailBuddyList.cpp Thu Aug 29 14:23:23 2013 +0100
    +++ b/src/QuailBuddyList.cpp Thu Aug 29 15:12:20 2013 +0100
    @@ -23,6 +23,7 @@
    #include "QuailBuddyList.h"
    #include "QuailProtocolUtils.h"
    #include "QuailImageUtils.h"
    +#include "QuailBlistItem.h"
    #include <libpurple/debug.h>
    #include <libpurple/prefs.h>
    @@ -37,589 +38,112 @@
    #define BUDDY_ICON_SIZE 20
    -/**************************************************************************
    - * QQuailBListItem
    - **************************************************************************/
    -QQuailBListItem::QQuailBListItem(QTreeWidget *parent, PurpleBlistNode *node)
    - : QTreeWidgetItem(parent), node(node), dirty(true)
    -{
    - qDebug() << "QQuailBListItem::QQuailBListItem::Added to TreeWidget";
    - init();
    -}
    -
    -QQuailBListItem::QQuailBListItem(QTreeWidgetItem *parent, PurpleBlistNode *node)
    - : QTreeWidgetItem(parent), node(node), dirty(true)
    -{
    - qDebug() << "QQuailBListItem::QQuailBListItem::Added to TreeWidgetItem";
    - init();
    -}
    -
    -QQuailBListItem::~QQuailBListItem()
    -{
    - if (node != NULL)
    - node->ui_data = NULL;
    -}
    -
    -PurpleBlistNode *
    -QQuailBListItem::getBlistNode() const
    -{
    - return node;
    -}
    -
    -void
    -QQuailBListItem::updateInfo()
    -{
    - qDebug() << "QQuailBListItem::updateInfo";
    -
    - dirty = true;
    -
    - if (PURPLE_BLIST_NODE_IS_CONTACT(node))
    - {
    - qDebug() << "QQuailBListItem::updateInfo.Contact";
    - PurpleContact *contact = (PurpleContact *)node;
    - PurpleBuddy *buddy = purple_contact_get_priority_buddy(contact);
    - PurplePresence *presence = purple_buddy_get_presence(buddy);
    - char *tmp;
    -
    - if (buddy == NULL)
    - return;
    -
    -
    - qDebug() << "QQuailBListItem::updateInfo.Contact.1";
    -
    - if (isExpanded())
    - {
    - setIcon(0, QIcon(QPixmap(":/data/images/logo.png")));
    - }
    - else
    - {
    - qDebug() << "QQuailBListItem::updateInfo.Contact.2";
    - QString text("");
    -
    -// if (buddy->evil > 0)
    -// text += QString("%1%").arg(buddy->evil);
    -
    - if (purple_prefs_get_bool("/quail/blist/show_idle_times"))
    - {
    - int idle_secs = 0;
    - /* Idle */
    - if (purple_presence_is_idle(presence))
    - {
    - idle_secs = purple_presence_get_idle_time(presence);
    - if (idle_secs > 0)
    - {
    - tmp = purple_str_seconds_to_string(time(NULL) - idle_secs);
    - //purple_notify_user_info_add_pair(user_info, tr("Idle"), tmp);
    -
    - g_free(tmp);
    - time_t t;
    - int ihrs, imin;
    - QString idle;
    -
    - time(&t);
    -
    - ihrs = (t - idle_secs) / 3600;
    - imin = ((t - idle_secs) / 60) % 60;
    -
    - if (ihrs > 0)
    - idle = QString("(%1:%2)").arg(ihrs).arg(imin, 2);
    - else
    - idle = QString("(%1)").arg(imin);
    -
    - if (text != "")
    - text += " ";
    -
    - text += idle;
    -
    - }
    - }
    -
    - }
    - qDebug() << "QQuailBListItem::updateInfo.Contact.3";
    - setIcon(0, QQuailBuddyList::getBuddyStatusIcon((PurpleBlistNode *)buddy));
    - setToolTip(1, text);
    - //setIcon(2, QImage::fromData(((PurpleBuddyIcon*)purple_buddy_get_icon(buddy))));
    - }
    - //qDebug() << "QQuailBListItem::updateInfo.Contact.1:" << buddy->server_alias;
    - setText(1, getAlias(buddy));
    - //setText(1, purple_get_buddy_alias(buddy));
    - }
    - else if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    - {
    - qDebug() << "QQuailBListItem::updateInfo.Buddy";
    - PurpleBuddy *buddy = (PurpleBuddy *)node;
    - PurplePresence *presence = purple_buddy_get_presence(buddy);
    - QString text = "";
    -
    - //if (buddy->evil > 0)
    - //text += QString("%1%").arg(buddy->evil);
    -
    - if (purple_prefs_get_bool("/quail/blist/show_idle_times"))
    - {
    - int idle_secs = 0;
    - /* Idle */
    - if (purple_presence_is_idle(presence))
    - {
    - idle_secs = purple_presence_get_idle_time(presence);
    - if (idle_secs > 0)
    - {
    - //tmp = purple_str_seconds_to_string(time(NULL) - idle_secs);
    - //purple_notify_user_info_add_pair(user_info, tr("Idle"), tmp);
    -
    - //g_free(tmp);
    - time_t t;
    - int ihrs, imin;
    - QString idle;
    -
    - time(&t);
    -
    - ihrs = (t - idle_secs) / 3600;
    - imin = ((t - idle_secs) / 60) % 60;
    -
    - if (ihrs > 0)
    - idle = QString("(%1:%2)").arg(ihrs).arg(imin, 2);
    - else
    - idle = QString("(%1)").arg(imin);
    -
    - if (text != "")
    - text += " ";
    -
    - text += idle;
    -
    - }
    - }
    - }
    - qDebug() << "QQuailBListItem::updateInfo.Buddy.1" << buddy->server_alias;
    - setIcon(0, QIcon(QQuailBuddyList::getBuddyStatusIcon(node)));
    - setText(1, getAlias(buddy));
    - //setIcon(2, purple_buddy_get_icon(buddy));
    - //setText(1, text);
    - }
    - else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    - {
    - qDebug() << "QQuailBListItem::updateInfo.Chat";
    - PurpleChat *chat = (PurpleChat *)node;
    -
    - setIcon(0, QIcon(QQuailProtocolUtils::getProtocolIcon(chat->account)));
    - setText(1, chat->alias);
    - }
    - else if (PURPLE_BLIST_NODE_IS_GROUP(node))
    - {
    - qDebug() << "QQuailBListItem::updateInfo.Group";
    - PurpleGroup *group = (PurpleGroup *)node;
    - setText(1, group->name);
    - }
    -}
    -
    -QString
    -QQuailBListItem::getAlias(PurpleBuddy *buddy)
    -{
    - if(!QString(buddy->alias).isEmpty())
    - return QString(buddy->alias);
    - else if(!QString(buddy->server_alias).isEmpty())
    - return QString(buddy->server_alias);
    -
    - return QString(buddy->name);
    -}
    -
    -void
    -QQuailBListItem::init()
    -{
    - updateInfo();
    -}
    -
    -QSize
    -QQuailBListItem::sizeHint ( int column ) const
    -{
    - qDebug() << "QQuailBListItem::sizeHint";
    - if (column == 0 || column == 2)
    - return QSize(50, 50);
    - else
    - return QSize(100,50);
    -}
    -
    -//void
    -//QQuailBListItem::paintBuddyInfo(QPainter *p, const QPalette &cg, int column,
    -// int width, int align, int lmarg, int itMarg)
    -//{
    -// qDebug() << "QQuailBListItem::paintBuddyInfo";
    -// PurpleBuddy *buddy;
    -// PurpleContact *contact = NULL;
    -
    -// if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    -// buddy = (PurpleBuddy *)node;
    -// else
    -// {
    -// contact = (PurpleContact *)node;
    -// buddy = purple_contact_get_priority_buddy(contact);
    -// }
    -
    -// if (purple_prefs_get_bool("/quail/blist/show_large_icons"))
    -// {
    -// if (column > 0)
    -// return;
    -
    -// if (!isExpanded())
    -// {
    -// if (dirty)
    -// {
    -// PurplePlugin *prpl = NULL;
    -// PurplePluginProtocolInfo *prplInfo = NULL;
    -// QRect topRect, bottomRect;
    -// QString statusText;
    -// QString idleTime;
    -// QString warning;
    -
    -// prpl = purple_plugins_find_with_id(
    -// purple_account_get_protocol_id(buddy->account));
    -
    -// if (prpl != NULL)
    -// prplInfo = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    -
    -// if (prpl != NULL && prplInfo->status_text != NULL &&
    -// purple_account_get_connection(buddy->account) != NULL)
    -// {
    -// char *tmp = prplInfo->status_text(buddy);
    -
    -// if (tmp != NULL)
    -// {
    -// g_strdelimit(tmp, "\n", ' ');
    -
    -// statusText = QString(tmp) + " ";
    -
    -// g_free(tmp);
    -// }
    -// }
    -
    -// if (!isExpanded() &&
    -// purple_prefs_get_bool("/quail/blist/show_idle_times"))
    -// {
    -// time_t t;
    -//// int ihrs, imin;
    -
    -// time(&t);
    -//// ihrs = (t - buddy->idle) / 3600;
    -//// imin = ((t - buddy->idle) / 60) % 60;
    -
    -//// if (ihrs)
    -//// {
    -//// idleTime = tr("Idle (%1h%2m) ").args( ihrs, imin);
    -//// }
    -//// else
    -//// idleTime = tr("Idle (%1m) ").arg(imin);
    -// }
    -
    -//// if (!isExpanded() && buddy->evil > 0 &&
    -//// purple_prefs_get_bool("/quail/blist/show_warning_levels"))
    -//// {
    -//// warning = tr("Warned (%1%) ").arg(buddy->evil);
    -//// }
    -
    -// if (!PURPLE_BUDDY_IS_ONLINE(buddy) && statusText.isEmpty())
    -// statusText = QObject::tr("Offline ");
    -
    -// if (contact != NULL && !isExpanded() && contact->alias != NULL)
    -// topText = contact->alias;
    -// else
    -// topText = purple_contact_get_alias(contact);
    -
    -// bottomText = statusText + idleTime + warning;
    -
    -// /* Get the top rect info. */
    -//// topRect = p->boundingRect(lmarg, 0, width - lmarg - itMarg,
    -//// height(), align | AlignVCenter,
    -//// topText);
    -
    -//// if (!bottomText.isEmpty())
    -//// {
    -//// bottomRect = p->boundingRect(lmarg, 0,
    -//// width - lmarg - itMarg,
    -//// height(),
    -//// align | AlignVCenter,
    -//// bottomText);
    -//// }
    -
    -//// textY1 = (height() - topRect.height() -
    -//// bottomRect.height() - 2) / 2;
    -//// textY2 = textY1 + topRect.height() + 2;
    -// }
    -
    -//// if (buddy->idle > 0 &&
    -//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    -//// {
    -//// p->setPen(cg.dark());
    -//// }
    -
    -//// p->drawText(lmarg, textY1, width - lmarg - itMarg, height(),
    -//// align, topText);
    -
    -//// p->setPen(cg.dark());
    -//// p->drawText(lmarg, textY2, width - lmarg - itMarg, height(),
    -//// align, bottomText);
    -// }
    -// else
    -// {
    -// QPalette _cg(cg);
    -
    -//// if (buddy->idle > 0 &&
    -//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    -//// {
    -//// _cg.setColor(QPalette::Text, cg.dark());
    -//// }
    -
    -//// QTreeWidgetItem::paintCell(p, _cg, column, width, align);
    -// }
    -// }
    -// else
    -// {
    -// QPalette _cg(cg);
    -
    -//// if (buddy->idle > 0 &&
    -//// purple_prefs_get_bool("/quail/blist/dim_idle_buddies"))
    -//// {
    -//// _cg.setColor(QPalette::Text, cg.dark());
    -//// }
    -
    -//// QTreeWidgetItem::paintCell(p, _cg, column, width, align);
    -// }
    -//}
    -
    -//void
    -//QQuailBListItem::paintGroupInfo(QPainter *p, const QPalette &, int column,
    -// int width, int align, int lmarg, int itMarg)
    -//{
    -// qDebug() << "QQuailBListItem::paintGroupInfo";
    -// if (column > 0)
    -// return;
    -
    -// PurpleGroup *group = (PurpleGroup *)getBlistNode();
    -// QString groupName, detail;
    -//// QFont f = p->font();
    -
    -// groupName = group->name;
    -
    -// if (purple_prefs_get_bool("/quail/blist/show_group_count"))
    -// {
    -// groupName += " ";
    -// detail = QString("(%1/%2)").arg(
    -// purple_blist_get_group_online_count(group)).arg(
    -// purple_blist_get_group_size(group, FALSE));
    -// }
    -
    -//// f.setBold(true);
    -//// p->setFont(f);
    -//// p->drawText(lmarg, 0, width - lmarg - itMarg, height(),
    -//// align | AlignVCenter, groupName);
    -
    -//// QRect r = p->boundingRect(lmarg, 0, width - lmarg - itMarg,
    -//// height(),
    -//// align | AlignVCenter, groupName);
    -
    -//// f.setBold(false);
    -//// p->setFont(f);
    -//// p->drawText(lmarg + r.right(), 0, width - lmarg - itMarg, height(),
    -//// align | AlignVCenter, detail);
    -//}
    -
    /**************************************************************************
    * QQuailBuddyList static utility functions
    **************************************************************************/
    -QPixmap
    -QQuailBuddyList::getBuddyStatusIcon2(PurpleBlistNode *node)
    -{
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon";
    - QImage statusImage;
    - QImage emblemImage;
    - QPixmap statusPixmap;
    - const char *protoName = NULL;
    - PurplePlugin *prpl = NULL;
    - PurplePluginProtocolInfo *prplInfo = NULL;
    - PurpleAccount *account;
    - char *se = NULL, *sw = NULL, *nw = NULL, *ne = NULL;
    +//QPixmap
    +//QQuailBuddyList::getBuddyStatusIcon2(PurpleBlistNode *node)
    +//{
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon";
    +// QImage statusImage;
    +// QImage emblemImage;
    +// QPixmap statusPixmap;
    +// const char *protoName = NULL;
    +// PurplePlugin *prpl = NULL;
    +// PurplePluginProtocolInfo *prplInfo = NULL;
    +// PurpleAccount *account;
    +// char *se = NULL, *sw = NULL, *nw = NULL, *ne = NULL;
    - if (node == NULL)
    - return QPixmap();
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.1";
    - if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    - account = ((PurpleBuddy *)node)->account;
    - else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    - account = ((PurpleChat *)node)->account;
    - else
    - return QPixmap();
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.2";
    - prpl = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
    +// if (node == NULL)
    +// return QPixmap();
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.1";
    +// if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    +// account = ((PurpleBuddy *)node)->account;
    +// else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    +// account = ((PurpleChat *)node)->account;
    +// else
    +// return QPixmap();
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.2";
    +// prpl = purple_plugins_find_with_id(purple_account_get_protocol_id(account));
    - if (prpl == NULL)
    - return QPixmap();
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.3";
    - prplInfo = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    +// if (prpl == NULL)
    +// return QPixmap();
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.3";
    +// prplInfo = PURPLE_PLUGIN_PROTOCOL_INFO(prpl);
    - if (prplInfo->list_icon != NULL)
    - {
    - if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    - protoName = prplInfo->list_icon(account, (PurpleBuddy *)node);
    - else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    - protoName = prplInfo->list_icon(account, NULL);
    - }
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.4";
    -// if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    -// ((PurpleBuddy *)node)->present != GAIM_BUDDY_SIGNING_OFF &&
    -// prplInfo->list_emblems != NULL)
    +// if (prplInfo->list_icon != NULL)
    // {
    -// prplInfo->list_emblems((PurpleBuddy *)node, &se, &sw, &nw, &ne);
    +// if (PURPLE_BLIST_NODE_IS_BUDDY(node))
    +// protoName = prplInfo->list_icon(account, (PurpleBuddy *)node);
    +// else if (PURPLE_BLIST_NODE_IS_CHAT(node))
    +// protoName = prplInfo->list_icon(account, NULL);
    // }
    -
    - if (se == NULL)
    - {
    - if (sw != NULL) se = sw;
    - else if (ne != NULL) se = ne;
    - else if (nw != NULL) se = nw;
    - }
    -
    - sw = nw = ne = NULL; /* So that only the se icon will composite. */
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.4";
    +//// if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    +//// ((PurpleBuddy *)node)->present != GAIM_BUDDY_SIGNING_OFF &&
    +//// prplInfo->list_emblems != NULL)
    +//// {
    +//// prplInfo->list_emblems((PurpleBuddy *)node, &se, &sw, &nw, &ne);
    +//// }
    -// if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    -// ((PurpleBuddy *)node)->present == PURPLE_BUDDY_SIGNING_ON)
    -// {
    -// statusImage = QPixmap(":/data/images/status/login.png");
    -// }
    -// else if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    -// ((PurpleBuddy *)node)->present == PURPLE_BUDDY_SIGNING_OFF)
    -// {
    -// statusImage = QPixmap(":/data/images/status/logout.png");
    -// }
    -// else
    - {
    - statusImage = QPixmap(":/data/images/protocols/" +
    - QString(protoName) + ".svg").toImage();
    - }
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.5:" << protoName;
    - if (statusImage.isNull())
    - return QPixmap();
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.6";
    -// if (se != NULL)
    +// if (se == NULL)
    // {
    -// emblemImage = QPixmap(":/data/images/status/" + QString(se) + ".png").toImage();
    -
    -// if (!emblemImage.isNull())
    -// {
    -// QQuailImageUtils::blendOnLower(
    -// statusImage.width() - emblemImage.width(),
    -// statusImage.height() - emblemImage.height(),
    -// emblemImage, statusImage);
    -// }
    +// if (sw != NULL) se = sw;
    +// else if (ne != NULL) se = ne;
    +// else if (nw != NULL) se = nw;
    // }
    - /* Grey idle buddies. */
    - if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    - !PURPLE_BUDDY_IS_ONLINE((PurpleBuddy *)node))
    - {
    - QQuailImageUtils::greyImage(statusImage);
    - }
    - else if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    - (purple_presence_is_idle(purple_buddy_get_presence((PurpleBuddy *)node))))
    - {
    - QQuailImageUtils::saturate(statusImage, 0.25);
    - }
    -
    - statusPixmap.convertFromImage(statusImage);
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.end";
    - return statusPixmap;
    -}
    +// sw = nw = ne = NULL; /* So that only the se icon will composite. */
    -QPixmap
    -QQuailBuddyList::getBuddyStatusIcon(PurpleBlistNode *node)
    -{
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon";
    - QPixmap returnImage;
    - QQuailBListItem *qnode = (QQuailBListItem*)node->ui_data;
    - QQuailBListItem *qbuddynode = NULL;
    - PurpleBuddy *buddy = NULL;
    - PurpleChat *chat = NULL;
    -
    - if(PURPLE_BLIST_NODE_IS_CONTACT(node)) {
    - if(!qnode->isExpanded()) {
    - buddy = purple_contact_get_priority_buddy((PurpleContact*)node);
    - if (buddy != NULL)
    - qbuddynode = (QQuailBListItem*)((PurpleBlistNode*)buddy)->ui_data;
    - }
    - } else if(PURPLE_BLIST_NODE_IS_BUDDY(node)) {
    - buddy = (PurpleBuddy*)node;
    - qbuddynode = (QQuailBListItem*)node->ui_data;
    - } else if(PURPLE_BLIST_NODE_IS_CHAT(node)) {
    - chat = (PurpleChat*)node;
    - } else {
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.1";
    - return QPixmap();
    - }
    -
    - if(buddy || chat) {
    - PurpleAccount *account;
    - PurplePlugin *prpl;
    -
    - if(buddy)
    - account = buddy->account;
    - else
    - account = chat->account;
    +//// if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    +//// ((PurpleBuddy *)node)->present == PURPLE_BUDDY_SIGNING_ON)
    +//// {
    +//// statusImage = QPixmap(":/data/images/status/login.png");
    +//// }
    +//// else if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    +//// ((PurpleBuddy *)node)->present == PURPLE_BUDDY_SIGNING_OFF)
    +//// {
    +//// statusImage = QPixmap(":/data/images/status/logout.png");
    +//// }
    +//// else
    +// {
    +// statusImage = QPixmap(":/data/images/protocols/" +
    +// QString(protoName) + ".svg").toImage();
    +// }
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.5:" << protoName;
    +// if (statusImage.isNull())
    +// return QPixmap();
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.6";
    +//// if (se != NULL)
    +//// {
    +//// emblemImage = QPixmap(":/data/images/status/" + QString(se) + ".png").toImage();
    - prpl = purple_find_prpl(purple_account_get_protocol_id(account));
    - if(!prpl) {
    - qDebug() << "QQuailBuddyList::getBuddyStatusIcon.2";
    - return QPixmap();
    - }
    - }
    -
    - if(buddy) {
    - PurplePresence *p;
    - gboolean trans;
    -
    - p = purple_buddy_get_presence(buddy);
    - trans = purple_presence_is_idle(p);
    +//// if (!emblemImage.isNull())
    +//// {
    +//// QQuailImageUtils::blendOnLower(
    +//// statusImage.width() - emblemImage.width(),
    +//// statusImage.height() - emblemImage.height(),
    +//// emblemImage, statusImage);
    +//// }
    +//// }
    - if (PURPLE_BUDDY_IS_ONLINE(buddy) && qbuddynode && qbuddynode->recentSignedOnOff())
    - returnImage = QPixmap(":/data/images/status/log-in.png");
    - else if (qbuddynode && qbuddynode->recentSignedOnOff())
    - returnImage = QPixmap(":/data/images/status/log-out.png");
    - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_UNAVAILABLE))
    - if (trans)
    - returnImage = QQuailImageUtils::greyPixmap(
    - QPixmap(":/data/images/status/busy.png"),
    - "busy.png");
    - else
    - returnImage = QPixmap(":/data/images/status/busy.png");
    - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_AWAY))
    - if (trans)
    - returnImage = QQuailImageUtils::greyPixmap(
    - QPixmap(":/data/images/status/away.png"),
    - "away.png");
    - else
    - returnImage = QPixmap(":/data/images/status/away.png");
    - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_EXTENDED_AWAY))
    - if (trans)
    - returnImage = QQuailImageUtils::greyPixmap(
    - QPixmap(":/data/images/status/extended-away.png"),
    - "extended-away.png");
    - else
    - returnImage = QPixmap(":/data/images/status/extended-away.png");
    - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_OFFLINE))
    - returnImage = QPixmap(":/data/images/status/offline.png");
    - else if (trans)
    - returnImage = QQuailImageUtils::greyPixmap(
    - QPixmap(":/data/images/status/available.png"),
    - "available.png");
    - else if (purple_presence_is_status_primitive_active(p, PURPLE_STATUS_INVISIBLE))
    - returnImage = QPixmap(":/data/images/status/invisible.png");
    - else
    - returnImage = QPixmap(":/data/images/status/available.png");
    - } else if (chat) {
    - returnImage = QPixmap(":/data/images/status/chat.png");
    - } else {
    - returnImage = QPixmap(":/data/images/status/person.png");
    - }
    +// /* Grey idle buddies. */
    +// if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    +// !PURPLE_BUDDY_IS_ONLINE((PurpleBuddy *)node))
    +// {
    +// QQuailImageUtils::greyImage(statusImage);
    +// }
    +// else if (PURPLE_BLIST_NODE_IS_BUDDY(node) &&
    +// (purple_presence_is_idle(purple_buddy_get_presence((PurpleBuddy *)node))))
    +// {
    +// QQuailImageUtils::saturate(statusImage, 0.25);
    +// }
    - return returnImage;
    -}
    +// statusPixmap.convertFromImage(statusImage);
    +// qDebug() << "QQuailBuddyList::getBuddyStatusIcon.end";
    +// return statusPixmap;
    +//}
    /**************************************************************************
    @@ -876,7 +400,7 @@
    QMenu *subMenu = new QMenu(this);
    populateBuddyMenu(buddy2, subMenu, false);
    - subMenu->setIcon(QQuailBuddyList::getBuddyStatusIcon(bnode));
    + //subMenu->setIcon(QQuailBuddyList::getBuddyStatusIcon(bnode));
    subMenu->setTitle(buddy2->name);
    menu->addMenu(subMenu);
    }
    @@ -1118,6 +642,7 @@
    for (child = node->child; child != NULL; child = child->next)
    {
    + qDebug() << "QQuailBuddyList::expandContactSlot.1<<<<< set ui_data NULL";
    child->ui_data = NULL;
    updateNode(child);
    @@ -1503,23 +1028,24 @@
    (PURPLE_BUDDY_IS_ONLINE(buddy) ||
    (purple_prefs_get_bool("/quail/blist/show_offline_buddies"))))
    {
    -// qDebug() << "QQuailBuddyList::updateContact.1";
    + qDebug() << "QQuailBuddyList::updateContact.1";
    if (item == NULL)
    {
    -// qDebug() << "QQuailBuddyList::updateContact.2";
    + qDebug() << "QQuailBuddyList::updateContact.2";
    node->ui_data = item = new QQuailBListItem(
    (QQuailBListItem *)(node->parent->ui_data), node);
    item->setSizeHint(0, QSize(this->width(), 50));
    + //item->setIcon(0, QIcon(QQuailBuddyList::getBuddyStatusIcon(node)));
    }
    else
    {
    -// qDebug() << "QQuailBuddyList::updateContact.2";
    + qDebug() << "QQuailBuddyList::updateContact.2";
    item->updateInfo();
    }
    }
    else if (item != NULL)
    {
    -// qDebug() << "QQuailBuddyList::updateContact.3";
    + qDebug() << "QQuailBuddyList::updateContact.3";
    delete item;
    }
    // qDebug() << "QQuailBuddyList::updateContact.end";
    @@ -1557,6 +1083,7 @@
    {
    node->ui_data = item = new QQuailBListItem(
    (QQuailBListItem *)(node->parent->ui_data), node);
    + //item->setIcon(0, QIcon(QQuailBuddyList::getBuddyStatusIcon(node)));
    }
    else
    item->updateInfo();
    --- a/src/QuailBuddyList.h Thu Aug 29 14:23:23 2013 +0100
    +++ b/src/QuailBuddyList.h Thu Aug 29 15:12:20 2013 +0100
    @@ -27,47 +27,13 @@
    #include <QTreeWidget>
    -class QQuailBListItem : public QTreeWidgetItem
    -{
    - public:
    - QQuailBListItem(QTreeWidget *parent, PurpleBlistNode *node);
    - QQuailBListItem(QTreeWidgetItem *parent, PurpleBlistNode *node);
    - ~QQuailBListItem();
    -
    - PurpleBlistNode *getBlistNode() const;
    -
    - void updateInfo();
    - //TODO: Find out how to calculate this
    - bool recentSignedOnOff()
    - { return false; }
    - /*reimp*/QSize sizeHint ( int column ) const;
    -
    - protected:
    - void init();
    -
    -// void paintBuddyInfo(QPainter *p, const QPalette &cg, int column,
    -// int width, int align, int lmarg, int itMarg);
    -// void paintGroupInfo(QPainter *p, const QPalette &cg, int column,
    -// int width, int align, int lmarg, int itMarg);
    -
    - private:
    - PurpleBlistNode *node;
    - bool dirty;
    - QString topText, bottomText;
    - int textY1, textY2;
    -
    - QString getAlias(PurpleBuddy *buddy);
    -};
    +class QQuailBListItem;
    class QQuailBuddyList : public QTreeWidget
    {
    Q_OBJECT
    public:
    - static QPixmap getBuddyStatusIcon(PurpleBlistNode *node);
    - static QPixmap getBuddyStatusIcon2(PurpleBlistNode *node);
    -
    - public:
    QQuailBuddyList(QWidget *parent = NULL);
    virtual ~QQuailBuddyList();
    --- a/src/QuailConvButton.cpp Thu Aug 29 14:23:23 2013 +0100
    +++ b/src/QuailConvButton.cpp Thu Aug 29 15:12:20 2013 +0100
    @@ -129,7 +129,8 @@
    }
    else
    {
    - a->setIcon(QQuailBuddyList::getBuddyStatusIcon((PurpleBlistNode *)buddy));
    + //TODO: Fixme
    + //a->setIcon(QQuailBuddyList::getBuddyStatusIcon((PurpleBlistNode *)buddy));
    }
    a->setText(purple_conversation_get_title(conv));
    menu->addAction(a);
    --- a/src/QuailConvWindow.cpp Thu Aug 29 14:23:23 2013 +0100
    +++ b/src/QuailConvWindow.cpp Thu Aug 29 15:12:20 2013 +0100
    @@ -19,7 +19,8 @@
    * Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,
    * MA 02111-1307 USA
    */
    -#include "QuailBuddyList.h"
    +//#include "QuailBuddyList.h"
    +#include "QuailBlistItem.h"
    #include "QuailConvWindow.h"
    #include "QuailConvButton.h"
    #include "QuailConvDisplay.h"
    @@ -318,7 +319,7 @@
    else
    {
    qwin->getTabs()->setTabIcon(this->getTabId(),
    - QQuailBuddyList::getBuddyStatusIcon((PurpleBlistNode *)b));
    + QQuailBListItem::getBuddyStatusIcon((PurpleBlistNode *)b));
    }
    qwin->getTabs()->setTabText(this->getTabId(),
    purple_conversation_get_title(conv));
    @@ -801,7 +802,7 @@
    {
    qDebug() << "QQuailConvWindow::addConversation().4";
    tabs->addTab(qconv,
    - QQuailBuddyList::getBuddyStatusIcon((PurpleBlistNode *)b),
    + QQuailBListItem::getBuddyStatusIcon((PurpleBlistNode *)b),
    purple_conversation_get_title(conv));
    }