Skip to content

Q
qgroundcontrol
Commit 297f2401 authored by dogmaphobic's avatar dogmaphobic
Browse files
Options

More size adjustments.

parent 39913696
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 128 deletions
src/FlightDisplay/FlightDisplayViewWidgets.qml
View file @ 297f2401
...@@ -218,9 +218,9 @@ Item { ...@@ -218,9 +218,9 @@ Item {
QGCButton { QGCButton {
checkable: true checkable: true
checked: _flightMap ? _flightMap.mapType == text : false checked: _flightMap ? _flightMap.mapType === text : false
text: modelData text: modelData
width: clearButton.width
onClicked: { onClicked: {
_flightMap.mapType = text _flightMap.mapType = text
_dropButtonsExclusiveGroup.current = null _dropButtonsExclusiveGroup.current = null
...@@ -230,9 +230,9 @@ Item { ...@@ -230,9 +230,9 @@ Item {
} }
QGCButton { QGCButton {
text: qsTr("Clear flight trails") id: clearButton
text: qsTr("Clear Flight Trails")
enabled: QGroundControl.multiVehicleManager.activeVehicle enabled: QGroundControl.multiVehicleManager.activeVehicle
onClicked: { onClicked: {
QGroundControl.multiVehicleManager.activeVehicle.clearTrajectoryPoints() QGroundControl.multiVehicleManager.activeVehicle.clearTrajectoryPoints()
_dropButtonsExclusiveGroup.current = null _dropButtonsExclusiveGroup.current = null
......
src/MissionEditor/MissionEditor.qml
View file @ 297f2401
...@@ -26,6 +26,7 @@ import QtQuick.Controls 1.3 ...@@ -26,6 +26,7 @@ import QtQuick.Controls 1.3
import QtQuick.Dialogs 1.2 import QtQuick.Dialogs 1.2
import QtLocation 5.3 import QtLocation 5.3
import QtPositioning 5.3 import QtPositioning 5.3
import QtQuick.Layouts 1.2
import QGroundControl 1.0 import QGroundControl 1.0
import QGroundControl.FlightMap 1.0 import QGroundControl.FlightMap 1.0
...@@ -49,7 +50,7 @@ QGCView { ...@@ -49,7 +50,7 @@ QGCView {
readonly property int _decimalPlaces: 8 readonly property int _decimalPlaces: 8
readonly property real _horizontalMargin: ScreenTools.defaultFontPixelWidth / 2 readonly property real _horizontalMargin: ScreenTools.defaultFontPixelWidth / 2
readonly property real _margin: ScreenTools.defaultFontPixelHeight / 2 readonly property real _margin: ScreenTools.defaultFontPixelHeight * 0.5
readonly property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle readonly property var _activeVehicle: QGroundControl.multiVehicleManager.activeVehicle
readonly property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16 readonly property real _editFieldWidth: ScreenTools.defaultFontPixelWidth * 16
readonly property real _rightPanelWidth: Math.min(parent.width / 3, ScreenTools.defaultFontPixelWidth * 30) readonly property real _rightPanelWidth: Math.min(parent.width / 3, ScreenTools.defaultFontPixelWidth * 30)
...@@ -601,35 +602,31 @@ QGCView { ...@@ -601,35 +602,31 @@ QGCView {
dropDownComponent: Component { dropDownComponent: Component {
Column { Column {
spacing: ScreenTools.defaultFontPixelWidth * 0.5
QGCLabel { text: qsTr("Center map:") } QGCLabel { text: qsTr("Center map:") }
Row { Row {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
QGCButton { QGCButton {
text: qsTr("Home") text: qsTr("Home")
width: ScreenTools.defaultFontPixelWidth * 10
onClicked: { onClicked: {
centerMapButton.hideDropDown() centerMapButton.hideDropDown()
editorMap.center = controller.visualItems.get(0).coordinate editorMap.center = controller.visualItems.get(0).coordinate
} }
} }
QGCButton { QGCButton {
text: qsTr("Mission") text: qsTr("Mission")
width: ScreenTools.defaultFontPixelWidth * 10
onClicked: { onClicked: {
centerMapButton.hideDropDown() centerMapButton.hideDropDown()
fitViewportToMissionItems() fitViewportToMissionItems()
} }
} }
QGCButton { QGCButton {
text: qsTr("Vehicle") text: qsTr("Vehicle")
width: ScreenTools.defaultFontPixelWidth * 10
enabled: activeVehicle && activeVehicle.latitude != 0 && activeVehicle.longitude != 0 enabled: activeVehicle && activeVehicle.latitude != 0 && activeVehicle.longitude != 0
property var activeVehicle: _activeVehicle property var activeVehicle: _activeVehicle
onClicked: { onClicked: {
centerMapButton.hideDropDown() centerMapButton.hideDropDown()
editorMap.center = activeVehicle.coordinate editorMap.center = activeVehicle.coordinate
...@@ -651,20 +648,17 @@ QGCView { ...@@ -651,20 +648,17 @@ QGCView {
dropDownComponent: Component { dropDownComponent: Component {
Column { Column {
spacing: _margin
QGCLabel { text: qsTr("Map type:") } QGCLabel { text: qsTr("Map type:") }
Row { Row {
spacing: ScreenTools.defaultFontPixelWidth spacing: ScreenTools.defaultFontPixelWidth
Repeater { Repeater {
model: QGroundControl.flightMapSettings.mapTypes model: QGroundControl.flightMapSettings.mapTypes
QGCButton { QGCButton {
checkable: true checkable: true
checked: editorMap.mapType == text checked: editorMap.mapType === text
text: modelData text: modelData
exclusiveGroup: _mapTypeButtonsExclusiveGroup exclusiveGroup: _mapTypeButtonsExclusiveGroup
onClicked: { onClicked: {
editorMap.mapType = text editorMap.mapType = text
checked = true checked = true
...@@ -724,11 +718,9 @@ QGCView { ...@@ -724,11 +718,9 @@ QGCView {
Component { Component {
id: syncLoadFromVehicleOverwrite id: syncLoadFromVehicleOverwrite
QGCViewMessage { QGCViewMessage {
id: syncLoadFromVehicleCheck id: syncLoadFromVehicleCheck
message: qsTr("You have unsaved/unsent mission changes. Loading the mission from the Vehicle will lose these changes. Are you sure you want to load the mission from the Vehicle?") message: qsTr("You have unsaved/unsent mission changes. Loading the mission from the Vehicle will lose these changes. Are you sure you want to load the mission from the Vehicle?")
function accept() { function accept() {
hideDialog() hideDialog()
loadFromVehicle() loadFromVehicle()
...@@ -738,11 +730,9 @@ QGCView { ...@@ -738,11 +730,9 @@ QGCView {
Component { Component {
id: syncLoadFromFileOverwrite id: syncLoadFromFileOverwrite
QGCViewMessage { QGCViewMessage {
id: syncLoadFromVehicleCheck id: syncLoadFromVehicleCheck
message: qsTr("You have unsaved/unsent mission changes. Loading a mission from a file will lose these changes. Are you sure you want to load a mission from a file?") message: qsTr("You have unsaved/unsent mission changes. Loading a mission from a file will lose these changes. Are you sure you want to load a mission from a file?")
function accept() { function accept() {
hideDialog() hideDialog()
loadFromFile() loadFromFile()
...@@ -752,10 +742,8 @@ QGCView { ...@@ -752,10 +742,8 @@ QGCView {
Component { Component {
id: removeAllPromptDialog id: removeAllPromptDialog
QGCViewMessage { QGCViewMessage {
message: qsTr("Are you sure you want to delete all mission items?") message: qsTr("Are you sure you want to delete all mission items?")
function accept() { function accept() {
itemDragger.clearItem() itemDragger.clearItem()
controller.removeAllMissionItems() controller.removeAllMissionItems()
...@@ -766,38 +754,36 @@ QGCView { ...@@ -766,38 +754,36 @@ QGCView {
Component { Component {
id: syncDropDownComponent id: syncDropDownComponent
Column { Column {
id: columnHolder id: columnHolder
spacing: _margin spacing: _margin
QGCLabel { QGCLabel {
width: sendSaveRow.width width: sendSaveGrid.width
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
text: syncNeeded && !controller.autoSync ? text: syncNeeded && !controller.autoSync ?
qsTr("You have unsaved changed to you mission. You should send to your vehicle, or save to a file:") : qsTr("You have unsaved changed to you mission. You should send to your vehicle, or save to a file:") :
qsTr("Sync:") qsTr("Sync:")
} }
GridLayout {
Row { id: sendSaveGrid
id: sendSaveRow columns: 2
visible: true //autoSyncCheckBox.enabled && autoSyncCheckBox.checked anchors.margins: _margin
spacing: ScreenTools.defaultFontPixelWidth rowSpacing: _margin
columnSpacing: ScreenTools.defaultFontPixelWidth
visible: true //autoSyncCheckBox.enabled && autoSyncCheckBox.checked
QGCButton { QGCButton {
text: qsTr("Send to vehicle") text: qsTr("Send To Vehicle")
enabled: _activeVehicle && !controller.syncInProgress Layout.fillWidth: true
enabled: _activeVehicle && !controller.syncInProgress
onClicked: { onClicked: {
syncButton.hideDropDown() syncButton.hideDropDown()
controller.sendMissionItems() controller.sendMissionItems()
} }
} }
QGCButton { QGCButton {
text: qsTr("Load from vehicle") text: qsTr("Load From Vehicle")
enabled: _activeVehicle && !controller.syncInProgress Layout.fillWidth: true
enabled: _activeVehicle && !controller.syncInProgress
onClicked: { onClicked: {
syncButton.hideDropDown() syncButton.hideDropDown()
if (syncNeeded) { if (syncNeeded) {
...@@ -807,25 +793,19 @@ QGCView { ...@@ -807,25 +793,19 @@ QGCView {
} }
} }
} }
}
Row {
spacing: ScreenTools.defaultFontPixelWidth
QGCButton { QGCButton {
text: qsTr("Save to file...") text: qsTr("Save To File...")
enabled: !controller.syncInProgress Layout.fillWidth: true
enabled: !controller.syncInProgress
onClicked: { onClicked: {
syncButton.hideDropDown() syncButton.hideDropDown()
saveToFile() saveToFile()
} }
} }
QGCButton { QGCButton {
text: qsTr("Load from file...") text: qsTr("Load From File...")
enabled: !controller.syncInProgress Layout.fillWidth: true
enabled: !controller.syncInProgress
onClicked: { onClicked: {
syncButton.hideDropDown() syncButton.hideDropDown()
if (syncNeeded) { if (syncNeeded) {
...@@ -835,16 +815,17 @@ QGCView { ...@@ -835,16 +815,17 @@ QGCView {
} }
} }
} }
} QGCButton {
text: qsTr("Remove All")
QGCButton { Layout.fillWidth: true
text: qsTr("Remove all") onClicked: {
onClicked: { syncButton.hideDropDown()
syncButton.hideDropDown() _root.showDialog(removeAllPromptDialog, qsTr("Delete all"), _root.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No)
_root.showDialog(removeAllPromptDialog, qsTr("Delete all"), _root.showDialogDefaultWidth, StandardButton.Yes | StandardButton.No) }
} }
} }
/* /*
FIXME: autoSync is temporarily disconnected since it's still buggy FIXME: autoSync is temporarily disconnected since it's still buggy
......
src/QmlControls/DropButton.qml
View file @ 297f2401
...@@ -11,7 +11,7 @@ Item { ...@@ -11,7 +11,7 @@ Item {
signal clicked() signal clicked()
property alias buttonImage: roundButton.buttonImage property alias buttonImage: roundButton.buttonImage
property alias rotateImage: roundButton.rotateImage property alias rotateImage: roundButton.rotateImage
property real radius: ScreenTools.defaultFontPixelHeight * 1.25 property real radius: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.75 : ScreenTools.defaultFontPixelHeight * 1.25
property int dropDirection: dropDown property int dropDirection: dropDown
property alias dropDownComponent: dropDownLoader.sourceComponent property alias dropDownComponent: dropDownLoader.sourceComponent
property real viewportMargins: 0 property real viewportMargins: 0
...@@ -26,15 +26,15 @@ Item { ...@@ -26,15 +26,15 @@ Item {
readonly property int dropUp: 3 readonly property int dropUp: 3
readonly property int dropDown: 4 readonly property int dropDown: 4
readonly property real _arrowBaseWidth: (radius * 2) / 2 // Width of long side of arrow readonly property real _arrowBaseWidth: radius // Width of long side of arrow
readonly property real _arrowPointHeight: (radius * 2) / 3 // Height is long side to point readonly property real _arrowPointHeight: radius * 0.666 // Height is long side to point
readonly property real _dropCornerRadius: ScreenTools.defaultFontPixelWidth / 2 readonly property real _dropCornerRadius: ScreenTools.defaultFontPixelWidth * 0.5
readonly property real _dropCornerRadiusX2: _dropCornerRadius * 2 readonly property real _dropCornerRadiusX2: _dropCornerRadius * 2
readonly property real _dropMargin: _dropCornerRadius readonly property real _dropMargin: _dropCornerRadius
readonly property real _dropMarginX2: _dropMargin * 2 readonly property real _dropMarginX2: _dropMargin * 2
property real _viewportMaxLeft: -x + viewportMargins property real _viewportMaxLeft: -x + viewportMargins
property real _viewportMaxRight: parent.width - (viewportMargins * 2) - x property real _viewportMaxRight: parent.width - (viewportMargins * 2) - x
property real _viewportMaxTop: -y + viewportMargins property real _viewportMaxTop: -y + viewportMargins
property real _viewportMaxBottom: parent.height - (viewportMargins * 2) - y property real _viewportMaxBottom: parent.height - (viewportMargins * 2) - y
......
src/QmlControls/QGCButton.qml
View file @ 297f2401
...@@ -20,8 +20,9 @@ Button { ...@@ -20,8 +20,9 @@ Button {
property bool __forceHoverOff: false property bool __forceHoverOff: false
property int __lastGlobalMouseX: 0 property int __lastGlobalMouseX: 0
property int __lastGlobalMouseY: 0 property int __lastGlobalMouseY: 0
property int __padding: Math.round(ScreenTools.defaultFontPixelHeight * 0.5)
Connections { Connections {
target: __behavior target: __behavior
...@@ -41,7 +42,6 @@ Button { ...@@ -41,7 +42,6 @@ Button {
id: hoverTimer id: hoverTimer
interval: 250 interval: 250
repeat: true repeat: true
onTriggered: { onTriggered: {
__forceHoverOff = (__lastGlobalMouseX !== ScreenTools.mouseX() || __lastGlobalMouseY !== ScreenTools.mouseY()); __forceHoverOff = (__lastGlobalMouseX !== ScreenTools.mouseX() || __lastGlobalMouseY !== ScreenTools.mouseY());
} }
...@@ -50,17 +50,17 @@ Button { ...@@ -50,17 +50,17 @@ Button {
style: ButtonStyle { style: ButtonStyle {
/*! The padding between the background and the label components. */ /*! The padding between the background and the label components. */
padding { padding {
top: 4 top: __padding
left: 4 left: __padding
right: control.menu !== null ? Math.round(ScreenTools.defaultFontPixelHeight * 0.5) : 4 right: control.menu !== null ? Math.round(ScreenTools.defaultFontPixelHeight) : __padding
bottom: 4 bottom: __padding
} }
/*! This defines the background of the button. */ /*! This defines the background of the button. */
background: Item { background: Item {
property bool down: control.pressed || (control.checkable && control.checked) property bool down: control.pressed || (control.checkable && control.checked)
implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5) implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5)
implicitHeight: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2)) implicitHeight: ScreenTools.isMobile ? Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 2)) : Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
...@@ -72,26 +72,26 @@ Button { ...@@ -72,26 +72,26 @@ Button {
} }
Image { Image {
id: imageItem id: imageItem
visible: control.menu !== null visible: control.menu !== null
source: "/qmlimages/arrow-down.png" source: "/qmlimages/arrow-down.png"
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: padding.right anchors.rightMargin: __padding
opacity: control.enabled ? 0.6 : 0.5 opacity: control.enabled ? 0.6 : 0.5
} }
} }
/*! This defines the label of the button. */ /*! This defines the label of the button. */
label: Item { label: Item {
implicitWidth: row.implicitWidth implicitWidth: control.menu === null ? row.implicitWidth : row.implicitWidth + ScreenTools.defaultFontPixelWidth
implicitHeight: row.implicitHeight implicitHeight: row.implicitHeight
baselineOffset: row.y + text.y + text.baselineOffset baselineOffset: row.y + text.y + text.baselineOffset
Row { Row {
id: row id: row
anchors.centerIn: parent anchors.centerIn: parent
spacing: 2 spacing: ScreenTools.defaultFontPixelWidth * 0.25
Image { Image {
source: control.iconSource source: control.iconSource
......
src/QmlControls/QGCComboBox.qml
View file @ 297f2401
...@@ -18,8 +18,8 @@ ComboBox { ...@@ -18,8 +18,8 @@ ComboBox {
control._qgcPal.buttonText control._qgcPal.buttonText
background: Item { background: Item {
implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5) implicitWidth: Math.round(ScreenTools.defaultFontPixelWidth * 4.5)
implicitHeight: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2)) implicitHeight: ScreenTools.isMobile ? Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 2)) : Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
......
src/QmlControls/QGCRadioButton.qml
View file @ 297f2401
...@@ -10,29 +10,29 @@ RadioButton { ...@@ -10,29 +10,29 @@ RadioButton {
style: RadioButtonStyle { style: RadioButtonStyle {
label: Item { label: Item {
implicitWidth: text.implicitWidth + 2 implicitWidth: text.implicitWidth + ScreenTools.defaultFontPixelWidth * 0.25
implicitHeight: text.implicitHeight implicitHeight: text.implicitHeight
baselineOffset: text.y + text.baselineOffset baselineOffset: text.y + text.baselineOffset
Rectangle { Rectangle {
anchors.fill: text anchors.fill: text
anchors.margins: -1 anchors.margins: -1
anchors.leftMargin: -3 anchors.leftMargin: -3
anchors.rightMargin: -3 anchors.rightMargin:-3
visible: control.activeFocus visible: control.activeFocus
height: 6 height: ScreenTools.defaultFontPixelWidth * 0.25
radius: 3 radius: height * 0.5
color: "#224f9fef" color: "#224f9fef"
border.color: "#47b" border.color: "#47b"
opacity: 0.6 opacity: 0.6
} }
Text { Text {
id: text id: text
text: control.text text: control.text
font.pointSize: ScreenTools.defaultFontPointSize font.pointSize: ScreenTools.defaultFontPointSize
font.family: ScreenTools.normalFontFamily font.family: ScreenTools.normalFontFamily
antialiasing: true antialiasing: true
color: control.__qgcPal.text color: control.__qgcPal.text
anchors.centerIn: parent anchors.centerIn: parent
} }
} }
} }
......
src/QmlControls/QGCTextField.qml
View file @ 297f2401
...@@ -20,12 +20,12 @@ TextField { ...@@ -20,12 +20,12 @@ TextField {
property var __qgcPal: QGCPalette { colorGroupEnabled: enabled } property var __qgcPal: QGCPalette { colorGroupEnabled: enabled }
textColor: __qgcPal.textFieldText textColor: __qgcPal.textFieldText
height: Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2)) height: ScreenTools.isMobile ? Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 2)) : Math.max(25, Math.round(ScreenTools.defaultFontPixelHeight * 1.2))
Label { Label {
id: unitsLabelWidthGenerator id: unitsLabelWidthGenerator
text: unitsLabel text: unitsLabel
width: contentWidth + ((parent.__contentHeight/3)*2) width: contentWidth + parent.__contentHeight * 0.666
visible: false visible: false
antialiasing: true antialiasing: true
font.family: ScreenTools.normalFontFamily font.family: ScreenTools.normalFontFamily
...@@ -37,15 +37,15 @@ TextField { ...@@ -37,15 +37,15 @@ TextField {
id: backgroundItem id: backgroundItem
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: -1 anchors.bottomMargin: -1
color: "#44ffffff" color: "#44ffffff"
} }
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
border.color: control.activeFocus ? "#47b" : "#999" border.color: control.activeFocus ? "#47b" : "#999"
color: __qgcPal.textField color: __qgcPal.textField
} }
Text { Text {
...@@ -70,7 +70,7 @@ TextField { ...@@ -70,7 +70,7 @@ TextField {
} }
} }
padding.right: control.showUnits ? unitsLabelWidthGenerator.width : control.__contentHeight/3 padding.right: control.showUnits ? unitsLabelWidthGenerator.width : control.__contentHeight * 0.333
} }
onActiveFocusChanged: { onActiveFocusChanged: {
......
src/QmlControls/RoundButton.qml
View file @ 297f2401
...@@ -10,7 +10,7 @@ Item { ...@@ -10,7 +10,7 @@ Item {
signal clicked() signal clicked()
property alias buttonImage: button.source property alias buttonImage: button.source
property real radius: ScreenTools.defaultFontPixelHeight * 1.25 property real radius: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.75 : ScreenTools.defaultFontPixelHeight * 1.25
property bool rotateImage: false property bool rotateImage: false
property bool lightBorders: true property bool lightBorders: true
...@@ -54,12 +54,12 @@ Item { ...@@ -54,12 +54,12 @@ Item {
color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText color: checked ? qgcPal.buttonHighlightText : qgcPal.buttonText
RotationAnimation on rotation { RotationAnimation on rotation {
id: imageRotation id: imageRotation
loops: Animation.Infinite loops: Animation.Infinite
from: 0 from: 0
to: 360 to: 360
duration: 500 duration: 500
running: false running: false
} }
MouseArea { MouseArea {
......
src/ui/MainWindowInner.qml
View file @ 297f2401
...@@ -391,7 +391,7 @@ Item { ...@@ -391,7 +391,7 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight width: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight
height: width height: width
sourceSize.height: width sourceSize.height: width
source: "/res/XDelete.svg" source: "/res/XDelete.svg"
...@@ -399,7 +399,8 @@ Item { ...@@ -399,7 +399,8 @@ Item {
mipmap: true mipmap: true
smooth: true smooth: true
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.isMobile ? -ScreenTools.defaultFontPixelHeight : 0
onClicked: { onClicked: {
messageArea.close() messageArea.close()
} }
...@@ -410,7 +411,7 @@ Item { ...@@ -410,7 +411,7 @@ Item {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
height: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight height: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight
width: height width: height
sourceSize.height: height sourceSize.height: height
source: "/res/TrashDelete.svg" source: "/res/TrashDelete.svg"
...@@ -499,14 +500,15 @@ Item { ...@@ -499,14 +500,15 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight width: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight
height: width height: width
sourceSize.height: width sourceSize.height: width
source: "/res/XDelete.svg" source: "/res/XDelete.svg"
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
color: "black" color: "black"
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
anchors.margins: ScreenTools.isMobile ? -ScreenTools.defaultFontPixelHeight : 0
onClicked: { onClicked: {
criticalMmessageArea.close() criticalMmessageArea.close()
} }
...@@ -518,14 +520,13 @@ Item { ...@@ -518,14 +520,13 @@ Item {
anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5 anchors.margins: ScreenTools.defaultFontPixelHeight * 0.5
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
width: ScreenTools.isTinyScreen ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight width: ScreenTools.isMobile ? ScreenTools.defaultFontPixelHeight * 1.5 : ScreenTools.defaultFontPixelHeight
height: width height: width
sourceSize.height: width sourceSize.height: width
source: "/res/ArrowDown.svg" source: "/res/ArrowDown.svg"
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
visible: criticalMessageText.lineCount > 5 visible: criticalMessageText.lineCount > 5
color: "black" color: "black"
MouseArea { MouseArea {
anchors.fill: parent anchors.fill: parent
onClicked: { onClicked: {
......
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