Zergling_man/moment
Zergling_man/moment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename "logout" things to "sign out" + update icon

Browse Source
This commit is contained in:
miruka 2019-12-07 12:45:20 -04:00
parent 0f1a6c7df1
commit 7deb21c182
5 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/icons/thin/logout.svg
View File

@ -1,3 +0,0 @@
<svg height="24" viewBox="0 0 24 24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="m9.602 3.7c-1.154 1.937-.635 5.227 1.424 9.025.93 1.712.697 3.02.338 3.815-.982 2.178-3.675 2.799-6.525 3.456-1.964.454-1.839.87-1.839 4.004h-1.995l-.005-1.241c0-2.52.199-3.975 3.178-4.663 3.365-.777 6.688-1.473 5.09-4.418-4.733-8.729-1.35-13.678 3.732-13.678 3.321 0 5.97 2.117 5.97 6.167 0 3.555-1.949 6.833-2.383 7.833h-2.115c.392-1.536 2.499-4.366 2.499-7.842 0-5.153-5.867-4.985-7.369-2.458zm13.398 15.3h-8v2h8z"/>
</svg>
Side by Side

Before

Width:  |  Height:  |  Size: 524 B

3
src/icons/thin/sign-out.svg Normal file
View File

@ -0,0 +1,3 @@
<svg clip-rule="evenodd" fill-rule="evenodd" height="24" width="24" xmlns="http://www.w3.org/2000/svg">
<path d="m4.81 4 13.243 15.714-1.532 1.286-5.092-6h-2.124l-1.046-1.013-1.302 1.019-1.362-1.075-1.407 1.081-4.188-3.448 3.346-3.564h2.21l-2.278-2.714zm8.499 6h-1.504l-1.678-2h2.06c1.145-1.683 3.104-3 5.339-3 3.497 0 6.474 2.866 6.474 6.5 0 3.288-2.444 5.975-5.54 6.431l-1.678-2c.237.045.485.069.744.069 2.412 0 4.474-1.986 4.474-4.5 0-2.498-2.044-4.5-4.479-4.5-2.055 0-3.292 1.433-4.212 3zm5.691-.125c.828 0 1.5.672 1.5 1.5s-.672 1.5-1.5 1.5-1.5-.672-1.5-1.5.672-1.5 1.5-1.5zm-10.626 1.484-1.14-1.359h-3.022l-1.293 1.376 1.312 1.081 1.38-1.061 1.351 1.066z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 674 B

2
src/qml/Dialogs/ExportKeys.qml
View File

@ -12,7 +12,7 @@ HFileDialogOpener {
} }
// This is used for the LogoutPopup to know when the export is done // This is used for the SignOutPopup to know when the export is done
// so it can close // so it can close
signal done() signal done()

2
src/qml/Popups/LogoutPopup.qml → src/qml/Popups/SignOutPopup.qml
View File

@ -18,7 +18,7 @@ BoxPopup {
box.focusButton: "ok" box.focusButton: "ok"
box.buttonModel: [ box.buttonModel: [
{ name: "ok", text: qsTr("Export keys"), iconName: "export-keys" }, { name: "ok", text: qsTr("Export keys"), iconName: "export-keys" },
{ name: "signout", text: qsTr("Sign out now"), iconName: "logout", { name: "signout", text: qsTr("Sign out now"), iconName: "sign-out",
iconColor: theme.colors.middleBackground }, iconColor: theme.colors.middleBackground },
{ name: "cancel", text: qsTr("Cancel"), iconName: "cancel" }, { name: "cancel", text: qsTr("Cancel"), iconName: "cancel" },
] ]

6
src/qml/SidePane/AccountDelegate.qml
View File

@ -107,11 +107,11 @@ HTileDelegate {
contextMenu: HMenu { contextMenu: HMenu {
HMenuItem { HMenuItem {
icon.name: "logout" icon.name: "sign-out"
icon.color: theme.colors.negativeBackground icon.color: theme.colors.negativeBackground
text: qsTr("Logout") text: qsTr("Sign out")
onTriggered: Utils.makePopup( onTriggered: Utils.makePopup(
"Popups/LogoutPopup.qml", "Popups/SignOutPopup.qml",
mainUI, mainUI,
{ "userId": model.data.user_id }, { "userId": model.data.user_id },
popup => { popup.ok.connect(() => { disconnecting = true }) }, popup => { popup.ok.connect(() => { disconnecting = true }) },