forked from Public/monero-gui
Merge pull request #4043
7954661Android: disable simple mode (malinero)22a1509Android: hide local node settings (malinero)499eeeeAndroid: hide log tab (malinero)8cf76cfAndroid: hide mining tab (malinero)6441d99Android: useRemoteNode default to true (malinero)
This commit is contained in:
2
main.qml
2
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,
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
|
||||
@@ -55,6 +55,7 @@ Rectangle{
|
||||
Layout.fillWidth: true
|
||||
Layout.preferredHeight: 90
|
||||
color: "transparent"
|
||||
visible: !isAndroid
|
||||
|
||||
Rectangle {
|
||||
id: localNodeDivider
|
||||
|
||||
@@ -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)) {
|
||||
|
||||
Reference in New Issue
Block a user