diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:04:55 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2020-05-01 15:04:55 -0500 |
| commit | 4b55197e18571ae06ec40d1da6a80fd1ce468f84 (patch) | |
| tree | a114c56fa4114b641054b943a04e7f1f9fe1580d /components | |
| parent | 11617d2f76b55811edd0263800af99399b844286 (diff) | |
| parent | c7f9ac926b63739616ba221ccd48b1ba0c4cc336 (diff) | |
| download | monzero-gui-4b55197e18571ae06ec40d1da6a80fd1ce468f84.tar.gz monzero-gui-4b55197e18571ae06ec40d1da6a80fd1ce468f84.tar.xz monzero-gui-4b55197e18571ae06ec40d1da6a80fd1ce468f84.zip | |
Merge pull request #2848
c7f9ac9 LanguageSidebar: reenable (selsta)
3835387 wizard: add flags to language sidebar (mmbyday, selsta)
Diffstat (limited to 'components')
| -rw-r--r-- | components/LanguageSidebar.qml | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/components/LanguageSidebar.qml b/components/LanguageSidebar.qml index f67cde7b..ba8fc9fd 100644 --- a/components/LanguageSidebar.qml +++ b/components/LanguageSidebar.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2014-2019, The Monero Project +// Copyright (c) 2014-2020, The Monero Project // // All rights reserved. // @@ -79,9 +79,24 @@ Drawer { width: sideBar.width height: 32 + Rectangle { + id: flagRect + height: 24 + width: 24 + anchors.left: parent.left + anchors.leftMargin: 4 + anchors.verticalCenter: parent.verticalCenter + color: "transparent" + + Image { + anchors.fill: parent + source: flag + } + } + MoneroComponents.TextPlain { anchors.left: parent.left - anchors.leftMargin: 16 + anchors.leftMargin: 30 font.bold: true font.pixelSize: 14 color: MoneroComponents.Style.defaultFontColor @@ -118,8 +133,10 @@ Drawer { // set wizard language settings wizard.language_locale = locale; wizard.language_wallet = wallet_language; - wizard.language_language = display_name + " (" + locale_spl[1] + ") "; - sideBar.close() + wizard.language_language = display_name; + + appWindow.showStatusMessage(qsTr("Language changed."), 3); + appWindow.toggleLanguageView(); } hoverEnabled: true onEntered: { @@ -134,15 +151,8 @@ Drawer { } } - ScrollIndicator.vertical: ScrollIndicator { - // @TODO: QT 5.9 introduces `policy: ScrollBar.AlwaysOn` - active: true - contentItem.opacity: 0.7 - onActiveChanged: { - if (!active) { - active = true; - } - } + ScrollBar.vertical: ScrollBar { + onActiveChanged: if (!active && !isMac) active = true } } } |