[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=84a8cd8

The following commit has been merged in the master branch:
commit 84a8cd8bd0d6cfbccccdac2289cfbdabfd74ccf6
Author: Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
Date:   Mon Feb 27 22:45:42 2012 +0100

    Add class ChangeIconButton
---
 src/CMakeLists.txt                                 |  1 +
 src/change-icon-button.cpp                         | 68 ++++++++++++++++++++++
 ...-display-name-button.h => change-icon-button.h} | 18 +++---
 3 files changed, 78 insertions(+), 9 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8014005..ee82fd0 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -20,6 +20,7 @@ set (kcm_ktp_accounts_SRCS
      salut-details-dialog.cpp
      accounts-list-delegate.cpp
      edit-display-name-button.cpp
+     change-icon-button.cpp
 )
 
 
diff --git a/src/change-icon-button.cpp b/src/change-icon-button.cpp
new file mode 100644
index 0000000..2885f9d
--- /dev/null
+++ b/src/change-icon-button.cpp
@@ -0,0 +1,68 @@
+/*
+ * This file is part of telepathy-accounts-kcm
+ *
+ * Copyright (C) 2012 Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include "change-icon-button.h"
+
+#include <KDE/KDebug>
+
+#include <TelepathyQt/Account>
+#include <TelepathyQt/PendingOperation>
+
+ChangeIconButton::ChangeIconButton(QWidget* parent) :
+    KIconButton(parent)
+{
+    setIconType(KIconLoader::NoGroup, KIconLoader::Action);
+    setIconSize(KIconLoader::SizeLarge);
+    setButtonIconSize(KIconLoader::SizeMedium);
+    setFixedSize(KIconLoader::SizeMedium + 10, KIconLoader::SizeMedium + 10);
+
+    connect(this, SIGNAL(iconChanged(QString)), SLOT(onIconChanged(QString)));
+}
+
+ChangeIconButton::~ChangeIconButton()
+{
+}
+
+void ChangeIconButton::setAccount(Tp::AccountPtr account)
+{
+    m_account = account;
+}
+
+Tp::AccountPtr ChangeIconButton::account() const
+{
+    return m_account;
+}
+
+void ChangeIconButton::onIconChanged(const QString& icon)
+{
+    kDebug();
+    if (!m_account.isNull() && m_account->isValid()) {
+        kDebug() << "Setting icon" << icon << "for account" << account()->uniqueIdentifier();
+        Tp::PendingOperation *op = m_account->setIconName(icon);
+        connect(op, SIGNAL(finished(Tp::PendingOperation*)), SLOT(onFinished(Tp::PendingOperation*)));
+    }
+}
+
+void ChangeIconButton::onFinished(Tp::PendingOperation* op)
+{
+    if (op->isError()) {
+        kWarning() << "Cannot set icon" << op->errorName() << op->errorMessage();
+    }
+}
diff --git a/src/edit-display-name-button.h b/src/change-icon-button.h
similarity index 77%
copy from src/edit-display-name-button.h
copy to src/change-icon-button.h
index 159b63d..cc80417 100644
--- a/src/edit-display-name-button.h
+++ b/src/change-icon-button.h
@@ -18,32 +18,32 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef EDIT_DISPLAY_NAME_BUTTON_H
-#define EDIT_DISPLAY_NAME_BUTTON_H
+#ifndef CHANGE_ICON_BUTTON_H
+#define CHANGE_ICON_BUTTON_H
 
-#include <KDE/KPushButton>
+#include <KDE/KIconButton>
 #include <TelepathyQt/Types>
 
 namespace Tp { class PendingOperation; }
 
-class EditDisplayNameButton : public KPushButton
+class ChangeIconButton : public KIconButton
 {
     Q_OBJECT
-    Q_DISABLE_COPY(EditDisplayNameButton)
+    Q_DISABLE_COPY(ChangeIconButton)
 
 public:
-    explicit EditDisplayNameButton(QWidget *parent = 0);
-    virtual ~EditDisplayNameButton();
+    explicit ChangeIconButton(QWidget* parent = 0);
+    virtual ~ChangeIconButton();
 
     void setAccount(Tp::AccountPtr account);
     Tp::AccountPtr account() const;
 
 private Q_SLOTS:
-    void onClicked();
+    void onIconChanged(const QString &icon);
     void onFinished(Tp::PendingOperation* op);
 
 private:
     Tp::AccountPtr m_account;
 };
 
-#endif // EDIT_DISPLAY_NAME_BUTTON_H
+#endif // CHANGE_ICON_BUTTON_H

-- 
ktp-accounts-kcm packaging