monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-22 19:49:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #4043

Browse source 
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)
This commit is contained in:
luigi1111 2022-12-01 23:40:39 -06:00
commit 2ade733867
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
5 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
main.qml
View file

@ -1395,7 +1395,7 @@ ApplicationWindow {
property bool historyShowAdvanced: false property bool historyShowAdvanced: false
property bool historyHumanDates: true property bool historyHumanDates: true
property string blockchainDataDir: "" property string blockchainDataDir: ""
property bool useRemoteNode: false property bool useRemoteNode: isAndroid
property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release property string remoteNodeAddress: "" // TODO: drop after v0.17.2.0 release
property string remoteNodesSerialized: JSON.stringify({ property string remoteNodesSerialized: JSON.stringify({
selected: 0, selected: 0,

5
pages/Advanced.qml
View file

@ -52,6 +52,7 @@ ColumnLayout {
active: state == "Mining" active: state == "Mining"
text: qsTr("Mining") + translationManager.emptyString text: qsTr("Mining") + translationManager.emptyString
onSelected: state = "Mining" onSelected: state = "Mining"
visible: !isAndroid
} }
MoneroComponents.NavbarItem { MoneroComponents.NavbarItem {
active: state == "Prove" active: state == "Prove"
@ -81,7 +82,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: panelHeight Layout.preferredHeight: panelHeight
color: "transparent" color: "transparent"
state: "Mining" state: isAndroid ? "Prove" : "Mining"
onCurrentViewChanged: { onCurrentViewChanged: {
if (previousView) { if (previousView) {
@ -120,7 +121,7 @@ ColumnLayout {
StackView { StackView {
id: stackView id: stackView
initialItem: stateView.miningView initialItem: isAndroid ? stateView.prooveView : stateView.miningView
anchors.fill: parent anchors.fill: parent
clip: false // otherwise animation will affect left panel clip: false // otherwise animation will affect left panel

1
pages/settings/Settings.qml
View file

@ -74,6 +74,7 @@ ColumnLayout {
active: settingsStateView.state == "Log" active: settingsStateView.state == "Log"
text: qsTr("Log") + translationManager.emptyString text: qsTr("Log") + translationManager.emptyString
onSelected: settingsStateView.state = "Log" onSelected: settingsStateView.state = "Log"
visible: !isAndroid
} }
MoneroComponents.NavbarItem { MoneroComponents.NavbarItem {
active: settingsStateView.state == "Info" active: settingsStateView.state == "Info"

1
pages/settings/SettingsNode.qml
View file

@ -55,6 +55,7 @@ Rectangle{
Layout.fillWidth: true Layout.fillWidth: true
Layout.preferredHeight: 90 Layout.preferredHeight: 90
color: "transparent" color: "transparent"
visible: !isAndroid
Rectangle { Rectangle {
id: localNodeDivider id: localNodeDivider

2
wizard/WizardModeSelection.qml
View file

@ -41,7 +41,7 @@ Rectangle {
property alias pageHeight: pageRoot.height property alias pageHeight: pageRoot.height
property string viewName: "wizardModeSelection1" property string viewName: "wizardModeSelection1"
property bool portable: persistentSettings.portable 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) { function applyWalletMode(mode, wizardState) {
if (!persistentSettings.setPortable(portable)) { if (!persistentSettings.setPortable(portable)) {