Skip to content

Commit

Permalink
change from 'show tray' to 'hide tray'
Browse files Browse the repository at this point in the history
  • Loading branch information
C41M50N committed Jun 18, 2024
1 parent 439a7a8 commit 8a49c73
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 7 deletions.
3 changes: 2 additions & 1 deletion app/lib/app.ts
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,10 @@ export class Application {
}

enableTray (): void {
if (!!this.tray || process.platform === 'linux' || this.configStore.showTray === false) {
if (!!this.tray || process.platform === 'linux' || (this.configStore.hideTray ?? false) === true) {
return
}

if (process.platform === 'darwin') {
this.tray = new Tray(`${app.getAppPath()}/assets/tray-darwinTemplate.png`)
this.tray.setPressedImage(`${app.getAppPath()}/assets/tray-darwinHighlightTemplate.png`)
Expand Down
4 changes: 2 additions & 2 deletions locale/en-GB.po
Original file line number Diff line number Diff line change
Expand Up @@ -2037,7 +2037,7 @@ msgid "Show Serial connections"
msgstr ""

#: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:73
msgid "Show Tabby in tray or menu bar."
msgid "Hide Tabby in tray or menu bar."
msgstr ""

#: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:152
Expand All @@ -2049,7 +2049,7 @@ msgid "Show toolbar"
msgstr ""

#: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:73
msgid "Show tray"
msgid "Hide tray"
msgstr ""

#: locale/tmp-html/tabby-settings/src/components/vaultSettingsTab.component.html:45
Expand Down
2 changes: 1 addition & 1 deletion tabby-core/src/configDefaults.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ enableWelcomeTab: true
electronFlags:
- ['force_discrete_gpu', '0']
enableAutomaticUpdates: true
showTray: true
hideTray: false
version: 1
vault: null
encrypted: false
Expand Down
6 changes: 3 additions & 3 deletions tabby-settings/src/components/windowSettingsTab.component.pug
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,10 @@ h3.mb-3(translate) Window

.form-line(*ngIf='hostApp.platform !== Platform.Web && hostApp.platform !== Platform.Linux')
.header
.title(translate) Show tray
.description(translate) Show Tabby in tray or menu bar.
.title(translate) Hide tray
.description(translate) Hide Tabby in tray or menu bar.
toggle(
[(ngModel)]='config.store.showTray',
[(ngModel)]='config.store.hideTray',
(ngModelChange)='saveConfiguration(true)'
)

Expand Down

0 comments on commit 8a49c73

Please sign in to comment.