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

repo: remove isMobile leftovers

Browse Source
This commit is contained in:
selsta
2019-09-06 00:11:12 +02:00
parent a267712d10
commit 8dab0755d3
31 changed files with 48 additions and 360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pages/Account.qml
View File

@@ -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

2
pages/AddressBook.qml
View File

@@ -52,7 +52,7 @@ Rectangle {
ColumnLayout {
id: mainLayout
anchors.margins: (isMobile)? 17 : 20
anchors.margins: 20
anchors.topMargin: 40
anchors.left: parent.left

2
pages/Keys.qml
View File

@@ -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

2
pages/Mining.qml
View File

@@ -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

2
pages/Receive.qml
View File

@@ -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

8
pages/SharedRingDB.qml
View File

@@ -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 {

2
pages/Sign.qml
View File

@@ -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

8
pages/Transfer.qml
View File

@@ -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

2
pages/TxKey.qml
View File

@@ -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

2
pages/merchant/MerchantTitlebar.qml
View File

@@ -44,7 +44,7 @@ Rectangle {
property bool showCloseButton: true
height: {
if(!persistentSettings.customDecorations || isMobile) return 0;
if(!persistentSettings.customDecorations) return 0;
return 50;
}

4
pages/settings/Navbar.qml
View File

@@ -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;

2
pages/settings/SettingsInfo.qml
View File

@@ -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

14
pages/settings/SettingsLayout.qml
View File

@@ -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 {

2
pages/settings/SettingsLog.qml
View File

@@ -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

10
pages/settings/SettingsNode.qml
View File

@@ -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

2
pages/settings/SettingsWallet.qml
View File

@@ -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