aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorluigi1111 <luigi1111w@gmail.com>2022-12-01 23:40:39 -0600
committerluigi1111 <luigi1111w@gmail.com>2022-12-01 23:40:39 -0600
commit2ade73386751a03b895b155ecb6596de94cf4f16 (patch)
tree889d51623ccb677d3618a79ab849737e4d5619fa
parent1735154b81365985538c9781d09e4a9d3786cc2e (diff)
parent7954661100dddcecbf472d7f470d4b5a57a59f25 (diff)
downloadmonzero-gui-2ade73386751a03b895b155ecb6596de94cf4f16.tar.gz
monzero-gui-2ade73386751a03b895b155ecb6596de94cf4f16.tar.xz
monzero-gui-2ade73386751a03b895b155ecb6596de94cf4f16.zip
Merge pull request #4043
7954661 Android: disable simple mode (malinero) 22a1509 Android: hide local node settings (malinero) 499eeee Android: hide log tab (malinero) 8cf76cf Android: hide mining tab (malinero) 6441d99 Android: useRemoteNode default to true (malinero)
-rw-r--r--main.qml2
-rw-r--r--pages/Advanced.qml5
-rw-r--r--pages/settings/Settings.qml1
-rw-r--r--pages/settings/SettingsNode.qml1
-rw-r--r--wizard/WizardModeSelection.qml2
5 files changed, 7 insertions, 4 deletions
diff --git a/main.qml b/main.qml
index 4be6be06..abf08edb 100644
--- a/main.qml
+++ b/main.qml
@@ -1395,7 +1395,7 @@ ApplicationWindow {
property bool historyShowAdvanced: false
property bool historyHumanDates: true
property string blockchainDataDir: ""
- property bool useRemoteNode: false
+ property bool useRemoteNode: isAndroid
property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release
property string remoteNodesSerialized: JSON.stringify({
selected: 0,
diff --git a/pages/Advanced.qml b/pages/Advanced.qml
index 6aa8ac46..e41390db 100644
--- a/pages/Advanced.qml
+++ b/pages/Advanced.qml
@@ -52,6 +52,7 @@ ColumnLayout {
active: state == "Mining"
text: qsTr("Mining") + translationManager.emptyString
onSelected: state = "Mining"
+ visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: state == "Prove"
@@ -81,7 +82,7 @@ ColumnLayout {
Layout.fillWidth: true
Layout.preferredHeight: panelHeight
color: "transparent"
- state: "Mining"
+ state: isAndroid ? "Prove" : "Mining"
onCurrentViewChanged: {
if (previousView) {
@@ -120,7 +121,7 @@ ColumnLayout {
StackView {
id: stackView
- initialItem: stateView.miningView
+ initialItem: isAndroid ? stateView.prooveView : stateView.miningView
anchors.fill: parent
clip: false // otherwise animation will affect left panel
diff --git a/pages/settings/Settings.qml b/pages/settings/Settings.qml
index fdf03ce6..414b61a1 100644
--- a/pages/settings/Settings.qml
+++ b/pages/settings/Settings.qml
@@ -74,6 +74,7 @@ ColumnLayout {
active: settingsStateView.state == "Log"
text: qsTr("Log") + translationManager.emptyString
onSelected: settingsStateView.state = "Log"
+ visible: !isAndroid
}
MoneroComponents.NavbarItem {
active: settingsStateView.state == "Info"
diff --git a/pages/settings/SettingsNode.qml b/pages/settings/SettingsNode.qml
index ab3d49f1..e0ae009a 100644
--- a/pages/settings/SettingsNode.qml
+++ b/pages/settings/SettingsNode.qml
@@ -55,6 +55,7 @@ Rectangle{
Layout.fillWidth: true
Layout.preferredHeight: 90
color: "transparent"
+ visible: !isAndroid
Rectangle {
id: localNodeDivider
diff --git a/wizard/WizardModeSelection.qml b/wizard/WizardModeSelection.qml
index 5411735c..eb6b36d4 100644
--- a/wizard/WizardModeSelection.qml
+++ b/wizard/WizardModeSelection.qml
@@ -41,7 +41,7 @@ Rectangle {
property alias pageHeight: pageRoot.height
property string viewName: "wizardModeSelection1"
property bool portable: persistentSettings.portable
- property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0
+ property bool simpleModeAvailable: !isTails && appWindow.persistentSettings.nettype == 0 && !isAndroid
function applyWalletMode(mode, wizardState) {
if (!persistentSettings.setPortable(portable)) {