From 7c881d01006bce99e832c7012a323a522080336f Mon Sep 17 00:00:00 2001 From: xiphon Date: Sat, 20 Mar 2021 09:12:15 +0000 Subject: LeftPanel: drop Advanced submenu items, use NavBar instead --- MiddlePanel.qml | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) (limited to 'MiddlePanel.qml') diff --git a/MiddlePanel.qml b/MiddlePanel.qml index 2d850eac..386ec24b 100644 --- a/MiddlePanel.qml +++ b/MiddlePanel.qml @@ -56,12 +56,9 @@ Rectangle { } property Receive receiveView: Receive { } property Merchant merchantView: Merchant { } - property TxKey txkeyView: TxKey { } - property SharedRingDB sharedringdbView: SharedRingDB { } property History historyView: History { } - property Sign signView: Sign { } + property Advanced advancedView: Advanced { } property Settings settingsView: Settings { } - property Mining miningView: Mining { } property AddressBook addressBookView: AddressBook { } property Keys keysView: Keys { } property Account accountView: Account { } @@ -136,30 +133,18 @@ Rectangle { name: "Merchant" PropertyChanges { target: root; currentView: merchantView } PropertyChanges { target: mainFlickable; contentHeight: merchantView.merchantHeight + 80 } - }, State { - name: "TxKey" - PropertyChanges { target: root; currentView: txkeyView } - PropertyChanges { target: mainFlickable; contentHeight: txkeyView.txkeyHeight + 80 } - }, State { - name: "SharedRingDB" - PropertyChanges { target: root; currentView: sharedringdbView } - PropertyChanges { target: mainFlickable; contentHeight: sharedringdbView.panelHeight + 80 } }, State { name: "AddressBook" PropertyChanges { target: root; currentView: addressBookView } PropertyChanges { target: mainFlickable; contentHeight: addressBookView.addressbookHeight + 80 } }, State { - name: "Sign" - PropertyChanges { target: root; currentView: signView } - PropertyChanges { target: mainFlickable; contentHeight: signView.signHeight + 80 } + name: "Advanced" + PropertyChanges { target: root; currentView: advancedView } + PropertyChanges { target: mainFlickable; contentHeight: advancedView.panelHeight } }, State { name: "Settings" PropertyChanges { target: root; currentView: settingsView } PropertyChanges { target: mainFlickable; contentHeight: settingsView.settingsHeight } - }, State { - name: "Mining" - PropertyChanges { target: root; currentView: miningView } - PropertyChanges { target: mainFlickable; contentHeight: miningView.miningHeight + 80 } }, State { name: "Keys" PropertyChanges { target: root; currentView: keysView } @@ -168,7 +153,7 @@ Rectangle { name: "Account" PropertyChanges { target: root; currentView: accountView } PropertyChanges { target: mainFlickable; contentHeight: accountView.accountHeight + 80 } - } + } ] ColumnLayout { -- cgit v1.2.3