Bill/monero-gui
1
0
Fork 0
forked from Public/monero-gui
Code Pull Requests Actions Packages Activity

components mobile scaling

Browse Source
This commit is contained in:
Jaquee
2017-08-07 15:47:56 +02:00
parent 66bb3fe7ac
commit 9e0db8f4ff
12 changed files with 124 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
components/Label.qml
View File

@@ -35,19 +35,21 @@ Item {
property alias color: label.color property alias color: label.color
property alias textFormat: label.textFormat property alias textFormat: label.textFormat
property string tipText: "" property string tipText: ""
property int fontSize: 12 property int fontSize: 16 * scaleRatio
property alias wrapMode: label.wrapMode property alias wrapMode: label.wrapMode
property alias horizontalAlignment: label.horizontalAlignment
signal linkActivated() signal linkActivated()
width: icon.x + icon.width width: icon.x + icon.width * scaleRatio
height: icon.height height: icon.height * scaleRatio
Layout.topMargin: 10 * scaleRatio
Text { Text {
id: label id: label
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.bottomMargin: 2 anchors.bottomMargin: 2 * scaleRatio
anchors.left: parent.left anchors.left: parent.left
font.family: "Arial" font.family: "Arial"
font.pixelSize: parent.fontSize font.pixelSize: fontSize
color: "#555555" color: "#555555"
onLinkActivated: item.linkActivated() onLinkActivated: item.linkActivated()
} }
@@ -56,7 +58,7 @@ Item {
id: icon id: icon
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: label.right anchors.left: label.right
anchors.leftMargin: 5 anchors.leftMargin: 5 * scaleRatio
source: "../images/whatIsIcon.png" source: "../images/whatIsIcon.png"
visible: appWindow.whatIsEnable visible: appWindow.whatIsEnable
} }

12
components/LineEdit.qml
View File

@@ -36,13 +36,13 @@ Item {
property alias readOnly : input.readOnly property alias readOnly : input.readOnly
property alias cursorPosition: input.cursorPosition property alias cursorPosition: input.cursorPosition
property alias echoMode: input.echoMode property alias echoMode: input.echoMode
property int fontSize: 18 property int fontSize: 18 * scaleRatio
property bool error: false property bool error: false
signal editingFinished() signal editingFinished()
signal accepted(); signal accepted();
signal textUpdated(); signal textUpdated();
height: 37 height: 37 * scaleRatio
function getColor(error) { function getColor(error) {
if (error) if (error)
@@ -53,14 +53,14 @@ Item {
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
anchors.bottomMargin: 1 anchors.bottomMargin: 1 * scaleRatio
color: "#DBDBDB" color: "#DBDBDB"
//radius: 4 //radius: 4
} }
Rectangle { Rectangle {
anchors.fill: parent anchors.fill: parent
anchors.topMargin: 1 anchors.topMargin: 1 * scaleRatio
color: getColor(error) color: getColor(error)
//radius: 4 //radius: 4
} }
@@ -68,8 +68,8 @@ Item {
Input { Input {
id: input id: input
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 4 anchors.leftMargin: 4 * scaleRatio
anchors.rightMargin: 30 anchors.rightMargin: 30 * scaleRatio
font.pixelSize: parent.fontSize font.pixelSize: parent.fontSize
onEditingFinished: item.editingFinished() onEditingFinished: item.editingFinished()
onAccepted: item.accepted(); onAccepted: item.accepted();

18
components/MenuButton.qml
View File

@@ -42,7 +42,7 @@ Rectangle {
var offset = 0 var offset = 0
var item = button var item = button
while (item.under) { while (item.under) {
offset += 20 offset += 20 * scaleRatio
item = item.under item = item.under
} }
return offset return offset
@@ -50,7 +50,7 @@ Rectangle {
color: checked ? "#FFFFFF" : "#1C1C1C" color: checked ? "#FFFFFF" : "#1C1C1C"
property bool present: !under || under.checked || checked || under.numSelectedChildren > 0 property bool present: !under || under.checked || checked || under.numSelectedChildren > 0
height: present ? ((appWindow.height >= 800) ? 64 : 52) : 0 height: present ? ((appWindow.height >= 800) ? 64 * scaleRatio : 52 * scaleRatio ) : 0
transform: Scale { transform: Scale {
yScale: button.present ? 1 : 0 yScale: button.present ? 1 : 0
@@ -76,18 +76,18 @@ Rectangle {
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: parent.getOffset() anchors.leftMargin: parent.getOffset()
width: 50 width: 50 * scaleRatio
Rectangle { Rectangle {
id: dot id: dot
anchors.centerIn: parent anchors.centerIn: parent
width: 16 width: 16 * scaleRatio
height: width height: width
radius: height / 2 radius: height / 2
Rectangle { Rectangle {
anchors.centerIn: parent anchors.centerIn: parent
width: 12 width: 12 * scaleRatio
height: width height: width
radius: height / 2 radius: height / 2
color: "#1C1C1C" color: "#1C1C1C"
@@ -98,7 +98,7 @@ Rectangle {
Text { Text {
id: symbolText id: symbolText
anchors.centerIn: parent anchors.centerIn: parent
font.pixelSize: 11 font.pixelSize: 11 * scaleRatio
font.bold: true font.bold: true
color: button.checked || buttonArea.containsMouse ? "#FFFFFF" : dot.color color: button.checked || buttonArea.containsMouse ? "#FFFFFF" : dot.color
visible: appWindow.ctrlPressed visible: appWindow.ctrlPressed
@@ -117,7 +117,7 @@ Rectangle {
Image { Image {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 20 anchors.rightMargin: 20 * scaleRatio
anchors.leftMargin: parent.getOffset() anchors.leftMargin: parent.getOffset()
source: "../images/menuIndicator.png" source: "../images/menuIndicator.png"
} }
@@ -126,9 +126,9 @@ Rectangle {
id: label id: label
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: parent.getOffset() + 50 anchors.leftMargin: parent.getOffset() + 50 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18 * scaleRatio
color: parent.checked ? "#000000" : "#FFFFFF" color: parent.checked ? "#000000" : "#FFFFFF"
} }

42
components/MobileHeader.qml
View File

@@ -10,17 +10,16 @@ Rectangle {
anchors.leftMargin: 1 anchors.leftMargin: 1
anchors.rightMargin: 1 anchors.rightMargin: 1
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 64 Layout.preferredHeight: 64 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
// visible: basicMode
Image { Image {
id: logo id: logo
visible: appWindow.width > 460 visible: appWindow.width > 460 * scaleRatio
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.verticalCenterOffset: -5 anchors.verticalCenterOffset: -5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: appWindow.persistentSettings.customDecorations ? 20 : 40 anchors.leftMargin: 50 * scaleRatio
source: "../images/moneroLogo2.png" source: "../images/moneroLogo2.png"
} }
@@ -28,9 +27,8 @@ Rectangle {
id: icon id: icon
visible: !logo.visible visible: !logo.visible
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
// anchors.verticalCenterOffset: -5
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: appWindow.persistentSettings.customDecorations ? 20 : 40 anchors.leftMargin: 40 * scaleRatio
source: "../images/moneroIcon.png" source: "../images/moneroIcon.png"
} }
@@ -38,16 +36,16 @@ Rectangle {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.top: parent.top anchors.top: parent.top
anchors.right: parent.right anchors.right: parent.right
anchors.topMargin: 10 anchors.topMargin: 10 * scaleRatio
width: 256 width: 256 * scaleRatio
columns: 3 columns: 3
Text { Text {
id: balanceLabel id: balanceLabel
width: 116 width: 116 * scaleRatio
height: 20 height: 20 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
font.letterSpacing: -1 font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@@ -58,10 +56,10 @@ Rectangle {
Text { Text {
id: balanceText id: balanceText
width: 110 width: 110 * scaleRatio
height: 20 height: 20 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 18 font.pixelSize: 18 * scaleRatio
font.letterSpacing: -1 font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@@ -71,8 +69,8 @@ Rectangle {
} }
Item { Item {
height: 20 height: 20 * scaleRatio
width: 20 width: 20 * scaleRatio
Image { Image {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@@ -82,10 +80,10 @@ Rectangle {
} }
Text { Text {
width: 116 width: 116 * scaleRatio
height: 20 height: 20 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
font.letterSpacing: -1 font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@@ -96,10 +94,10 @@ Rectangle {
Text { Text {
id: availableBalanceText id: availableBalanceText
width: 110 width: 110 * scaleRatio
height: 20 height: 20 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 14 font.pixelSize: 14 * scaleRatio
font.letterSpacing: -1 font.letterSpacing: -1
elide: Text.ElideRight elide: Text.ElideRight
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft

63
components/NetworkStatusItem.qml
View File

@@ -60,37 +60,44 @@ Row {
return qsTr("Invalid connection status") return qsTr("Invalid connection status")
} }
Item {
id: iconItem
anchors.bottom: parent.bottom
width: 50
height: 50
Image { color: "#1C1C1C"
anchors.centerIn: parent Row {
source: getConnectionStatusImage(item.connected) height: 60 * scaleRatio
Item {
id: iconItem
anchors.bottom: parent.bottom
width: 50 * scaleRatio
height: 50 * scaleRatio
Image {
anchors.centerIn: parent
source: getConnectionStatusImage(item.connected)
}
}
Column {
anchors.bottom: parent.bottom
height: 53 * scaleRatio
spacing: 3 * scaleRatio
Text {
anchors.left: parent.left
font.family: "Arial"
font.pixelSize: 12 * scaleRatio
color: "#545454"
text: qsTr("Network status") + translationManager.emptyString
}
Text {
anchors.left: parent.left
font.family: "Arial"
font.pixelSize: 18 * scaleRatio
color: getConnectionStatusColor(item.connected)
text: getConnectionStatusString(item.connected) + translationManager.emptyString
}
} }
} }
Column {
anchors.bottom: parent.bottom
height: 53
spacing: 3
Text {
anchors.left: parent.left
font.family: "Arial"
font.pixelSize: 12
color: "#545454"
text: qsTr("Network status") + translationManager.emptyString
}
Text {
anchors.left: parent.left
font.family: "Arial"
font.pixelSize: 18
color: getConnectionStatusColor(item.connected)
text: getConnectionStatusString(item.connected) + translationManager.emptyString
}
}
} }

18
components/PasswordDialog.qml
View File

@@ -53,8 +53,8 @@ Window {
} }
// TODO: implement without hardcoding sizes // TODO: implement without hardcoding sizes
width: 480 // width: isMobile ? screenWidth : 480
height: walletName ? 240 : 200 // height: isMobile ? screenHeight - mobileHeader.height : walletName ? 240 : 200
// Make window draggable // Make window draggable
MouseArea { MouseArea {
@@ -68,7 +68,7 @@ Window {
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
spacing: 10 spacing: 10
anchors { fill: parent; margins: 35 } anchors { fill: parent; margins: 35 * scaleRatio }
ColumnLayout { ColumnLayout {
id: column id: column
@@ -81,20 +81,20 @@ Window {
Layout.columnSpan: 2 Layout.columnSpan: 2
Layout.fillWidth: true Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: 24 font.pixelSize: 24 * scaleRatio
font.family: "Arial" font.family: "Arial"
color: "#555555" color: "#555555"
} }
TextField { TextField {
id : passwordInput id : passwordInput
focus: true
Layout.fillWidth: true Layout.fillWidth: true
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
Layout.maximumWidth: 400 * scaleRatio
horizontalAlignment: TextInput.AlignHCenter horizontalAlignment: TextInput.AlignHCenter
verticalAlignment: TextInput.AlignVCenter verticalAlignment: TextInput.AlignVCenter
font.family: "Arial" font.family: "Arial"
font.pixelSize: 32 font.pixelSize: 32 * scaleRatio
echoMode: TextInput.Password echoMode: TextInput.Password
KeyNavigation.tab: okButton KeyNavigation.tab: okButton
@@ -142,13 +142,11 @@ Window {
// Ok/Cancel buttons // Ok/Cancel buttons
RowLayout { RowLayout {
id: buttons id: buttons
spacing: 60 spacing: 60 * scaleRatio
Layout.alignment: Qt.AlignHCenter Layout.alignment: Qt.AlignHCenter
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: cancelButton id: cancelButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
@@ -162,8 +160,6 @@ Window {
} }
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: okButton id: okButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"

12
components/ProcessingSplash.qml
View File

@@ -38,8 +38,8 @@ Window {
property alias messageText: messageTitle.text property alias messageText: messageTitle.text
property alias heightProgressText : heightProgress.text property alias heightProgressText : heightProgress.text
width: 200 width: 200 * scaleRatio
height: 100 height: 100 * scaleRatio
opacity: 0.7 opacity: 0.7
ColumnLayout { ColumnLayout {
@@ -49,8 +49,8 @@ Window {
anchors.right: parent.right anchors.right: parent.right
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.leftMargin: 30 anchors.leftMargin: 30 * scaleRatio
anchors.rightMargin: 30 anchors.rightMargin: 30 * scaleRatio
BusyIndicator { BusyIndicator {
running: parent.visible running: parent.visible
@@ -61,7 +61,7 @@ Window {
id: messageTitle id: messageTitle
text: "Please wait..." text: "Please wait..."
font { font {
pixelSize: 22 pixelSize: 22 * scaleRatio
} }
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
@@ -72,7 +72,7 @@ Window {
Text { Text {
id: heightProgress id: heightProgress
font { font {
pixelSize: 18 pixelSize: 18 * scaleRatio
} }
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter

6
components/StandardButton.qml
View File

@@ -31,19 +31,19 @@ import QtQuick.Layouts 1.1
Item { Item {
id: button id: button
height: 37 height: 37 * scaleRatio
property string shadowPressedColor property string shadowPressedColor
property string shadowReleasedColor property string shadowReleasedColor
property string pressedColor property string pressedColor
property string releasedColor property string releasedColor
property string icon: "" property string icon: ""
property string textColor: "#FFFFFF" property string textColor: "#FFFFFF"
property int fontSize: 12 property int fontSize: 12 * scaleRatio
property alias text: label.text property alias text: label.text
signal clicked() signal clicked()
// Dynamic label width // Dynamic label width
Layout.minimumWidth: (label.contentWidth > 80)? label.contentWidth + 20 : 100 Layout.minimumWidth: (label.contentWidth + 10 * scaleRatio) // (label.contentWidth > 80)? label.contentWidth + 20 : 100
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left

12
components/StandardDialog.qml
View File

@@ -68,8 +68,8 @@ Window {
} }
// TODO: implement without hardcoding sizes // TODO: implement without hardcoding sizes
width: 480 width: isMobile ? screenWidth : 480
height: 280 height: isMobile ? screenHeight : 280
ColumnLayout { ColumnLayout {
id: mainLayout id: mainLayout
@@ -84,7 +84,7 @@ Window {
Label { Label {
id: dialogTitle id: dialogTitle
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
font.pixelSize: 32 font.pixelSize: 32 * scaleRatio
font.family: "Arial" font.family: "Arial"
color: "#555555" color: "#555555"
} }
@@ -99,7 +99,7 @@ Window {
font.family: "Arial" font.family: "Arial"
textFormat: TextEdit.AutoText textFormat: TextEdit.AutoText
readOnly: true readOnly: true
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
} }
} }
@@ -111,8 +111,6 @@ Window {
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: cancelButton id: cancelButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"
@@ -126,8 +124,6 @@ Window {
MoneroComponents.StandardButton { MoneroComponents.StandardButton {
id: okButton id: okButton
width: 120
fontSize: 14
shadowReleasedColor: "#FF4304" shadowReleasedColor: "#FF4304"
shadowPressedColor: "#B32D00" shadowPressedColor: "#B32D00"
releasedColor: "#FF6C3C" releasedColor: "#FF6C3C"

46
components/StandardDropdown.qml
View File

@@ -38,7 +38,7 @@ Item {
property string textColor: "#FFFFFF" property string textColor: "#FFFFFF"
property alias currentIndex: column.currentIndex property alias currentIndex: column.currentIndex
property bool expanded: false property bool expanded: false
height: 37 height: 37 * scaleRatio
onExpandedChanged: if(expanded) appWindow.currentItem = dropdown onExpandedChanged: if(expanded) appWindow.currentItem = dropdown
function hide() { dropdown.expanded = false } function hide() { dropdown.expanded = false }
@@ -59,7 +59,7 @@ Item {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
height: 37 height: 37 * scaleRatio
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
@@ -82,8 +82,8 @@ Item {
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: 3 height: 3 * scaleRatio
width: 3 width: 3 * scaleRatio
color: dropdown.pressedColor color: dropdown.pressedColor
visible: dropdown.expanded || droplist.height > 0 visible: dropdown.expanded || droplist.height > 0
} }
@@ -91,8 +91,8 @@ Item {
Rectangle { Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
height: 3 height: 3 * scaleRatio
width: 3 width: 3 * scaleRatio
color: dropdown.pressedColor color: dropdown.pressedColor
visible: dropdown.expanded || droplist.height > 0 visible: dropdown.expanded || droplist.height > 0
} }
@@ -101,11 +101,11 @@ Item {
id: firstColText id: firstColText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 12 anchors.leftMargin: 12 * scaleRatio
elide: Text.ElideRight elide: Text.ElideRight
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
text: column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : "" text: column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column1) + translationManager.emptyString : ""
} }
@@ -114,10 +114,10 @@ Item {
id: secondColText id: secondColText
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: separator.left anchors.right: separator.left
anchors.rightMargin: 12 anchors.rightMargin: 12 * scaleRatio
width: dropdown.expanded ? w : (separator.x - 12) - (firstColText.x + firstColText.width + 5) width: dropdown.expanded ? w : (separator.x - 12) - (firstColText.x + firstColText.width + 5)
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
text: column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column2) + translationManager.emptyString : "" text: column.currentIndex < repeater.model.rowCount() ? qsTr(repeater.model.get(column.currentIndex).column2) + translationManager.emptyString : ""
@@ -129,7 +129,7 @@ Item {
id: separator id: separator
anchors.right: dropIndicator.left anchors.right: dropIndicator.left
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
height: 18 height: 18 * scaleRatio
width: 1 width: 1
color: "#FFFFFF" color: "#FFFFFF"
} }
@@ -139,12 +139,12 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
anchors.right: parent.right anchors.right: parent.right
width: 32 width: 32 * scaleRatio
Image { Image {
anchors.centerIn: parent anchors.centerIn: parent
source: "../images/whiteDropIndicator.png" source: "../images/whiteDropIndicator.png"
rotation: dropdown.expanded ? 180 : 0 rotation: dropdown.expanded ? 180 * scaleRatio : 0
} }
} }
@@ -168,14 +168,14 @@ Item {
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
width: 3; height: 3 width: 3 * scaleRatio; height: 3 * scaleRatio
color: dropdown.pressedColor color: dropdown.pressedColor
} }
Rectangle { Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
width: 3; height: 3 width: 3 * scaleRatio; height: 3 * scaleRatio
color: dropdown.pressedColor color: dropdown.pressedColor
} }
@@ -209,7 +209,7 @@ Item {
delegate: Rectangle { delegate: Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
height: 30 height: 30 * scaleRatio
//radius: index === repeater.count - 1 ? 4 : 0 //radius: index === repeater.count - 1 ? 4 : 0
color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? dropdown.releasedColor : dropdown.pressedColor
@@ -217,11 +217,11 @@ Item {
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.right: col2Text.left anchors.right: col2Text.left
anchors.leftMargin: 12 anchors.leftMargin: 12 * scaleRatio
anchors.rightMargin: column2.length > 0 ? 12 : 0 anchors.rightMargin: column2.length > 0 ? 12 * scaleRatio: 0
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
text: qsTr(column1) + translationManager.emptyString text: qsTr(column1) + translationManager.emptyString
} }
@@ -230,9 +230,9 @@ Item {
id: col2Text id: col2Text
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 45 anchors.rightMargin: 45 * scaleRatio
font.family: "Arial" font.family: "Arial"
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
color: "#FFFFFF" color: "#FFFFFF"
text: column2 text: column2
} }
@@ -240,14 +240,14 @@ Item {
Rectangle { Rectangle {
anchors.left: parent.left anchors.left: parent.left
anchors.top: parent.top anchors.top: parent.top
width: 3; height: 3 width: 3 * scaleRatio; height: 3 * scaleRatio
color: parent.color color: parent.color
} }
Rectangle { Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.top: parent.top anchors.top: parent.top
width: 3; height: 3 width: 3 * scaleRatio; height: 3 * scaleRatio
color: parent.color color: parent.color
} }

2
components/TickDelegate.qml
View File

@@ -49,7 +49,7 @@ Item {
anchors.bottomMargin: 2 anchors.bottomMargin: 2
font.family: "Arial" font.family: "Arial"
font.bold: true font.bold: true
font.pixelSize: 12 font.pixelSize: 12 * scaleRatio
color: "#4A4949" color: "#4A4949"
text: { text: {
if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString if(currentIndex === 0) return qsTr("Normal") + translationManager.emptyString

4
components/TitleBar.qml
View File

@@ -37,7 +37,7 @@ Rectangle {
property alias basicButtonVisible: goToBasicVersionButton.visible property alias basicButtonVisible: goToBasicVersionButton.visible
property bool customDecorations: true property bool customDecorations: true
signal goToBasicVersion(bool yes) signal goToBasicVersion(bool yes)
height: customDecorations ? 30 : 0 height: customDecorations && !isMobile ? 30 : 0
y: -height y: -height
property string title property string title
property alias maximizeButtonVisible: maximizeButton.visible property alias maximizeButtonVisible: maximizeButton.visible
@@ -59,7 +59,7 @@ Rectangle {
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
color: basicMouseArea.containsMouse || !leftPanel.visible ? "#FFE00A" : "#000000" color: basicMouseArea.containsMouse || !leftPanel.visible ? "#FFE00A" : "#000000"
height: 30 height: 30 * scaleRatio
width: height width: height
visible: isMobile visible: isMobile