mirror of
https://github.com/monero-project/monero-gui.git
synced 2024-12-22 19:49:34 +00:00
Merge pull request #2133
cb4a9da RightPanel: cleanup from repo (selsta)This commit is contained in:
luigi1111
commit
d0a40b4ca8
4 changed files with 2 additions and 69 deletions
|
|
@ -1,40 +0,0 @@
|
|||
// Copyright (c) 2014-2018, The Monero Project
|
||||
//
|
||||
// All rights reserved.
|
||||
//
|
||||
// Redistribution and use in source and binary forms, with or without modification, are
|
||||
// permitted provided that the following conditions are met:
|
||||
//
|
||||
// 1. Redistributions of source code must retain the above copyright notice, this list of
|
||||
// conditions and the following disclaimer.
|
||||
//
|
||||
// 2. Redistributions in binary form must reproduce the above copyright notice, this list
|
||||
// of conditions and the following disclaimer in the documentation and/or other
|
||||
// materials provided with the distribution.
|
||||
//
|
||||
// 3. Neither the name of the copyright holder nor the names of its contributors may be
|
||||
// used to endorse or promote products derived from this software without specific
|
||||
// prior written permission.
|
||||
//
|
||||
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY
|
||||
// EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
||||
// MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
|
||||
// THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
||||
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
||||
// PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
|
||||
// INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
|
||||
// STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF
|
||||
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
|
||||
import QtQuick 2.9
|
||||
import QtQuick.Controls 1.2
|
||||
import QtQuick.Controls.Styles 1.2
|
||||
import QtGraphicalEffects 1.0
|
||||
|
||||
import "components"
|
||||
|
||||
Rectangle {
|
||||
id: root
|
||||
width: 330
|
||||
color: "#FFFFFF"
|
||||
}
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 410 B |
29
main.qml
29
main.qml
|
|
@ -53,7 +53,6 @@ ApplicationWindow {
|
|||
property bool hideBalanceForced: false
|
||||
property bool whatIsEnable: false
|
||||
property bool ctrlPressed: false
|
||||
property bool rightPanelExpanded: false
|
||||
property bool osx: false
|
||||
property alias persistentSettings : persistentSettings
|
||||
property var currentWallet;
|
||||
|
|
@ -1063,7 +1062,6 @@ ApplicationWindow {
|
|||
function enableUI(enable) {
|
||||
middlePanel.enabled = enable;
|
||||
leftPanel.enabled = enable;
|
||||
rightPanel.enabled = enable;
|
||||
}
|
||||
|
||||
function showProcessingSplash(message) {
|
||||
|
|
@ -1178,13 +1176,6 @@ ApplicationWindow {
|
|||
checkUpdates();
|
||||
}
|
||||
|
||||
onRightPanelExpandedChanged: {
|
||||
if (rightPanelExpanded) {
|
||||
rightPanel.updateTweets()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Settings {
|
||||
id: persistentSettings
|
||||
property string language
|
||||
|
|
@ -1437,7 +1428,6 @@ ApplicationWindow {
|
|||
State {
|
||||
name: "wizard"
|
||||
PropertyChanges { target: leftPanel; visible: false }
|
||||
PropertyChanges { target: rightPanel; visible: false }
|
||||
PropertyChanges { target: middlePanel; visible: false }
|
||||
PropertyChanges { target: wizard; visible: true }
|
||||
PropertyChanges { target: resizeArea; visible: true }
|
||||
|
|
@ -1446,7 +1436,6 @@ ApplicationWindow {
|
|||
}, State {
|
||||
name: "normal"
|
||||
PropertyChanges { target: leftPanel; visible: (isMobile)? false : true }
|
||||
PropertyChanges { target: rightPanel; visible: true }
|
||||
PropertyChanges { target: middlePanel; visible: true }
|
||||
PropertyChanges { target: titleBar; basicButtonVisible: true }
|
||||
PropertyChanges { target: wizard; visible: false }
|
||||
|
|
@ -1591,14 +1580,6 @@ ApplicationWindow {
|
|||
}
|
||||
}
|
||||
|
||||
RightPanel {
|
||||
id: rightPanel
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: parent.bottom
|
||||
width: appWindow.rightPanelExpanded ? 300 : 0
|
||||
visible: appWindow.rightPanelExpanded
|
||||
}
|
||||
|
||||
|
||||
MiddlePanel {
|
||||
id: middlePanel
|
||||
|
|
@ -1642,7 +1623,7 @@ ApplicationWindow {
|
|||
// value: 326
|
||||
// }
|
||||
PropertyAction {
|
||||
targets: [leftPanel, rightPanel]
|
||||
target: leftPanel
|
||||
properties: "visible"
|
||||
value: false
|
||||
}
|
||||
|
|
@ -1660,7 +1641,6 @@ ApplicationWindow {
|
|||
|
||||
onStopped: {
|
||||
// middlePanel.visible = false
|
||||
rightPanel.visible = false
|
||||
leftPanel.visible = false
|
||||
}
|
||||
}
|
||||
|
|
@ -1678,17 +1658,12 @@ ApplicationWindow {
|
|||
value: false
|
||||
}
|
||||
PropertyAction {
|
||||
targets: [leftPanel, middlePanel, rightPanel, resizeArea]
|
||||
targets: [leftPanel, middlePanel, resizeArea]
|
||||
properties: "visible"
|
||||
value: true
|
||||
}
|
||||
// PropertyAction {
|
||||
// target: appWindow
|
||||
// properties: "width"
|
||||
// value: rightPanelExpanded ? 1269 : 1269 - 300
|
||||
// }
|
||||
// PropertyAction {
|
||||
// target: appWindow
|
||||
// properties: "height"
|
||||
// value: maxWindowHeight
|
||||
// }
|
||||
|
|
|
|||
2
qml.qrc
2
qml.qrc
|
|
@ -2,7 +2,6 @@
|
|||
<qresource prefix="/">
|
||||
<file>main.qml</file>
|
||||
<file>LeftPanel.qml</file>
|
||||
<file>RightPanel.qml</file>
|
||||
<file>MiddlePanel.qml</file>
|
||||
<file>images/download-white.png</file>
|
||||
<file>images/download-white@2x.png</file>
|
||||
|
|
@ -41,7 +40,6 @@
|
|||
<file>images/prevMonth.png</file>
|
||||
<file>images/prevMonth@2x.png</file>
|
||||
<file>components/TitleBar.qml</file>
|
||||
<file>images/expandRightPanel.png</file>
|
||||
<file>images/moneroLogo2.png</file>
|
||||
<file>images/resize.png</file>
|
||||
<file>images/resize@2x.png</file>
|
||||
|
|
|
|||
Loading…
Reference in a new issue