[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/15.12.1-1-1157-gc4589c5

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-accounts-kcm.git;a=commitdiff;h=6c2666c

The following commit has been merged in the master branch:
commit 6c2666c64c05367a497285cbfe0a47d2a79dd3a1
Author: Martin Klapetek <martin.klapetek at gmail.com>
Date:   Fri Oct 28 14:07:26 2011 +0200

    Fix for the wrong icon while connecting an account. It's not animated, I think it's not really worth the effort. Also some code polish.
---
 src/account-item.cpp           | 13 +++++++------
 src/accounts-list-delegate.cpp |  2 --
 src/accounts-list-delegate.h   |  6 ++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/account-item.cpp b/src/account-item.cpp
index 32b7b6d..10b9367 100644
--- a/src/account-item.cpp
+++ b/src/account-item.cpp
@@ -35,6 +35,7 @@
 
 #include <TelepathyQt4/PendingOperation>
 #include <TelepathyQt4/PendingReady>
+#include <KPixmapSequence>
 
 AccountItem::AccountItem(const Tp::AccountPtr &account, AccountsListModel *parent)
  : QObject(parent),
@@ -112,7 +113,8 @@ const KIcon AccountItem::connectionStateIcon() const
     case Tp::ConnectionStatusConnected:
         return KIcon("user-online");
     case Tp::ConnectionStatusConnecting:
-        return KIcon("user-away"); //FIXME this is bit misleading
+        //imho this is not really worth animating, but feel free to play around..
+        return KIcon(KPixmapSequence("process-working", 22).frameAt(0));
     case Tp::ConnectionStatusDisconnected:
         return KIcon("user-offline");
     default:
@@ -121,7 +123,7 @@ const KIcon AccountItem::connectionStateIcon() const
 }
 
 const QString AccountItem::connectionStatusReason() const
-{ 
+{
     if (!m_account->isEnabled()) {
         return i18n("Account disabled - Click checkbox to enable");
     }
@@ -144,7 +146,7 @@ void AccountItem::generateIcon()
 
     QString iconPath = account()->iconName();
 
-    //if the icon has not been setted, we use the protocol icon    
+    //if the icon has not been setted, we use the protocol icon
     if(iconPath.isEmpty()) {
         iconPath = QString("im-%1").arg(account()->protocolName());
     }
@@ -179,9 +181,8 @@ void AccountItem::onAccountRemoved(Tp::PendingOperation *op)
 
 void AccountItem::onTitleForCustomPages(QString mandatoryPage, QList<QString> optionalPage)
 {
-	kDebug();
-	emit setTitleForCustomPages(mandatoryPage, optionalPage);
+    kDebug();
+    emit setTitleForCustomPages(mandatoryPage, optionalPage);
 }
 
 #include "account-item.moc"
-
diff --git a/src/accounts-list-delegate.cpp b/src/accounts-list-delegate.cpp
index 1950f95..f670e0f 100644
--- a/src/accounts-list-delegate.cpp
+++ b/src/accounts-list-delegate.cpp
@@ -140,5 +140,3 @@ void AccountsListDelegate::paint(QPainter *painter, const QStyleOptionViewItem &
     painter->setFont(accountNameFont);
     painter->drawText(mainTextRect, Qt::AlignTop, accountName);
 }
-
-
diff --git a/src/accounts-list-delegate.h b/src/accounts-list-delegate.h
index b194972..d163fb2 100644
--- a/src/accounts-list-delegate.h
+++ b/src/accounts-list-delegate.h
@@ -39,13 +39,11 @@ public:
 signals:
     void itemChecked(const QModelIndex &index, bool checked);
 
-public slots:
+private slots:
+    void onCheckBoxToggled(bool checked);
 
 private:
     static const int m_paddingSize = 7;
-
-private slots:
-    void onCheckBoxToggled(bool checked);
 };
 
 #endif // ACCOUNTLISTDELEGATE_H

-- 
ktp-accounts-kcm packaging