From f9c25f2f32220e4f22969b9d65e8750f82774499 Mon Sep 17 00:00:00 2001 From: Kerry Ivan Kurian Date: Thu, 20 Sep 2018 16:36:06 -0700 Subject: [PATCH] Allow user to select asset type in marketplace item tester --- .../MarketplaceItemTester.qml | 27 ++++++++++++++----- 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml index 37d2f2c170..559b6cb29c 100644 --- a/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml +++ b/interface/resources/qml/hifi/commerce/marketplaceItemTester/MarketplaceItemTester.qml @@ -12,6 +12,7 @@ // import QtQuick 2.5 +import QtQuick.Controls 1.4 import QtQuick.Controls.Styles 1.4 import QtQuick.Dialogs 1.0 import QtQuick.Layouts 1.1 @@ -83,6 +84,7 @@ Rectangle { anchors.rightMargin: 12 model: resourceListModel spacing: 5 + interactive: false delegate: RowLayout { anchors.left: parent.left @@ -138,12 +140,25 @@ Rectangle { } } - Text { - text: assetType - font.pointSize: 10 + ComboBox { + id: comboBox + Layout.preferredWidth: root.width * .2 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter + + model: [ + "application", + "avatar", + "content set", + "entity", + "wearable", + "unknown" + ] + + currentIndex: ("entity or wearable" == assetType) ? model.indexOf("unknown") : model.indexOf(assetType) + + Component.onCompleted: { + onActivated.connect(function() { assetType = currentText; }); + } } Repeater { @@ -159,7 +174,7 @@ Rectangle { MouseArea { anchors.fill: parent onClicked: { - actions[modelData.name](resource, assetType); + actions[modelData.name](resource, comboBox.currentText); } } }