Merge lp:~tpeeters/ubuntu-ui-toolkit/no-red-header into lp:ubuntu-ui-toolkit

[Tim Peeters]

Disable the red outline around deprecated headers in AdaptivePageLayout

[Tim Peeters (tpeeters)]

outdated

Unmerged revisions

2011. By Tim Peeters on 2016-06-17

disable red outline on deprecated header in APL

=== modified file 'components.api'
--- components.api	2016-05-20 17:33:56 +0000
+++ components.api	2016-06-17 13:30:14 +0000
@@ -1076,6 +1076,12 @@
     property list<Action> actions
     property var model
     property int selectedIndex
+Ubuntu.Components.Styles.SectionsStyle 1.3: Item
+    property color pressedBackgroundColor
+    property color sectionColor
+    property color selectedSectionColor
+    property int textSize
+    property color underlineColor
 Ubuntu.Components.ServiceProperties 1.1 UCServiceProperties: QtObject
     property string adaptorInterface 1.1
     readonly property string error 1.1

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-07 18:25:12 +0000
+++ debian/changelog	2016-06-17 13:30:14 +0000
@@ -1,3 +1,31 @@
+ubuntu-ui-toolkit (1.3.2009+16.10) UNRELEASED; urgency=medium
+
+  [ Tim Peeters ]
+  * Introduce Styles.SectionsStyle. Fixes LP: #1585548
+  * Update header contents only after its style was initialized. 
+    Fixes LP: #1588837
+  * Update export_qml_dir.qml to work inside a lxd container.
+  * Draw a red outline around the subheader in AdaptivePageLayout to warn that
+    the old header is deprecated. Fixes LP: #1583636
+  
+  [ Christian Dywan ]
+  * Select the current item before adding the test page.
+  * Introduce gallery for browsing visual tests.
+  * Put Scrollbar in ShaderEffectSource to blend with frame. Fixes LP: #1583543
+  * Correctly use build/src dir with unit tests. Fixes LP: #1589982
+
+  [ Florian Boucault ]
+  * Do not initialize haptics at startup but only when used for the first time.
+  * PageHeadButton: do not load the icon until the button is made visible.
+  
+  [ Albert Astals Cid ]
+  * Prepend UC_ to performance env vars.
+  * Using -1 as PERFORMANCE_MONITOR_WARNING_COUNT_THRESHOLD envvar disables the
+    warning count threshold.
+  * Add envvars to change the performance monitor variables. 
+
+ -- Zoltán Balogh <[e-mail]>  Wed, 15 Jun 2016 17:44:31 +0300
+
 ubuntu-ui-toolkit (1.3.1995+16.10.20160607.1) yakkety; urgency=medium
 
   [ Albert Astals Cid ]

=== modified file 'export_qml_dir.sh'
--- export_qml_dir.sh	2016-04-05 16:14:13 +0000
+++ export_qml_dir.sh	2016-06-17 13:30:14 +0000
@@ -28,6 +28,8 @@
 export LD_LIBRARY_PATH=$BUILD_DIR/lib:$UBUNTU_QML_DIRS$LD_LIBRARY_PATH
 # Build machines may not have initctl and don't need it
 test -f /sbin/initctl || return 0
+# initctl may be available but not working (for example in a lxd container without upstart)
+/sbin/initctl list > /dev/null || return 0
 /sbin/initctl set-env --global QML_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global QML2_IMPORT_PATH=$BUILD_DIR/qml
 /sbin/initctl set-env --global UBUNTU_UI_TOOLKIT_THEMES_PATH=$BUILD_DIR/qml

=== modified file 'src/Ubuntu/Components/1.3/AdaptivePageLayout.qml'
--- src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/AdaptivePageLayout.qml	2016-06-17 13:30:14 +0000
@@ -827,6 +827,9 @@
                 property color panelColor: layout.__propagated.header.panelColor
                 property color backgroundColor: layout.__propagated.header.backgroundColor
 
+                // Enable red outline in the PageHeadStyle. See bug #1583636.
+                property bool showDeprecatedWarning: false
+
                 visible: !customHeader && holder.pageWrapper && holder.pageWrapper.active
 
                 // The multiColumn, page and showBackButton properties are used in

=== modified file 'src/Ubuntu/Components/1.3/PageHeader.qml'
--- src/Ubuntu/Components/1.3/PageHeader.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/PageHeader.qml	2016-06-17 13:30:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -109,6 +109,7 @@
         property Item previousContentsParent: null
 
         function updateContents() {
+            if (!__styleInstance) return; // the style needs to be loaded first
             if (previousContents) {
                 previousContents.parent = previousContentsParent;
             }

=== modified file 'src/Ubuntu/Components/1.3/TextArea.qml'
--- src/Ubuntu/Components/1.3/TextArea.qml	2016-05-25 12:48:10 +0000
+++ src/Ubuntu/Components/1.3/TextArea.qml	2016-06-17 13:30:14 +0000
@@ -875,6 +875,9 @@
             }
         }
     }
+
+    /*! \internal */
+    property Item __rightScrollbar: rightScrollbar
     Scrollbar {
         id: rightScrollbar
         flickableItem: flicker
@@ -884,10 +887,6 @@
         anchors.topMargin: -internal.frameSpacing
         anchors.rightMargin: -internal.frameSpacing
         anchors.bottomMargin: -internal.frameSpacing
-        Ubuntu.StyleHints {
-            // No background color
-            troughColorSteppersStyle: Qt.rgba(0, 0, 0, 0)
-        }
     }
 
     styleName: "TextAreaStyle"

=== modified file 'src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	2015-09-22 14:39:47 +0000
+++ src/Ubuntu/Components/Styles/1.3/PageHeadStyle.qml	2016-06-17 13:30:14 +0000
@@ -17,6 +17,7 @@
 
 /*!
     \qmltype PageHeadStyle
+    \deprecated
     \inqmlmodule Ubuntu.Components.Styles 1.1
     \ingroup style-api
     \brief Style API for page header.

=== added file 'src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml	1970-01-01 00:00:00 +0000
+++ src/Ubuntu/Components/Styles/1.3/SectionsStyle.qml	2016-06-17 13:30:14 +0000
@@ -0,0 +1,50 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+import QtQuick 2.4
+/*!
+    \qmltype SectionsStyle
+    \inqmlmodule Ubuntu.Components.Styles 1.3
+    \ingroup style-api
+    \brief Style API for Sections.
+
+    The component defines the style API for the \l Sections component.
+  */
+Item {
+    /*!
+      The foreground color of unselected sections.
+     */
+    property color sectionColor
+
+    /*!
+      The foreground color of underline of unselected sections.
+     */
+    property color underlineColor
+
+    /*!
+      The foreground color of the selected section.
+     */
+    property color selectedSectionColor
+
+    /*!
+      The background color for the pressed section button.
+     */
+    property color pressedBackgroundColor
+
+    /*!
+      The size of text in the buttons.
+     */
+    property int textSize
+}

=== modified file 'src/Ubuntu/Components/Styles/Styles.pro'
--- src/Ubuntu/Components/Styles/Styles.pro	2015-11-24 20:49:07 +0000
+++ src/Ubuntu/Components/Styles/Styles.pro	2016-06-17 13:30:14 +0000
@@ -1,7 +1,5 @@
 TARGETPATH = Ubuntu/Components/Styles
 
-ARTWORK_FILES = $$system(find artwork -type f)
-
 QML_FILES += 1.2/ComboButtonStyle.qml \
              1.2/PageHeadStyle.qml \
              1.2/PullToRefreshStyle.qml \
@@ -9,7 +7,7 @@
 	     1.3/ActionBarStyle.qml \
 	     1.3/PageHeaderStyle.qml \
 	     1.3/ToolbarStyle.qml \
-             $$ARTWORK_FILES
+	     1.3/SectionsStyle.qml \
 
 load(ubuntu_qml_module)
 

=== modified file 'src/Ubuntu/Components/Styles/qmldir'
--- src/Ubuntu/Components/Styles/qmldir	2015-11-24 20:49:07 +0000
+++ src/Ubuntu/Components/Styles/qmldir	2016-06-17 13:30:14 +0000
@@ -9,3 +9,4 @@
 ActionBarStyle 1.3 1.3/ActionBarStyle.qml
 PageHeaderStyle 1.3 1.3/PageHeaderStyle.qml
 ToolbarStyle 1.3 1.3/ToolbarStyle.qml
+SectionsStyle 1.3 1.3/SectionsStyle.qml

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml	2015-04-24 14:43:08 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.2/PageHeadButton.qml	2016-06-17 13:30:14 +0000
@@ -43,7 +43,7 @@
         // when the button is invisible by setting width and height to 0
         width: visible ? button.iconWidth : 0
         height: visible ? button.iconHeight : 0
-        source: button.iconSource
+        source: visible ? button.iconSource : ""
         color: Qt.rgba(0, 0, 0, 0)
         opacity: button.enabled ? 1.0 : 0.3
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2015-09-21 14:44:13 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadButton.qml	2016-06-17 13:30:14 +0000
@@ -44,7 +44,7 @@
         // when the button is invisible by setting width and height to 0
         width: visible ? button.iconWidth : 0
         height: visible ? button.iconHeight : 0
-        source: button.iconSource
+        source: visible ? button.iconSource : ""
         color: Qt.rgba(0, 0, 0, 0)
         opacity: button.enabled ? 1.0 : 0.3
     }

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-02-29 16:02:50 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeadStyle.qml	2016-06-17 13:30:14 +0000
@@ -50,8 +50,18 @@
      */
     property color backgroundColor: styledItem.backgroundColor
     Rectangle {
+        id: background
         anchors.fill: parent
         color: headerStyle.backgroundColor
+
+        // The border is shown to warn the developer that the AppHeader
+        //  is deprecated. See bug #1583636
+        property bool showBorder: styledItem.hasOwnProperty("showDeprecatedWarning") &&
+                                  styledItem.showDeprecatedWarning
+        border {
+            width: background.showBorder ? units.gu(0.5) : 0
+            color: background.showBorder ? UbuntuColors.red : "transparent"
+        }
     }
 
     // FIXME: When the three panel color properties below are removed,

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-05-06 08:53:16 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/PageHeaderStyle.qml	2016-06-17 13:30:14 +0000
@@ -1,5 +1,5 @@
 /*
- * Copyright 2015 Canonical Ltd.
+ * Copyright 2016 Canonical Ltd.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-05-17 13:00:51 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/SectionsStyle.qml	2016-06-17 13:30:14 +0000
@@ -15,44 +15,30 @@
  */
 import QtQuick 2.4
 import QtQuick.Window 2.2
+import QtGraphicalEffects 1.0
 import Ubuntu.Components 1.3
-import QtGraphicalEffects 1.0
 import Ubuntu.Components.Private 1.3
+import Ubuntu.Components.Styles 1.3 as Style
 
-Item {
+Style.SectionsStyle {
     id: sectionsStyle
 
     implicitWidth: sectionsListView.contentWidth + 2 * listViewContainer.listViewMargins
     implicitHeight: Screen.height > units.gu(50) ? units.gu(4) : units.gu(3)
 
-    /*!
-      The foreground color of unselected sections.
-     */
-    property color sectionColor: enabled
-                                 ? theme.palette.normal.backgroundTertiaryText
-                                 : theme.palette.disabled.backgroundTertiaryText
-
-    /*!
-      The foreground color of underline rectangle of unselected sections.
-     */
-    property color underlineColor: theme.palette.normal.base
-
-    /*!
-      The foreground color of the selected section.
-     */
-    property color selectedSectionColor: enabled
-                                         ? theme.palette.selected.positionText
-                                         : theme.palette.selectedDisabled.positionText
-
-    /*!
-      The background color for the pressed section button.
-     */
-    property color pressedBackgroundColor: theme.palette.highlighted.background
-
-    /*!
-      The size of text in the buttons.
-     */
-    property int textSize: Label.Medium
+    sectionColor: enabled
+                  ? theme.palette.normal.backgroundTertiaryText
+                  : theme.palette.disabled.backgroundTertiaryText
+
+    underlineColor: theme.palette.normal.base
+
+    selectedSectionColor: enabled
+                          ? theme.palette.selected.positionText
+                          : theme.palette.selectedDisabled.positionText
+
+    pressedBackgroundColor: theme.palette.highlighted.background
+
+    textSize: Label.Medium
 
     /*!
       The spacing on the left and right sides of the label

=== modified file 'src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml'
--- src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-05-10 12:08:32 +0000
+++ src/Ubuntu/Components/Themes/Ambiance/1.3/TextAreaStyle.qml	2016-06-17 13:30:14 +0000
@@ -76,6 +76,12 @@
             radius: units.gu(1.7)
             backgroundColor: visuals.backgroundColor
             aspect: UbuntuShape.Flat
+            source: ShaderEffectSource {
+                sourceItem: styledItem.__rightScrollbar ? styledItem.__rightScrollbar : null
+                hideSource: true
+            }
+            sourceFillMode: UbuntuShape.Pad
+            sourceHorizontalAlignment: UbuntuShape.AlignRight
         }
     }
 

=== modified file 'src/Ubuntu/Components/Themes/ThemesModule.pro'
--- src/Ubuntu/Components/Themes/ThemesModule.pro	2015-05-19 09:23:01 +0000
+++ src/Ubuntu/Components/Themes/ThemesModule.pro	2016-06-17 13:30:14 +0000
@@ -1,12 +1,9 @@
 TARGETPATH = Ubuntu/Components/Themes
 
 
-ARTWORK_FILES = $$system(find artwork -type f)
-
 QML_FILES += 1.2/Palette.qml \
              1.2/PaletteValues.qml \
              1.3/Palette.qml \
              1.3/PaletteValues.qml \
-             $$ARTWORK_FILES
 
 load(ubuntu_qml_module)

=== modified file 'src/Ubuntu/Components/plugin/ucabstractbutton.cpp'
--- src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-05-30 09:48:54 +0000
+++ src/Ubuntu/Components/plugin/ucabstractbutton.cpp	2016-06-17 13:30:14 +0000
@@ -129,9 +129,6 @@
 {
     UCActionItem::classBegin();
 
-    // make sure we have the haptics set up!
-    HapticsProxy::instance()->initialize();
-
     // set up mouse area
     Q_D(UCAbstractButton);
     QQml_setParent_noEvent(d->mouseArea, this);

=== modified file 'src/Ubuntu/Components/plugin/ucperformancemonitor.cpp'
--- src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-03-15 13:46:27 +0000
+++ src/Ubuntu/Components/plugin/ucperformancemonitor.cpp	2016-06-17 13:30:14 +0000
@@ -21,10 +21,23 @@
 
 Q_LOGGING_CATEGORY(ucPerformance, "[PERFORMANCE]")
 
-const int singleFrameThreshold = 32;
-const int multipleFrameThreshold = 17;
-const int framesCountThreshold = 10;
-const int warningCountThreshold = 30;
+static int singleFrameThreshold = 32;
+static int multipleFrameThreshold = 17;
+static int framesCountThreshold = 10;
+static int warningCountThreshold = 30;
+
+// TODO Qt 5.5. switch to qEnvironmentVariableIntValue
+static int getenvInt(const char* name, int defaultValue)
+{
+    if (qEnvironmentVariableIsSet(name)) {
+        QByteArray stringValue = qgetenv(name);
+        bool ok;
+        int value = stringValue.toFloat(&ok);
+        return ok ? value : defaultValue;
+    } else {
+        return defaultValue;
+    }
+}
 
 UCPerformanceMonitor::UCPerformanceMonitor(QObject* parent) :
     QObject(parent),
@@ -34,6 +47,11 @@
 {
     QObject::connect((QGuiApplication*)QGuiApplication::instance(), &QGuiApplication::applicationStateChanged,
                      this, &UCPerformanceMonitor::onApplicationStateChanged);
+
+    singleFrameThreshold = getenvInt("UC_PERFORMANCE_MONITOR_SINGLE_FRAME_THRESHOLD", singleFrameThreshold);
+    multipleFrameThreshold = getenvInt("UC_PERFORMANCE_MONITOR_MULTIPLE_FRAME_THRESHOLD", multipleFrameThreshold);
+    framesCountThreshold = getenvInt("UC_PERFORMANCE_MONITOR_FRAMES_COUNT_THRESHOLD", framesCountThreshold);
+    warningCountThreshold = getenvInt("UC_PERFORMANCE_MONITOR_WARNING_COUNT_THRESHOLD", warningCountThreshold);
 }
 
 UCPerformanceMonitor::~UCPerformanceMonitor()
@@ -53,7 +71,7 @@
 
 void UCPerformanceMonitor::onApplicationStateChanged(Qt::ApplicationState state)
 {
-    if (m_warningCount >= warningCountThreshold) {
+    if (m_warningCount >= warningCountThreshold && warningCountThreshold != -1) {
         // do not monitor performance if the warning count threshold was reached
         return;
     }
@@ -124,7 +142,7 @@
         m_framesAboveThreshold = 0;
     }
 
-    if (m_warningCount >= warningCountThreshold) {
+    if (m_warningCount >= warningCountThreshold && warningCountThreshold != -1) {
         qCWarning(ucPerformance, "Too many warnings were given. Performance monitoring stops.");
         connectToWindow(NULL);
     }

=== modified file 'tests/unit/add_qmlmakecheck.pri'
--- tests/unit/add_qmlmakecheck.pri	2016-02-08 09:33:08 +0000
+++ tests/unit/add_qmlmakecheck.pri	2016-06-17 13:30:14 +0000
@@ -7,7 +7,7 @@
 for(TEST, TESTS) {
   _uitk_command = cd $$_PRO_FILE_PWD_;
   _uitk_command += env UITK_TEST_KEEP_RUNNING=1
-  _uitk_command += '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$${TEST}" minimal';
+  _uitk_command += '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$${_PRO_FILE_PWD_}/$${TEST}" minimal';
 
   check.commands += $${_uitk_command}
 

=== modified file 'tests/unit/add_qmlmakecheck_x11.pri'
--- tests/unit/add_qmlmakecheck_x11.pri	2016-05-30 15:14:42 +0000
+++ tests/unit/add_qmlmakecheck_x11.pri	2016-06-17 13:30:14 +0000
@@ -10,7 +10,7 @@
  for(TEST, TESTS) {
   _uitk_command = cd $$_PRO_FILE_PWD_;
   _uitk_command += env UITK_TEST_KEEP_RUNNING=1
-  _uitk_command += '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$${TEST}"';
+  _uitk_command += '$${ROOT_SOURCE_DIR}/tests/unit/runtest.sh "$$shadowed($$_PRO_FILE_PWD_)/$${TARGET}" "$${_PRO_FILE_PWD_}/$${TEST}"';
 
   check.commands += $${_uitk_command}
 

=== modified file 'tests/unit/i18n/LocalizedApp/LocalizedApp.pro'
--- tests/unit/i18n/LocalizedApp/LocalizedApp.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/i18n/LocalizedApp/LocalizedApp.pro	2016-06-17 13:30:14 +0000
@@ -5,7 +5,6 @@
 DOMAIN = localizedApp
 mo.target = mo
 mo.commands = set -e;
-mo.commands += echo Generating localization;
 mo.commands += msgfmt $$PWD/po/en_US.po -o $$PWD/$${DOMAIN}/share/locale/en/LC_MESSAGES/$${DOMAIN}.mo;
 QMAKE_EXTRA_TARGETS += mo
 PRE_TARGETDEPS += mo

=== modified file 'tests/unit/i18n/RelativeTime/RelativeTime.pro'
--- tests/unit/i18n/RelativeTime/RelativeTime.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/i18n/RelativeTime/RelativeTime.pro	2016-06-17 13:30:14 +0000
@@ -5,7 +5,6 @@
 DOMAIN = ubuntu-ui-toolkit
 mo.target = mo
 mo.commands = set -e;
-mo.commands += echo Generating localization;
 mo.commands += msgfmt $${PWD}/po/en_US.po -o $${PWD}/$${DOMAIN}/share/locale/en/LC_MESSAGES/$${DOMAIN}.mo;
 QMAKE_EXTRA_TARGETS += mo
 PRE_TARGETDEPS += mo

=== modified file 'tests/unit/mainview/mainview.pro'
--- tests/unit/mainview/mainview.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/mainview/mainview.pro	2016-06-17 13:30:14 +0000
@@ -2,5 +2,3 @@
 
 QT += gui
 SOURCES += tst_mainview.cpp
-
-OTHER_FILES += $$system(ls tst_*.qml)

=== modified file 'tests/unit/page/page.pro'
--- tests/unit/page/page.pro	2016-05-31 09:02:35 +0000
+++ tests/unit/page/page.pro	2016-06-17 13:30:14 +0000
@@ -2,5 +2,3 @@
 
 QT += gui
 SOURCES += tst_page.cpp
-
-OTHER_FILES += $$system(ls tst_*.qml)

=== added file 'tests/unit/performance/TextArea13Grid.qml'
--- tests/unit/performance/TextArea13Grid.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/performance/TextArea13Grid.qml	2016-06-17 13:30:14 +0000
@@ -0,0 +1,33 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.0
+import Ubuntu.Components 1.3
+
+Grid {
+    width: units.gu(80)
+    height: units.gu(60)
+    rows: 16
+    columns: 16
+
+    Repeater {
+        model: 16 * 16
+
+        TextField {
+            text: i18n.tr("Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.")
+        }
+    }
+}

=== modified file 'tests/unit/performance/tst_performance.cpp'
--- tests/unit/performance/tst_performance.cpp	2015-12-07 22:16:52 +0000
+++ tests/unit/performance/tst_performance.cpp	2016-06-17 13:30:14 +0000
@@ -102,6 +102,7 @@
         QTest::addColumn<QString>("document");
         QTest::addColumn<QUrl>("theme");
 
+        QTest::newRow("TextArea 1.3") << "TextArea13Grid.qml" << QUrl();
         QTest::newRow("AbstractButton 1.2") << "AbstractButtonGrid.qml" << QUrl();
         QTest::newRow("AbstractButton 1.3") << "AbstractButton13Grid.qml" << QUrl();
         QTest::newRow("grid with Rectangle") << "RectangleGrid.qml" << QUrl();

=== modified file 'tests/unit/runtest.sh'
--- tests/unit/runtest.sh	2016-06-01 09:48:44 +0000
+++ tests/unit/runtest.sh	2016-06-17 13:30:14 +0000
@@ -43,14 +43,14 @@
   echo "  $0 TEST_EXECUTABLE [QML_FILE] [QT_QPA_PLATFORM]"
   echo ''
   echo 'Examples:'
-  echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/components/components) tst_label13.qml minimal"
+  echo "  $0 $(relpath ${BUILD_DIR}/tests/unit/components/components) $(relpath ${SRC_DIR}/tests/unit/components/tst_label13.qml) minimal"
   echo ''
   echo "  cd $(relpath ${BUILD_DIR}/tests/unit/mainview)"
   echo "  ../$(basename $0) mainview minimal"
   echo "  cd ../../.."
   echo ''
   echo "  cd $(relpath ${BUILD_DIR}/tests/unit/visual)"
-  echo "  ../../xvfb.sh ../../unit/$(basename $0) visual tst_listitem13.qml"
+  echo "  ../../xvfb.sh ../../unit/$(basename $0) visual ../../unit/visual/tst_listitem13.qml"
   echo "  cd ../../.."
   echo ''
   echo "  $(relpath ${BUILD_DIR}/tests/xvfb.sh) $0 $(relpath ${BUILD_DIR}/tests/unit/bottomedge/bottomedge)"
@@ -74,20 +74,26 @@
 EOF
 }
 
+function abspath {
+  if [[ "$1" = /* ]]; then
+      ABSPATH=$1
+  else
+      ABSPATH=./$1
+  fi
+  # Note: '|| echo' so we get a sane error message if it doesn't exist
+  echo -n $(readlink -f $ABSPATH || echo $ABSPATH)
+}
+
 function create_test_cmd {
-  if [[ "$_TARGETPATH" = /* ]]; then
-      EXE=$_TARGETPATH
-  else
-      EXE=./$_TARGETPATH
-  fi
+  EXE=$(abspath $_TARGETPATH)
   _CMD="-n $_TESTFILE -m 500"
 
   DEB_HOST_ARCH=$(dpkg-architecture -qDEB_HOST_ARCH)
   if [[ ${DEB_HOST_ARCH} =~ 'arm' ]]; then
-    _CMD="dbus-test-runner --task $(readlink -f $EXE) $_CMD"
+    _CMD="dbus-test-runner --task $EXE $_CMD"
   else
     _CMD="dbus-test-runner --task gdb -p --quiet $_CMD"
-    _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $(readlink -f $EXE)"
+    _CMD="$_CMD -p --batch -p -ex -p 'set print thread-events off' -p -ex -p run -p -ex -p bt -p --return-child-result -p --args -p $EXE"
   fi
 
   if [[ 'minimal custom' == *$_MINIMAL* ]]; then
@@ -95,27 +101,26 @@
   fi
 
   if [[ $_TESTFILEPATH == *\.qml* ]]; then
-      _CMD="$_CMD -p -input -p $_TESTFILEPATH"
+      _CMD="$_CMD -p -input -p $(abspath $_TESTFILEPATH)"
   fi
   _CMD="$_CMD -p -maxwarnings -p 100"
 }
 
 function execute_test_cmd {
   echo "Executing $_CMD $_ARGS"
-  echo "Working directory: $PWD"
   if [ ! -x $_TARGETPATH ]; then
     echo "Error: $_TARGET wasn't built!"
     RESULT=2
   elif [ $DISPLAY ]; then
-    cd $(dirname $_TARGETPATH)
+    SRC_TARGETPATH=$(echo $EXE | sed "s@$BUILD_DIR@$SRC_DIR@")
+    cd $(dirname $SRC_TARGETPATH)
 
     # https://bugs.launchpad.net/ubuntu-ui-toolkit/+bug/1256999
     # https://bugreports.qt-project.org/browse/QTBUG-36243
-	
     # QV4_MM_AGGRESSIVE_GC=1 \
     ALARM_BACKEND=memory SUPPRESS_DEPRECATED_NOTE=no \
     QT_LOGGING_RULES="[PERFORMANCE].warning=false" \
-    $_CMD $_ARGS 2>&1 | grep -v 'QFontDatabase: Cannot find font directory'
+    $_CMD $_ARGS 2>&1 | sed "s@$_TESTFILE: @@" | grep -v 'QFontDatabase: Cannot find font directory'
     if [ ! -s $_XML ]; then
         # Write fallback in case it crashed and the file is empty
         if [[ $_XML == *".SEGFAULT"* ]]; then
@@ -125,7 +130,7 @@
         fi
     fi
     if [ "x$UITK_TEST_KEEP_RUNNING" != "x1" ]; then
-        ${BUILD_DIR}/tests/checkresults.sh $_XML
+        ${SRC_DIR}/tests/checkresults.sh $_XML
         RESULT=$?
     fi
   else

=== added file 'tests/unit/visual/gallery.qml'
--- tests/unit/visual/gallery.qml	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/gallery.qml	2016-06-17 13:30:14 +0000
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 Canonical Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; version 3.
+ *
+ * This program 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+import QtQuick 2.4
+import Ubuntu.Components 1.3
+import Qt.labs.folderlistmodel 2.1
+
+MainView {
+    width: units.gu(120)
+    height: units.gu(75)
+
+    AdaptivePageLayout {
+        id: pageLayout
+        anchors.fill: parent
+        primaryPage: Page {
+            header: PageHeader {
+                flickable: testsListView
+                title: 'Unit Tests'
+            }
+
+            UbuntuListView {
+                id: testsListView
+                anchors.fill: parent
+                model: FolderListModel {
+                    Component.onCompleted: folder += '/tests/unit/visual'
+                    showDirs: false
+                    showOnlyReadable: true
+                    sortField: FolderListModel.Name
+                    nameFilters: [ "tst_*13.qml" ]
+                }
+
+                delegate: ListItem {
+                    height: listItemLayout.height
+                    ListItemLayout {
+                        id: listItemLayout
+                        title.text: fileBaseName
+                        ProgressionSlot {}
+                    }
+                    onClicked: {
+                        testsListView.currentIndex = index
+                        pageLayout.addPageToNextColumn(pageLayout.primaryPage, testPage, { source: fileURL, title: fileBaseName })
+                    }
+                }
+            }
+        }
+        asynchronous: false
+
+        Page {
+            id: testPage
+            property alias source: testLoader.source
+            header: PageHeader {
+                id: testPageHeader
+                title: testPage.title
+            }
+
+            Loader {
+                id: testLoader
+                anchors.fill: parent
+                anchors.topMargin: testPage.header.height
+                asynchronous: false
+            }
+        }
+    }
+}
+

=== added file 'tests/unit/visual/gallery.sh'
--- tests/unit/visual/gallery.sh	1970-01-01 00:00:00 +0000
+++ tests/unit/visual/gallery.sh	2016-06-17 13:30:14 +0000
@@ -0,0 +1,6 @@
+#!/bin/bash
+
+. `dirname ${BASH_SOURCE[0]}`/../../../export_qml_dir.sh || exit 1
+
+SCRIPT_DIRECTORY=`dirname $0`
+$BUILD_DIR/ubuntu-ui-toolkit-launcher/ubuntu-ui-toolkit-launcher $@ $SCRIPT_DIRECTORY/gallery.qml

=== modified file 'tests/unit/visual/tst_pageheader.qml'
--- tests/unit/visual/tst_pageheader.qml	2016-03-30 15:12:36 +0000
+++ tests/unit/visual/tst_pageheader.qml	2016-06-17 13:30:14 +0000
@@ -238,7 +238,8 @@
 
                 Switch {
                     id: subtitleSwitch
-                    checked: false
+                    // Subtitle enabled initially as a regression test for bug #1588837.
+                    checked: true
                 }
                 Label {
                     text: "subtitle"

=== modified file 'tests/unit/visual/tst_picker13.qml'
--- tests/unit/visual/tst_picker13.qml	2016-03-15 13:26:55 +0000
+++ tests/unit/visual/tst_picker13.qml	2016-06-17 13:30:14 +0000
@@ -100,6 +100,7 @@
     Loader {
         id: pickerLoader
         asynchronous: false
+        sourceComponent: defaultPicker
     }
 
     ListModel {

=== modified file 'tests/unit/visual/tst_popups_dialog13.qml'
--- tests/unit/visual/tst_popups_dialog13.qml	2016-03-15 13:26:55 +0000
+++ tests/unit/visual/tst_popups_dialog13.qml	2016-06-17 13:30:14 +0000
@@ -26,6 +26,13 @@
     width: units.gu(40)
     height: units.gu(71)
 
+    Button {
+        id: pressMe
+        anchors.top: parent.top
+        text: "Open Dialog"
+        onClicked: PopupUtils.open(dialog)
+    }
+
     UbuntuTestCase {
         id: test
         name: "Popups.Dialog"
@@ -45,7 +52,13 @@
     Component {
         id: dialog
         Dialog {
+            id: ahojDialog
             title: "Ahoj"
+
+            Button {
+                text: "Close"
+                onClicked: PopupUtils.close(ahojDialog)
+            }
         }
     }
 }

=== modified file 'tests/xvfb.sh'
--- tests/xvfb.sh	2013-12-19 14:46:25 +0000
+++ tests/xvfb.sh	2016-06-17 13:30:14 +0000
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # Copyright 2013 Canonical Ltd.
 #
@@ -16,15 +16,18 @@
 #
 # Author: Christian Dywan <[e-mail]>
 
+. `dirname ${BASH_SOURCE[0]}`/../export_qml_dir.sh || exit 1
+
+LOG=$BUILD_DIR/xvfb.err
 echo Running $@ in virtual frame buffer...
-xvfb-run -a -s "-screen 0 1280x1024x24" -e xvfb.err "$@" 2>test.err
+xvfb-run -a -s "-screen 0 1280x1024x24" -e $LOG "$@" 2>$LOG
 RETVAL=$?
 if [ $RETVAL -eq 0 ]; then
     echo $@ finished successfully...
 else
     echo $@ in virtual frame buffer failed...
-    cat test.err >&2
+    cat $LOG >&2
     echo Tail of xvfb-run output:
-    tail xvfb.err >&2
+    tail $LOG >&2
     exit $RETVAL
 fi