[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=41a12c4

The following commit has been merged in the master branch:
commit 41a12c41766970e52c7dcb660a68bb9b58225f7c
Author: George Goldberg <grundleborg at googlemail.com>
Date:   Wed Jul 22 21:06:32 2009 +0000

    Add a ParameterEditWidget class. This class will provide the autogenerated fallback parameter-editing widget for the addAccount assistant.
    
    svn path=/trunk/playground/network/telepathy-accounts-kcm/; revision=1001302
---
 src/CMakeLists.txt                                 |  2 ++
 ...protocol-item.cpp => parameter-edit-widget.cpp} | 40 +++++++++++++---------
 ...account-assistant.h => parameter-edit-widget.h} | 23 ++++---------
 ...l-select-widget.ui => parameter-edit-widget.ui} |  8 ++---
 4 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 80679cd..28f9f4b 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,11 +13,13 @@ set (telepathy_accounts_kcm_SRCS
      protocol-list-model.cpp
      connection-manager-item.cpp
      protocol-item.cpp
+     parameter-edit-widget.cpp
 )
 
 kde4_add_ui_files (telepathy_accounts_kcm_SRCS
                    main-widget.ui
                    protocol-select-widget.ui
+                   parameter-edit-widget.ui
 )
 
 kde4_add_plugin (kcm_telepathy_accounts
diff --git a/src/protocol-item.cpp b/src/parameter-edit-widget.cpp
similarity index 65%
copy from src/protocol-item.cpp
copy to src/parameter-edit-widget.cpp
index 3162bae..bb5a298 100644
--- a/src/protocol-item.cpp
+++ b/src/parameter-edit-widget.cpp
@@ -18,33 +18,39 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "protocol-item.h"
+#include "parameter-edit-widget.h"
 
-#include "connection-manager-item.h"
+#include "ui_parameter-edit-widget.h"
 
 #include <KDebug>
 
-ProtocolItem::ProtocolItem(const QString &protocol, ConnectionManagerItem *parent)
- : QObject(parent),
-   m_protocol(protocol)
+class ParameterEditWidget::Private
 {
-    kDebug() << "Creating new ProtocolItem with cmItem: " << parent << " and protocol;" << protocol;
-
-    // TODO: Implement me!
-}
-
-ProtocolItem::~ProtocolItem()
+public:
+    Private()
+     : ui(0)
+    {
+        kDebug();
+    }
+
+    Ui::ParameterEditWidget *ui;
+};
+
+ParameterEditWidget::ParameterEditWidget(QWidget *parent)
+ : QWidget(parent),
+   d(new Private)
 {
     kDebug();
 
-    // TODO: Implement me...
+    // Set up the UI.
+    d->ui = new Ui::ParameterEditWidget;
+    d->ui->setupUi(this);
 }
 
-QString ProtocolItem::protocol() const
+ParameterEditWidget::~ParameterEditWidget()
 {
-    return m_protocol;
-}
-
+    kDebug();
 
-#include "protocol-item.moc"
+    delete d;
+}
 
diff --git a/src/add-account-assistant.h b/src/parameter-edit-widget.h
similarity index 68%
copy from src/add-account-assistant.h
copy to src/parameter-edit-widget.h
index 524ab2f..d4f8c0a 100644
--- a/src/add-account-assistant.h
+++ b/src/parameter-edit-widget.h
@@ -18,29 +18,20 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#ifndef TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_ASSISTANT_H
-#define TELEPATHY_ACCOUNTS_KCM_ADD_ACCOUNT_ASSISTANT_H
+#ifndef TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
+#define TELEPATHY_ACCOUNTS_KCM_PARAMETER_EDIT_WIDGET_H
 
-#include <KAssistantDialog>
+#include <QtGui/QWidget>
 
-class AddAccountAssistant : public KAssistantDialog
+class ParameterEditWidget : public QWidget
 {
     Q_OBJECT
 
 public:
-    explicit AddAccountAssistant(QWidget *parent = 0);
-    ~AddAccountAssistant();
+    explicit ParameterEditWidget(QWidget *parent = 0);
+    ~ParameterEditWidget();
 
-protected Q_SLOTS:
-    virtual void back();
-    virtual void next();
-    virtual void accept();
-    virtual void reject();
-
-Q_SIGNALS:
-    void cancelled();
-
-private:
+protected:
     class Private;
     Private * const d;
 };
diff --git a/src/protocol-select-widget.ui b/src/parameter-edit-widget.ui
similarity index 63%
copy from src/protocol-select-widget.ui
copy to src/parameter-edit-widget.ui
index 2b02c1e..1cf104d 100644
--- a/src/protocol-select-widget.ui
+++ b/src/parameter-edit-widget.ui
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ui version="4.0">
- <class>ProtocolSelectWidget</class>
- <widget class="QWidget" name="ProtocolSelectWidget">
+ <class>ParameterEditWidget</class>
+ <widget class="QWidget" name="ParameterEditWidget">
   <property name="geometry">
    <rect>
     <x>0</x>
@@ -13,9 +13,9 @@
   <property name="windowTitle">
    <string>Form</string>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
-    <widget class="QListView" name="protocolListView"/>
+    <widget class="QListView" name="parameterEditWidget"/>
    </item>
   </layout>
  </widget>

-- 
ktp-accounts-kcm packaging