diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/CheckBox.qml | 2 | ||||
| -rw-r--r-- | components/MobileHeader.qml | 118 | ||||
| -rw-r--r-- | components/RadioButton.qml | 2 | ||||
| -rw-r--r-- | components/RemoteNodeEdit.qml | 2 | ||||
| -rw-r--r-- | components/StandardDialog.qml | 12 | ||||
| -rw-r--r-- | components/TitleBar.qml | 2 |
6 files changed, 9 insertions, 129 deletions
diff --git a/components/CheckBox.qml b/components/CheckBox.qml index d871c649..1fec83ea 100644 --- a/components/CheckBox.qml +++ b/components/CheckBox.qml @@ -58,7 +58,7 @@ Item { RowLayout { id: checkBoxLayout layoutDirection: iconOnTheLeft ? Qt.LeftToRight : Qt.RightToLeft - spacing: (!isMobile ? 10 : 8) + spacing: 10 Item { id: checkMark diff --git a/components/MobileHeader.qml b/components/MobileHeader.qml deleted file mode 100644 index abf5580e..00000000 --- a/components/MobileHeader.qml +++ /dev/null @@ -1,118 +0,0 @@ -import QtQuick 2.9 -import QtGraphicalEffects 1.0 -import QtQuick.Layouts 1.1 - -import moneroComponents.Wallet 1.0 -import "../components" as MoneroComponents - -// BasicPanel header -Rectangle { - id: header - anchors.leftMargin: 1 - anchors.rightMargin: 1 - Layout.fillWidth: true - Layout.preferredHeight: 64 - color: "#FFFFFF" - - Image { - id: logo - visible: appWindow.width > 460 - anchors.verticalCenter: parent.verticalCenter - anchors.verticalCenterOffset: -5 - anchors.left: parent.left - anchors.leftMargin: 50 - source: "qrc:///images/moneroLogo2.png" - } - - Image { - id: icon - visible: !logo.visible - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - anchors.leftMargin: 40 - source: "qrc:///images/moneroIcon.png" - } - - Grid { - anchors.verticalCenter: parent.verticalCenter - anchors.top: parent.top - anchors.right: parent.right - anchors.topMargin: 10 - width: 256 - columns: 3 - - MoneroComponents.TextPlain { - id: balanceLabel - width: 116 - height: 20 - font.family: "Arial" - font.pixelSize: 12 - font.letterSpacing: -1 - elide: Text.ElideRight - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignBottom - color: "#535353" - text: leftPanel.balanceLabelText + ":" - } - - MoneroComponents.TextPlain { - id: balanceText - width: 110 - height: 20 - font.family: "Arial" - font.pixelSize: 18 - font.letterSpacing: -1 - elide: Text.ElideRight - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignBottom - color: "#000000" - text: leftPanel.balanceText - } - - Item { - height: 20 - width: 20 - - Image { - anchors.verticalCenter: parent.verticalCenter - anchors.left: parent.left - source: "qrc:///images/lockIcon.png" - } - } - - MoneroComponents.TextPlain { - width: 116 - height: 20 - font.family: "Arial" - font.pixelSize: 12 - font.letterSpacing: -1 - elide: Text.ElideRight - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignBottom - color: "#535353" - text: qsTr("Unlocked Balance:") - } - - MoneroComponents.TextPlain { - id: availableBalanceText - width: 110 - height: 20 - font.family: "Arial" - font.pixelSize: 14 - font.letterSpacing: -1 - elide: Text.ElideRight - horizontalAlignment: Text.AlignLeft - verticalAlignment: Text.AlignBottom - color: "#000000" - text: leftPanel.unlockedBalanceText - } - } - - Rectangle { - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - height: 1 - color: "#DBDBDB" - } -} diff --git a/components/RadioButton.qml b/components/RadioButton.qml index b0f21ca0..02cf2b83 100644 --- a/components/RadioButton.qml +++ b/components/RadioButton.qml @@ -74,7 +74,7 @@ Item { MoneroComponents.TextPlain { id: label - Layout.leftMargin: (!isMobile ? 10 : 8) + Layout.leftMargin: 10 color: MoneroComponents.Style.defaultFontColor font.family: MoneroComponents.Style.fontRegular.name font.pixelSize: radioButton.fontSize diff --git a/components/RemoteNodeEdit.qml b/components/RemoteNodeEdit.qml index b575df3b..e6076823 100644 --- a/components/RemoteNodeEdit.qml +++ b/components/RemoteNodeEdit.qml @@ -35,7 +35,7 @@ import "../js/Utils.js" as Utils import "../components" as MoneroComponents GridLayout { - columns: (isMobile) ? 1 : 2 + columns: 2 columnSpacing: 32 id: root property alias daemonAddrText: daemonAddr.text diff --git a/components/StandardDialog.qml b/components/StandardDialog.qml index 338d6767..cf6ed30e 100644 --- a/components/StandardDialog.qml +++ b/components/StandardDialog.qml @@ -82,10 +82,8 @@ Rectangle { function open() { // Center - if(!isMobile) { - root.x = parent.width/2 - root.width/2 - root.y = 100 - } + root.x = parent.width/2 - root.width/2 + root.y = 100 root.z = 11 root.visible = true; } @@ -96,14 +94,14 @@ Rectangle { } // TODO: implement without hardcoding sizes - width: isMobile ? screenWidth : 520 - height: isMobile ? screenHeight : 380 + width: 520 + height: 380 ColumnLayout { id: mainLayout spacing: 10 anchors.fill: parent - anchors.margins: (isMobile? 17 : 20) + anchors.margins: 20 RowLayout { id: column diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 272a3b88..55a2a86c 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -45,7 +45,7 @@ Rectangle { property bool showCloseButton: true height: { - if(!persistentSettings.customDecorations || isMobile) return 0; + if(!persistentSettings.customDecorations) return 0; return 50; } |