Merge lp:~zsombi/ubuntu-ui-toolkit/dialogFacelift into lp:ubuntu-ui-toolkit/staging

[Zsombor Egri]

Add contentWidth and contentHeight to Dialog so foreground can be resized.

Add contentWidth and contentHeight to Dialog so foreground can be resized.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1743
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2578/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1306/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1308/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1305/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2578/rebuild

review: Needs Fixing (continuous-integration)

[Zoltan Balogh (bzoltan)]

Good to go

review: Approve

[lp:~zsombi/ubuntu-ui-toolkit/dialogFacelift]

1744. By Zsombor Egri on 2015-12-08

API fixed

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1744
http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2588/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-amd64-ci/1316
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1318
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-armhf-ci/1318/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-vivid-i386-ci/1315

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-sdk-team-ubuntu-ui-toolkit-staging-ci/2588/rebuild

review: Approve (continuous-integration)

=== modified file 'components.api'
--- components.api	2015-12-07 17:02:28 +0000
+++ components.api	2015-12-08 18:52:39 +0000
@@ -409,10 +409,11 @@
 Ubuntu.Components.Popups.Dialog 1.3: PopupBase
     property Item caller
     property double callerMargin
+    property double contentHeight
+    property double contentWidth
     default property list<QtObject> contents
     property double edgeMargins
     property bool modal
-    property Item pointerTarget
     property string text
     property string title
 Ubuntu.Components.ListItems.Divider 1.0 0.1: QQuickImageBase

=== modified file 'examples/ubuntu-ui-toolkit-gallery/Dialog.qml'
--- examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-05-30 16:35:48 +0000
+++ examples/ubuntu-ui-toolkit-gallery/Dialog.qml	2015-12-08 18:52:39 +0000
@@ -26,7 +26,7 @@
         documentation: "qml-ubuntu-components-popups-%1.html".arg(className.toLowerCase())
 
         TemplateRow {
-            title: i18n.tr("Standard")
+            title: i18n.tr("Dialog")
 
             Button {
                 text: i18n.tr("Open")
@@ -52,12 +52,12 @@
                     width: parent.width
                     spacing: units.gu(1)
                     Button {
-                        width: parent.width/2
+                        width: parent.width/2 - row.spacing/2
                         text: "Cancel"
                         onClicked: PopupUtils.close(dialogue)
                     }
                     Button {
-                        width: parent.width/2
+                        width: parent.width/2 - row.spacing/2
                         text: "Confirm"
                         color: UbuntuColors.green
                         onClicked: PopupUtils.close(dialogue)

=== modified file 'src/Ubuntu/Components/Popups/1.3/Dialog.qml'
--- src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-11-23 20:19:31 +0000
+++ src/Ubuntu/Components/Popups/1.3/Dialog.qml	2015-12-08 18:52:39 +0000
@@ -93,22 +93,13 @@
     property alias text: foreground.text
 
     /*!
+      \deprecated
       The Item such as a \l Button that the user interacted with to open the Dialog.
       This property will be used for the automatic positioning of the Dialog next to
       the caller, if possible.
      */
     property Item caller
-
-    /*!
-      The property holds the item to which the pointer should be anchored to.
-      This can be same as the caller or any child of the caller. By default the
-      property is set to caller.
-      */
-    property Item pointerTarget
-    /*! \internal */
-    onPointerTargetChanged: {
-        console.debug("pointerTarget DEPRECATED")
-    }
+    onCallerChanged: console.debug("caller DEPRECATED")
 
     /*!
       The property holds the margins from the dialog's dismissArea. The property
@@ -132,19 +123,19 @@
       */
     property bool modal: true
 
-    /*
-    QtObject {
-        id: internal
-
-        function updatePosition() {
-            var pos = new InternalPopupUtils.CallerPositioning(foreground, pointer, dialog, caller, pointerTarget, edgeMargins, callerMargin);
-            pos.auto();
-
-        }
-    }
-
-    Pointer { id: pointer }
-    */
+    /*!
+      \qmlproperty real contentWidth
+      \since Ubuntu.Components 1.3
+      Specifies the width of the dialog content.
+      */
+    property alias contentWidth: foreground.width
+
+    /*!
+      \qmlproperty real contentHeight
+      \since Ubuntu.Components 1.3
+      Specifies the height of the dialog content.
+      */
+    property alias contentHeight: foreground.height
 
     __foreground: foreground
     __eventGrabber.enabled: modal