From 445c799514388ae15bc513419a48461a6c7bd573 Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Tue, 5 May 2015 09:34:00 +0200 Subject: Remove some unused features from 'places' example Current plugins do not support adding or removing place and category. Remove this support from 'places' example. Change-Id: I768697e0509c7ff74cc61c5a1ffc3709d28d0b6f Reviewed-by: Alex Blasche --- .../places/content/places/CategoryDelegate.qml | 36 -- .../places/content/places/CategoryDialog.qml | 73 ----- .../places/content/places/CategoryView.qml | 7 - .../places/content/places/PlaceDelegate.qml | 72 ---- .../location/places/content/places/PlaceDialog.qml | 362 --------------------- .../location/places/content/places/SearchBox.qml | 6 - .../places/content/places/SearchResultView.qml | 10 - examples/location/places/places.pro | 2 - examples/location/places/places.qml | 92 ------ examples/location/places/placeswrapper.qrc | 2 - 10 files changed, 662 deletions(-) delete mode 100644 examples/location/places/content/places/CategoryDialog.qml delete mode 100644 examples/location/places/content/places/PlaceDialog.qml diff --git a/examples/location/places/content/places/CategoryDelegate.qml b/examples/location/places/content/places/CategoryDelegate.qml index 2e985faf..e12efd2f 100644 --- a/examples/location/places/content/places/CategoryDelegate.qml +++ b/examples/location/places/content/places/CategoryDelegate.qml @@ -45,14 +45,10 @@ import QtLocation.examples 5.0 Item { id: root - property bool showSave: true - property bool showRemove: true property bool showChildren: true signal clicked signal arrowClicked - signal crossClicked - signal editClicked width: parent.width height: textItem.height @@ -94,38 +90,6 @@ Item { //! [CategoryModel delegate text] } - //! [CategoryModel delegate icon] - IconButton { - id: edit - - anchors.right: cross.left - anchors.verticalCenter: parent.verticalCenter - - visible: (placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.SaveCategoryFeature) : false) - && showSave - - source: "../../resources/pencil.png" - hoveredSource: "../../resources/pencil_hovered.png" - pressedSource: "../../resources/pencil_pressed.png" - - onClicked: root.editClicked() - } - - IconButton { - id: cross - - anchors.right: arrow.left - anchors.verticalCenter: parent.verticalCenter - visible: (placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.RemoveCategoryFeature) : false) - && showRemove - - source: "../../resources/cross.png" - hoveredSource: "../../resources/cross_hovered.png" - pressedSource: "../../resources/cross_pressed.png" - - onClicked: root.crossClicked() - } - IconButton { id: arrow diff --git a/examples/location/places/content/places/CategoryDialog.qml b/examples/location/places/content/places/CategoryDialog.qml deleted file mode 100644 index 7ded77ce..00000000 --- a/examples/location/places/content/places/CategoryDialog.qml +++ /dev/null @@ -1,73 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples 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 The Qt Company Ltd 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 QtLocation 5.3 -import QtLocation.examples 5.0 - -InputDialog { - title: "Edit Category" - - property Category category - - Behavior on opacity { NumberAnimation { duration: 500 } } - - Component.onCompleted: prepareDialog() - onCategoryChanged: prepareDialog() - - function prepareDialog() { - setModel([ - ["Name", category ? category.name : ""] - ]); - } - - //! [Category save] - onGoButtonClicked: { - var modifiedCategory = category ? category : Qt.createQmlObject('import QtLocation 5.3; Category { }', page); - modifiedCategory.plugin = placesPlugin; - - modifiedCategory.name = dialogModel.get(0).inputText; - - category = modifiedCategory; - - category.save(); - } - //! [Category save] -} diff --git a/examples/location/places/content/places/CategoryView.qml b/examples/location/places/content/places/CategoryView.qml index 56f4c8b4..18495f73 100644 --- a/examples/location/places/content/places/CategoryView.qml +++ b/examples/location/places/content/places/CategoryView.qml @@ -47,12 +47,9 @@ import QtLocation.examples 5.0 ListView { id: root - property bool showSave: true - property bool showRemove: true property bool showChildren: true signal categoryClicked(variant category) - signal editClicked(variant category) //! [CategoryModel view 1] anchors.topMargin: 10 @@ -80,14 +77,10 @@ ListView { delegate: CategoryDelegate { id: categoryDelegate - showSave: root.showSave - showRemove: root.showRemove showChildren: root.showChildren onClicked: root.categoryClicked(category); onArrowClicked: categoryListModel.rootIndex = categoryListModel.modelIndex(index) - onCrossClicked: category.remove(); - onEditClicked: root.editClicked(category); } } } diff --git a/examples/location/places/content/places/PlaceDelegate.qml b/examples/location/places/content/places/PlaceDelegate.qml index 6d263e10..3dba28a6 100644 --- a/examples/location/places/content/places/PlaceDelegate.qml +++ b/examples/location/places/content/places/PlaceDelegate.qml @@ -53,8 +53,6 @@ Item { signal showReviews(variant place) signal showEditorials(variant place) signal showImages(variant place) - signal editPlace(variant place) - signal deletePlace(variant place) Flickable { anchors.fill: parent @@ -205,76 +203,6 @@ Item { text: qsTr("Find similar") onClicked: searchForSimilar(place) } - Button { - text: qsTr("Edit") - visible: placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.SavePlaceFeature) : false; - onClicked: editPlace(place) - } - - Button { - text: qsTr("Delete"); - visible: placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.RemovePlaceFeature) : false; - onClicked: deletePlace(place) - } - - Item { - width: parent.width - height: childrenRect.height - - Button { - id: saveButton; - function updateSaveStatus() { - if (updateSaveStatus.prevStatus === Place.Saving) { - switch (place.favorite.status) { - case Place.Ready: - break; - case Place.Error: - saveStatus.text = "Save Failed"; - saveStatus.visible = true; - console.log(place.favorite.errorString()); - break; - default: - } - } else if (updateSaveStatus.prevStatus == Place.Removing) { - place.favorite = null; - updateSaveStatus.prevStatus = Place.Ready - return; - - } - - updateSaveStatus.prevStatus = place.favorite.status; - } - - function reset() - { - saveButton.visible = (placeSearchModel.favoritesPlugin !== null); - saveStatus.visible = false; - } - - Component.onCompleted: { - reset(); - placeDelegate.placeChanged.connect(reset); - } - - text: (place && place.favorite !== null) ? qsTr("Remove Favorite") : qsTr("Save as Favorite") - onClicked: { - if (place.favorite === null) { - place.initializeFavorite(placeSearchModel.favoritesPlugin); - place.favorite.statusChanged.connect(updateSaveStatus); - place.favorite.save(); - } else { - place.favorite.statusChanged.connect(updateSaveStatus); - place.favorite.remove(); - } - } - } - - Text { - id: saveStatus - anchors.top: saveButton.bottom - visible: false - } - } } } } diff --git a/examples/location/places/content/places/PlaceDialog.qml b/examples/location/places/content/places/PlaceDialog.qml deleted file mode 100644 index 9e5c7e70..00000000 --- a/examples/location/places/content/places/PlaceDialog.qml +++ /dev/null @@ -1,362 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples 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 The Qt Company Ltd 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 QtLocation 5.3 -import QtLocation.examples 5.0 - -Dialog { - id: root - property list __categories - property Place locationPlace - property bool __createdPlace: false - - signal completed; - - function prepareDialog(inputPlace) { - if (!inputPlace) { - locationPlace = Qt.createQmlObject('import QtLocation 5.3; Place { }', root); - __createdPlace = true; - } else { - locationPlace = inputPlace; - __createdPlace = false; - } - - setDataFields([ - ["Name", locationPlace ? locationPlace.name : ""], - ["Street", locationPlace ? locationPlace.location.address.street : ""], - ["District", locationPlace ? locationPlace.location.address.district : ""], - ["City", locationPlace ? locationPlace.location.address.city : ""], - ["County", locationPlace ? locationPlace.location.address.county : ""], - ["State", locationPlace ? locationPlace.location.address.state : ""], - ["Country code", locationPlace ? locationPlace.location.address.countryCode : ""], - ["Country", locationPlace ? locationPlace.location.address.country : ""], - ["Postal code", locationPlace ? locationPlace.location.address.postalCode : ""], - ["Latitude", locationPlace ? locationPlace.location.coordinate.latitude.toString() : ""], - ["Longitude", locationPlace ? locationPlace.location.coordinate.longitude.toString() : ""], - ["Phone", locationPlace ? locationPlace.primaryPhone : ""], - ["Fax", locationPlace ? locationPlace.primaryFax : ""], - ["Email", locationPlace ? locationPlace.primaryEmail : ""], - ["Website", locationPlace ? locationPlace.primaryWebsite.toString() : ""] - ]); - - __categories = locationPlace ? locationPlace.categories : new Array() - } - - function setDataFields(objects) - { - dataFieldsModel.clear(); - for (var i = 0; i < objects.length; i++) - dataFieldsModel.append({"labelText": objects[i][0], "inputText": objects[i][1]}) - } - - function processStatus() { - if (processStatus.prevStatus == Place.Saving) { - switch (locationPlace.status) { - case Place.Ready: - if (__createdPlace) { - locationPlace.destroy(); - __createdPlace = false; - processStatus.prevStatus = null; - } - completed(); - break; - case Place.Error: - console.log("Save failed:" + locationPlace.errorString()); - errorDialog.text = locationPlace.errorString(); - errorDialog.opacity = 1; - break; - } - } - - processStatus.prevStatus = locationPlace.status; - } - - Behavior on opacity { NumberAnimation { duration: 500 } } - - ErrorDialog { - id: errorDialog - title: "Save Place Failed" - } - - onGoButtonClicked: { - if (locationPlace.status == Place.Saving) - return; -//! [Place save] - locationPlace.plugin = placesPlugin; - - locationPlace.name = dataFieldsModel.get(0).inputText; - locationPlace.location.address.street = dataFieldsModel.get(1).inputText; - locationPlace.location.address.district = dataFieldsModel.get(2).inputText; - locationPlace.location.address.city = dataFieldsModel.get(3).inputText; - locationPlace.location.address.county = dataFieldsModel.get(4).inputText; - locationPlace.location.address.state = dataFieldsModel.get(5).inputText; - locationPlace.location.address.countryCode = dataFieldsModel.get(6).inputText; - locationPlace.location.address.country = dataFieldsModel.get(7).inputText; - locationPlace.location.address.postalCode = dataFieldsModel.get(8).inputText; - - var c = QtPositioning.coordinate(parseFloat(dataFieldsModel.get(9).inputText), - parseFloat(dataFieldsModel.get(10).inputText)); - locationPlace.location.coordinate = c; - var phone = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); - phone.label = "Phone"; - phone.value = dataFieldsModel.get(11).inputText; - locationPlace.contactDetails.phone = phone; - - var fax = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); - fax.label = "Fax"; - fax.value = dataFieldsModel.get(12).inputText; - locationPlace.contactDetails.fax = fax; - - var email = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); - email.label = "Email"; - email.value = dataFieldsModel.get(13).inputText; - locationPlace.contactDetails.email = email; - - var website = Qt.createQmlObject('import QtLocation 5.3; ContactDetail { }', locationPlace); - website.label = "Website"; - website.value = dataFieldsModel.get(14).inputText; - locationPlace.contactDetails.website = website; - - locationPlace.categories = __categories; - locationPlace.statusChanged.connect(processStatus); - locationPlace.save(); -//! [Place save] - } - - onClearButtonClicked: { - for (var i = 0; i < dataFieldsModel.count; i++) - dataFieldsModel.set(i, {"inputText": ""}); - __categories = new Array(); - } - - onCancelButtonClicked: { - if (locationPlace && __createdPlace) - locationPlace.destroy(); - } - - onOpacityChanged: { - if (opacity == 0) - view.currentIndex = 0 - } - - ListModel { - id: dataFieldsModel - } - - item: ListView { - id: view - - anchors.left: parent.left - anchors.right: parent.right - anchors.margins: 10 - - implicitHeight: flickable.contentHeight - - spacing: gap/2 - orientation: ListView.Horizontal - interactive: false - - model: VisualItemModel { - Item { - id: firstPage - width: view.width - height: view.height - - Flickable { - id: flickable - anchors.top: parent.top - anchors.topMargin: gap/2 - anchors.bottomMargin: gap/2 - height: parent.height - width: parent.width - interactive: height < contentHeight - contentWidth: parent.width - contentHeight:col.height - - clip: true - - Column { - id: col - anchors.top: parent.top - anchors.left: parent.left - width: parent.width - gap - spacing: gap/2 - - Repeater { - id: dataFields - model: dataFieldsModel - - TextWithLabel { - anchors.leftMargin: gap/2 - anchors.rightMargin: gap/2 - - width: parent ? parent.width : 0 - labelWidth: 95 - label: labelText - text: inputText - - onTextChanged: dataFieldsModel.set(index, {"inputText": text}) - } - } - - Group { - id: categoriesHeading - width: parent.width - anchors.topMargin: gap - - text: qsTr("Categories"); - } - - Repeater { - model: __categories - width: parent.width - - delegate: Item { - height: cross.height - width: parent.width - - Text { - id: categoryName - - anchors.left: parent.left - anchors.verticalCenter: parent.verticalCenter - verticalAlignment: Text.AlignVCenter - text: model.modelData.name - } - - IconButton { - id: cross - - anchors.top: parent.top - anchors.right: parent.right - source: "../../resources/cross.png" - hoveredSource: "../../resources/cross_hovered.png" - pressedSource: "../../resources/cross_pressed.png" - - onClicked: { - var cats = new Array(); - for (var i =0; i < __categories.length; ++i) { - if (__categories[i].name != model.modelData.name) - cats.push(__categories[i]); - } - __categories = cats - } - } - } - } - - Button { - text: qsTr("Add Category") - onClicked: view.currentIndex = 1 - } - } - } - - Rectangle { - id: scrollbar - anchors.right: flickable.right - y: { - var yPosition = flickable.visibleArea.yPosition - if (yPosition < 0) - yPosition = 0 - if (yPosition > (1.0 - flickable.visibleArea.heightRatio)) - yPosition = (1.0 - flickable.visibleArea.heightRatio) - yPosition *flickable.height - } - - width: 10 - height: flickable.visibleArea.heightRatio * flickable.height - color: "gray" - radius: 5 - } - - } - - Item { - height:view.height - width: view.width - - Group { - id: chooseCategoryHeading - - anchors.top: parent.top - width: parent.width - text: qsTr("Choose Category"); - } - - CategoryView { - id: categoryView - - anchors.top: chooseCategoryHeading.bottom - anchors.bottom: categoryCancel.top - width: parent.width - - showSave: false - showRemove: false - showChildren: false - - onCategoryClicked: { - var categoriesList = new Array(); - var alreadyExists = false; - for (var i = 0; i < __categories.length; ++i) { - categoriesList.push(__categories[i]); - if (__categories[i].categoryId == category.categoryId) - alreadyExists = true; - } - - if (!alreadyExists) - categoriesList.push(category); - __categories = categoriesList - view.currentIndex = 0; - } - } - - Button { - id: categoryCancel - - anchors.bottom: parent.bottom - text: qsTr("Cancel ") - onClicked: view.currentIndex = 0 - } - } - } - } -} diff --git a/examples/location/places/content/places/SearchBox.qml b/examples/location/places/content/places/SearchBox.qml index b23c775a..c61ba069 100644 --- a/examples/location/places/content/places/SearchBox.qml +++ b/examples/location/places/content/places/SearchBox.qml @@ -140,12 +140,6 @@ Rectangle { placeSearchModel.searchForCategory(category); searchRectangle.state = ""; } - - onEditClicked: { - editCategoryDialog.category = category; - page.state = "EditCategory"; - searchRectangle.state = ""; - } } BusyIndicator { diff --git a/examples/location/places/content/places/SearchResultView.qml b/examples/location/places/content/places/SearchResultView.qml index 711d6b78..06b0e1b8 100644 --- a/examples/location/places/content/places/SearchResultView.qml +++ b/examples/location/places/content/places/SearchResultView.qml @@ -171,16 +171,6 @@ Item { placeSearchModel.searchForRecommendations(place.placeId); } //! [PlaceRecommendationModel search] - - onEditPlace: { - editPlaceDialog.prepareDialog(place); - page.state = "EditPlace" - } - - onDeletePlace: { - place.remove(); - showSearchResults(); - } } } Item { diff --git a/examples/location/places/places.pro b/examples/location/places/places.pro index b0c422aa..5f418e05 100644 --- a/examples/location/places/places.pro +++ b/examples/location/places/places.pro @@ -20,8 +20,6 @@ qmlcontentplaces.files += \ content/places/PlaceDelegate.qml \ content/places/RatingView.qml \ content/places/SearchResultView.qml \ - content/places/PlaceDialog.qml \ - content/places/CategoryDialog.qml \ content/places/PlaceEditorials.qml \ content/places/EditorialDelegate.qml \ content/places/EditorialPage.qml \ diff --git a/examples/location/places/places.qml b/examples/location/places/places.qml index c6021680..814fcd21 100644 --- a/examples/location/places/places.qml +++ b/examples/location/places/places.qml @@ -54,8 +54,6 @@ Item { property variant searchRegionItem property Plugin favoritesPlugin - onMapChanged: editPlaceDialog.prepareDialog() - Binding { target: page property: "startLocation" @@ -77,7 +75,6 @@ Item { Component.onCompleted: { addItem("Provider"); - addItem("New"); addItem("Search"); } @@ -111,38 +108,6 @@ Item { onExclusiveButtonChanged: placesPlugin.name = exclusiveButton; } - Menu { - id: newMenu - z: backgroundRect.z + 2 - y: page.height - horizontalOrientation: false - - Component.onCompleted: { - var item = addItem("Place"); - item.enabled = Qt.binding(function() { return placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.SavePlaceFeature) : false }) - - item = addItem("Category"); - item.enabled = Qt.binding(function() { return placesPlugin.name != "" ? placesPlugin.supportsPlaces(Plugin.SaveCategoryFeature) : false }) - } - - onClicked: { - switch (button) { - case "Place": { - editPlaceDialog.prepareDialog(); - - page.state = "NewPlace"; - break; - } - case "Category": { - editCategoryDialog.category = null; - editCategoryDialog.prepareDialog(); - page.state = "NewCategory"; - break; - } - } - } - } - Menu { id: searchMenu z: backgroundRect.z + 2 @@ -160,39 +125,6 @@ Item { } //=====================Dialogs===================== - PlaceDialog { - id: editPlaceDialog - z: backgroundRect.z + 4 - - onCancelButtonClicked: page.state = "" - onCompleted: page.state = ""; - } - - CategoryDialog { - id: editCategoryDialog - z: backgroundRect.z + 4 - - onCancelButtonClicked: page.state = "" - - Connections { - target: editCategoryDialog.category - onStatusChanged: { - switch (editCategoryDialog.category.status) { - case Category.Saving: { - break; - } - case Category.Ready: { - page.state = ""; - break; - } - case Category.Error: { - console.log("Error while saving!"); - break; - } - } - } - } - } InputDialog { id: searchCenterDialog @@ -580,30 +512,10 @@ Item { name: "Provider" PropertyChanges { target: providerMenu; y: page.height - providerMenu.height - mainMenu.height } }, - State { - name: "New" - PropertyChanges { target: newMenu; y: page.height - newMenu.height - mainMenu.height } - }, State { name: "Search" PropertyChanges { target: searchMenu; y: page.height - searchMenu.height - mainMenu.height } }, - State { - name: "NewPlace" - PropertyChanges { target: editPlaceDialog; title: "New Place"; opacity: 1 } - }, - State { - name: "NewCategory" - PropertyChanges { target: editCategoryDialog; title: "New Category"; opacity: 1 } - }, - State { - name: "EditPlace" - PropertyChanges { target: editPlaceDialog; title: "Edit Place"; opacity: 1 } - }, - State { - name: "EditCategory" - PropertyChanges { target: editCategoryDialog; opacity: 1 } - }, State { name: "Search Center" PropertyChanges { target: searchCenterDialog; opacity: 1 } @@ -636,10 +548,6 @@ Item { to: "Provider" NumberAnimation { properties: "y" ; duration: 300; easing.type: Easing.Linear } }, - Transition { - to: "New" - NumberAnimation { properties: "y" ; duration: 300; easing.type: Easing.Linear } - }, Transition { to: "Search" NumberAnimation { properties: "y" ; duration: 300; easing.type: Easing.Linear } diff --git a/examples/location/places/placeswrapper.qrc b/examples/location/places/placeswrapper.qrc index 1e69207e..4ce2461c 100644 --- a/examples/location/places/placeswrapper.qrc +++ b/examples/location/places/placeswrapper.qrc @@ -2,7 +2,6 @@ places.qml content/places/CategoryDelegate.qml - content/places/CategoryDialog.qml content/places/CategoryView.qml content/places/EditorialDelegate.qml content/places/EditorialPage.qml @@ -10,7 +9,6 @@ content/places/MapComponent.qml content/places/OptionsDialog.qml content/places/PlaceDelegate.qml - content/places/PlaceDialog.qml content/places/PlaceEditorials.qml content/places/PlaceImages.qml content/places/PlaceReviews.qml -- cgit v1.2.1