4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-04 23:51:10 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge 55b3b6f8c2 into 0a9d61986c

Browse Source
This commit is contained in:
rating89us 2024-11-25 23:25:42 +00:00 committed by GitHub
commit 8f7d599c06
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
13 changed files with 154 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
components/StandardDialog.qml
View File

@ -32,6 +32,7 @@ import QtQuick.Dialogs 1.2
import QtQuick.Layouts 1.1
import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
import FontAwesome 1.0
import "../components" as MoneroComponents
import "effects/" as MoneroEffects
@ -200,24 +201,34 @@ Rectangle {
height: 48
color: "transparent"
MoneroEffects.ImageMask {
anchors.centerIn: parent
width: 16
height: 16
image: MoneroComponents.Style.titleBarCloseSource
color: MoneroComponents.Style.defaultFontColor
Text {
text: FontAwesome.times
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 19
color: closeButtonMouseArea.containsMouse ? MoneroComponents.Style.dimmedFontColor : MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
opacity: 0.75
}
MouseArea {
MoneroComponents.Tooltip {
id: btnCloseStandardDialogTooltip
anchors.fill: parent
text: qsTr("Close") + translationManager.emptyString
}
MouseArea {
id: closeButtonMouseArea
anchors.fill: parent
hoverEnabled: true
onClicked: {
root.close()
root.rejected()
}
cursorShape: Qt.PointingHandCursor
onEntered: closeButton.color = "#262626";
onExited: closeButton.color = "transparent";
onEntered: btnCloseStandardDialogTooltip.tooltipPopup.open()
onExited: btnCloseStandardDialogTooltip.tooltipPopup.close()
}
}

9
components/Style.qml
View File

@ -55,9 +55,6 @@ QtObject {
property string titleBarBackgroundGradientStop: blackTheme ? _b_titleBarBackgroundGradientStop : _w_titleBarBackgroundGradientStop
property string titleBarBackgroundBorderColor: blackTheme ? _b_titleBarBackgroundBorderColor : _w_titleBarBackgroundBorderColor
property string titleBarLogoSource: blackTheme ? _b_titleBarLogoSource : _w_titleBarLogoSource
property string titleBarMinimizeSource: blackTheme ? _b_titleBarMinimizeSource : _w_titleBarMinimizeSource
property string titleBarFullscreenSource: blackTheme ? _b_titleBarFullscreenSource : _w_titleBarFullscreenSource
property string titleBarCloseSource: blackTheme ? _b_titleBarCloseSource : _w_titleBarCloseSource
property string titleBarButtonHoverColor: blackTheme ? _b_titleBarButtonHoverColor : _w_titleBarButtonHoverColor
property string wizardBackgroundGradientStart: blackTheme ? _b_wizardBackgroundGradientStart : _w_wizardBackgroundGradientStart
@ -117,9 +114,6 @@ QtObject {
property string _b_titleBarBackgroundGradientStop: "#191919"
property string _b_titleBarBackgroundBorderColor: "#2f2f2f"
property string _b_titleBarLogoSource: "qrc:///images/titlebarLogo.png"
property string _b_titleBarMinimizeSource: "qrc:///images/minimize.svg"
property string _b_titleBarFullscreenSource: "qrc:///images/fullscreen.svg"
property string _b_titleBarCloseSource: "qrc:///images/close.svg"
property string _b_titleBarButtonHoverColor: "#10FFFFFF"
property string _b_wizardBackgroundGradientStart: "#1e1e1e"
@ -179,9 +173,6 @@ QtObject {
property string _w_titleBarBackgroundGradientStop: "#FBFBFB"
property string _w_titleBarBackgroundBorderColor: "#DEDEDE"
property string _w_titleBarLogoSource: "qrc:///images/themes/white/titlebarLogo.png"
property string _w_titleBarMinimizeSource: "qrc:///images/themes/white/minimize.svg"
property string _w_titleBarFullscreenSource: "qrc:///images/themes/white/fullscreen.svg"
property string _w_titleBarCloseSource: "qrc:///images/themes/white/close.svg"
property string _w_titleBarButtonHoverColor: "#11000000"
property string _w_wizardBackgroundGradientStart: "white"

97
components/TitleBar.qml
View File

@ -161,6 +161,7 @@ Rectangle {
MouseArea {
anchors.fill: parent
visible: middlePanel.state !== "Merchant" && !informationPopup.visible && !confirmationDialog.visible
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: {
@ -201,6 +202,7 @@ Rectangle {
MouseArea {
anchors.fill: parent
visible: middlePanel.state !== "Merchant" && !informationPopup.visible && !confirmationDialog.visible
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: {
@ -240,6 +242,7 @@ Rectangle {
MouseArea {
anchors.fill: parent
visible: middlePanel.state !== "Merchant" && !informationPopup.visible && !confirmationDialog.visible
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: {
@ -318,26 +321,36 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
anchors.bottom: parent.bottom
anchors.bottomMargin: 18
anchors.horizontalCenter: parent.horizontalCenter
height: 3
width: 15
image: MoneroComponents.Style.titleBarMinimizeSource
Text {
text: FontAwesome.windowMinimize
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
fontAwesomeFallbackIcon: FontAwesome.minus
fontAwesomeFallbackSize: 18
fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
opacity: 0.75
}
MoneroComponents.Tooltip {
id: btnMinimizeWindowTooltip
anchors.fill: parent
text: qsTr("Minimize") + translationManager.emptyString
}
MouseArea {
anchors.fill: parent
visible: !informationPopup.visible && !confirmationDialog.visible
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
onExited: parent.color = "transparent"
onEntered: {
parent.color = MoneroComponents.Style.titleBarButtonHoverColor
btnMinimizeWindowTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnMinimizeWindowTooltip.tooltipPopup.close()
}
onClicked: root.minimizeClicked();
}
}
@ -350,25 +363,37 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
Image {
Text {
text: appWindow.visibility == Window.Maximized ? FontAwesome.windowRestore : FontAwesome.windowMaximize
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
source: MoneroComponents.Style.titleBarFullscreenSource
sourceSize.width: 16
sourceSize.height: 16
smooth: true
mipmap: true
opacity: 0.75
rotation: appWindow.visibility === Window.FullScreen ? 180 : 0
}
MoneroComponents.Tooltip {
id: btnMaximizeRestoreTooltip
anchors.fill: parent
text: appWindow.visibility == Window.Maximized ? qsTr("Restore") : qsTr("Maximize") + translationManager.emptyString
}
MouseArea {
id: buttonArea
anchors.fill: parent
visible: !informationPopup.visible && !confirmationDialog.visible
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
onExited: parent.color = "transparent"
onEntered: {
parent.color = MoneroComponents.Style.titleBarButtonHoverColor
btnMaximizeRestoreTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnMaximizeRestoreTooltip.tooltipPopup.close()
}
onClicked: root.maximizeClicked();
}
}
@ -380,25 +405,35 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
Text {
text: FontAwesome.times
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 19
color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
height: 16
width: 16
image: MoneroComponents.Style.titleBarCloseSource
color: MoneroComponents.Style.defaultFontColor
fontAwesomeFallbackIcon: FontAwesome.times
fontAwesomeFallbackSize: 21
fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
opacity: 0.75
}
MoneroComponents.Tooltip {
id: btnCloseWindowTooltip
anchors.fill: parent
text: qsTr("Close Monero GUI") + translationManager.emptyString
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor
onExited: parent.color = "transparent"
onEntered: {
parent.color = MoneroComponents.Style.titleBarButtonHoverColor
btnCloseWindowTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnCloseWindowTooltip.tooltipPopup.close()
}
onClicked: root.closeClicked();
}
}

1
fonts/FontAwesome/FontAwesome.qml
View File

@ -43,6 +43,7 @@ Object {
property string edit : "\uf044"
property string ellipsisH : "\uf141"
property string exclamationCircle : "\uf06a"
property string expandAlt : "\uf424"
property string eye : "\uf06e"
property string eyeSlash : "\uf070"
property string folderOpen : "\uf07c"

5
images/close.svg
View File

@ -1,5 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd" stroke="#FFF" stroke-linecap="round" stroke-width="1.85" opacity="1">
<path d="M1 1l14 14M15 1L1 15"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 250 B

6
images/fullscreen.svg
View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g fill="none" fill-rule="evenodd" stroke="#FFF" stroke-width="1.636" opacity="1">
<rect width="16.364" height="16.364" x=".818" y=".818" rx="1.636"/>
<rect width="16.364" height="3.273" x=".818" y=".818" fill="#FFF" rx="1.636"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 350 B

3
images/minimize.svg
View File

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="4" viewBox="0 0 18 4">
<rect width="16" height="2" x="899" y="31" fill="#FFF" fill-rule="evenodd" stroke="#FFF" stroke-width="2" opacity="1" rx="1" transform="translate(-898 -30)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 252 B

6
images/themes/white/close.svg
View File

@ -1,6 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
<g fill="none" fill-rule="evenodd" opacity="1">
<path fill="none" d="M-10-10h36v36h-36z" opacity="1"/>
<path stroke="#000" stroke-linecap="round" stroke-width="1.5" d="M1 1l14 14M15 1L1 15"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 312 B

7
images/themes/white/fullscreen.svg
View File

@ -1,7 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 18 18">
<g fill="none" fill-rule="evenodd" opacity="1" transform="translate(-9 -9)">
<path fill="none" d="M0 0h36v36H0z" opacity="1"/>
<rect width="16" height="16" x="10" y="10" stroke="#000" stroke-width="1.5" rx="1.5"/>
<path fill="#FFF" stroke="#000" stroke-width="1.5" d="M11 10h14a1 1 0 0 1 1 1v2H10v-2a1 1 0 0 1 1-1z"/>
</g>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 446 B

3
images/themes/white/minimize.svg
View File

@ -1,3 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="2" viewBox="0 0 16 2">
<rect width="16" height="2" x="10" y="25" fill="#000" fill-rule="evenodd" opacity="1" rx="1" transform="translate(-10 -25)"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 219 B

9
main.qml
View File

@ -1778,13 +1778,13 @@ ApplicationWindow {
name: "wizard"
PropertyChanges { target: middlePanel; visible: false }
PropertyChanges { target: wizard; visible: true }
PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: resizeArea; visible: appWindow.visibility !== Window.Maximized }
PropertyChanges { target: titleBar; state: "essentials" }
}, State {
name: "normal"
PropertyChanges { target: middlePanel; visible: true }
PropertyChanges { target: wizard; visible: false }
PropertyChanges { target: resizeArea; visible: true }
PropertyChanges { target: resizeArea; visible: appWindow.visibility !== Window.Maximized }
PropertyChanges { target: titleBar; state: "default" }
}
]
@ -1895,11 +1895,14 @@ ApplicationWindow {
MoneroEffects.ImageMask {
anchors.centerIn: parent
visible: persistentSettings.customDecorations
visible: persistentSettings.customDecorations && appWindow.visibility !== Window.Maximized
image: "qrc:///images/resize.png"
color: MoneroComponents.Style.defaultFontColor
width: 12
height: 12
fontAwesomeFallbackIcon: FontAwesome.expandAlt
fontAwesomeFallbackSize: 18
fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 0.8 : 0.6
opacity: (parent.containsMouse || parent.pressed) ? 0.5 : 1.0
}

86
pages/merchant/MerchantTitlebar.qml
View File

@ -96,23 +96,35 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
anchors.bottom: parent.bottom
anchors.bottomMargin: 18
Text {
text: FontAwesome.windowMinimize
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
height: 3
width: 15
image: MoneroComponents.Style.titleBarMinimizeSource
color: "white"
opacity: 0.75
}
MoneroComponents.Tooltip {
id: btnMinimizeWindowTooltip
anchors.fill: parent
text: qsTr("Minimize") + translationManager.emptyString
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onEntered: {
parent.color = "#44FFFFFF"
btnMinimizeWindowTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnMinimizeWindowTooltip.tooltipPopup.close()
}
onClicked: root.minimizeClicked();
}
}
@ -125,16 +137,21 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
Image {
Text {
text: appWindow.visibility == Window.Maximized ? FontAwesome.windowRestore : FontAwesome.windowMaximize
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 16
color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
source: MoneroComponents.Style._b_titleBarFullscreenSource
sourceSize.width: 16
sourceSize.height: 16
smooth: true
mipmap: true
opacity: 0.75
rotation: appWindow.visibility === Window.FullScreen ? 180 : 0
}
MoneroComponents.Tooltip {
id: btnMaximizeRestoreTooltip
anchors.fill: parent
text: appWindow.visibility == Window.Maximized ? qsTr("Restore") : qsTr("Maximize") + translationManager.emptyString
}
MouseArea {
@ -142,8 +159,14 @@ Rectangle {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onEntered: {
parent.color = "#44FFFFFF"
btnMaximizeRestoreTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnMaximizeRestoreTooltip.tooltipPopup.close()
}
onClicked: root.maximizeClicked();
}
}
@ -155,22 +178,35 @@ Rectangle {
Layout.preferredWidth: parent.height
Layout.preferredHeight: parent.height
MoneroEffects.ImageMask {
Text {
text: FontAwesome.times
font.family:FontAwesome.fontFamilySolid
font.pixelSize: 19
color: MoneroComponents.Style.defaultFontColor
font.styleName: "Solid"
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
height: 16
width: 16
image: MoneroComponents.Style._b_titleBarCloseSource
color: "white"
opacity: 0.75
}
MoneroComponents.Tooltip {
id: btnCloseWindowTooltip
anchors.fill: parent
text: qsTr("Close Monero GUI") + translationManager.emptyString
}
MouseArea {
anchors.fill: parent
hoverEnabled: true
cursorShape: Qt.PointingHandCursor
onEntered: parent.color = "#44FFFFFF"
onExited: parent.color = "transparent"
onEntered: {
parent.color = "#44FFFFFF"
btnCloseWindowTooltip.tooltipPopup.open()
}
onExited: {
parent.color = "transparent"
btnCloseWindowTooltip.tooltipPopup.close()
}
onClicked: root.closeClicked();
}
}

6
qml.qrc
View File

@ -258,12 +258,6 @@
<file>images/middlePanelShadow.png</file>
<file>images/themes/white/titlebarLogo@2x.png</file>
<file>images/themes/white/titlebarLogo.png</file>
<file>images/fullscreen.svg</file>
<file>images/close.svg</file>
<file>images/minimize.svg</file>
<file>images/themes/white/close.svg</file>
<file>images/themes/white/fullscreen.svg</file>
<file>images/themes/white/minimize.svg</file>
<file>components/effects/ColorTransition.qml</file>
<file>components/effects/GradientBackground.qml</file>
<file>images/check-white.svg</file>