OpenCloud
/
riot-web
mirror of https://github.com/vector-im/riot-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge hide-to-tray-icon with show-tray-icon

pull/21833/head
Michael Telatynski 2019-10-30 14:32:27 +00:00
parent 46e7e1e81a
commit fa811f99de
3 changed files with 3 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/BasePlatform.js
View File

@ -140,18 +140,6 @@ export default class BasePlatform {
throw new Error("Unimplemented");
}
supportsTrayIcon(): boolean {
return false;
}
async getTrayIconEnabled(): boolean {
return false;
}
async setTrayIconEnabled(enabled: boolean): void {
throw new Error("Unimplemented");
}
supportsMinimizeToTray(): boolean {
return false;
}

31
src/components/views/settings/tabs/user/PreferencesUserSettingsTab.js
View File

@ -69,8 +69,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
autoLaunchSupported: false,
alwaysShowMenuBar: true,
alwaysShowMenuBarSupported: false,
showTrayIcon: false,
showTrayIconSupported: false,
minimizeToTray: true,
minimizeToTraySupported: false,
autocompleteDelay:
@ -97,12 +95,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
alwaysShowMenuBar = !await platform.getAutoHideMenuBarEnabled();
}
const showTrayIconSupported = await platform.supportsTrayIcon();
let showTrayIcon = true;
if (showTrayIconSupported) {
showTrayIcon = await platform.getTrayIconEnabled();
}
const minimizeToTraySupported = await platform.supportsMinimizeToTray();
let minimizeToTray = true;
if (minimizeToTraySupported) {
@ -114,8 +106,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
autoLaunchSupported,
alwaysShowMenuBarSupported,
alwaysShowMenuBar,
showTrayIconSupported,
showTrayIcon,
minimizeToTraySupported,
minimizeToTray,
});
@ -129,10 +119,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
PlatformPeg.get().setAutoHideMenuBarEnabled(!checked).then(() => this.setState({alwaysShowMenuBar: checked}));
};
_onShowTrayIconChange = (checked) => {
PlatformPeg.get().setTrayIconEnabled(checked).then(() => this.setState({showTrayIcon: checked}));
};
_onMinimizeToTrayChange = (checked) => {
PlatformPeg.get().setMinimizeToTrayEnabled(checked).then(() => this.setState({minimizeToTray: checked}));
};
@ -174,24 +160,12 @@ export default class PreferencesUserSettingsTab extends React.Component {
label={_t('Always show the window menu bar')} />;
}
let enableTrayIcon = null;
if (this.state.showTrayIconSupported) {
enableTrayIcon = <LabelledToggleSwitch
value={this.state.showTrayIcon}
onChange={this._onShowTrayIconChange}
label={_t('Show tray icon')} />;
}
let minimizeToTrayOption = null;
if (this.state.minimizeToTraySupported) {
// If tray icon is disabled then this option is not available and forced to off.
// Unless tray icon is not supported (darwin)
const disableOption = this.state.showTrayIconSupported && !this.state.showTrayIcon;
minimizeToTrayOption = <LabelledToggleSwitch
value={!disableOption && this.state.minimizeToTray}
disabled={disableOption}
value={this.state.minimizeToTray}
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 (
@ -209,7 +183,6 @@ export default class PreferencesUserSettingsTab extends React.Component {
<span className="mx_SettingsTab_subheading">{_t("Advanced")}</span>
{this._renderGroup(PreferencesUserSettingsTab.ADVANCED_SETTINGS)}
{enableTrayIcon}
{minimizeToTrayOption}
{autoHideMenuOption}
{autoLaunchOption}

3
src/i18n/strings/en_EN.json
View File

@ -640,8 +640,7 @@
"Notifications": "Notifications",
"Start automatically after system login": "Start automatically after system login",
"Always show the window menu bar": "Always show the window menu bar",
"Show tray icon": "Show tray icon",
"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",
"Composer": "Composer",
"Timeline": "Timeline",