diff --git a/LeftPanel.qml b/LeftPanel.qml index c3124a1a..a9f01cfa 100644 --- a/LeftPanel.qml +++ b/LeftPanel.qml @@ -171,44 +171,6 @@ Rectangle { color: "#ff9323" themeTransition: false } - - Rectangle { - height: (logoutImage.height + 8) - width: (logoutImage.width + 8) - color: "transparent" - anchors.right: parent.right - anchors.rightMargin: 8 - anchors.top: parent.top - anchors.topMargin: 30 - - Image { - id: logoutImage - anchors.verticalCenter: parent.verticalCenter - anchors.horizontalCenter: parent.horizontalCenter - height: 16 - width: 13 - source: "qrc:///images/logout.png" - } - - ColorOverlay { - anchors.fill: logoutImage - source: logoutImage - visible: !MoneroComponents.Style.blackTheme - color: "#000000" - } - - MouseArea{ - anchors.fill: parent - hoverEnabled: true - cursorShape: Qt.PointingHandCursor - onClicked: { - middlePanel.addressBookView.clearFields(); - middlePanel.transferView.clearFields(); - middlePanel.receiveView.clearFields(); - appWindow.showWizard(); - } - } - } } Item { diff --git a/components/Style.qml b/components/Style.qml index 37c2f9ce..43b2de5c 100644 --- a/components/Style.qml +++ b/components/Style.qml @@ -51,7 +51,6 @@ QtObject { 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 titleBarExpandSource: blackTheme ? _b_titleBarExpandSource : _w_titleBarExpandSource property string titleBarFullscreenSource: blackTheme ? _b_titleBarFullscreenSource : _w_titleBarFullscreenSource property string titleBarCloseSource: blackTheme ? _b_titleBarCloseSource : _w_titleBarCloseSource property string titleBarButtonHoverColor: blackTheme ? _b_titleBarButtonHoverColor : _w_titleBarButtonHoverColor @@ -108,7 +107,6 @@ QtObject { property string _b_titleBarBackgroundBorderColor: "#2f2f2f" property string _b_titleBarLogoSource: "qrc:///images/titlebarLogo.png" property string _b_titleBarMinimizeSource: "qrc:///images/minimize.svg" - property string _b_titleBarExpandSource: "qrc:///images/sidebar.svg" property string _b_titleBarFullscreenSource: "qrc:///images/fullscreen.svg" property string _b_titleBarCloseSource: "qrc:///images/close.svg" property string _b_titleBarButtonHoverColor: "#10FFFFFF" @@ -165,7 +163,6 @@ QtObject { 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_titleBarExpandSource: "qrc:///images/themes/white/expand.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" diff --git a/components/TitleBar.qml b/components/TitleBar.qml index 034d242a..cf35f952 100644 --- a/components/TitleBar.qml +++ b/components/TitleBar.qml @@ -38,7 +38,6 @@ import "effects/" as MoneroEffects Rectangle { id: root property int mouseX: 0 - property bool basicButtonVisible: false property bool customDecorations: persistentSettings.customDecorations property bool showMinimizeButton: true property bool showMaximizeButton: true @@ -57,18 +56,18 @@ Rectangle { signal maximizeClicked signal minimizeClicked signal languageClicked - signal goToBasicVersion(bool yes) + signal closeWalletClicked state: "default" states: [ State { name: "default"; - PropertyChanges { target: btnSidebarCollapse; visible: true} + PropertyChanges { target: btnCloseWallet; visible: true} PropertyChanges { target: btnLanguageToggle; visible: true} }, State { // show only theme switcher and window controls name: "essentials"; - PropertyChanges { target: btnSidebarCollapse; visible: false} + PropertyChanges { target: btnCloseWallet; visible: false} PropertyChanges { target: btnLanguageToggle; visible: false} } ] @@ -94,22 +93,20 @@ Rectangle { // collapse sidebar Rectangle { - id: btnSidebarCollapse - visible: root.basicButtonVisible + id: btnCloseWallet color: "transparent" Layout.preferredWidth: parent.height Layout.preferredHeight: parent.height - MoneroEffects.ImageMask { + + Text { + text: FontAwesome.signOutAlt + font.family: FontAwesome.fontFamilySolid + font.pixelSize: 16 + color: MoneroComponents.Style.defaultFontColor + font.styleName: "Solid" anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter - height: 14 - width: 14 - image: MoneroComponents.Style.titleBarExpandSource - color: MoneroComponents.Style.defaultFontColor - fontAwesomeFallbackIcon: FontAwesome.cube - fontAwesomeFallbackSize: 16 - fontAwesomeFallbackOpacity: MoneroComponents.Style.blackTheme ? 1.0 : 0.9 opacity: 0.75 } @@ -119,7 +116,7 @@ Rectangle { cursorShape: Qt.PointingHandCursor onEntered: parent.color = MoneroComponents.Style.titleBarButtonHoverColor onExited: parent.color = "transparent" - onClicked: root.goToBasicVersion(leftPanel.visible) + onClicked: root.closeWalletClicked(leftPanel.visible) } } @@ -161,7 +158,7 @@ Rectangle { text: FontAwesome.moonO font.family: MoneroComponents.Style.blackTheme ? FontAwesome.fontFamilySolid : FontAwesome.fontFamily font.styleName: MoneroComponents.Style.blackTheme ? "Solid" : "Regular" - font.pixelSize: 16 + font.pixelSize: 15 color: MoneroComponents.Style.defaultFontColor anchors.verticalCenter: parent.verticalCenter anchors.horizontalCenter: parent.horizontalCenter diff --git a/fonts/FontAwesome/FontAwesome.qml b/fonts/FontAwesome/FontAwesome.qml index b163fd6c..2362ff5d 100644 --- a/fonts/FontAwesome/FontAwesome.qml +++ b/fonts/FontAwesome/FontAwesome.qml @@ -607,6 +607,7 @@ Object { property string shower : "\uf2cc" property string signIn : "\uf090" property string signLanguage : "\uf2a7" + property string signOutAlt : "\uf2f5" property string signOut : "\uf08b" property string signal : "\uf012" property string signing : "\uf2a7" diff --git a/images/sidebar.svg b/images/sidebar.svg deleted file mode 100644 index c475bc66..00000000 --- a/images/sidebar.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/images/themes/white/expand.svg b/images/themes/white/expand.svg deleted file mode 100644 index 065fbbe4..00000000 --- a/images/themes/white/expand.svg +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/main.qml b/main.qml index 75f4a158..46086171 100644 --- a/main.qml +++ b/main.qml @@ -1579,7 +1579,6 @@ ApplicationWindow { name: "normal" PropertyChanges { target: leftPanel; visible: true } PropertyChanges { target: middlePanel; visible: true } - PropertyChanges { target: titleBar; basicButtonVisible: true } PropertyChanges { target: wizard; visible: false } PropertyChanges { target: resizeArea; visible: true } PropertyChanges { target: titleBar; state: "default" } @@ -1738,11 +1737,9 @@ ApplicationWindow { anchors.right: parent.right onCloseClicked: appWindow.close(); onLanguageClicked: appWindow.toggleLanguageView(); + onCloseWalletClicked: appWindow.showWizard(); onMaximizeClicked: appWindow.visibility = appWindow.visibility !== Window.Maximized ? Window.Maximized : Window.Windowed onMinimizeClicked: appWindow.visibility = Window.Minimized - onGoToBasicVersion: { - //nop - } } MoneroMerchant.MerchantTitlebar { diff --git a/qml.qrc b/qml.qrc index 85e33b1c..c70999e5 100644 --- a/qml.qrc +++ b/qml.qrc @@ -237,7 +237,6 @@ images/middlePanelShadow.png images/themes/white/titlebarLogo@2x.png images/themes/white/titlebarLogo.png - images/sidebar.svg images/fullscreen.svg images/close.svg images/minimize.svg @@ -245,7 +244,6 @@ images/themes/white/fullscreen.svg images/themes/white/minimize.svg images/themes/white/question.svg - images/themes/white/expand.svg components/effects/ColorTransition.qml components/effects/GradientBackground.qml images/check-white.svg