diff --git a/qml/ComponentLibrary/ComponentLibrary.qrc b/qml/ComponentLibrary/ComponentLibrary.qrc
index 7b251e8..cc21b27 100644
--- a/qml/ComponentLibrary/ComponentLibrary.qrc
+++ b/qml/ComponentLibrary/ComponentLibrary.qrc
@@ -18,7 +18,6 @@
menus/ListSeparator.qml
menus/ListSeparatorPadded.qml
menus/ListTitle.qml
- menus/SectionTitle.qml
buttons/ButtonDesktop.qml
buttons/ButtonOutline.qml
@@ -117,6 +116,13 @@
complex/TextField_FileDialog.qml
complex/TextField_FolderDialog.qml
+ maps/MapButton.qml
+ maps/MapButtonCompass.qml
+ maps/MapButtonZoom.qml
+ maps/MapFrameArea.qml
+ maps/MapMarker.qml
+ maps/MapScale.qml
+
wip/TagClear.qml
wip/TagDesktop.qml
wip/TagFlat.qml
diff --git a/qml/ComponentLibrary/ThemeEngine.qml b/qml/ComponentLibrary/ThemeEngine.qml
index 18167ab..1b6309c 100644
--- a/qml/ComponentLibrary/ThemeEngine.qml
+++ b/qml/ComponentLibrary/ThemeEngine.qml
@@ -552,8 +552,8 @@ Item {
colorBackground = "#f9f8f7"
colorForeground = "#f3f2f1"
- colorPrimary = colorYellow
- colorSecondary = "#ffe800"
+ colorPrimary = "#ffc900"
+ colorSecondary = "#ffeb00"
colorSuccess = colorGreen
colorWarning = colorOrange
colorError = colorRed
@@ -1036,7 +1036,7 @@ Item {
colorError = "#D33E39"
colorText = "white"
- colorSubText = "#AAA"
+ colorSubText = "#999"
colorIcon = "white"
colorSeparator = "#666" // darker: "#333" // lighter: "#666"
colorLowContrast = "black"
@@ -1091,16 +1091,16 @@ Item {
colorText = "#222222"
colorSubText = "#555555"
colorIcon = "#333333"
- colorSeparator = "#E4E4E4"
+ colorSeparator = "#e4e4e4"
colorLowContrast = "white"
colorHighContrast = "black"
- colorComponent = "#EAEAEA"
+ colorComponent = "#f5f5f5"
colorComponentText = "black"
colorComponentContent = "black"
- colorComponentBorder = "#DDD"
- colorComponentDown = "#E6E6E6"
- colorComponentBackground = "#FAFAFA"
+ colorComponentBorder = "#ddd"
+ colorComponentDown = "#eee"
+ colorComponentBackground = "#f8f8f8"
componentRadius = 4
componentBorderWidth = 2
@@ -1141,18 +1141,18 @@ Item {
colorWarning = "#FFDB63"
colorError = "#FA6871"
- colorText = "#D2D2D2"
- colorSubText = "#A3A3A3"
+ colorText = "#D4D4D4"
+ colorSubText = "#888"
colorIcon = "#A0A0A0"
colorSeparator = "#666"
colorLowContrast = "black"
colorHighContrast = "white"
- colorComponent = "white"
+ colorComponent = "#fcfcfc"
colorComponentText = "black"
colorComponentContent = "black"
- colorComponentBorder = "#E4E4E4"
- colorComponentDown = "#DDD"
+ colorComponentBorder = "#e4e4e4"
+ colorComponentDown = "#ddd"
colorComponentBackground = "white"
componentRadius = 2
diff --git a/qml/ComponentLibrary/complex/TextField_FileDialog.qml b/qml/ComponentLibrary/complex/TextField_FileDialog.qml
index 70ba129..ace2260 100644
--- a/qml/ComponentLibrary/complex/TextField_FileDialog.qml
+++ b/qml/ComponentLibrary/complex/TextField_FileDialog.qml
@@ -1,10 +1,10 @@
+import QtCore
+
import QtQuick
+import QtQuick.Dialogs
import QtQuick.Controls.impl
import QtQuick.Templates as T
-import QtQuick.Dialogs
-import QtCore
-
import ThemeEngine
import "qrc:/utils/UtilsPath.js" as UtilsPath
diff --git a/qml/ComponentLibrary/complex/TextField_FolderDialog.qml b/qml/ComponentLibrary/complex/TextField_FolderDialog.qml
index 7367c0b..22739d4 100644
--- a/qml/ComponentLibrary/complex/TextField_FolderDialog.qml
+++ b/qml/ComponentLibrary/complex/TextField_FolderDialog.qml
@@ -1,10 +1,10 @@
+import QtCore
+
import QtQuick
+import QtQuick.Dialogs
import QtQuick.Controls.impl
import QtQuick.Templates as T
-import QtQuick.Dialogs
-import QtCore
-
import ThemeEngine
import "qrc:/utils/UtilsPath.js" as UtilsPath
diff --git a/qml/ComponentLibrary/maps/MapButton.qml b/qml/ComponentLibrary/maps/MapButton.qml
new file mode 100644
index 0000000..007a588
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapButton.qml
@@ -0,0 +1,88 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+import ThemeEngine
+import "qrc:/utils/UtilsNumber.js" as UtilsNumber
+
+T.Button {
+ id: control
+
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ focusPolicy: Qt.NoFocus
+
+ // image
+ property url source
+ property int sourceSize: UtilsNumber.alignTo(height * 0.5, 2)
+ property int sourceRotation: 0
+
+ // settings
+ property int radius: width * 0.28
+ property string hoverMode: "off" // available: off
+ property string highlightMode: "off" // available: off
+
+ // colors
+ property string iconColor: Theme.colorIcon
+ property string highlightColor: Theme.colorPrimary
+ property string borderColor: Theme.colorSeparator
+ property string backgroundColor: Theme.colorLowContrast
+
+ ////////////////
+
+ background: Item {
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ Rectangle { // background_alpha_borders
+ anchors.fill: parent
+ anchors.margins: isPhone ? -2 : -3
+ radius: control.radius
+ color: control.borderColor
+ opacity: 0.66
+
+ layer.enabled: true
+ layer.effect: MultiEffect {
+ autoPaddingEnabled: true
+ shadowEnabled: true
+ shadowColor: Theme.colorBoxShadow
+ }
+ }
+ Rectangle { // background
+ anchors.fill: parent
+ radius: control.radius
+ color: control.backgroundColor
+ }
+/*
+ RippleThemed {
+ width: parent.width
+ height: parent.height
+
+ clip: visible
+ anchor: control
+ pressed: control.pressed
+ active: enabled && (control.down || control.visualFocus || control.hovered)
+ color: Qt.rgba(Theme.colorForeground.r, Theme.colorForeground.g, Theme.colorForeground.b, 0.9)
+ }
+*/
+ }
+
+ ////////////////
+
+ contentItem: Item {
+ IconSvg {
+ anchors.centerIn: parent
+
+ width: control.sourceSize
+ height: control.sourceSize
+
+ color: control.iconColor
+ source: control.source
+ rotation: control.sourceRotation
+ }
+ }
+
+ ////////////////
+}
diff --git a/qml/ComponentLibrary/maps/MapButtonCompass.qml b/qml/ComponentLibrary/maps/MapButtonCompass.qml
new file mode 100644
index 0000000..a378469
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapButtonCompass.qml
@@ -0,0 +1,100 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+import ThemeEngine
+import "qrc:/utils/UtilsNumber.js" as UtilsNumber
+
+T.Button {
+ id: control
+
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ focusPolicy: Qt.NoFocus
+
+ // image
+ property url source_top: "qrc:/gfx/compass_top.svg"
+ property url source_bottom: "qrc:/gfx/compass_bottom.svg"
+ property int sourceSize: UtilsNumber.alignTo(height * 0.8, 2)
+ property int sourceRotation: 0
+
+ // settings
+ property int radius: width * 0.28
+ property string hoverMode: "off" // available: off
+ property string highlightMode: "off" // available: off
+
+ // colors
+ property string iconColor: Theme.colorIcon
+ property string highlightColor: Theme.colorPrimary
+ property string borderColor: Theme.colorSeparator
+ property string backgroundColor: Theme.colorLowContrast
+
+ ////////////////
+
+ background: Item {
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ Rectangle { // background_alpha_borders
+ anchors.fill: parent
+ anchors.margins: isPhone ? -2 : -3
+ radius: control.radius
+ color: control.borderColor
+ opacity: 0.66
+
+ layer.enabled: true
+ layer.effect: MultiEffect {
+ autoPaddingEnabled: true
+ shadowEnabled: true
+ shadowColor: Theme.colorBoxShadow
+ }
+ }
+ Rectangle { // background
+ anchors.fill: parent
+ radius: control.radius
+ color: control.backgroundColor
+ }
+/*
+ RippleThemed {
+ width: parent.width
+ height: parent.height
+
+ clip: visible
+ anchor: control
+ pressed: control.pressed
+ active: enabled && (control.down || control.visualFocus || control.hovered)
+ color: Qt.rgba(Theme.colorForeground.r, Theme.colorForeground.g, Theme.colorForeground.b, 0.9)
+ }
+*/
+ }
+
+ ////////////////
+
+ contentItem: Item {
+ rotation: control.sourceRotation
+ Behavior on rotation { RotationAnimation { duration: 333; direction: RotationAnimator.Shortest} }
+
+ IconSvg {
+ anchors.centerIn: parent
+
+ width: control.sourceSize
+ height: control.sourceSize
+
+ color: Theme.colorRed
+ source: control.source_top
+ }
+ IconSvg {
+ anchors.centerIn: parent
+
+ width: control.sourceSize
+ height: control.sourceSize
+
+ color: control.iconColor
+ source: control.source_bottom
+ }
+ }
+
+ ////////////////
+}
diff --git a/qml/ComponentLibrary/maps/MapButtonZoom.qml b/qml/ComponentLibrary/maps/MapButtonZoom.qml
new file mode 100644
index 0000000..d3debc7
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapButtonZoom.qml
@@ -0,0 +1,163 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+import ThemeEngine
+import "qrc:/utils/UtilsNumber.js" as UtilsNumber
+
+T.Button {
+ id: control
+
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ focusPolicy: Qt.NoFocus
+
+ signal mapZoomIn()
+ signal mapZoomOut()
+
+ property int zoomLevel
+ property int zoomLevel_minimum
+ property int zoomLevel_maximum
+
+ // image
+ property int sourceSize: UtilsNumber.alignTo(width * 0.5, 2)
+
+ // settings
+ property int radius: width * 0.28
+ property string hoverMode: "off" // available: off
+ property string highlightMode: "off" // available: off
+
+ // colors
+ property string iconColor: Theme.colorIcon
+ property string highlightColor: Theme.colorPrimary
+ property string borderColor: Theme.colorSeparator
+ property string backgroundColor: Theme.colorLowContrast
+
+ ////////////////
+
+ background: Item {
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ Rectangle { // background_alpha_border
+ anchors.fill: parent
+ anchors.margins: isPhone ? -2 : -3
+ radius: control.radius
+ color: control.borderColor
+ opacity: 0.66
+
+ layer.enabled: true
+ layer.effect: MultiEffect {
+ autoPaddingEnabled: true
+ shadowEnabled: true
+ shadowColor: Theme.colorBoxShadow
+ }
+ }
+ Rectangle { // background
+ anchors.fill: parent
+ radius: control.radius
+ color: control.backgroundColor
+ }
+
+ Item {
+ id: bglayer
+ anchors.fill: parent
+
+ Rectangle { // button1_bg
+ anchors.top: parent.top
+ width: parent.width
+ height: parent.width
+
+ color: Theme.colorComponent
+ opacity: button1_ma.containsMouse ? 0.66 : 0
+ Behavior on opacity { NumberAnimation { duration: 333 } }
+ }
+ Rectangle { // button2_bg
+ anchors.bottom: parent.bottom
+ width: parent.width
+ height: parent.width
+
+ color: Theme.colorComponent
+ opacity: button2_ma.containsMouse ? 0.66 : 0
+ Behavior on opacity { NumberAnimation { duration: 333 } }
+ }
+
+ layer.enabled: true
+ layer.effect: MultiEffect {
+ maskEnabled: true
+ maskInverted: false
+ maskThresholdMin: 0.5
+ maskSpreadAtMin: 1.0
+ maskSpreadAtMax: 0.0
+ maskSource: ShaderEffectSource {
+ sourceItem: Rectangle {
+ x: bglayer.x
+ y: bglayer.y
+ width: bglayer.width
+ height: bglayer.height
+ radius: control.radius
+ }
+ }
+ }
+ }
+ }
+
+ ////////////////
+
+ contentItem: Item {
+ MouseArea {
+ id: button1_ma
+ anchors.top: parent.top
+
+ width: parent.width
+ height: parent.width
+
+ hoverEnabled: control.zoomLevel < control.zoomLevel_maximum
+ enabled: control.zoomLevel < control.zoomLevel_maximum
+
+ onClicked: control.mapZoomIn()
+
+ IconSvg {
+ anchors.centerIn: parent
+
+ width: control.sourceSize
+ height: control.sourceSize
+
+ opacity: control.zoomLevel < control.zoomLevel_maximum ? 1 : 0.4
+ Behavior on opacity { NumberAnimation { duration: 333 } }
+
+ color: control.iconColor
+ source: "qrc:/assets/icons/material-symbols/add.svg"
+ }
+ }
+ MouseArea {
+ id: button2_ma
+ anchors.bottom: parent.bottom
+
+ width: parent.width
+ height: parent.width
+
+ hoverEnabled: control.zoomLevel > control.zoomLevel_minimum
+ enabled: control.zoomLevel > control.zoomLevel_minimum
+
+ onClicked: control.mapZoomOut()
+
+ IconSvg {
+ anchors.centerIn: parent
+
+ width: control.sourceSize
+ height: control.sourceSize
+
+ opacity: control.zoomLevel > control.zoomLevel_minimum ? 1 : 0.4
+ Behavior on opacity { NumberAnimation { duration: 333 } }
+
+ color: control.iconColor
+ source: "qrc:/assets/icons/material-symbols/remove.svg"
+ }
+ }
+ }
+
+ ////////////////
+}
diff --git a/qml/ComponentLibrary/maps/MapFrameArea.qml b/qml/ComponentLibrary/maps/MapFrameArea.qml
new file mode 100644
index 0000000..f7008b9
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapFrameArea.qml
@@ -0,0 +1,55 @@
+import QtQuick
+import QtQuick.Effects
+import QtQuick.Controls.impl
+import QtQuick.Templates as T
+
+import ThemeEngine
+
+T.Frame {
+ id: control
+
+ implicitWidth: Math.max(implicitBackgroundWidth + leftInset + rightInset,
+ contentWidth + leftPadding + rightPadding)
+ implicitHeight: Math.max(implicitBackgroundHeight + topInset + bottomInset,
+ contentHeight + topPadding + bottomPadding)
+
+ padding: 12
+ leftPadding: 16
+ rightPadding: 16
+
+ // settings
+ property int radius: height * 0.28
+
+ // colors
+ property string borderColor: Theme.colorSeparator
+ property string backgroundColor: Theme.colorLowContrast
+
+ ////////////////
+
+ background: Item {
+ implicitWidth: Theme.componentHeight
+ implicitHeight: Theme.componentHeight
+
+ Rectangle { // background_alpha_borders
+ anchors.fill: parent
+ anchors.margins: isPhone ? -2 : -3
+ radius: control.radius
+ color: control.borderColor
+ opacity: 0.66
+
+ layer.enabled: true
+ layer.effect: MultiEffect {
+ autoPaddingEnabled: true
+ shadowEnabled: true
+ shadowColor: Theme.colorBoxShadow
+ }
+ }
+ Rectangle { // background
+ anchors.fill: parent
+ radius: control.radius
+ color: control.backgroundColor
+ }
+ }
+
+ ////////////////
+}
diff --git a/qml/ComponentLibrary/maps/MapMarker.qml b/qml/ComponentLibrary/maps/MapMarker.qml
new file mode 100644
index 0000000..e83d171
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapMarker.qml
@@ -0,0 +1,34 @@
+import QtQuick
+
+import QtLocation
+
+import ThemeEngine
+
+MapQuickItem {
+ id: posMarker
+
+ property string source: "qrc:/gfx/gps_marker.svg"
+ property string source_bearing: "qrc:/gfx/gps_marker_bearing.svg"
+
+ property bool has_bearing: (map_bearing || compass_bearing)
+ property real map_bearing: 0.0
+ property real compass_bearing: 0.0
+
+ width: 64
+ height: 64
+
+ anchorPoint.x: (posMarker.width / 2)
+ anchorPoint.y: (posMarker.height / 2)
+
+ //coordinate: QtPositioning.coordinate(1, 2)
+
+ rotation: 360.0 - map_bearing - compass_bearing
+ Behavior on rotation { RotationAnimation { duration: 133; direction: RotationAnimator.Shortest; } }
+
+ sourceItem: Image {
+ width: posMarker.width
+ height: posMarker.height
+ sourceSize: Qt.size(width, height)
+ source: posMarker.has_bearing ? posMarker.source_bearing :posMarker.source
+ }
+}
diff --git a/qml/ComponentLibrary/maps/MapScale.qml b/qml/ComponentLibrary/maps/MapScale.qml
new file mode 100644
index 0000000..cf47ed0
--- /dev/null
+++ b/qml/ComponentLibrary/maps/MapScale.qml
@@ -0,0 +1,88 @@
+import QtQuick
+
+import QtLocation
+
+import ThemeEngine
+import "qrc:/utils/UtilsString.js" as UtilsString
+
+Item {
+ id: mapScale
+
+ implicitWidth: 128
+ implicitHeight: 20
+
+ property Map map: null
+
+ property variant scaleLengths: [5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000,
+ 20000, 50000, 100000, 200000, 500000, 1000000, 2000000]
+
+ ////////////////
+
+ Component.onCompleted: computeScale()
+
+ function computeScale() {
+ if (!map) return
+
+ var coord1 = map.toCoordinate(Qt.point(0, 100))
+ var coord2 = map.toCoordinate(Qt.point(100, 100))
+ var dist = Math.round(coord1.distanceTo(coord2))
+ var f = 0
+
+ //console.log("computeScale(zoom: " + map.zoomLevel + " | dist: " + dist +")")
+
+ if (dist === 0) {
+ // not visible
+ } else {
+ for (var i = 0; i < scaleLengths.length-1; i++) {
+ if (dist < (scaleLengths[i] + scaleLengths[i+1]) / 2 ) {
+ f = scaleLengths[i] / dist
+ dist = scaleLengths[i]
+ break
+ }
+ }
+ if (f === 0) {
+ f = dist / scaleLengths[i]
+ dist = scaleLengths[i]
+ }
+ }
+
+ mapScale.width = 100 * f
+ mapScaleText.text = UtilsString.distanceToString(dist, 0, settingsManager.appUnits)
+ }
+
+ ////////////////
+
+ Text {
+ id: mapScaleText
+ anchors.centerIn: parent
+ text: "100m"
+ color: "#555"
+ font.pixelSize: Theme.fontSizeContentVerySmall
+ }
+
+ Rectangle {
+ anchors.left: parent.left
+ anchors.bottom: parent.bottom
+
+ width: 2
+ height: 6
+ color: "#555"
+ }
+ Rectangle {
+ anchors.bottom: parent.bottom
+
+ width: parent.width
+ height: 2
+ color: "#555"
+ }
+ Rectangle {
+ anchors.right: parent.right
+ anchors.bottom: parent.bottom
+
+ width: 2
+ height: 6
+ color:"#555"
+ }
+
+ ////////////////
+}
diff --git a/qml/ComponentLibrary/menus/ActionMenuItem.qml b/qml/ComponentLibrary/menus/ActionMenuItem.qml
index b92f6aa..ade2486 100644
--- a/qml/ComponentLibrary/menus/ActionMenuItem.qml
+++ b/qml/ComponentLibrary/menus/ActionMenuItem.qml
@@ -73,7 +73,7 @@ T.Button {
////////////////
contentItem: RowLayout {
- spacing: (Theme.componentMargin / 1)
+ spacing: Theme.componentMargin
layoutDirection: control.layoutDirection
IconSvg {
@@ -95,7 +95,7 @@ T.Button {
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
elide: Text.ElideRight
- color: Theme.colorText
+ color: Theme.colorComponentText
}
}
diff --git a/qml/ComponentLibrary/menus/DrawerButton.qml b/qml/ComponentLibrary/menus/DrawerButton.qml
index 671962c..cf27514 100644
--- a/qml/ComponentLibrary/menus/DrawerButton.qml
+++ b/qml/ComponentLibrary/menus/DrawerButton.qml
@@ -20,6 +20,7 @@ T.ItemDelegate {
property string source
property int sourceSize: 24
+ property int sourceRotation: 0
property color sourceColor: Theme.colorIcon
//property string text
@@ -92,8 +93,10 @@ T.ItemDelegate {
width: control.sourceSize
height: control.sourceSize
- color: control.sourceColor
+ rotation: control.sourceRotation
+
source: control.source
+ color: control.sourceColor
NumberAnimation on rotation { // rotate animation // icon only
duration: 2000
diff --git a/qml/ComponentLibrary/menus/DrawerItem.qml b/qml/ComponentLibrary/menus/DrawerItem.qml
index aa02f5a..e784cf3 100644
--- a/qml/ComponentLibrary/menus/DrawerItem.qml
+++ b/qml/ComponentLibrary/menus/DrawerItem.qml
@@ -19,6 +19,7 @@ T.ItemDelegate {
property string source
property int sourceSize: 24
+ property int sourceRotation: 0
property color sourceColor: Theme.colorIcon
//property string text
@@ -67,8 +68,10 @@ T.ItemDelegate {
width: control.sourceSize
height: control.sourceSize
- color: control.sourceColor
+ rotation: control.sourceRotation
+
source: control.source
+ color: control.sourceColor
}
}
diff --git a/qml/ComponentLibrary/menus/ListTitle.qml b/qml/ComponentLibrary/menus/ListTitle.qml
index fb1e210..b80134e 100644
--- a/qml/ComponentLibrary/menus/ListTitle.qml
+++ b/qml/ComponentLibrary/menus/ListTitle.qml
@@ -1,4 +1,5 @@
import QtQuick
+import QtQuick.Effects
import ThemeEngine
@@ -20,12 +21,15 @@ Rectangle {
property string source
property int sourceSize: 24
+ property int sourceRotation: 0
property color sourceColor: Theme.colorIcon
property string text: "title"
property color textColor: Theme.colorText
property int textSize: source ? Theme.fontSizeContentBig : Theme.fontSizeContentVeryBig
+ property bool shadow: !singleColumn
+
////////////////
IconSvg {
@@ -33,12 +37,13 @@ Rectangle {
anchors.leftMargin: Theme.componentMarginL
anchors.verticalCenter: control.verticalCenter
+ visible: control.source
width: control.sourceSize
height: control.sourceSize
+ rotation: control.sourceRotation
- source: control.source
- visible: control.source
color: control.sourceColor
+ source: control.source
}
Text {
@@ -59,4 +64,11 @@ Rectangle {
}
////////////////
+
+ layer.enabled: control.shadow
+ layer.effect: MultiEffect {
+ autoPaddingEnabled: true
+ shadowEnabled: true
+ shadowColor: ThemeEngine.isLight ? "#16000000" : "#88ffffff"
+ }
}
diff --git a/qml/ComponentLibrary/menus/MobileMenuItem_vertical.qml b/qml/ComponentLibrary/menus/MobileMenuItem_vertical.qml
index 294ce86..efa4afc 100644
--- a/qml/ComponentLibrary/menus/MobileMenuItem_vertical.qml
+++ b/qml/ComponentLibrary/menus/MobileMenuItem_vertical.qml
@@ -34,7 +34,7 @@ T.Button {
////////////////
contentItem: ColumnLayout {
- spacing: -6
+ spacing: 0
Item {
Layout.preferredWidth: 32
diff --git a/qml/ComponentLibrary/menus/SectionTitle.qml b/qml/ComponentLibrary/menus/SectionTitle.qml
deleted file mode 100644
index 9d92d4f..0000000
--- a/qml/ComponentLibrary/menus/SectionTitle.qml
+++ /dev/null
@@ -1,57 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-
-import ThemeEngine
-
-Rectangle {
- id: control
-
- implicitWidth: 512
- implicitHeight: Theme.componentHeightL
-
- radius: singleColumn ? 0 : Theme.componentRadius
- z: 2
-
- color: Theme.colorForeground
- border.width: singleColumn ? 0 : Theme.componentBorderWidth
- border.color: Theme.colorSeparator
-
- property string source
-
- property string text: "title"
- property int textSize: source ? Theme.fontSizeContentBig :
- Theme.fontSizeContentVeryBig
-
- ////////////////////////////////////////////////////////////////////////////
-
- Row {
- anchors.left: parent.left
- anchors.leftMargin: 16
- anchors.verticalCenter: parent.verticalCenter
- spacing: singleColumn ? 24 : 16
-
- IconSvg {
- width: 24
- height: 24
- anchors.verticalCenter: parent.verticalCenter
-
- source: control.source
- visible: control.source
- color: Theme.colorIcon
- }
-
- Text {
- anchors.verticalCenter: parent.verticalCenter
-
- text: control.text
- textFormat: Text.PlainText
- font.pixelSize: control.textSize
- font.bold: false
- color: Theme.colorText
- wrapMode: Text.WordWrap
- verticalAlignment: Text.AlignVCenter
- }
- }
-
- ////////////////////////////////////////////////////////////////////////////
-}
diff --git a/qml/ComponentLibrary/utils/UtilsMedia.js b/qml/ComponentLibrary/utils/UtilsMedia.js
index dad6532..f501b83 100644
--- a/qml/ComponentLibrary/utils/UtilsMedia.js
+++ b/qml/ComponentLibrary/utils/UtilsMedia.js
@@ -221,7 +221,7 @@ function framerateToString(framerate) {
var text = '';
if (framerate > 0) {
- text = framerate.toFixed(3) + " " + qsTr("fps");
+ text = framerate.toFixed(3) + " " + qsTr("FPS");
} else {
text = qsTr("Unknown");
}
diff --git a/qml/ComponentLibrary/wip/TagButtonDesktop.qml b/qml/ComponentLibrary/wip/TagButtonDesktop.qml
index 0311602..01e8c50 100644
--- a/qml/ComponentLibrary/wip/TagButtonDesktop.qml
+++ b/qml/ComponentLibrary/wip/TagButtonDesktop.qml
@@ -2,10 +2,7 @@ import QtQuick
import ThemeEngine
TagButtonImpl {
- height: 32
- leftPadding: 12
- rightPadding: 12
-
+ height: 28
colorBackground: Theme.colorBackground
colorBorder: Theme.colorComponentBorder
colorText: Theme.colorText
diff --git a/qml/ScreenFontInfos.qml b/qml/ScreenFontInfos.qml
index cce174e..a936ea3 100644
--- a/qml/ScreenFontInfos.qml
+++ b/qml/ScreenFontInfos.qml
@@ -53,9 +53,13 @@ Loader {
width: grid.wwww
height: grid.hhhh
- SectionTitle {
+ ListTitle {
Layout.preferredWidth: singleColumn ? parent.width : parent.width - Theme.componentMargin*0.5
Layout.alignment: Qt.AlignLeft
+
+ anchors.left: undefined
+ anchors.right: undefined
+
text: "Font sizes"
}
@@ -119,9 +123,13 @@ Loader {
width: grid.wwww
height: grid.hhhh
- SectionTitle {
+ ListTitle {
Layout.preferredWidth: singleColumn ? parent.width : parent.width - Theme.componentMargin*0.5
Layout.alignment: Qt.AlignRight
+
+ anchors.left: undefined
+ anchors.right: undefined
+
text: "Fonts available"
}
diff --git a/qml/popups/PopupMessage.qml b/qml/popups/PopupMessage.qml
index 59f3cc5..5fdf8fc 100644
--- a/qml/popups/PopupMessage.qml
+++ b/qml/popups/PopupMessage.qml
@@ -22,8 +22,6 @@ Popup {
closePolicy: Popup.CloseOnEscape | Popup.CloseOnPressOutside
parent: Overlay.overlay
- signal confirmed()
-
////////////////////////////////////////////////////////////////////////////
enter: Transition { NumberAnimation { property: "opacity"; from: 0.5; to: 1.0; duration: 133; } }