From 439a7a8d44b21b7420bf128ece8b04f292408eac Mon Sep 17 00:00:00 2001 From: Charles Buffington Date: Mon, 17 Jun 2024 19:26:39 -0400 Subject: [PATCH] move 'show tray' setting to window settings --- locale/en-GB.po | 4 ++-- tabby-settings/src/components/settingsTab.component.pug | 9 --------- .../src/components/windowSettingsTab.component.pug | 9 +++++++++ 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/locale/en-GB.po b/locale/en-GB.po index 752421d9..1afee621 100644 --- a/locale/en-GB.po +++ b/locale/en-GB.po @@ -2036,7 +2036,7 @@ msgstr "" msgid "Show Serial connections" msgstr "" -#: locale/tmp-html/tabby-settings/src/components/settingsTab.component.html:73 +#: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:73 msgid "Show Tabby in tray or menu bar." msgstr "" @@ -2048,7 +2048,7 @@ msgstr "" msgid "Show toolbar" msgstr "" -#: locale/tmp-html/tabby-settings/src/components/settingsTab.component.html:73 +#: locale/tmp-html/tabby-settings/src/components/windowSettingsTab.component.html:73 msgid "Show tray" msgstr "" diff --git a/tabby-settings/src/components/settingsTab.component.pug b/tabby-settings/src/components/settingsTab.component.pug index 19b1a5fb..e923d29f 100644 --- a/tabby-settings/src/components/settingsTab.component.pug +++ b/tabby-settings/src/components/settingsTab.component.pug @@ -100,15 +100,6 @@ .description(translate) Enable automatic installation of updates when they become available. toggle([(ngModel)]='config.store.enableAutomaticUpdates', (ngModelChange)='saveConfiguration()') - .form-line(*ngIf='hostApp.platform !== Platform.Web') - .header - .title(translate) Show tray - .description(translate) Show Tabby in tray or menu bar. - toggle( - [(ngModel)]='config.store.showTray', - (ngModelChange)='saveConfiguration(true)' - ) - .form-line(*ngIf='hostApp.platform !== Platform.Web') .header .title(translate) Debugging diff --git a/tabby-settings/src/components/windowSettingsTab.component.pug b/tabby-settings/src/components/windowSettingsTab.component.pug index a7b4d705..f3177bba 100644 --- a/tabby-settings/src/components/windowSettingsTab.component.pug +++ b/tabby-settings/src/components/windowSettingsTab.component.pug @@ -121,6 +121,15 @@ h3.mb-3(translate) Window label.btn.btn-secondary(for='frameFull') span(translate) Full +.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. + toggle( + [(ngModel)]='config.store.showTray', + (ngModelChange)='saveConfiguration(true)' + ) + h3.mt-4(translate) Docking .form-line(*ngIf='docking')