aboutsummaryrefslogtreecommitdiff
path: root/pages
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2019-09-06 00:11:12 +0200
committerselsta <selsta@sent.at>2019-09-06 00:11:12 +0200
commit8dab0755d325f338c81c8eb8ab1f0f0156cf86b1 (patch)
treee2056793c43afee57ca5209ab080aec5bac5b9be /pages
parenta267712d100a9c514dd7de451356fe115b2090a9 (diff)
downloadmonzero-gui-8dab0755d325f338c81c8eb8ab1f0f0156cf86b1.tar.gz
monzero-gui-8dab0755d325f338c81c8eb8ab1f0f0156cf86b1.tar.xz
monzero-gui-8dab0755d325f338c81c8eb8ab1f0f0156cf86b1.zip
repo: remove isMobile leftovers
Diffstat (limited to 'pages')
-rw-r--r--pages/Account.qml2
-rw-r--r--pages/AddressBook.qml2
-rw-r--r--pages/Keys.qml2
-rw-r--r--pages/Mining.qml2
-rw-r--r--pages/Receive.qml2
-rw-r--r--pages/SharedRingDB.qml8
-rw-r--r--pages/Sign.qml2
-rw-r--r--pages/Transfer.qml8
-rw-r--r--pages/TxKey.qml2
-rw-r--r--pages/merchant/MerchantTitlebar.qml2
-rw-r--r--pages/settings/Navbar.qml4
-rw-r--r--pages/settings/SettingsInfo.qml2
-rw-r--r--pages/settings/SettingsLayout.qml14
-rw-r--r--pages/settings/SettingsLog.qml2
-rw-r--r--pages/settings/SettingsNode.qml10
-rw-r--r--pages/settings/SettingsWallet.qml2
16 files changed, 26 insertions, 40 deletions
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 82557134..b5bb95a6 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
@@ -276,7 +276,7 @@ Rectangle{
spacing: 20
Layout.fillWidth: true
Layout.topMargin: 20
- visible: !isMobile && persistentSettings.useRemoteNode
+ visible: persistentSettings.useRemoteNode
MoneroComponents.WarningBox {
Layout.topMargin: 26
@@ -308,7 +308,7 @@ Rectangle{
}
GridLayout {
- columns: (isMobile) ? 1 : 2
+ columns: 2
columnSpacing: 32
MoneroComponents.LineEdit {
@@ -368,7 +368,7 @@ Rectangle{
id: localNodeLayout
spacing: 20
Layout.topMargin: 40
- visible: !isMobile && !persistentSettings.useRemoteNode
+ visible: !persistentSettings.useRemoteNode
MoneroComponents.StandardButton {
small: true
@@ -427,7 +427,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