diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/CHANGES ubuntu-ui-toolkit-0.1.46+13.10.20130828/CHANGES --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/CHANGES 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/CHANGES 2013-08-28 08:19:35.000000000 +0000 @@ -9,7 +9,7 @@ API Changes *********** -* ADDED IN: Empty: property alias divider + * REMOVED IN ALL: attached property ItemStyle * ADDED IN OrientationHelper: property alias rotating * ADDED IN OrientationHelper: property alias __orientationHelper diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/components.api ubuntu-ui-toolkit-0.1.46+13.10.20130828/components.api --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/components.api 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/components.api 2013-08-28 08:19:35.000000000 +0000 @@ -99,23 +99,6 @@ modules/Ubuntu/Components/Object.qml QtObject default property internal children -modules/Ubuntu/Components/OptionSelector.qml -ListItem.Empty - property var model - property bool expanded - property bool colourImage - readonly property int selectedIndex - property real containerHeight - signal scroll() -modules/Ubuntu/Components/OptionSelectorDelegate.qml -ListItem.Standard - property string text - property string subText - property url icon - property ListView listView - property color assetColour - property bool colourImage - property string fragColourShader modules/Ubuntu/Components/OrientationHelper.qml Item property bool automaticOrientation diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/debian/changelog ubuntu-ui-toolkit-0.1.46+13.10.20130828/debian/changelog --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/debian/changelog 2013-08-28 08:30:07.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/debian/changelog 2013-08-28 08:30:07.000000000 +0000 @@ -1,3 +1,9 @@ +ubuntu-ui-toolkit (0.1.46+13.10.20130828-0ubuntu1) saucy; urgency=low + + * Automatic snapshot from revision 717 + + -- Ubuntu daily release Wed, 28 Aug 2013 08:19:49 +0000 + ubuntu-ui-toolkit (0.1.46+13.10.20130827-0ubuntu1) saucy; urgency=low [ Michael Zanetti ] diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/ListItems.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/ListItems.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/ListItems.qml 2013-08-28 08:19:35.000000000 +0000 @@ -77,6 +77,18 @@ } ListItemsSection { + title: i18n.tr("Value selector") + className: "ValueSelector" + delegate: ListItem.ValueSelector { + text: i18n.tr("Label") + values: [i18n.tr("Value 1"), + i18n.tr("Value 2"), + i18n.tr("Value 3"), + i18n.tr("Value 4")] + } + } + + ListItemsSection { title: i18n.tr("Control") className: "Standard" delegate: ListItem.Standard { diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/OptionSelectors.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/* - * Copyright 2013 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 . - */ - -import QtQuick 2.0 -import Ubuntu.Components 0.1 - -Template { - TemplateSection { - id: section - - title: i18n.tr("Option Selector") - className: "Option Selector" - - Column { - id: column - anchors.left: parent.left - anchors.right: parent.right - spacing: units.gu(3) - - OptionSelector { - text: i18n.tr("Label") - model: [i18n.tr("Value 1"), - i18n.tr("Value 2"), - i18n.tr("Value 3"), - i18n.tr("Value 4")] - } - - OptionSelector { - text: i18n.tr("Label") - expanded: true - model: [i18n.tr("Value 1"), - i18n.tr("Value 2"), - i18n.tr("Value 3"), - i18n.tr("Value 4")] - } - - OptionSelector { - text: i18n.tr("Label") - model: customModel - expanded: true - colourImage: true - delegate: selectorDelegate - } - - Component { - id: selectorDelegate - - OptionSelectorDelegate { text: name; subText: description; icon: image } - } - - ListModel { - id: customModel - ListElement { name: "Name 1"; description: "Description 1"; image: "images.png" } - ListElement { name: "Name 2"; description: "Description 2"; image: "images.png" } - ListElement { name: "Name 3"; description: "Description 3"; image: "images.png" } - ListElement { name: "Name 4"; description: "Description 4"; image: "images.png" } - } - } - } -} diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/WidgetsModel.qml 2013-08-28 08:19:35.000000000 +0000 @@ -40,11 +40,6 @@ source: "TextInputs.qml" } - ListElement { - label: "Option Selector" - source: "OptionSelectors.qml" - } - // Not in design guidelines yet ListElement { label: "Progress and activity" Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/examples/ubuntu-ui-toolkit-gallery/images.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/examples/ubuntu-ui-toolkit-gallery/images.png differ diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/ListItems/Empty.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/ListItems/Empty.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/ListItems/Empty.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/ListItems/Empty.qml 2013-08-28 08:19:35.000000000 +0000 @@ -120,7 +120,34 @@ Set to show or hide the thin bottom divider line (drawn by the \l ThinDivider component). This line is shown by default except in cases where this item is the delegate of a ListView. */ - property bool showDivider: true + property bool showDivider: __showDivider() + + /*! + \internal + Method to automatically determine if the bottom divider line should be drawn. + This always returns true, unless item is a delegate in a ListView. If in a ListView + it will return false only when: + + if there is a section.delegate below this item (as thin divider line and section + delegate should not both appear) + + if this is the final item in the list, and ListView.footer is set (again as thin + divider line won't look well with footer below it) + */ + // FIXME: The new design shows dividers everywhere, so if it does not change anymore, + // the __showDivider() function may be removed. + function __showDivider() { + // if we're not in ListView, always show a thin dividing line at the bottom + //if (ListView.view !== null) { + + // if we're last item in ListView, show divider if no footer is defined + // and hide it if footer defined + //if (index === ListView.view.model.count - 1) return !ListView.footer; + + // if section.delegate is positioned between this item and the next + //else if (ListView.section !== ListView.nextSection) return true; + //else return false; + //} + return true; + } /*! \internal @@ -142,13 +169,6 @@ */ property alias backgroundIndicator: backgroundIndicator.children - /*! - \preliminary - \qmlproperty ThinDivider bottomDividerLine - Exposes our the bottom line divider. - */ - property alias divider: bottomDividerLine - /*! \internal The spacing inside the list item. */ @@ -252,6 +272,21 @@ } } + Rectangle { + id: highlight + + z: -1 + visible: !priv.removed && emptyListItem.swipingState === "" ? emptyListItem.selected || (emptyListItem.highlightWhenPressed && emptyListItem.pressed) : false + anchors { + left: parent.left + right: parent.right + top: parent.top + } + height: emptyListItem.height - bottomDividerLine.height + color: Theme.palette.selected.background + } + + ThinDivider { id: bottomDividerLine anchors.bottom: parent.bottom @@ -267,7 +302,7 @@ left: parent.left right: parent.right top: parent.top - bottom: parent.bottom + bottom: bottomDividerLine.top } Item { diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/OptionSelector.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/OptionSelector.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/OptionSelector.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/OptionSelector.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,188 +0,0 @@ -/* - * Copyright 2012 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 . - */ - -import QtQuick 2.0 -import "ListItems" as ListItem -import Ubuntu.Components 0.1 as Components - -/*! - \qmltype OptionSelector - \inqmlmodule Components.Components.ListItems 0.1 - \ingroup ubuntu-listitems - \brief List item displaying single selected value when not expanded, - where expanding it opens a listing of all the possible values for selection - with an additional option of always being expanded. - - \b{This component is under heavy development.} - - Examples: - \qml - import Components.Components 0.1 - Column { - width: 250 - OptionSelector { - text: "Standard" - values: ["Value 1", "Value 2", "Value 3", "Value 4"] - } - OptionSelector { - text: "Disabled" - values: ["Value 1", "Value 2", "Value 3", "Value 4"] - enabled: false - } - OptionSelector { - text: "Expanded" - values: ["Value 1", "Value 2", "Value 3", "Value 4"] - expanded: true - } - OptionSelector { - text: "Icon" - icon: Qt.resolvedUrl("icon.png") - values: ["Value 1", "Value 2", "Value 3", "Value 4"] - selectedIndex: 2 - } - } - \endqml -*/ - -/*FIXME: -There is a bug with UbuntuShape background which should be fixed once the new UbuntuShape changes land.*/ - -ListItem.Empty { - id: optionSelector - __height: column.height - - /*! - \preliminary - The list of values that will be shown under the label text. This is a model. - */ - property var model - - /*! - \preliminary - Specifies whether the list is always expanded. - */ - property bool expanded: false - - /*! - \preliminary - Colours image according to the fieldText colour of the theme, otherwise source colour is maintained. - */ - property bool colourImage: false - - /*! - \preliminary - ListView delegate. - */ - property Component delegate: OptionSelectorDelegate {} - - /*! - \qmlproperty int selectedIndex - The index of the currently selected element in our list. - */ - readonly property alias selectedIndex: list.currentIndex - - /*! - \qmlproperty real containerHeight - Custom height for list container which allows scrolling inside the selector. - */ - property real containerHeight: list.contentHeight - - /*! - Called when the optionSelector is either expanded or collapsed. - */ - signal scroll() - - showDivider: false - - Column { - id: column - - spacing: units.gu(2) - anchors { - left: parent.left - right: parent.right - } - - Label { - text: optionSelector.text - height: units.gu(2) - } - - StyledItem { - id: listContainer - objectName: "listContainer" - - readonly property url chevron: __styleInstance.chevron - readonly property url tick: __styleInstance.tick - readonly property color themeColour: Theme.palette.selected.fieldText - property bool isExpanded: expanded - property bool isFullyExpanded: expanded - property bool colourImage: optionSelector.colourImage - - anchors { - left: parent.left - right: parent.right - } - state: optionSelector.expanded ? state = "expanded" : state = "collapsed" - style: Theme.createStyleComponent("OptionSelectorStyle.qml", listContainer) - - onHeightChanged: scroll() - - states: [ State { - name: "expanded" - when: listContainer.isExpanded - PropertyChanges { - target: listContainer - height: containerHeight - } - }, State { - name: "collapsed" - when: !listContainer.isExpanded - PropertyChanges { - target: listContainer - height: list.itemHeight - } - } - ] - - transitions: [ Transition { - UbuntuNumberAnimation { - properties: "height" - duration: Components.UbuntuAnimation.BriskDuration - } - } - ] - - ListView { - id: list - - property int previousIndex: -1 - readonly property alias expanded: optionSelector.expanded - readonly property alias container: listContainer - property real itemHeight - - boundsBehavior: Flickable.StopAtBounds - interactive: listContainer.height !== list.contentHeight && listContainer.isExpanded ? true : false - clip: true - currentIndex: 0 - model: optionSelector.model - anchors.fill: parent - - delegate: optionSelector.delegate - } - } - } -} diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/OptionSelectorDelegate.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/OptionSelectorDelegate.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/OptionSelectorDelegate.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/OptionSelectorDelegate.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,295 +0,0 @@ -/* - * Copyright 2012 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 . - */ - -import QtQuick 2.0 -import "ListItems" as ListItem -import Ubuntu.Components 0.1 as Components - -ListItem.Standard { - id: option - - property string text - property string subText - property url icon - property ListView listView: ListView.view - property color assetColour: listView.container.themeColour - property bool colourImage: listView.container.colourImage - property string fragColourShader: - "varying highp vec2 qt_TexCoord0; - uniform sampler2D source; - uniform lowp vec4 colour; - uniform lowp float qt_Opacity; - - void main() { - lowp vec4 sourceColour = texture2D(source, qt_TexCoord0); - gl_FragColor = colour * sourceColour.a * qt_Opacity; - }" - - width: parent.width + units.gu(2) - showDivider: index !== listView.count - 1 ? 1 : 0 - highlightWhenPressed: false - selected: ListView.isCurrentItem - anchors { - left: parent.left - leftMargin: units.gu(-2) - } - onClicked: { - if (listView.container.isExpanded) { - listView.previousIndex = listView.currentIndex; - listView.currentIndex = index; - } - - if (!listView.expanded) { - listView.container.isExpanded = !listView.container.isExpanded; - } - } - - Component.onCompleted: { - height = listView.itemHeight = childrenRect.height; - } - - //Since we don't want to add states to our divider, we use the exposed alias provided in Empty to access it and alter it's opacity from here. - states: [ State { - name: "dividerExpanded" - when: listView.container.state === "expanded" && index === listView.currentIndex - PropertyChanges { - target: option.divider - opacity: 1 - } - }, State { - name: "dividerCollapsed" - when: listView.container.state === "collapsed" && index === listView.currentIndex - PropertyChanges { - target: option.divider - opacity: 0 - } - } - ] - - //As with our states, we apply the transition with our divider as the target. - transitions: [ Transition { - from: "dividerExpanded" - to: "dividerCollapsed" - UbuntuNumberAnimation { - target: option.divider - properties: "opacity" - duration: Components.UbuntuAnimation.SlowDuration - } - } - ] - - resources: [ - Connections { - target: listView.container - onIsExpandedChanged: { - optionExpansion.stop(); - imageExpansion.stop(); - optionCollapse.stop(); - selectedImageCollapse.stop(); - deselectedImageCollapse.stop(); - - if (listView.container.isExpanded === true) { - if (!option.selected) { - optionExpansion.start(); - - //Ensure a source change. This solves a bug which happens occasionaly when source is switched correctly. Probably related to the image.source binding. - image.source = listView.container.tick - } else { - imageExpansion.start(); - } - } else { - if (!option.selected) { - optionCollapse.start(); - } else { - if (listView.previousIndex !== listView.currentIndex) - selectedImageCollapse.start(); - else { - deselectedImageCollapse.start(); - } - } - } - } - }, SequentialAnimation { - id: imageExpansion - - PropertyAnimation { - target: image - properties: "opacity" - from : 1.0 - to: 0.0 - duration: Components.UbuntuAnimation.FastDuration - } - PauseAnimation { duration: Components.UbuntuAnimation.BriskDuration - Components.UbuntuAnimation.FastDuration } - PropertyAction { - target: image - property: "source" - value: listView.container.tick - } - PropertyAnimation { - target: image - properties: "opacity" - from : 0.0 - to: 1.0 - duration: Components.UbuntuAnimation.FastDuration - } - }, PropertyAnimation { - id: optionExpansion - - target: option - properties: "opacity" - from : 0.0 - to: 1.0 - duration: Components.UbuntuAnimation.SlowDuration - }, SequentialAnimation { - id: deselectedImageCollapse - - PauseAnimation { duration: Components.UbuntuAnimation.BriskDuration } - PropertyAnimation { - target: image - properties: "opacity" - from : 1.0 - to: 0.0 - duration: Components.UbuntuAnimation.FastDuration - } - PauseAnimation { duration: Components.UbuntuAnimation.FastDuration } - PropertyAction { - target: image - property: "source" - value: listView.container.chevron - } - PropertyAnimation { - target: image - properties: "opacity" - from : 0.0 - to: 1.0 - duration: Components.UbuntuAnimation.FastDuration - } - }, SequentialAnimation { - id: selectedImageCollapse - - PropertyAnimation { - target: image - properties: "opacity" - from : 0.0 - to: 1.0 - duration: Components.UbuntuAnimation.FastDuration - } - PauseAnimation { duration: Components.UbuntuAnimation.BriskDuration - Components.UbuntuAnimation.FastDuration } - PropertyAnimation { - target: image - properties: "opacity" - from : 1.0 - to: 0.0 - duration: Components.UbuntuAnimation.FastDuration - } - PauseAnimation { duration: Components.UbuntuAnimation.FastDuration } - PropertyAction { - target: image - property: "source" - value: listView.container.chevron - } - PropertyAnimation { - target: image - properties: "opacity" - from : 0.0 - to: 1.0 - duration: Components.UbuntuAnimation.FastDuration - } - }, PropertyAnimation { - id: optionCollapse - target: option - properties: "opacity" - from : 1.0 - to: 0.0 - duration: Components.UbuntuAnimation.SlowDuration - } - ] - - Row { - spacing: units.gu(1) - - anchors { - left: parent.left - leftMargin: units.gu(3) - verticalCenter: parent.verticalCenter - } - - Image { - id: leftIcon - - source: icon - - ShaderEffect { - property color colour: assetColour - property Image source: parent - - width: source.width - height: source.height - visible: colourImage - - fragmentShader: fragColourShader - } - } - - Column { - anchors { - verticalCenter: parent.verticalCenter - } - Label { - text: option.text === "" ? modelData : option.text - } - Label { - text: option.subText - visible: option.subText !== "" ? true : false - fontSize: "small" - } - } - } - - Image { - id: image - - width: units.gu(2) - height: units.gu(2) - source: listView.expanded ? listView.container.tick : listView.container.chevron - opacity: option.selected ? 1.0 : 0.0 - anchors { - right: parent.right - rightMargin: units.gu(2) - verticalCenter: parent.verticalCenter - } - - //Our behaviour is only enabled for our expanded list due to flickering bugs in relation to all this other animations running on the expanding version. - Behavior on opacity { - enabled: listView.expanded - - UbuntuNumberAnimation { - properties: "opacity" - duration: Components.UbuntuAnimation.FastDuration - } - } - - ShaderEffect { - property color colour: assetColour - property Image source: parent - - width: source.width - height: source.height - - fragmentShader: fragColourShader - } - } -} diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/Ambiance/OptionSelectorStyle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -/* - * Copyright 2013 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 . - * - */ - -import QtQuick 2.0 -import Ubuntu.Components 0.1 - -Item { - id: ambianceStyle - - property url chevron: "../../artwork/chevron_down@30.png" - property url tick: "../../artwork/tick@30.png" - property bool colourComponent: true - - UbuntuShape { - id: background - - width: styledItem.width - height: styledItem.height - radius: "medium" - } -} Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/Ambiance/artwork/tick@30.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/Ambiance/artwork/tick@30.png differ diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/Ambiance/qmldir ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/Ambiance/qmldir --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/Ambiance/qmldir 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/Ambiance/qmldir 2013-08-28 08:19:35.000000000 +0000 @@ -5,8 +5,7 @@ internal DialogForegroundStyle DialogForegroundStyle.qml internal HeaderStyle HeaderStyle.qml MainViewStyle 0.1 MainViewStyle.qml -OptionSelectorStyle 0.1 OptionSelectorStyle.qml -internal PopoverForegroundStyle PopoverForegroundStyle.qml +PopoverForegroundStyle 0.1 PopoverForegroundStyle.qml internal ScrollbarStyle ScrollbarStyle.qml internal SelectionCursorStyle SelectionCursorStyle.qml internal SheetForegroundStyle SheetForegroundStyle.qml diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruDark/OptionSelectorStyle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -/* - * Copyright 2013 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 . - * - */ - -import QtQuick 2.0 -import Ubuntu.Components.Themes.Ambiance 0.1 - -OptionSelectorStyle { - id: suruDarkStyle -} diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruGradient/OptionSelectorStyle.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -/* - * Copyright 2013 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 . - * - */ - -import QtQuick 2.0 -import Ubuntu.Components.Themes.Ambiance 0.1 - -OptionSelectorStyle { - id: suruGradientStyle - - chevron: "artwork/chevron_down@30.png" - tick: "artwork/tick@30.png" - colourComponent: false -} Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruGradient/artwork/chevron_down@30.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruGradient/artwork/chevron_down@30.png differ Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/Themes/SuruGradient/artwork/tick@30.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/Themes/SuruGradient/artwork/tick@30.png differ Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/artwork/chevron_down@30.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/artwork/chevron_down@30.png differ Binary files /tmp/0ctRQif5N_/ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/artwork/tick@30.png and /tmp/1lLR1X5Shx/ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/artwork/tick@30.png differ diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/qmldir ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/qmldir --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/modules/Ubuntu/Components/qmldir 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/modules/Ubuntu/Components/qmldir 2013-08-28 08:19:35.000000000 +0000 @@ -25,8 +25,6 @@ Scrollbar 0.1 Scrollbar.qml internal ModelSectionCounter ModelSectionCounter.qml Object 0.1 Object.qml -OptionSelector 0.1 OptionSelector.qml -OptionSelectorDelegate 0.1 OptionSelectorDelegate.qml Page 0.1 Page.qml internal PageTreeNode PageTreeNode.qml PageStack 0.1 PageStack.qml diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py ubuntu-ui-toolkit-0.1.46+13.10.20130828/tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/tests/autopilot/ubuntuuitoolkit/tests/gallery/test_gallery.py 2013-08-28 08:19:35.000000000 +0000 @@ -69,11 +69,11 @@ "Buttons", "Slider", "Text Field", - "Option Selector", "Progress and activity", "Ubuntu Shape", "Icons", "Label", + "List Items", ] for item in items: @@ -91,7 +91,6 @@ # now that we have more items, lets continue items = [ - "List Items", "Dialog", "Popover", "Sheet", diff -Nru ubuntu-ui-toolkit-0.1.46+13.10.20130827/tests/unit/tst_components/tst_optionselector.qml ubuntu-ui-toolkit-0.1.46+13.10.20130828/tests/unit/tst_components/tst_optionselector.qml --- ubuntu-ui-toolkit-0.1.46+13.10.20130827/tests/unit/tst_components/tst_optionselector.qml 2013-08-27 19:11:43.000000000 +0000 +++ ubuntu-ui-toolkit-0.1.46+13.10.20130828/tests/unit/tst_components/tst_optionselector.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,107 +0,0 @@ -/* - * Copyright 2012 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 . - */ - -import QtQuick 2.0 -import QtTest 1.0 -import Ubuntu.Components 0.1 -import Ubuntu.Test 0.1 - -UbuntuTestCase { - name: "OptionSelectorAPI" - - function test_expanded() { - var listContainer = findChild(optionSelector, "listContainer"); - - optionSelector.expanded = false; - compare(listContainer.isExpanded, false, "isExpanded should be true if list is an expanded one"); - - optionSelector.expanded = true; - compare(listContainer.isExpanded, true, "isExpanded should be false if list is an expanded one"); - } - - function test_states_and_signal() { - var listContainer = findChild(optionSelector, "listContainer"); - - signalSpy.signalName = "scroll"; - compare(signalSpy.count, 0); - - optionSelector.expanded = false; - compare(listContainer.state, "collapsed", "state should be collapsed"); - - optionSelector.expanded = true; - compare(listContainer.state, "expanded", "state should be expanded"); - - //Check if scroll signal was fired after expansion. - compare(signalSpy.count, 2); - } - - function test_text() { - compare(optionSelector.text,"","text is '' by default") - var newText = "Hello World!"; - optionSelector.text = newText; - compare(optionSelector.text, newText, "set/get"); - } - - function test_selectedIndex() { - compare(optionSelector.selectedIndex, 0, "selectedIndex is 0 by default"); - } - - function test_values() { - compare(optionSelector.values,undefined,"values is undefined by default") - var newValues = ["value1","value2","value3"]; - optionSelector.model = newValues; - compare(optionSelector.model, newValues, "set/get"); - } - - function test_custom_model_delegate() { - compare(optionSelector.model, undefined, "model is undefined by default"); - optionSelector.model = customModel; - optionSelector.delegate = selectorDelegate; - compare(optionSelector.model, customModel, "Model wasn't set correctly."); - compare(optionSelector.delegate, selectorDelegate, "Delegate hasn't been set correctly"); - } - - Rectangle { - id: testItem - } - - OptionSelector { - id: optionSelector - - SignalSpy { - id: signalSpy - target: optionSelector - } - } - - OptionSelector { - id: optionSelectorCustomModel - } - - Component { - id: selectorDelegate - - OptionSelectorDelegate { text: name; subText: description } - } - - ListModel { - id: customModel - ListElement { name: "Name 1"; description: "Description 1" } - ListElement { name: "Name 2"; description: "Description 2" } - ListElement { name: "Name 3"; description: "Description 3" } - ListElement { name: "Name 4"; description: "Description 4" } - } -}