Skip to content

Q
qgroundcontrol
Commit 4b215098 authored by Gus Grubba's avatar Gus Grubba
Browse files
Options

Replace old QGCComboBox with a standard, QtQuick 2.x one.

parent 0271c2cc
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 252 deletions
src/PlanView/SimpleItemEditor.qml
View file @ 4b215098
...@@ -92,7 +92,7 @@ Rectangle { ...@@ -92,7 +92,7 @@ Rectangle {
indexModel: false indexModel: false
model: object.enumStrings model: object.enumStrings
fact: object fact: object
pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
Layout.column: 1 Layout.column: 1
Layout.row: index Layout.row: index
Layout.fillWidth: true Layout.fillWidth: true
......
src/QmlControls/PageView.qml
View file @ 4b215098
...@@ -27,7 +27,7 @@ Rectangle { ...@@ -27,7 +27,7 @@ Rectangle {
model: _instrumentPages model: _instrumentPages
textRole: "title" textRole: "title"
centeredLabel: true centeredLabel: true
pointSize: ScreenTools.smallFontPointSize font.pointSize: ScreenTools.smallFontPointSize
Image { Image {
anchors.leftMargin: _margins anchors.leftMargin: _margins
......
src/QmlControls/QGCComboBox.qml
View file @ 4b215098
import QtQuick 2.3 /****************************************************************************
import QtQuick.Controls 1.2 *
import QtQuick.Controls.Styles 1.4 * (c) 2009-2019 QGROUNDCONTROL PROJECT <http://www.qgroundcontrol.org>
*
import QGroundControl.Palette 1.0 * QGroundControl is licensed according to the terms in the file
import QGroundControl.ScreenTools 1.0 * COPYING.md in the root of the source code directory.
*
Button { * @file
id: combo * @author Gus Grubba <gus@auterion.com>
implicitHeight: ScreenTools.implicitComboBoxHeight */
property real pointSize: ScreenTools.defaultFontPointSize ///< Point size for button text import QtQuick 2.11
property bool centeredLabel: false import QtQuick.Controls 2.4
property alias model: popupItems.model import QtQuick.Layouts 1.11
property alias textRole: popup.textRole
property alias currentIndex: popup.__selectedIndex import QGroundControl.Controls 1.0
import QGroundControl.Palette 1.0
readonly property alias count: popupItems.count import QGroundControl.ScreenTools 1.0
readonly property alias currentText: popup.currentText
ComboBox {
property bool _showBorder: _qgcPal.globalTheme === QGCPalette.Light id: control
property var _qgcPal: QGCPalette { colorGroupEnabled: enabled } padding: ScreenTools.comboBoxPadding
property int _horizontalPadding: ScreenTools.defaultFontPixelWidth
property int _verticalPadding: Math.round(ScreenTools.defaultFontPixelHeight / 2) property bool centeredLabel: false
property real _dropImageWidth: ScreenTools.defaultFontPixelHeight / 2
property real _dropImageMargin: _dropImageWidth / 2 background: Rectangle {
property var __popup: popup implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight
signal activated(int index) color: qgcPal.textField
border.width: enabled ? 1 : 0
style: ButtonStyle { border.color: "#999"
/*! The padding between the background and the label components. */
padding {
top: _verticalPadding
bottom: _verticalPadding
left: _horizontalPadding
right: _horizontalPadding
}
/*! This defines the background of the button. */
background: Rectangle {
implicitWidth: ScreenTools.implicitComboBoxWidth
implicitHeight: ScreenTools.implicitComboBoxHeight
color: control._qgcPal.textField
border.width: enabled ? 1 : 0
border.color: "#999"
QGCColoredImage {
id: image
width: _dropImageWidth
height: _dropImageWidth
anchors.verticalCenter: parent.verticalCenter
anchors.rightMargin: _dropImageMargin
anchors.right: parent.right
source: "/qmlimages/arrow-down.png"
color: control._qgcPal.textFieldText
}
}
/*! This defines the label of the button. */
label: Item {
implicitWidth: text.implicitWidth + _dropImageWidth
implicitHeight: text.implicitHeight
baselineOffset: text.y + text.baselineOffset
QGCLabel {
id: text
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined
text: control.currentText
color: control._qgcPal.textFieldText
font.pointSize: pointSize
}
}
}
onClicked: {
combo.focus = true
popup.toggleShow()
}
Component.onCompleted: {
if (currentIndex === -1) {
currentIndex = 0
}
popup.resolveTextValue(textRole)
} }
function textAt (index) { /*! This defines the label of the button. */
if (index >= count || index < 0) contentItem: Item {
return null; implicitWidth: text.implicitWidth
return popupItems.objectAt(index).text; implicitHeight: text.implicitHeight
} QGCLabel {
id: text
function find (text) { anchors.verticalCenter: parent.verticalCenter
for (var i = 0 ; i < popupItems.count ; ++i) { anchors.horizontalCenter: centeredLabel ? parent.horizontalCenter : undefined
var currentString = popupItems.objectAt(i).text text: control.currentText
if (text === currentString) { color: qgcPal.textFieldText
return i
}
}
return -1
}
ExclusiveGroup { id: eg }
QGCMenu {
id: popup
__minimumWidth: combo.width
__visualItem: combo
style: MenuStyle {
font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily
__labelColor: combo._qgcPal.buttonText
__selectedLabelColor: combo._qgcPal.buttonHighlightText
__selectedBackgroundColor: combo._qgcPal.buttonHighlight
__backgroundColor: combo._qgcPal.button
__maxPopupHeight: 600
__menuItemType: "comboboxitem"
__scrollerStyle: ScrollViewStyle { }
}
property string textRole: ""
property bool showing: false
property string currentText: selectedText
property string selectedText
onSelectedTextChanged: popup.currentText = selectedText
on__SelectedIndexChanged: {
if (__selectedIndex === -1)
popup.currentText = ""
else
updateSelectedText()
}
property int _y: combo.height
property bool _modelIsArray: false
onAboutToShow: showing = true
onAboutToHide: showing = false
function toggleShow() {
if (popup._popupVisible) {
popup.__dismissAndDestroy()
} else {
__popup(Qt.rect(0, _y, 0, 0), 0)
}
}
function resolveTextValue(initialTextRole) {
if (!model) {
return
}
var get = model['get'];
if (!get && popup._modelIsArray && !!model[0]) {
if (model[0].constructor !== String && model[0].constructor !== Number)
get = function(i) { return model[i]; }
}
var modelMayHaveRoles = get !== undefined
textRole = initialTextRole
if (textRole === "" && modelMayHaveRoles && get(0)) {
// No text role set, check whether model has a suitable role
// If 'text' is found, or there's only one role, pick that.
var listElement = get(0)
var roleName = ""
var roleCount = 0
for (var role in listElement) {
if (listElement[role].constructor === Function)
continue;
if (role === "text") {
roleName = role
break
} else if (!roleName) {
roleName = role
}
++roleCount
}
if (roleCount > 1 && roleName !== "text") {
console.warn("No suitable 'textRole' found for ComboBox.")
} else {
textRole = roleName
}
}
updateSelectedText()
}
function updateSelectedText() {
var selectedItem
if (__selectedIndex !== -1 && (selectedItem = items[__selectedIndex])) {
selectedText = Qt.binding(function () { return selectedItem.text })
if (currentText !== selectedText) // __selectedIndex went form -1 to 0
selectedTextChanged()
}
}
Instantiator {
id: popupItems
onModelChanged: {
popup._modelIsArray = !!model ? model.constructor === Array : false
popup.resolveTextValue(popup.textRole)
}
onObjectAdded: {
// There is a bug in Instantiator which can cause objects to be added out of order from an index standpoint.
// If not handled correctly this will cause menu items to be added incorrectly due to the way Menu.insertItem works.
//console.log("menu add", index, object.text)
if (index === popup.__selectedIndex) {
popup.selectedText = object["text"]
}
// Find the correct place for menu item. We can't just add at index, due to possible bad ordering
var insertIndex = -1
for (var i=0; i<popup.items.length; i++) {
//console.log("position search", i, popup.items[i].itemIndex)
if (popup.items[i].itemIndex > index) {
insertIndex = i
break
}
}
if (insertIndex === -1) {
popup.insertItem(popup.items.length, object)
} else {
//console.log("out of order menu add", index, insertIndex)
popup.insertItem(insertIndex, object)
}
}
onObjectRemoved: popup.removeItem(object)
QGCMenuItem {
text: popup.textRole === '' ? modelData : ((popup._modelIsArray ? modelData[popup.textRole] : model[popup.textRole]) || '')
checked: index == currentIndex
checkable: true
exclusiveGroup: eg
property int itemIndex: index
onTriggered: {
//console.log("onTriggered", index, currentIndex)
if (index !== currentIndex) {
//console.log("activated", index)
activated(index)
}
}
}
} }
} }
} }
src/QmlControls/ScreenTools.qml
View file @ 4b215098
...@@ -75,7 +75,7 @@ Item { ...@@ -75,7 +75,7 @@ Item {
property bool isDebug: ScreenToolsController.isDebug property bool isDebug: ScreenToolsController.isDebug
property bool isMac: ScreenToolsController.isMacOS property bool isMac: ScreenToolsController.isMacOS
property bool isTinyScreen: (Screen.width / realPixelDensity) < 120 // 120mm property bool isTinyScreen: (Screen.width / realPixelDensity) < 120 // 120mm
property bool isShortScreen: ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6) // Nexus 7 for example property bool isShortScreen: ((Screen.height / realPixelDensity) < 120) || (ScreenToolsController.isMobile && ((Screen.height / Screen.width) < 0.6))
property bool isHugeScreen: (Screen.width / realPixelDensity) >= (23.5 * 25.4) // 27" monitor property bool isHugeScreen: (Screen.width / realPixelDensity) >= (23.5 * 25.4) // 27" monitor
property bool isSerialAvailable: ScreenToolsController.isSerialAvailable property bool isSerialAvailable: ScreenToolsController.isSerialAvailable
...@@ -90,6 +90,7 @@ Item { ...@@ -90,6 +90,7 @@ Item {
property real implicitTextFieldHeight: Math.round(defaultFontPixelHeight * (isMobile ? 2.0 : 1.6)) property real implicitTextFieldHeight: Math.round(defaultFontPixelHeight * (isMobile ? 2.0 : 1.6))
property real implicitComboBoxHeight: Math.round(defaultFontPixelHeight * (isMobile ? 2.0 : 1.6)) property real implicitComboBoxHeight: Math.round(defaultFontPixelHeight * (isMobile ? 2.0 : 1.6))
property real implicitComboBoxWidth: Math.round(defaultFontPixelWidth * (isMobile ? 7.0 : 5.0)) property real implicitComboBoxWidth: Math.round(defaultFontPixelWidth * (isMobile ? 7.0 : 5.0))
property real comboBoxPadding: Math.round(defaultFontPixelWidth * (isShortScreen ? 1 : 0.5))
property real implicitSliderHeight: isMobile ? Math.max(defaultFontPixelHeight, minTouchPixels) : defaultFontPixelHeight property real implicitSliderHeight: isMobile ? Math.max(defaultFontPixelHeight, minTouchPixels) : defaultFontPixelHeight
// It's not possible to centralize an even number of pixels, checkBoxIndicatorSize should be an odd number to allow centralization // It's not possible to centralize an even number of pixels, checkBoxIndicatorSize should be an odd number to allow centralization
property real checkBoxIndicatorSize: 2 * Math.floor(defaultFontPixelHeight * (isMobile ? 1.5 : 1.0) / 2) + 1 property real checkBoxIndicatorSize: 2 * Math.floor(defaultFontPixelHeight * (isMobile ? 1.5 : 1.0) / 2) + 1
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment