[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=dc863ed

The following commit has been merged in the master branch:
commit dc863ed8dfdadfb8c18efdb176592352aab02fe0
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 22 13:10:12 2009 +0000

    Show the AddAccountWizard when you click on the Add Account button in the UI.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001012
---
 src/kcm-telepathy-accounts.cpp | 20 +++++++++++++++++++-
 src/kcm-telepathy-accounts.h   |  3 +++
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/kcm-telepathy-accounts.cpp b/src/kcm-telepathy-accounts.cpp
index 2abc562..5362014 100644
--- a/src/kcm-telepathy-accounts.cpp
+++ b/src/kcm-telepathy-accounts.cpp
@@ -21,6 +21,7 @@
 #include "kcm-telepathy-accounts.h"
 
 #include "accounts-list-model.h"
+#include "add-account-wizard.h"
 
 #include <KCategorizedSortFilterProxyModel>
 #include <KCategoryDrawer>
@@ -38,7 +39,8 @@ K_EXPORT_PLUGIN(KCMTelepathyAccountsFactory("telepathy_accounts", "kcm_telepathy
 KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList& args)
  : KCModule(KCMTelepathyAccountsFactory::componentData(), parent, args),
    m_accountsListProxyModel(0),
-   m_accountsListModel(0)
+   m_accountsListModel(0),
+   m_addAccountWizard(0)
 {
     // Start setting up the Telepathy AccountManager.
     m_accountManager = Tp::AccountManager::create();
@@ -56,6 +58,11 @@ KCMTelepathyAccounts::KCMTelepathyAccounts(QWidget *parent, const QVariantList&
     m_accountsListProxyModel->setSourceModel(m_accountsListModel);
     m_accountsListView->setModel(m_accountsListProxyModel);
     m_accountsListProxyModel->setCategorizedModel(true);
+
+    // Connect to useful signals from the UI elements.
+    connect(m_addAccountButton,
+            SIGNAL(clicked()),
+            SLOT(onAddAccountClicked()));
 }
 
 KCMTelepathyAccounts::~KCMTelepathyAccounts()
@@ -89,6 +96,17 @@ void KCMTelepathyAccounts::onAccountManagerReady(Tp::PendingOperation *op)
     }
 }
 
+void KCMTelepathyAccounts::onAddAccountClicked()
+{
+    if (!m_addAccountWizard) {
+        m_addAccountWizard = new AddAccountWizard(this);
+        m_addAccountWizard->show();
+        return;
+    }
+
+    kWarning() << "Cannot create a new AddAccountWizard. One already exists.";
+}
+
 
 #include "kcm-telepathy-accounts.moc"
 
diff --git a/src/kcm-telepathy-accounts.h b/src/kcm-telepathy-accounts.h
index b3b83dd..1cefef7 100644
--- a/src/kcm-telepathy-accounts.h
+++ b/src/kcm-telepathy-accounts.h
@@ -28,6 +28,7 @@
 #include <TelepathyQt4/AccountManager>
 
 class AccountsListModel;
+class AddAccountWizard;
 
 class KCategorizedSortFilterProxyModel;
 
@@ -50,11 +51,13 @@ public Q_SLOTS:
 
 private Q_SLOTS:
     void onAccountManagerReady(Tp::PendingOperation *op);
+    void onAddAccountClicked();
 
 private:
     KCategorizedSortFilterProxyModel *m_accountsListProxyModel;
     Tp::AccountManagerPtr m_accountManager;
     AccountsListModel *m_accountsListModel;
+    AddAccountWizard *m_addAccountWizard;
 };
 
 

-- 
ktp-accounts-kcm packaging