From 59b12b5240f94c4822cdf4f1e4cb05bc0ede76e9 Mon Sep 17 00:00:00 2001 From: Jens Bache-Wiig Date: Fri, 22 Feb 2013 11:23:24 +0100 Subject: Rename ScrollArea to ScrollView We want to introduce View as a common name for items that are not simple controlss but views controlling other items Change-Id: I13ffc096742ec13023c58b4744ad53084e11cc67 Reviewed-by: Gabriel de Dietrich --- tests/auto/controls/controls.pro | 2 +- tests/auto/controls/data/tst_scrollarea.qml | 108 -------------------------- tests/auto/controls/data/tst_scrollview.qml | 108 ++++++++++++++++++++++++++ tests/manual/scrollbars.qml | 8 +- tests/manual/testbench/content/Components.qml | 4 +- tests/manual/testbench/main.qml | 6 +- 6 files changed, 118 insertions(+), 118 deletions(-) delete mode 100644 tests/auto/controls/data/tst_scrollarea.qml create mode 100644 tests/auto/controls/data/tst_scrollview.qml (limited to 'tests') diff --git a/tests/auto/controls/controls.pro b/tests/auto/controls/controls.pro index 20ee603a..cbd7150f 100644 --- a/tests/auto/controls/controls.pro +++ b/tests/auto/controls/controls.pro @@ -18,7 +18,7 @@ OTHER_FILES += \ $$PWD/data/tst_spinbox.qml \ $$PWD/data/tst_tableview.qml \ $$PWD/data/tst_rangemodel.qml \ - $$PWD/data/tst_scrollarea.qml \ + $$PWD/data/tst_scrollview.qml \ $$PWD/data/tst_menu.qml \ $$PWD/data/tst_textfield.qml \ $$PWD/data/tst_textarea.qml \ diff --git a/tests/auto/controls/data/tst_scrollarea.qml b/tests/auto/controls/data/tst_scrollarea.qml deleted file mode 100644 index 427f98ea..00000000 --- a/tests/auto/controls/data/tst_scrollarea.qml +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -** Contact: http://www.qt-project.org/legal -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -** of its contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.0 -import QtTest 1.0 -import QtQuick.Controls 1.0 - -TestCase { - id: testCase - name: "Tests_ScrollArea" - when:windowShown - width:400 - height:400 - - - TextArea { id: textArea } - - Item { id: bigItem } - - Component { - id: scrollAreaComponent - ScrollArea { } - } - - function test_scroll() { - var component = scrollAreaComponent - var scrollArea = component.createObject(testCase); - verify(scrollArea !== null, "table created is null") - - scrollArea.contentItem = bigItem - scrollArea.visible = true - verify(scrollArea.flickableItem, "flickableItem should not be null") - verify(scrollArea.flickableItem !== scrollArea.contentItem) - verify(scrollArea.flickableItem.contentHeight === 0, "ContentHeight not set") - - bigItem.height = 222 - bigItem.width = 333 - - verify(scrollArea.flickableItem.contentHeight === 222, "ContentHeight not set") - verify(scrollArea.flickableItem.contentWidth === 333, "ContentHeight not set") - - scrollArea.flickableItem.contentY = 200 - verify(scrollArea.flickableItem.contentY === 200, "ContentY not set") - - scrollArea.flickableItem.contentX = 300 - verify(scrollArea.flickableItem.contentX === 300, "ContentX not set") - } - - function test_viewport() { - var component = scrollAreaComponent - var scrollArea = component.createObject(testCase); - verify(scrollArea !== null, "table created is null") - - scrollArea.forceActiveFocus(); - verify(scrollArea.viewport, "Viewport not defined") - verify(!scrollArea.contentItem, "contentItem should be null") - verify(!scrollArea.flickableItem, "flickableItem should be null") - verify(!scrollArea.frame, "Frame should be false") - - scrollArea.contentItem = textArea - verify(scrollArea.viewport, "Viewport should be defined") - verify(scrollArea.contentItem, "contentItem should not be null") - verify(scrollArea.flickableItem, "flickableItem should not be null") - verify(scrollArea.flickableItem.contentHeight === textArea.height, "Content height not set") - - var prevViewportWidth = scrollArea.viewport.width - scrollArea.frame = true - verify(scrollArea.frame, "Frame should be true") - verify(scrollArea.viewport.width < prevViewportWidth, "Viewport should be smaller with frame") - } -} diff --git a/tests/auto/controls/data/tst_scrollview.qml b/tests/auto/controls/data/tst_scrollview.qml new file mode 100644 index 00000000..95c6cccf --- /dev/null +++ b/tests/auto/controls/data/tst_scrollview.qml @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names +** of its contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtTest 1.0 +import QtQuick.Controls 1.0 + +TestCase { + id: testCase + name: "Tests_ScrollView" + when:windowShown + width:400 + height:400 + + + TextArea { id: textArea } + + Item { id: bigItem } + + Component { + id: scrollViewComponent + ScrollView { } + } + + function test_scroll() { + var component = scrollViewComponent + var scrollView = component.createObject(testCase); + verify(scrollView !== null, "table created is null") + + scrollView.contentItem = bigItem + scrollView.visible = true + verify(scrollView.flickableItem, "flickableItem should not be null") + verify(scrollView.flickableItem !== scrollView.contentItem) + verify(scrollView.flickableItem.contentHeight === 0, "ContentHeight not set") + + bigItem.height = 222 + bigItem.width = 333 + + verify(scrollView.flickableItem.contentHeight === 222, "ContentHeight not set") + verify(scrollView.flickableItem.contentWidth === 333, "ContentHeight not set") + + scrollView.flickableItem.contentY = 200 + verify(scrollView.flickableItem.contentY === 200, "ContentY not set") + + scrollView.flickableItem.contentX = 300 + verify(scrollView.flickableItem.contentX === 300, "ContentX not set") + } + + function test_viewport() { + var component = scrollViewComponent + var scrollView = component.createObject(testCase); + verify(scrollView !== null, "table created is null") + + scrollView.forceActiveFocus(); + verify(scrollView.viewport, "Viewport not defined") + verify(!scrollView.contentItem, "contentItem should be null") + verify(!scrollView.flickableItem, "flickableItem should be null") + verify(!scrollView.frame, "Frame should be false") + + scrollView.contentItem = textArea + verify(scrollView.viewport, "Viewport should be defined") + verify(scrollView.contentItem, "contentItem should not be null") + verify(scrollView.flickableItem, "flickableItem should not be null") + verify(scrollView.flickableItem.contentHeight === textArea.height, "Content height not set") + + var prevViewportWidth = scrollView.viewport.width + scrollView.frame = true + verify(scrollView.frame, "Frame should be true") + verify(scrollView.viewport.width < prevViewportWidth, "Viewport should be smaller with frame") + } +} diff --git a/tests/manual/scrollbars.qml b/tests/manual/scrollbars.qml index 01609906..4ce169da 100644 --- a/tests/manual/scrollbars.qml +++ b/tests/manual/scrollbars.qml @@ -88,7 +88,7 @@ ApplicationWindow { frame: false Tab { title: "Rectangle" - ScrollArea { + ScrollView { anchors.fill: parent anchors.margins:4 frame: frameCheck.checked @@ -100,7 +100,7 @@ ApplicationWindow { } Tab { title: "Image" - ScrollArea { + ScrollView { anchors.fill: parent anchors.margins:4 frame: frameCheck.checked @@ -114,7 +114,7 @@ ApplicationWindow { } Tab { title: "Flickable" - ScrollArea{ + ScrollView{ anchors.fill: parent anchors.margins:4 frame: true @@ -142,7 +142,7 @@ ApplicationWindow { } Tab { title: "ListView" - ScrollArea{ + ScrollView{ anchors.fill: parent anchors.margins:4 frame: true diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index cb020596..06483882 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -54,7 +54,7 @@ Item { property Component toolbar: ToolBar { } property Component statusbar: StatusBar { } property Component tableview: TableView { model: testDataModel ; TableViewColumn {title: "Column 1"}} - property Component scrollarea: ScrollArea { + property Component scrollview: ScrollView { Rectangle { color: "#eee" width: 1000 @@ -111,7 +111,7 @@ Item { append({ name: "ToolBar", component: toolbar}); append({ name: "StatusBar", component: statusbar}); append({ name: "TableView", component: tableview}); - append({ name: "ScrollArea", component: scrollarea}); + append({ name: "ScrollView", component: scrollview}); } } } diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index c0f64b76..78248d7f 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -367,8 +367,8 @@ ApplicationWindow { id: sidebar color : syspal.window width: 300 - ScrollArea { - id: scrollArea + ScrollView { + id: scrollView anchors.fill: parent flickableItem.flickableDirection: Flickable.VerticalFlick Column { @@ -376,7 +376,7 @@ ApplicationWindow { anchors.left: parent ? parent.left : undefined anchors.top: parent ? parent.top : undefined anchors.margins: 10 - width: scrollArea.viewport.width - 20 + width: scrollView.viewport.width - 20 spacing: 8 Repeater { model: ["Boolean", "String","Int", "Real", "ReadOnly", "Enum"] -- cgit v1.2.1