From f1d884b6dad5a93d7a3077b6b05d3ec7fcd9a6ea Mon Sep 17 00:00:00 2001 From: Teemu Holappa Date: Thu, 11 Feb 2016 11:50:55 +0200 Subject: Refactored Qml plugins into modules. Separated C++ and Qml interfaces. All the UI's from plugins are moved to the settingsui folder. Change-Id: Id6a6623346b18321357bc42d24121c4d9cdfd098 Reviewed-by: Kimmo Ollila --- src/qtdevicesettings/settingscomponents/icons.qrc | 21 --- .../imports/Settings/CustomCombobox.qml | 185 --------------------- .../Settings/FlatStyledDropdownDelegate.qml | 78 --------- .../imports/Settings/IconButton.qml | 54 ------ .../imports/Settings/TextLabel.qml | 48 ------ .../settingscomponents/imports/Settings/qmldir | 5 - .../settingscomponents/settingscomponents.pro | 26 --- 7 files changed, 417 deletions(-) delete mode 100644 src/qtdevicesettings/settingscomponents/icons.qrc delete mode 100644 src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml delete mode 100644 src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml delete mode 100644 src/qtdevicesettings/settingscomponents/imports/Settings/IconButton.qml delete mode 100644 src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml delete mode 100644 src/qtdevicesettings/settingscomponents/imports/Settings/qmldir delete mode 100644 src/qtdevicesettings/settingscomponents/settingscomponents.pro (limited to 'src/qtdevicesettings/settingscomponents') diff --git a/src/qtdevicesettings/settingscomponents/icons.qrc b/src/qtdevicesettings/settingscomponents/icons.qrc deleted file mode 100644 index d6ff9da..0000000 --- a/src/qtdevicesettings/settingscomponents/icons.qrc +++ /dev/null @@ -1,21 +0,0 @@ - - - imports/Settings/Back.png - imports/Settings/Chevron-left.png - imports/Settings/Chevron-right.png - imports/Settings/Circle-x.png - imports/Settings/Cogs.png - imports/Settings/Connections.png - imports/Settings/Display.png - imports/Settings/Lock.png - imports/Settings/Plus.png - imports/Settings/Settings.png - imports/Settings/Wifi.png - imports/Settings/World.png - imports/Settings/Wrench.png - imports/Settings/Chevron-left-med.png - imports/Settings/Chevron-left-big.png - imports/Settings/Settings-big.png - imports/Settings/Connections-big.png - - diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml deleted file mode 100644 index 37c7871..0000000 --- a/src/qtdevicesettings/settingscomponents/imports/Settings/CustomCombobox.qml +++ /dev/null @@ -1,185 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Device Utilities module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles.Flat 1.0 as Flat -import QtQml.Models 2.1 - -Item { - id: control - property alias popupParent: popupView.parent - property bool popupVisible: popupView.visible - property int selectedIndex: -1 - property alias model: comboboxModel.model - property string textRole: "text" - property bool modified: false - property alias popupVisibility: popupView.visible - property alias textValue: label.text - property int popupHeight: comboboxModel.items.count * height - property bool enabled: true - property bool editable: true - property Component delegate - - implicitWidth: Math.round(100 * Flat.FlatStyle.scaleFactor) - implicitHeight: Math.round(26 * Flat.FlatStyle.scaleFactor) - - Component.onCompleted: { - //Find root window for parent - var p = control.parent - while (p.parent) { - p = p.parent; - } - popupParent = p; - } - - function hide() { - popupView.visible = false - button.checked = false - } - - function setSelectIndexToVal(value, role) { - if (model) { - for (var i=0, len=comboboxModel.items.count;i=0 ? comboboxModel.items.count>0 ? comboboxModel.items.get(selectedIndex).model[textRole]:"":"" - } - - Flat.LeftArrowIcon { - anchors.right: parent.right - anchors.verticalCenter: parent.verticalCenter - anchors.rightMargin: Math.round(10 * Flat.FlatStyle.scaleFactor) - width: Math.round(14 * Flat.FlatStyle.scaleFactor) - height: Math.round(14 * Flat.FlatStyle.scaleFactor) - rotation: popupVisibility ? 90 : -90 - color: button.hovered || button.checked ? Flat.FlatStyle.selectedTextColor:Flat.FlatStyle.styleColor - opacity: control.enabled || control.editable ? 1.0 : 0.2 - } - } - - Item { - id: popupView - y: 0 - x: 0 - height: control.popupHeight - width: control.width - visible: false - onVisibleChanged: { - if (visible) { - var pos = control.mapToItem(popupView.parent, 0, 0) - x = pos.x - y = pos.y + button.height - - if (y + control.popupHeight > popupParent.height) { - y = popupParent.height - control.popupHeight; - } - } - } - - Rectangle { - anchors.fill: parent - border.color: Flat.FlatStyle.darkFrameColor - border.width: 1 - color: "white" - - Column { - ExclusiveGroup { - id: exgroup - } - - DelegateModel { - id: comboboxModel - delegate: comboboxDelegate - } - - Repeater { - id: comboboxView - model: comboboxModel - } - } - } - } - - Component { - id: comboboxDelegate - Item { - id: comboboxViewDelegate - property bool checked - width: control.width - height: control.height - - Loader { - id: loader - sourceComponent: delegate - anchors.fill: parent - property var modelData: model - property string textRole: textRole - onLoaded : exgroup.bindCheckable(item) - } - - Connections { - target: loader.item - onClicked: { - popupView.visible = false; - button.checked = false - selectedIndex = index - } - } - } - } -} diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml deleted file mode 100644 index c1bd24c..0000000 --- a/src/qtdevicesettings/settingscomponents/imports/Settings/FlatStyledDropdownDelegate.qml +++ /dev/null @@ -1,78 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Device Utilities module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles.Flat 1.0 as Flat - -Item { - id: root - property bool checkable: true - property bool checked: false - property bool pressed: false - signal clicked() - - MouseArea { - id: delegateButton - anchors.fill: parent - hoverEnabled: true - - onPressed: root.pressed = true - onClicked: root.clicked(); - onEntered: checked = !checked; - - Rectangle { - anchors.fill: parent - color: root.checked ? Flat.FlatStyle.disabledColor : "transparent" - opacity: root.checked ? 0.15 : 1.0 - } - Rectangle { - color: Flat.FlatStyle.darkFrameColor - width: parent.width - height: Flat.FlatStyle.onePixel - anchors.bottom: parent.bottom - } - TextLabel { - anchors.left: parent.left - anchors.right: parent.right - anchors.top: parent.top - anchors.bottom: parent.bottom - anchors.margins: Math.round(10 * Flat.FlatStyle.scaleFactor) - horizontalAlignment: Text.AlignLeft - text: modelData.name - } - } -} diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/IconButton.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/IconButton.qml deleted file mode 100644 index 898e5e0..0000000 --- a/src/qtdevicesettings/settingscomponents/imports/Settings/IconButton.qml +++ /dev/null @@ -1,54 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Device Utilities module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.5 - -MouseArea { - id: root - property alias pressedIcon: pressedImage.source - property alias releasedIcon: releasedImage.source - width: pressedImage.sourceSize.width - height: pressedImage.sourceSize.height - - Image { - id: pressedImage - visible: root.pressed - } - - Image { - id: releasedImage - visible: !root.pressed - } -} diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml b/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml deleted file mode 100644 index e9f5d12..0000000 --- a/src/qtdevicesettings/settingscomponents/imports/Settings/TextLabel.qml +++ /dev/null @@ -1,48 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Device Utilities module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see http://www.qt.io/terms-conditions. For further -** information use the contact form at http://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ -import QtQuick 2.5 -import QtQuick.Layouts 1.1 -import QtQuick.Controls 1.4 -import QtQuick.Controls.Styles.Flat 1.0 as Flat - -Text { - color: systemPalette.text - font.family: Flat.FlatStyle.fontFamily - font.pixelSize: Math.round(12 * Flat.FlatStyle.scaleFactor) - renderType: Text.QtRendering - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter -} diff --git a/src/qtdevicesettings/settingscomponents/imports/Settings/qmldir b/src/qtdevicesettings/settingscomponents/imports/Settings/qmldir deleted file mode 100644 index 2810983..0000000 --- a/src/qtdevicesettings/settingscomponents/imports/Settings/qmldir +++ /dev/null @@ -1,5 +0,0 @@ -module com.theqtcompany.settings.common -TextLabel 1.0 TextLabel.qml -IconButton 1.0 IconButton.qml -CustomCombobox 1.0 CustomCombobox.qml -FlatStyledDropdownDelegate 1.0 FlatStyledDropdownDelegate.qml diff --git a/src/qtdevicesettings/settingscomponents/settingscomponents.pro b/src/qtdevicesettings/settingscomponents/settingscomponents.pro deleted file mode 100644 index 9d2567e..0000000 --- a/src/qtdevicesettings/settingscomponents/settingscomponents.pro +++ /dev/null @@ -1,26 +0,0 @@ -TEMPLATE = lib -CONFIG += plugin -QT += qml - -uri = com.theqtcompany.settings.common - -DESTDIR = imports/Settings -TARGET = qmlsettingsplugin - -pluginfiles.files += \ - imports/Settings/qmldir \ - imports/Settings/TextLabel.qml \ - imports/Settings/IconButton.qml \ - imports/Settings/CustomCombobox.qml \ - imports/Settings/FlatStyledDropdownDelegate.qml - -installPath = $$[QT_INSTALL_QML]/$$replace(uri, \\., /) - -target.path = $$installPath -pluginfiles.path += $$installPath -INSTALLS += target pluginfiles - -RESOURCES += - -DISTFILES += - -- cgit v1.2.3