diff --git a/LeftPanel.qml b/LeftPanel.qml
index a1c31e4c..3c55ba5e 100644
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -84,7 +84,7 @@ Rectangle {
menuColumn.previousButton.checked = true
}
- width: (isMobile)? appWindow.width : 300
+ width: 300
color: "transparent"
anchors.bottom: parent.bottom
anchors.top: parent.top
@@ -390,7 +390,6 @@ Rectangle {
}
MoneroComponents.Label {
- visible: !isMobile
id: balanceLabel
text: qsTr("Balance") + translationManager.emptyString
color: "white"
@@ -418,7 +417,7 @@ Rectangle {
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: parent.bottom
- anchors.top: (isMobile)? parent.top : column1.bottom
+ anchors.top: column1.bottom
color: "transparent"
Flickable {
diff --git a/MiddlePanel.qml b/MiddlePanel.qml
index a689731e..59ea2296 100644
--- a/MiddlePanel.qml
+++ b/MiddlePanel.qml
@@ -46,7 +46,6 @@ Rectangle {
property Item currentView
property Item previousView
- property bool basicMode : isMobile
property string balanceLabelText: qsTr("Balance") + translationManager.emptyString
property string balanceText
property string unlockedBalanceLabelText: qsTr("Unlocked Balance") + translationManager.emptyString
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 fe4195bf..034d242a 100644
--- a/components/TitleBar.qml
+++ b/components/TitleBar.qml
@@ -46,7 +46,7 @@ Rectangle {
property string walletName: ""
height: {
- if(!persistentSettings.customDecorations || isMobile) return 0;
+ if(!persistentSettings.customDecorations) return 0;
return 50;
}
diff --git a/js/Utils.js b/js/Utils.js
index 96786650..ab2179c8 100644
--- a/js/Utils.js
+++ b/js/Utils.js
@@ -46,7 +46,6 @@ function showSeedPage() {
leftPanel.selectItem(middlePanel.state);
}
passwordDialog.open();
- if(isMobile) hideMenu();
updateBalance();
}
diff --git a/js/Wizard.js b/js/Wizard.js
index 8bdc4616..a41864d4 100644
--- a/js/Wizard.js
+++ b/js/Wizard.js
@@ -39,10 +39,8 @@ function switchPage(next) {
console.log("switchpage: currentPage: ", currentPage);
// Update prev/next button positions for mobile/desktop
- prevButton.anchors.verticalCenter = (!isMobile) ? wizard.verticalCenter : undefined
- prevButton.anchors.bottom = (isMobile) ? wizard.bottom : undefined
- nextButton.anchors.verticalCenter = (!isMobile) ? wizard.verticalCenter : undefined
- nextButton.anchors.bottom = (isMobile) ? wizard.bottom : undefined
+ prevButton.anchors.verticalCenter = wizard.verticalCenter
+ nextButton.anchors.verticalCenter = wizard.verticalCenter
if (currentPage > 0 || currentPage < pages.length - 1) {
pages[currentPage].opacity = 0
diff --git a/main.qml b/main.qml
index 3c3c143c..6173b604 100644
--- a/main.qml
+++ b/main.qml
@@ -69,7 +69,6 @@ ApplicationWindow {
property bool foundNewBlock: false
property bool qrScannerEnabled: (typeof builtWithScanner != "undefined") && builtWithScanner
property int blocksToSync: 1
- property var isMobile: (appWindow.width > 700 && !isAndroid) ? false : true
property bool isMining: false
property int walletMode: persistentSettings.walletMode
property var cameraUi
@@ -477,14 +476,14 @@ ApplicationWindow {
leftPanel.networkStatus.connected = status
// update local daemon status.
- if(!isMobile && walletManager.isDaemonLocal(currentDaemonAddress))
+ if(walletManager.isDaemonLocal(currentDaemonAddress))
daemonRunning = status;
// Update fee multiplier dropdown on transfer page
middlePanel.transferView.updatePriorityDropdown();
// If wallet isnt connected, advanced wallet mode and no daemon is running - Ask
- if (!isMobile && appWindow.walletMode >= 2 && walletManager.isDaemonLocal(currentDaemonAddress) && !walletInitialized && status === Wallet.ConnectionStatus_Disconnected) {
+ if (appWindow.walletMode >= 2 && walletManager.isDaemonLocal(currentDaemonAddress) && !walletInitialized && status === Wallet.ConnectionStatus_Disconnected) {
daemonManager.runningAsync(persistentSettings.nettype, function(running) {
if (!running) {
daemonManagerDialog.open();
@@ -1143,16 +1142,6 @@ ApplicationWindow {
});
}
- function hideMenu() {
- goToBasicAnimation.start();
- console.log(appWindow.width)
- }
-
- function showMenu() {
- goToProAnimation.start();
- console.log(appWindow.width)
- }
-
objectName: "appWindow"
visible: true
@@ -1602,149 +1591,87 @@ ApplicationWindow {
PropertyChanges { target: middlePanel; visible: false }
PropertyChanges { target: wizard; visible: true }
PropertyChanges { target: resizeArea; visible: true }
- PropertyChanges { target: mobileHeader; visible: false }
PropertyChanges { target: titleBar; state: "essentials" }
}, State {
name: "normal"
- PropertyChanges { target: leftPanel; visible: (isMobile)? false : true }
+ PropertyChanges { target: leftPanel; visible: true }
PropertyChanges { target: middlePanel; visible: true }
PropertyChanges { target: titleBar; basicButtonVisible: true }
PropertyChanges { target: wizard; visible: false }
PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: titleBar; state: "default" }
- PropertyChanges { target: mobileHeader; visible: isMobile ? true : false }
}
]
- MobileHeader {
- id: mobileHeader
- visible: isMobile
- anchors.left: parent.left
- anchors.right: parent.right
- height: visible? 65 : 0
-
- MouseArea {
- enabled: persistentSettings.customDecorations
- property var previousPosition
- anchors.fill: parent
- propagateComposedEvents: true
- onPressed: previousPosition = globalCursor.getPosition()
- onPositionChanged: {
- if (pressedButtons == Qt.LeftButton) {
- var pos = globalCursor.getPosition()
- var dx = pos.x - previousPosition.x
- var dy = pos.y - previousPosition.y
-
- appWindow.x += dx
- appWindow.y += dy
- previousPosition = pos
- }
- }
- }
- }
-
LeftPanel {
id: leftPanel
- anchors.top: mobileHeader.bottom
+ anchors.top: parent.top
anchors.left: parent.left
anchors.bottom: parent.bottom
onTransferClicked: {
middlePanel.state = "Transfer";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onReceiveClicked: {
middlePanel.state = "Receive";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onMerchantClicked: {
middlePanel.state = "Merchant";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onTxkeyClicked: {
middlePanel.state = "TxKey";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onSharedringdbClicked: {
middlePanel.state = "SharedRingDB";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onHistoryClicked: {
middlePanel.state = "History";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onAddressBookClicked: {
middlePanel.state = "AddressBook";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onMiningClicked: {
middlePanel.state = "Mining";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onSignClicked: {
middlePanel.state = "Sign";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onSettingsClicked: {
middlePanel.state = "Settings";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
onAccountClicked: {
middlePanel.state = "Account";
middlePanel.flickable.contentY = 0;
- if(isMobile) {
- hideMenu();
- }
updateBalance();
}
}
@@ -1752,102 +1679,13 @@ ApplicationWindow {
MiddlePanel {
id: middlePanel
- anchors.top: mobileHeader.bottom
+ anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: leftPanel.visible ? leftPanel.right : parent.left
anchors.right: parent.right
state: "Transfer"
}
- SequentialAnimation {
- id: goToBasicAnimation
-// PropertyAction {
-// target: appWindow
-// properties: "visibility"
-// value: Window.Windowed
-// }
-// PropertyAction {
-// target: titleBar
-// properties: "maximizeButtonVisible"
-// value: false
-// }
-// PropertyAction {
-// target: frameArea
-// properties: "blocked"
-// value: true
-// }
- PropertyAction {
- target: resizeArea
- properties: "visible"
- value: true
- }
-// PropertyAction {
-// target: appWindow
-// properties: "height"
-// value: 30
-// }
-// PropertyAction {
-// target: appWindow
-// properties: "width"
-// value: 326
-// }
- PropertyAction {
- target: leftPanel
- properties: "visible"
- value: false
- }
- PropertyAction {
- target: middlePanel
- properties: "basicMode"
- value: true
- }
-
-// PropertyAction {
-// target: appWindow
-// properties: "height"
-// value: middlePanel.height
-// }
-
- onStopped: {
- // middlePanel.visible = false
- leftPanel.visible = false
- }
- }
-
- SequentialAnimation {
- id: goToProAnimation
-// PropertyAction {
-// target: appWindow
-// properties: "height"
-// value: 30
-// }
- PropertyAction {
- target: middlePanel
- properties: "basicMode"
- value: false
- }
- PropertyAction {
- targets: [leftPanel, middlePanel, resizeArea]
- properties: "visible"
- value: true
- }
-// PropertyAction {
-// target: appWindow
-// properties: "height"
-// value: maxWindowHeight
-// }
-// PropertyAction {
-// target: frameArea
-// properties: "blocked"
-// value: false
-// }
-// PropertyAction {
-// target: titleBar
-// properties: "maximizeButtonVisible"
-// value: true
-// }
- }
-
WizardController {
id: wizard
anchors.fill: parent
@@ -1920,13 +1758,7 @@ ApplicationWindow {
onMaximizeClicked: appWindow.visibility = appWindow.visibility !== Window.Maximized ? Window.Maximized : Window.Windowed
onMinimizeClicked: appWindow.visibility = Window.Minimized
onGoToBasicVersion: {
- if (yes) {
- // basicPanel.currentView = middlePanel.currentView
- goToBasicAnimation.start()
- } else {
- // middlePanel.currentView = basicPanel.currentView
- goToProAnimation.start()
- }
+ //nop
}
}
diff --git a/pages/Account.qml b/pages/Account.qml
index a0cf24ac..dffc2eb8 100644
--- a/pages/Account.qml
+++ b/pages/Account.qml
@@ -64,7 +64,7 @@ Rectangle {
/* main layout */
ColumnLayout {
id: mainLayout
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
index c6c07f03..ce8acfe5 100644
--- a/pages/AddressBook.qml
+++ b/pages/AddressBook.qml
@@ -52,7 +52,7 @@ Rectangle {
ColumnLayout {
id: mainLayout
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
diff --git a/pages/Keys.qml b/pages/Keys.qml
index 3f6dcffd..1af37b2f 100644
--- a/pages/Keys.qml
+++ b/pages/Keys.qml
@@ -52,7 +52,7 @@ Rectangle {
anchors.top: parent.top
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
spacing: 30
diff --git a/pages/Mining.qml b/pages/Mining.qml
index e147f43d..46e18646 100644
--- a/pages/Mining.qml
+++ b/pages/Mining.qml
@@ -41,7 +41,7 @@ Rectangle {
ColumnLayout {
id: mainLayout
Layout.fillWidth: true
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
anchors.top: parent.top
diff --git a/pages/Receive.qml b/pages/Receive.qml
index 223c9078..6d3ee060 100644
--- a/pages/Receive.qml
+++ b/pages/Receive.qml
@@ -66,7 +66,7 @@ Rectangle {
/* main layout */
ColumnLayout {
id: mainLayout
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml
index 48cead73..cca3b137 100644
--- a/pages/SharedRingDB.qml
+++ b/pages/SharedRingDB.qml
@@ -80,7 +80,7 @@ Rectangle {
ColumnLayout {
id: mainLayout
Layout.fillWidth: true
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
@@ -296,7 +296,7 @@ Rectangle {
GridLayout{
Layout.topMargin: 12
- columns: (isMobile) ? 1 : 2
+ columns: 2
columnSpacing: 32
ColumnLayout {
@@ -368,7 +368,7 @@ Rectangle {
GridLayout {
columnSpacing: 20
- columns: (isMobile) ? 1 : 2
+ columns: 2
MoneroComponents.CheckBox {
id: segregatePreForkOutputs
@@ -405,7 +405,7 @@ Rectangle {
id: segregationHeightRow
Layout.fillWidth: true
Layout.topMargin: 17
- columns: (isMobile) ? 1 : 2
+ columns: 2
columnSpacing: 32
MoneroComponents.LineEdit {
diff --git a/pages/Sign.qml b/pages/Sign.qml
index 1df35fe5..b43f01ae 100644
--- a/pages/Sign.qml
+++ b/pages/Sign.qml
@@ -88,7 +88,7 @@ Rectangle {
ColumnLayout {
id: mainLayout
Layout.fillWidth: true
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
diff --git a/pages/Transfer.qml b/pages/Transfer.qml
index 6fa425ed..6b3b3a70 100644
--- a/pages/Transfer.qml
+++ b/pages/Transfer.qml
@@ -123,7 +123,7 @@ Rectangle {
ColumnLayout {
id: pageRoot
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
@@ -144,7 +144,7 @@ Rectangle {
}
GridLayout {
- columns: (isMobile || !(appWindow.walletMode >= 2)) ? 1 : 2
+ columns: appWindow.walletMode < 2 ? 1 : 2
Layout.fillWidth: true
columnSpacing: 32
@@ -443,7 +443,7 @@ Rectangle {
anchors.top: pageRoot.bottom
anchors.left: parent.left
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 32
spacing: 26
enabled: !viewOnly || pageRoot.enabled
@@ -462,7 +462,7 @@ Rectangle {
GridLayout {
visible: persistentSettings.transferShowAdvanced && appWindow.walletMode >= 2
- columns: (isMobile) ? 2 : 6
+ columns: 6
StandardButton {
id: sweepUnmixableButton
diff --git a/pages/TxKey.qml b/pages/TxKey.qml
index 4cb9f8f5..3b204e58 100644
--- a/pages/TxKey.qml
+++ b/pages/TxKey.qml
@@ -45,7 +45,7 @@ Rectangle {
/* main layout */
ColumnLayout {
id: mainLayout
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left
anchors.top: parent.top
diff --git a/pages/merchant/MerchantTitlebar.qml b/pages/merchant/MerchantTitlebar.qml
index 4a6b0472..5f9ebad6 100644
--- a/pages/merchant/MerchantTitlebar.qml
+++ b/pages/merchant/MerchantTitlebar.qml
@@ -44,7 +44,7 @@ Rectangle {
property bool showCloseButton: true
height: {
- if(!persistentSettings.customDecorations || isMobile) return 0;
+ if(!persistentSettings.customDecorations) return 0;
return 50;
}
diff --git a/pages/settings/Navbar.qml b/pages/settings/Navbar.qml
index 4c890a4c..a8817735 100644
--- a/pages/settings/Navbar.qml
+++ b/pages/settings/Navbar.qml
@@ -61,9 +61,7 @@ Rectangle {
property string borderColor: MoneroComponents.Style.blackTheme ? "#808080" : "#B9B9B9"
property int textMargin: {
// left-right margins for a given cell
- if(isMobile){
- return 10;
- } else if(appWindow.width < 890){
+ if(appWindow.width < 890){
return 32;
} else {
return 64;
diff --git a/pages/settings/SettingsInfo.qml b/pages/settings/SettingsInfo.qml
index 80e6a129..c7ca7dc0 100644
--- a/pages/settings/SettingsInfo.qml
+++ b/pages/settings/SettingsInfo.qml
@@ -57,7 +57,7 @@ Rectangle {
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 0
spacing: 30
diff --git a/pages/settings/SettingsLayout.qml b/pages/settings/SettingsLayout.qml
index f4b3d0b6..8dc31f90 100644
--- a/pages/settings/SettingsLayout.qml
+++ b/pages/settings/SettingsLayout.qml
@@ -47,12 +47,11 @@ Rectangle {
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 0
spacing: 6
MoneroComponents.CheckBox {
- visible: !isMobile
id: customDecorationsCheckBox
checked: persistentSettings.customDecorations
onClicked: Windows.setCustomWindowDecorations(checked)
@@ -60,7 +59,6 @@ Rectangle {
}
MoneroComponents.CheckBox {
- visible: !isMobile
id: hideBalanceCheckBox
checked: persistentSettings.hideBalance
onClicked: {
@@ -71,7 +69,6 @@ Rectangle {
}
MoneroComponents.CheckBox {
- visible: !isMobile
id: showPidCheckBox
checked: persistentSettings.showPid
onClicked: {
@@ -91,7 +88,6 @@ Rectangle {
}
MoneroComponents.CheckBox {
- visible: !isMobile
id: userInActivityCheckbox
checked: persistentSettings.lockOnUserInActivity
onClicked: persistentSettings.lockOnUserInActivity = !persistentSettings.lockOnUserInActivity
@@ -267,14 +263,6 @@ Rectangle {
appWindow.toggleLanguageView();
}
}
-
- MoneroComponents.TextBlock {
- visible: isMobile
- font.pixelSize: 14
- textFormat: Text.RichText
- Layout.fillWidth: true
- text: qsTr("No Layout options exist yet in mobile mode.") + translationManager.emptyString;
- }
}
ListModel {
diff --git a/pages/settings/SettingsLog.qml b/pages/settings/SettingsLog.qml
index 1aa564d7..eccd79b6 100644
--- a/pages/settings/SettingsLog.qml
+++ b/pages/settings/SettingsLog.qml
@@ -47,7 +47,7 @@ Rectangle {
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 0
spacing: 10
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index d4d08140..395fa0fc 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -42,7 +42,7 @@ Rectangle{
/* main layout */
ColumnLayout {
id: root
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 0
anchors.left: parent.left
@@ -278,7 +278,7 @@ Rectangle{
spacing: 20
Layout.fillWidth: true
Layout.topMargin: 20
- visible: !isMobile && persistentSettings.useRemoteNode
+ visible: persistentSettings.useRemoteNode
MoneroComponents.WarningBox {
Layout.topMargin: 26
@@ -310,7 +310,7 @@ Rectangle{
}
GridLayout {
- columns: (isMobile) ? 1 : 2
+ columns: 2
columnSpacing: 32
MoneroComponents.LineEdit {
@@ -370,7 +370,7 @@ Rectangle{
id: localNodeLayout
spacing: 20
Layout.topMargin: 40
- visible: !isMobile && !persistentSettings.useRemoteNode
+ visible: !persistentSettings.useRemoteNode
MoneroComponents.StandardButton {
small: true
@@ -429,7 +429,7 @@ Rectangle{
}
RowLayout {
- visible: !isMobile && !persistentSettings.useRemoteNode
+ visible: !persistentSettings.useRemoteNode
ColumnLayout {
Layout.fillWidth: true
diff --git a/pages/settings/SettingsWallet.qml b/pages/settings/SettingsWallet.qml
index ab80fec2..92e2299a 100644
--- a/pages/settings/SettingsWallet.qml
+++ b/pages/settings/SettingsWallet.qml
@@ -45,7 +45,7 @@ Rectangle {
anchors.left: parent.left
anchors.top: parent.top
anchors.right: parent.right
- anchors.margins: (isMobile)? 17 : 20
+ anchors.margins: 20
anchors.topMargin: 0
spacing: 0
diff --git a/qml.qrc b/qml.qrc
index 57d0c818..77179f88 100644
--- a/qml.qrc
+++ b/qml.qrc
@@ -107,7 +107,6 @@
components/DaemonConsole.qml
components/QRCodeScanner.qml
components/Notifier.qml
- components/MobileHeader.qml
components/TextBlock.qml
components/RemoteNodeEdit.qml
pages/Keys.qml
diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
index d1d29a5b..dd6452da 100644
--- a/wizard/WizardController.qml
+++ b/wizard/WizardController.qml
@@ -119,9 +119,7 @@ Rectangle {
property int flickableHeightMargin: 200
property int layoutScale: {
- if(isMobile){
- return 0;
- } else if(appWindow.width < 800){
+ if(appWindow.width < 800){
return 1;
} else {
return 2;
diff --git a/wizard/WizardLang.qml b/wizard/WizardLang.qml
index 162abb5e..b6b173b3 100644
--- a/wizard/WizardLang.qml
+++ b/wizard/WizardLang.qml
@@ -41,9 +41,7 @@ Rectangle {
color: "transparent"
anchors.fill: parent
property int layoutScale: {
- if(isMobile){
- return 0;
- } else if(appWindow.width < 800){
+ if(appWindow.width < 800){
return 1;
} else {
return 2;
diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
index 3d1f96f6..2d6d37b4 100644
--- a/wizard/WizardLanguage.qml
+++ b/wizard/WizardLanguage.qml
@@ -149,7 +149,7 @@ Rectangle {
GridLayout {
id: buttonsGrid
opacity: 0
- columns: isMobile ? 1 : 2
+ columns: 2
Layout.alignment: Qt.AlignCenter
Layout.topMargin: 20
Layout.fillWidth: true