diff options
Diffstat (limited to 'components')
| -rw-r--r-- | components/IconButton.qml | 30 | ||||
| -rw-r--r-- | components/Label.qml | 40 | ||||
| -rw-r--r-- | components/MobileHeader.qml | 119 | ||||
| -rw-r--r-- | components/Notifier.qml | 1 | ||||
| -rw-r--r-- | components/StandardButton.qml | 2 | ||||
| -rw-r--r-- | components/TitleBar.qml | 9 |
6 files changed, 161 insertions, 40 deletions
diff --git a/components/IconButton.qml b/components/IconButton.qml index 042439f1..eeb80267 100644 --- a/components/IconButton.qml +++ b/components/IconButton.qml @@ -50,23 +50,23 @@ Item { z: 100 } - MouseArea { - id: buttonArea - anchors.fill: parent +// MouseArea { +// id: buttonArea +// anchors.fill: parent - onPressed: { - buttonImage.x = buttonImage.x + 2 - buttonImage.y = buttonImage.y + 2 - } - onReleased: { - buttonImage.x = buttonImage.x - 2 - buttonImage.y = buttonImage.y - 2 - } +// onPressed: { +// buttonImage.x = buttonImage.x + 2 +// buttonImage.y = buttonImage.y + 2 +// } +// onReleased: { +// buttonImage.x = buttonImage.x - 2 +// buttonImage.y = buttonImage.y - 2 +// } - onClicked: { - parent.clicked(mouse) - } - } +// onClicked: { +// parent.clicked(mouse) +// } +// } } diff --git a/components/Label.qml b/components/Label.qml index bff37b57..30ff3d33 100644 --- a/components/Label.qml +++ b/components/Label.qml @@ -27,6 +27,7 @@ // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. import QtQuick 2.0 +import QtQuick.Layouts 1.1 Item { id: item @@ -35,6 +36,7 @@ Item { property alias textFormat: label.textFormat property string tipText: "" property int fontSize: 12 + property alias wrapMode: label.wrapMode signal linkActivated() width: icon.x + icon.width height: icon.height @@ -59,23 +61,23 @@ Item { visible: appWindow.whatIsEnable } - MouseArea { - anchors.fill: icon - enabled: appWindow.whatIsEnable - hoverEnabled: true - onEntered: { - icon.visible = false - var pos = appWindow.mapFromItem(icon, 0, -15) - tipItem.text = item.tipText - tipItem.x = pos.x - if(tipItem.height > 30) - pos.y -= tipItem.height - 28 - tipItem.y = pos.y - tipItem.visible = true - } - onExited: { - icon.visible = Qt.binding(function(){ return appWindow.whatIsEnable; }) - tipItem.visible = false - } - } +// MouseArea { +// anchors.fill: icon +// enabled: appWindow.whatIsEnable +// hoverEnabled: true +// onEntered: { +// icon.visible = false +// var pos = appWindow.mapFromItem(icon, 0, -15) +// tipItem.text = item.tipText +// tipItem.x = pos.x +// if(tipItem.height > 30) +// pos.y -= tipItem.height - 28 +// tipItem.y = pos.y +// tipItem.visible = true +// } +// onExited: { +// icon.visible = Qt.binding(function(){ return appWindow.whatIsEnable; }) +// tipItem.visible = false +// } +// } } diff --git a/components/MobileHeader.qml b/components/MobileHeader.qml new file mode 100644 index 00000000..73b22430 --- /dev/null +++ b/components/MobileHeader.qml @@ -0,0 +1,119 @@ +import QtQuick 2.2 +import QtGraphicalEffects 1.0 +import QtQuick.Layouts 1.1 +import moneroComponents.Wallet 1.0 + + +// BasicPanel header +Rectangle { + id: header + anchors.leftMargin: 1 + anchors.rightMargin: 1 + Layout.fillWidth: true + Layout.preferredHeight: 64 + color: "#FFFFFF" +// visible: basicMode + + Image { + id: logo + visible: appWindow.width > 460 + anchors.verticalCenter: parent.verticalCenter + anchors.verticalCenterOffset: -5 + anchors.left: parent.left + anchors.leftMargin: appWindow.persistentSettings.customDecorations ? 20 : 40 + source: "../images/moneroLogo2.png" + } + + Image { + id: icon + visible: !logo.visible + anchors.verticalCenter: parent.verticalCenter +// anchors.verticalCenterOffset: -5 + anchors.left: parent.left + anchors.leftMargin: appWindow.persistentSettings.customDecorations ? 20 : 40 + source: "../images/moneroIcon.png" + } + + Grid { + anchors.verticalCenter: parent.verticalCenter + anchors.top: parent.top + anchors.right: parent.right + anchors.topMargin: 10 + width: 256 + columns: 3 + + Text { + id: balanceLabel + width: 116 + height: 20 + font.family: "Arial" + font.pixelSize: 12 + font.letterSpacing: -1 + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignBottom + color: "#535353" + text: leftPanel.balanceLabelText + ":" + } + + Text { + id: balanceText + width: 110 + height: 20 + font.family: "Arial" + font.pixelSize: 18 + font.letterSpacing: -1 + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignBottom + color: "#000000" + text: leftPanel.balanceText + } + + Item { + height: 20 + width: 20 + + Image { + anchors.verticalCenter: parent.verticalCenter + anchors.left: parent.left + source: "../images/lockIcon.png" + } + } + + Text { + width: 116 + height: 20 + font.family: "Arial" + font.pixelSize: 12 + font.letterSpacing: -1 + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignBottom + color: "#535353" + text: qsTr("Unlocked Balance:") + } + + Text { + id: availableBalanceText + width: 110 + height: 20 + font.family: "Arial" + font.pixelSize: 14 + font.letterSpacing: -1 + elide: Text.ElideRight + horizontalAlignment: Text.AlignLeft + verticalAlignment: Text.AlignBottom + color: "#000000" + text: leftPanel.unlockedBalanceText + } + } + + Rectangle { + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + height: 1 + color: "#DBDBDB" + } +} diff --git a/components/Notifier.qml b/components/Notifier.qml index 8edc71e5..f314a952 100644 --- a/components/Notifier.qml +++ b/components/Notifier.qml @@ -75,6 +75,7 @@ Item { } function show(message) { + item.visible = true item.message = message item.active = true hider.running = true diff --git a/components/StandardButton.qml b/components/StandardButton.qml index 14f33e8f..33cedee7 100644 --- a/components/StandardButton.qml +++ b/components/StandardButton.qml @@ -45,8 +45,6 @@ Item { // Dynamic label width Layout.minimumWidth: (label.contentWidth > 80)? label.contentWidth + 20 : 100 - - Rectangle { anchors.left: parent.left anchors.right: parent.right diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 4a8bbb7c..34f25e73 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -58,14 +58,15 @@ Rectangle { property bool checked: false anchors.top: parent.top anchors.left: parent.left - color: basicMouseArea.containsMouse || checked ? "#FFE00A" : "#000000" + color: basicMouseArea.containsMouse || !leftPanel.visible ? "#FFE00A" : "#000000" height: 30 width: height + visible: isMobile Image { anchors.centerIn: parent - rotation: parent.checked ? 180 : 0 - source: parent.customDecorations || parent.checked ? "../images/goToBasicVersionHovered.png" : + rotation: !leftPanel.visible ? 180 : 0 + source: parent.customDecorations || !leftPanel.visible ? "../images/goToBasicVersionHovered.png" : "../images/gotoBasicVersion.png" } @@ -75,7 +76,7 @@ Rectangle { anchors.fill: parent onClicked: { parent.checked = !parent.checked - titleBar.goToBasicVersion(parent.checked) + titleBar.goToBasicVersion(leftPanel.visible) } } } |
