imterah/element-portable
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #3573 from matrix-org/t3chguy/hide_tray_icon

Browse source 
Add ability to hide tray icon on non-Mac
This commit is contained in:
Michael Telatynski 2019-10-30 16:31:36 +00:00 • committed by GitHub
commit 41792a23a6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View file

@ -85,21 +85,18 @@ export default class PreferencesUserSettingsTab extends React.Component {
const autoLaunchSupported = await platform.supportsAutoLaunch(); const autoLaunchSupported = await platform.supportsAutoLaunch();
let autoLaunch = false; let autoLaunch = false;
if (autoLaunchSupported) { if (autoLaunchSupported) {
autoLaunch = await platform.getAutoLaunchEnabled(); autoLaunch = await platform.getAutoLaunchEnabled();
} }
const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar(); const alwaysShowMenuBarSupported = await platform.supportsAutoHideMenuBar();
let alwaysShowMenuBar = true; let alwaysShowMenuBar = true;
if (alwaysShowMenuBarSupported) { if (alwaysShowMenuBarSupported) {
alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled(); alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled();
} }
const minimizeToTraySupported = await platform.supportsMinimizeToTray(); const minimizeToTraySupported = await platform.supportsMinimizeToTray();
let minimizeToTray = true; let minimizeToTray = true;
if (minimizeToTraySupported) { if (minimizeToTraySupported) {
minimizeToTray = await platform.getMinimizeToTrayEnabled(); minimizeToTray = await platform.getMinimizeToTrayEnabled();
} }
@ -168,7 +165,7 @@ export default class PreferencesUserSettingsTab extends React.Component {
minimizeToTrayOption = <LabelledToggleSwitch minimizeToTrayOption = <LabelledToggleSwitch
value={this.state.minimizeToTray} value={this.state.minimizeToTray}
onChange={this._onMinimizeToTrayChange} onChange={this._onMinimizeToTrayChange}
label={_t('Close button should minimize window to tray')} />; label={_t('Show tray icon and minimize window to it on close')} />;
} }
return ( return (

2
src/i18n/strings/en_EN.json
View file

@ -640,7 +640,7 @@
"Notifications": "Notifications", "Notifications": "Notifications",
"Start automatically after system login": "Start automatically after system login", "Start automatically after system login": "Start automatically after system login",
"Always show the window menu bar": "Always show the window menu bar", "Always show the window menu bar": "Always show the window menu bar",
"Close button should minimize window to tray": "Close button should minimize window to tray", "Show tray icon and minimize window to it on close": "Show tray icon and minimize window to it on close",
"Preferences": "Preferences", "Preferences": "Preferences",
"Composer": "Composer", "Composer": "Composer",
"Timeline": "Timeline", "Timeline": "Timeline",