Merge lp:~ken-vandine/accounts-qml-module/packaging into lp:~mardy/accounts-qml-module/implementation

[Ken VanDine]

binary package name set to qtdeclarative5-accounts-plugin

[Alberto Mardegan (mardy)]

Looks good, thanks!

review: Approve

[lp:~ken-vandine/accounts-qml-module/packaging]

11. By Alberto Mardegan on 2013-02-22

Model: add filter by accountId

12. By Alberto Mardegan on 2013-02-22

Packaging fixes

=== added directory '.bzr-builddeb'
=== added file '.bzr-builddeb/default.conf'
--- .bzr-builddeb/default.conf	1970-01-01 00:00:00 +0000
+++ .bzr-builddeb/default.conf	2013-02-20 10:46:28 +0000
@@ -0,0 +1,2 @@
+[BUILDDEB]
+split = True

=== modified file 'debian/changelog'
--- debian/changelog	2013-02-19 06:44:04 +0000
+++ debian/changelog	2013-02-20 10:46:28 +0000
@@ -1,4 +1,4 @@
-accounts-qml-module (0.1-~0ubuntu1) UNRELEASED; urgency=low
+accounts-qml-module (0.0) UNRELEASED; urgency=low
 
   * Initial release.
 

=== modified file 'debian/control'
--- debian/control	2013-02-19 06:44:04 +0000
+++ debian/control	2013-02-20 10:46:28 +0000
@@ -8,6 +8,8 @@
                libsignon-qt5-dev,
                pkg-config,
                qtdeclarative5-dev,
+               qtchooser,
+               qt5-qmake,
                xvfb,
 Standards-Version: 3.9.3
 Homepage: https://launchpad.net/accounts-qml-module
@@ -15,7 +17,7 @@
 # just go ahead.  ~online-accounts will notice and sync up the code again.
 Vcs-Bzr: https://code.launchpad.net/~online-accounts/accounts-qml-module/trunk
 
-Package: accounts-qml-module
+Package: qtdeclarative5-accounts-plugin
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},

=== modified file 'debian/rules'
--- debian/rules	2013-02-19 06:44:04 +0000
+++ debian/rules	2013-02-20 10:46:28 +0000
@@ -4,7 +4,15 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+override_dh_auto_configure:
+	QT_SELECT=qt5 \
+	dh_auto_configure \
+		-- LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) \
+		"QMAKE_CXXFLAGS=$(CFLAGS)" \
+		accounts-qml-module.pro
+
 override_dh_install:
+	rm -rf debian/*/usr/bin
 	dh_install --fail-missing
 
 %:

=== added directory 'examples.moved'
=== added file 'examples.moved/listaccounts.qml'
--- examples.moved/listaccounts.qml	1970-01-01 00:00:00 +0000
+++ examples.moved/listaccounts.qml	2013-02-20 10:46:28 +0000
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2013 Canonical Ltd.
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * telephony-app 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 0.1
+import Ubuntu.Components.ListItems 0.1 as ListItem
+import Ubuntu.OnlineAccounts 0.1
+
+MainView {
+    width: units.gu(60)
+    height: units.gu(80)
+    Behavior on x {
+        SequentialAnimation{
+            PropertyAction { property: "x"; value: main.width }
+            PropertyAnimation { duration: 200 }
+        }
+    }
+
+    AccountServiceModel {
+        id: accounts
+        serviceType: "microblogging"
+        //serviceType: "IM"
+        includeDisabled: true
+        Component.onCompleted: { set_model()}
+    }
+
+    function set_model () {
+        listView.model = accounts;
+        console.log ("MODEL READY: " + listView.count);
+    }
+    ListView {
+        id: listView
+        width: parent.width
+        height: parent.height
+        anchors.fill: parent
+        focus: true
+        delegate: Item {
+                width: parent.width
+                height: childrenRect.height
+                AccountService { 
+                    id: accts
+                    objectHandle: accountService
+                    onAuthenticated: { console.log("Access token is " + reply.AccessToken) }
+                    onAuthenticationError: { console.log("Authentication failed, code " + error.code) }
+                    Component.onCompleted: {
+                        sw.checked = accts.enabled;
+                    }
+                    onEnabledChanged: {
+                        console.log ("ENABLED CHANGED");
+                        sw.checked = accts.enabled;
+                    }
+                }    
+                ListItem.Standard {
+                    text: displayName
+                    icon: "image://gicon/"+accts.provider.iconName
+                    control {
+                        Switch {
+                            id: sw
+                            checked: false
+                        }
+                    }
+                    onClicked: accts.authenticate(null)
+                }
+        }
+
+        populate: Transition {
+            NumberAnimation { properties: "x,y"; duration: 1000 }
+        }
+    }
+}