[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=6d6bc3d

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

    Add a skeleton class for the ProtocolSelectWidget along with a ui file for it.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1000972
---
 src/CMakeLists.txt                                 |  2 ++
 ...account-wizard.h => protocol-select-widget.cpp} | 36 +++++++++++++---------
 ...d-account-wizard.h => protocol-select-widget.h} | 21 ++++++-------
 src/protocol-select-widget.ui                      | 24 +++++++++++++++
 4 files changed, 56 insertions(+), 27 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 43bdea6..c26a572 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -9,10 +9,12 @@ set (telepathy_accounts_kcm_SRCS
      accounts-list-model.cpp
      account-item.cpp
      add-account-wizard.cpp
+     protocol-select-widget.cpp
 )
 
 kde4_add_ui_files (telepathy_accounts_kcm_SRCS
                    main-widget.ui
+                   protocol-select-widget.ui
 )
 
 kde4_add_plugin (kcm_telepathy_accounts
diff --git a/src/add-account-wizard.h b/src/protocol-select-widget.cpp
similarity index 67%
copy from src/add-account-wizard.h
copy to src/protocol-select-widget.cpp
index 413ce86..1009a67 100644
--- a/src/add-account-wizard.h
+++ b/src/protocol-select-widget.cpp
@@ -18,27 +18,33 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
-#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
+#include "protocol-select-widget.h"
 
-#include <KAssistantDialog>
+#include "ui_protocol-select-widget.h"
 
-class AddAccountWizard : public KAssistantDialog
-{
-    Q_OBJECT
+#include <KDebug>
 
+class ProtocolSelectWidget::Private
+{
 public:
-    explicit AddAccountWizard(QWidget *parent = 0);
-    ~AddAccountWizard();
-
-protected Q_SLOTS:
-    virtual void back();
-    virtual void next();
-    virtual void accept();
-    virtual void reject();
+    Private()
+     : ui(0)
+    { }
 
+    Ui::ProtocolSelectWidget *ui;
 };
 
+ProtocolSelectWidget::ProtocolSelectWidget(QWidget *parent)
+ : QWidget(parent),
+   d(new Private)
+{
+    kDebug();
+    d->ui->setupUi(this);
+}
 
-#endif  // Header guard
+ProtocolSelectWidget::~ProtocolSelectWidget()
+{
+    kDebug();
+    delete d;
+}
 
diff --git a/src/add-account-wizard.h b/src/protocol-select-widget.h
similarity index 70%
copy from src/add-account-wizard.h
copy to src/protocol-select-widget.h
index 413ce86..c978d6d 100644
--- a/src/add-account-wizard.h
+++ b/src/protocol-select-widget.h
@@ -18,25 +18,22 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
-#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_WIZARD_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_PROTOCOL_SELECT_WIDGET_H
+#define TELEPATHY_ACCOUNTS_KCM_PROTOCOL_SELECT_WIDGET_H
 
-#include <KAssistantDialog>
+#include <QtGui/QWidget>
 
-class AddAccountWizard : public KAssistantDialog
+class ProtocolSelectWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit AddAccountWizard(QWidget *parent = 0);
-    ~AddAccountWizard();
-
-protected Q_SLOTS:
-    virtual void back();
-    virtual void next();
-    virtual void accept();
-    virtual void reject();
+    explicit ProtocolSelectWidget(QWidget *parent = 0);
+    ~ProtocolSelectWidget();
 
+private:
+    class Private;
+    Private * const d;
 };
 
 
diff --git a/src/protocol-select-widget.ui b/src/protocol-select-widget.ui
new file mode 100644
index 0000000..e4b16ea
--- /dev/null
+++ b/src/protocol-select-widget.ui
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ProtocolSelectWidget</class>
+ <widget class="QWidget" name="ProtocolSelectWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>400</width>
+    <height>300</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QListView" name="m_protocolListView"/>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

-- 
ktp-accounts-kcm packaging