[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:05:29 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=c37436b
The following commit has been merged in the master branch:
commit c37436b51662af5f3938231e122ebe99dcb82dbb
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date: Thu Mar 10 23:30:15 2011 +0100
Code polish
---
accountbutton.cpp | 38 +++++++++++++------------
accountbutton.h | 2 +-
accounts-model.cpp | 3 +-
contactdelegate.cpp | 45 ++++++++++++++---------------
contactdelegate.h | 8 +++---
main-widget.cpp | 81 ++++++++++++++++++++++++++---------------------------
main-widget.h | 16 ++++-------
7 files changed, 93 insertions(+), 100 deletions(-)
diff --git a/accountbutton.cpp b/accountbutton.cpp
index cdb3ca5..4ea92f6 100644
--- a/accountbutton.cpp
+++ b/accountbutton.cpp
@@ -31,13 +31,17 @@
#include "accountbutton.h"
-static Tp::ConnectionPresenceType accountPresenceTypes[] = { Tp::ConnectionPresenceTypeAvailable, Tp::ConnectionPresenceTypeAway,
-Tp::ConnectionPresenceTypeAway, Tp::ConnectionPresenceTypeBusy,
-Tp::ConnectionPresenceTypeBusy, Tp::ConnectionPresenceTypeExtendedAway,
-Tp::ConnectionPresenceTypeHidden, Tp::ConnectionPresenceTypeOffline };
+static Tp::ConnectionPresenceType accountPresenceTypes[] = { Tp::ConnectionPresenceTypeAvailable,
+ Tp::ConnectionPresenceTypeAway,
+ Tp::ConnectionPresenceTypeAway,
+ Tp::ConnectionPresenceTypeBusy,
+ Tp::ConnectionPresenceTypeBusy,
+ Tp::ConnectionPresenceTypeExtendedAway,
+ Tp::ConnectionPresenceTypeHidden,
+ Tp::ConnectionPresenceTypeOffline };
static const char *accountPresenceStatuses[] = { "available", "away", "brb", "busy",
-"dnd", "xa", "hidden", "offline" };
+ "dnd", "xa", "hidden", "offline" };
AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent): QToolButton(parent),m_busyOverlay(0)
{
@@ -106,8 +110,7 @@ AccountButton::AccountButton(const Tp::AccountPtr &account, QWidget* parent): QT
addActions(presenceActions->actions());
//make all the actions checkable
- foreach(QAction *a, actions())
- {
+ foreach(QAction *a, actions()) {
a->setCheckable(true);
if(m_account->currentPresence().status() == QLatin1String(accountPresenceStatuses[a->data().toInt()])) {
@@ -172,15 +175,15 @@ void AccountButton::updateToolTip()
void AccountButton::connectionChanged(Tp::ConnectionStatus status)
{
switch (status) {
- case Tp::ConnectionStatusConnecting:
- showBusyIndicator();
- break;
- case Tp::ConnectionStatusConnected:
- case Tp::ConnectionStatusDisconnected:
- hideBusyIndicator();
- break;
- default:
- break;
+ case Tp::ConnectionStatusConnecting:
+ showBusyIndicator();
+ break;
+ case Tp::ConnectionStatusConnected:
+ case Tp::ConnectionStatusDisconnected:
+ hideBusyIndicator();
+ break;
+ default:
+ break;
}
}
@@ -196,8 +199,7 @@ void AccountButton::hideBusyIndicator()
void AccountButton::preseneceChanged(Tp::Presence presence)
{
- foreach(QAction *a, actions())
- {
+ foreach(QAction *a, actions()) {
if(presence.status() == QLatin1String(accountPresenceStatuses[a->data().toInt()])) {
a->setChecked(true);
m_statusIndex = a->data().toInt();
diff --git a/accountbutton.h b/accountbutton.h
index 29cc153..497929e 100644
--- a/accountbutton.h
+++ b/accountbutton.h
@@ -49,7 +49,7 @@ public Q_SLOTS:
private:
Tp::AccountPtr m_account;
int m_statusIndex;
- KPixmapSequenceOverlayPainter* m_busyOverlay;
+ KPixmapSequenceOverlayPainter *m_busyOverlay;
};
#endif // TELEPATHY_ACCOUNTBUTTON_H
diff --git a/accounts-model.cpp b/accounts-model.cpp
index bb27976..c2720b1 100644
--- a/accounts-model.cpp
+++ b/accounts-model.cpp
@@ -54,9 +54,11 @@ AccountsModel::AccountsModel(const Tp::AccountManagerPtr &am, QObject *parent)
connect(mPriv->mTree,
SIGNAL(changed(TreeNode*)),
SLOT(onItemChanged(TreeNode*)));
+
connect(mPriv->mTree,
SIGNAL(childrenAdded(TreeNode*,QList<TreeNode*>)),
SLOT(onItemsAdded(TreeNode*,QList<TreeNode*>)));
+
connect(mPriv->mTree,
SIGNAL(childrenRemoved(TreeNode*,int,int)),
SLOT(onItemsRemoved(TreeNode*,int,int)));
@@ -141,7 +143,6 @@ void AccountsModel::onItemsAdded(TreeNode *parent, const QList<TreeNode *> &node
{
QModelIndex parentIndex = index(parent);
int currentSize = rowCount(parentIndex);
- //debug() << "adding rows from" << currentSize << "to" << (currentSize + nodes.size() - 1);
beginInsertRows(parentIndex, currentSize, currentSize + nodes.size() - 1);
foreach (TreeNode *node, nodes) {
parent->addChild(node);
diff --git a/contactdelegate.cpp b/contactdelegate.cpp
index 1af9f05..8912d43 100644
--- a/contactdelegate.cpp
+++ b/contactdelegate.cpp
@@ -53,26 +53,25 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
QPixmap icon;
- switch(index.data(AccountsModel::PresenceTypeRole).toInt())
- {
- case Tp::ConnectionPresenceTypeAvailable:
- icon = SmallIcon("user-online", KIconLoader::SizeSmallMedium);
- break;
- case Tp::ConnectionPresenceTypeAway:
- icon = SmallIcon("user-away", KIconLoader::SizeSmallMedium);
- break;
- case Tp::ConnectionPresenceTypeExtendedAway:
- icon = SmallIcon("user-away-extended", KIconLoader::SizeSmallMedium);
- break;
- case Tp::ConnectionPresenceTypeBusy:
- icon = SmallIcon("user-busy", KIconLoader::SizeSmallMedium);
- break;
- case Tp::ConnectionPresenceTypeOffline:
- icon = SmallIcon("user-offline", KIconLoader::SizeSmallMedium);
- break;
- default:
- icon = SmallIcon("task-attention", KIconLoader::SizeSmallMedium);
- break;
+ switch(index.data(AccountsModel::PresenceTypeRole).toInt()) {
+ case Tp::ConnectionPresenceTypeAvailable:
+ icon = SmallIcon("user-online", KIconLoader::SizeSmallMedium);
+ break;
+ case Tp::ConnectionPresenceTypeAway:
+ icon = SmallIcon("user-away", KIconLoader::SizeSmallMedium);
+ break;
+ case Tp::ConnectionPresenceTypeExtendedAway:
+ icon = SmallIcon("user-away-extended", KIconLoader::SizeSmallMedium);
+ break;
+ case Tp::ConnectionPresenceTypeBusy:
+ icon = SmallIcon("user-busy", KIconLoader::SizeSmallMedium);
+ break;
+ case Tp::ConnectionPresenceTypeOffline:
+ icon = SmallIcon("user-offline", KIconLoader::SizeSmallMedium);
+ break;
+ default:
+ icon = SmallIcon("task-attention", KIconLoader::SizeSmallMedium);
+ break;
}
QRect statusIconRect = optV4.rect;
@@ -147,15 +146,13 @@ void ContactDelegate::paint(QPainter * painter, const QStyleOptionViewItem & opt
painter->setPen(m_palette->color(QPalette::WindowText));
painter->setFont(groupFont);
- painter->drawText(groupLabelRect, Qt::AlignVCenter, index.data(AccountsModel::DisplayNameRole).toString().append(counts));
+ painter->drawText(groupLabelRect, Qt::AlignVCenter,
+ index.data(AccountsModel::DisplayNameRole).toString().append(counts));
painter->setPen(m_palette->color(QPalette::ButtonText));
painter->drawLine(groupRect.x(), groupRect.y(), groupRect.width(), groupRect.y());
painter->drawLine(groupRect.x(), groupRect.bottom(), groupRect.width(), groupRect.bottom());
- //painter->setPen(QColor(0, 0, 0));
-
-
QStyleOption expandSignOption = option;
expandSignOption.rect = expandSignRect;
diff --git a/contactdelegate.h b/contactdelegate.h
index 85ef46d..34ec76d 100644
--- a/contactdelegate.h
+++ b/contactdelegate.h
@@ -11,10 +11,10 @@ class ContactDelegate : public QStyledItemDelegate, public ContactDelegateOverla
Q_PROPERTY(int m_fadingValue READ fadingValue WRITE setFadingValue);
public:
- ContactDelegate(QObject * parent = 0);
+ ContactDelegate(QObject *parent = 0);
~ContactDelegate();
- void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
+ void paint(QPainter *painter, const QStyleOptionViewItem & option, const QModelIndex & index) const;
QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex & index) const;
int fadingValue() const;
@@ -31,12 +31,12 @@ Q_SIGNALS:
protected:
/// Returns the delegate, typically, the derived class
- virtual QAbstractItemDelegate* asDelegate() { return this; }
+ virtual QAbstractItemDelegate *asDelegate() { return this; }
private:
QModelIndex m_indexForHiding;
int m_fadingValue;
- QPalette* m_palette;
+ QPalette *m_palette;
};
#endif // CONTACTDELEGATE_H
diff --git a/main-widget.cpp b/main-widget.cpp
index dfc2693..bb8af28 100644
--- a/main-widget.cpp
+++ b/main-widget.cpp
@@ -95,7 +95,11 @@ MainWidget::MainWidget(QWidget *parent)
Tp::ChannelFactoryPtr channelFactory = Tp::ChannelFactory::create(QDBusConnection::sessionBus());
- m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(), accountFactory, connectionFactory, channelFactory, contactFactory);
+ m_accountManager = Tp::AccountManager::create(QDBusConnection::sessionBus(),
+ accountFactory,
+ connectionFactory,
+ channelFactory,
+ contactFactory);
connect(m_accountManager->becomeReady(),
SIGNAL(finished(Tp::PendingOperation*)),
@@ -177,8 +181,7 @@ void MainWidget::onAccountManagerReady(Tp::PendingOperation* op)
m_accountButtonsLayout->insertStretch(-1);
QList<Tp::AccountPtr> accounts = m_accountManager->allAccounts();
- foreach (Tp::AccountPtr account, accounts)
- {
+ foreach (Tp::AccountPtr account, accounts) {
onNewAccountAdded(account);
}
m_contactsListView->expandAll();
@@ -197,20 +200,15 @@ void MainWidget::onAccountReady(Tp::PendingOperation* op)
void MainWidget::onAccountConnectionStatusChanged(Tp::ConnectionStatus status)
{
- //TODO: Add some 'working' indicator
kDebug() << "Connection status is" << status;
switch (status) {
- case Tp::ConnectionStatusConnecting:
- //showMessageToUser(i18n("Connecting..."), MainWidget::SystemMessageInfo);
- break;
case Tp::ConnectionStatusConnected:
- //showMessageToUser(i18n("Connected!"), MainWidget::SystemMessageInfo);
m_model->onNewAccount(Tp::AccountPtr(static_cast<Tp::Account*>(sender())));
m_contactsListView->expandAll();
break;
+ //Fall through
+ case Tp::ConnectionStatusConnecting:
case Tp::ConnectionStatusDisconnected:
- //showMessageToUser(i18n("Disconnected!"), MainWidget::SystemMessageInfo);
- break;
default:
break;
}
@@ -320,7 +318,6 @@ void MainWidget::onChannelJoined(Tp::PendingOperation* op)
void MainWidget::showMessageToUser(const QString& text, const MainWidget::SystemMessageType type)
{
- //kDebug() << m_contactsListView->size() << m_contactsListView->viewport()->size();
QFrame *msgFrame = new QFrame(m_contactsListView);
msgFrame->setAttribute(Qt::WA_DeleteOnClose);
msgFrame->setMinimumSize(QSize(m_contactsListView->viewport()->width(), 55));
@@ -376,37 +373,37 @@ void MainWidget::showMessageToUser(const QString& text, const MainWidget::System
void MainWidget::addOverlayButtons()
{
- TextChannelContactOverlay* textOverlay = new TextChannelContactOverlay(this);
- AudioChannelContactOverlay* audioOverlay = new AudioChannelContactOverlay(this);
- VideoChannelContactOverlay* videoOverlay = new VideoChannelContactOverlay(this);
-
- FileTransferContactOverlay* fileOverlay = new FileTransferContactOverlay(this);
-
- m_delegate->installOverlay(textOverlay);
- m_delegate->installOverlay(audioOverlay);
- m_delegate->installOverlay(videoOverlay);
- m_delegate->installOverlay(fileOverlay);
-
- textOverlay->setView(m_contactsListView);
- textOverlay->setActive(true);
-
- audioOverlay->setView(m_contactsListView);
- audioOverlay->setActive(true);
-
- videoOverlay->setView(m_contactsListView);
- videoOverlay->setActive(true);
-
- fileOverlay->setView(m_contactsListView);
- fileOverlay->setActive(true);
-
- connect(textOverlay, SIGNAL(overlayActivated(QModelIndex)),
- m_delegate, SLOT(hideStatusMessageSlot(QModelIndex)));
-
- connect(textOverlay, SIGNAL(overlayHidden()),
- m_delegate, SLOT(reshowStatusMessageSlot()));
-
- connect(textOverlay, SIGNAL(activated(QModelIndex)),
- this, SLOT(startTextChannel(QModelIndex)));
+ TextChannelContactOverlay* textOverlay = new TextChannelContactOverlay(this);
+ AudioChannelContactOverlay* audioOverlay = new AudioChannelContactOverlay(this);
+ VideoChannelContactOverlay* videoOverlay = new VideoChannelContactOverlay(this);
+
+ FileTransferContactOverlay* fileOverlay = new FileTransferContactOverlay(this);
+
+ m_delegate->installOverlay(textOverlay);
+ m_delegate->installOverlay(audioOverlay);
+ m_delegate->installOverlay(videoOverlay);
+ m_delegate->installOverlay(fileOverlay);
+
+ textOverlay->setView(m_contactsListView);
+ textOverlay->setActive(true);
+
+ audioOverlay->setView(m_contactsListView);
+ audioOverlay->setActive(true);
+
+ videoOverlay->setView(m_contactsListView);
+ videoOverlay->setActive(true);
+
+ fileOverlay->setView(m_contactsListView);
+ fileOverlay->setActive(true);
+
+ connect(textOverlay, SIGNAL(overlayActivated(QModelIndex)),
+ m_delegate, SLOT(hideStatusMessageSlot(QModelIndex)));
+
+ connect(textOverlay, SIGNAL(overlayHidden()),
+ m_delegate, SLOT(reshowStatusMessageSlot()));
+
+ connect(textOverlay, SIGNAL(activated(QModelIndex)),
+ this, SLOT(startTextChannel(QModelIndex)));
}
void MainWidget::toggleSearchWidget(bool show)
diff --git a/main-widget.h b/main-widget.h
index ffaba43..472a264 100644
--- a/main-widget.h
+++ b/main-widget.h
@@ -59,8 +59,6 @@ public:
*/
SystemMessageError
};
-
-// ActionContactOverlay *addActionOverlay();
public Q_SLOTS:
void onAccountManagerReady(Tp::PendingOperation *op);
@@ -82,15 +80,13 @@ public Q_SLOTS:
void onCustomContextMenuRequested(const QPoint &point);
private:
- AccountsModel* m_model;
- AccountFilterModel* m_modelFilter;
+ AccountsModel *m_model;
+ AccountFilterModel *m_modelFilter;
Tp::AccountManagerPtr m_accountManager;
- KMenu* m_accountMenu;
- KSelectAction* m_setStatusAction;
- ContactDelegate* m_delegate;
-// FilterBar* m_filterBar;
+ KMenu *m_accountMenu;
+ KSelectAction *m_setStatusAction;
+ ContactDelegate *m_delegate;
};
-#endif // Header guard
-
+#endif // Header guard
\ No newline at end of file
--
ktp-contact-list packaging
More information about the pkg-kde-commits
mailing list