Merge lp:~cimi/ubuntu-ui-toolkit/panel_export-position into lp:ubuntu-ui-toolkit

[Andrea Cimitan]

Export a position value of the toolbar through dbus, setting the value of the dbus service created by the shell

The hud requires some extra info about the panel in order to apply some interactions.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/690/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/3732
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1260
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/547
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/547/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-saucy/78
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3744
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3744/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1262
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1262/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1054
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1066

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/690/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:752
http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-ci/721/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy-vm/25
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-touch/1441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-amd64-ci/578
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/578
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-ui-toolkit-saucy-armhf-ci/578/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-vm-saucy/21
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3925
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-i386/3925/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1443
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy-armhf/1443/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-maguro/1217
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-mako/1228

Click here to trigger a rebuild:
http://s-jenkins:8080/job/ubuntu-ui-toolkit-ci/721/rebuild

review: Approve (continuous-integration)

[Michał Sawicz (saviq)]

review: Approve

=== modified file 'modules/Ubuntu/Components/Panel.qml'
--- modules/Ubuntu/Components/Panel.qml	2013-09-09 19:11:39 +0000
+++ modules/Ubuntu/Components/Panel.qml	2013-09-20 08:59:16 +0000
@@ -534,6 +534,8 @@
         //position will always be in the range 0..size, where position==0 means spread, position==size means hidden.
         property real position: panel.opened ? 0 : size
 
+        onPositionChanged: bottomBarVisibilityCommunicator.position = size - position
+
         y: internal.align === Qt.AlignTop ? -position : internal.align === Qt.AlignBottom ? position : 0
         x: internal.align === Qt.AlignLeft ? -position : internal.align === Qt.AlignRight ? position : 0
     }

=== modified file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp'
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	2013-02-27 12:45:08 +0000
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.cpp	2013-09-20 08:59:16 +0000
@@ -35,7 +35,8 @@
 
 BottomBarVisibilityCommunicator::BottomBarVisibilityCommunicator()
  : m_shellDbusIface(NULL),
-   m_forceHidden(false)
+   m_forceHidden(false),
+   m_position(0)
 {
     m_shellDbusIface = new QDBusInterface(DBUS_SERVICE, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_PATH, BOTTOM_BAR_VISIBILITY_COMMUNICATOR_DBUS_INTERFACE, QDBusConnection::sessionBus(), this);
     if (m_shellDbusIface->isValid()) {
@@ -51,6 +52,20 @@
     return m_forceHidden;
 }
 
+double BottomBarVisibilityCommunicator::position() const
+{
+    return m_position;
+}
+
+void BottomBarVisibilityCommunicator::setPosition(double position)
+{
+    if (position != m_position) {
+        m_position = position;
+        m_shellDbusIface->setProperty("position", position);
+        Q_EMIT positionChanged(position);
+    }
+}
+
 void BottomBarVisibilityCommunicator::onShellForceHiddenChanged(bool forceHidden)
 {
     if (forceHidden != m_forceHidden) {

=== modified file 'modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h'
--- modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	2013-02-11 17:47:48 +0000
+++ modules/Ubuntu/Components/plugin/bottombarvisibilitycommunicator.h	2013-09-20 08:59:16 +0000
@@ -26,6 +26,7 @@
 {
     Q_OBJECT
     Q_PROPERTY(bool forceHidden READ forceHidden NOTIFY forceHiddenChanged)
+    Q_PROPERTY(double position READ position WRITE setPosition NOTIFY positionChanged)
 
 public:
     static BottomBarVisibilityCommunicator& instance() {
@@ -34,9 +35,12 @@
     }
 
     bool forceHidden() const;
+    double position() const;
+    void setPosition(double position);
 
 Q_SIGNALS:
     void forceHiddenChanged(bool forceHidden);
+    void positionChanged(double position);
 
 private Q_SLOTS:
     void onShellForceHiddenChanged(bool forceHidden);
@@ -46,6 +50,8 @@
 
     QDBusInterface* m_shellDbusIface;
 
+    double m_position;
+
     // This is cached from dbus
     bool m_forceHidden;
 };