From 7aff9e6af0fd6858f6f2ccb3f929e1658b0ae451 Mon Sep 17 00:00:00 2001 From: cryptochangements34 Date: Mon, 3 Jun 2019 17:32:38 -0400 Subject: [PATCH] remove Seed & Keys subtab in left panel --- LeftPanel.qml | 26 -------------------------- main.qml | 3 --- pages/Keys.qml | 10 ++++++++++ 3 files changed, 10 insertions(+), 29 deletions(-) diff --git a/LeftPanel.qml b/LeftPanel.qml index 82d5b76d..e8e06805 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -65,7 +65,6 @@ Rectangle { signal addressBookClicked() signal miningClicked() signal signClicked() - signal keysClicked() signal merchantClicked() signal accountClicked() @@ -82,7 +81,6 @@ Rectangle { else if(pos === "Sign") menuColumn.previousButton = signButton else if(pos === "Settings") menuColumn.previousButton = settingsButton else if(pos === "Advanced") menuColumn.previousButton = advancedButton - else if(pos === "Keys") menuColumn.previousButton = keysButton else if(pos === "Account") menuColumn.previousButton = accountButton menuColumn.previousButton.checked = true } @@ -727,30 +725,6 @@ Rectangle { anchors.leftMargin: 16 } - // ------------- Sign/verify tab --------------- - MoneroComponents.MenuButton { - id: keysButton - visible: appWindow.walletMode >= 2 - anchors.left: parent.left - anchors.right: parent.right - text: qsTr("Seed & Keys") + translationManager.emptyString - symbol: qsTr("Y") + translationManager.emptyString - dotColor: "#FFD781" - under: settingsButton - onClicked: { - parent.previousButton.checked = false - parent.previousButton = keysButton - panel.keysClicked() - } - } - - MoneroComponents.MenuButtonDivider { - visible: settingsButton.present && settingsButton.checked && appWindow.walletMode >= 2 - anchors.left: parent.left - anchors.right: parent.right - anchors.leftMargin: 16 - } - } // Column } // Flickable diff --git a/main.qml b/main.qml index 5f3d5086..e31efd05 100644 --- a/main.qml +++ b/main.qml @@ -157,7 +157,6 @@ ApplicationWindow { else if(seq === "Ctrl+I") middlePanel.state = "Sign" else if(seq === "Ctrl+G") middlePanel.state = "SharedRingDB" else if(seq === "Ctrl+E") middlePanel.state = "Settings" - else if(seq === "Ctrl+Y") leftPanel.keysClicked() else if(seq === "Ctrl+D") middlePanel.state = "Advanced" else if(seq === "Ctrl+T") middlePanel.state = "Account" else if(seq === "Ctrl+Tab" || seq === "Alt+Tab") { @@ -1734,8 +1733,6 @@ ApplicationWindow { } updateBalance(); } - - onKeysClicked: Utils.showSeedPage(); onAccountClicked: { middlePanel.state = "Account"; diff --git a/pages/Keys.qml b/pages/Keys.qml index c74a14a9..073facb2 100644 --- a/pages/Keys.qml +++ b/pages/Keys.qml @@ -216,6 +216,16 @@ Rectangle { text: (viewOnlyQRCode.visible) ? qsTr("View Only Wallet") + translationManager.emptyString : qsTr("Spendable Wallet") + translationManager.emptyString horizontalAlignment: Text.AlignHCenter } + + MoneroComponents.StandardButton { + small: true + text: qsTr("Done") + translationManager.emptyString + onClicked: { + loadPage("Settings") + } + anchors.horizontalCenter: parent.horizontalCenter + width: 135 + } } }