aaron/mattermost-desktop
1
0
Fork 0
Code Issues Pull requests Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #392 from jnugh/linuxTrayIconThemeSettings

Browse source 
Linux tray icon theme settings regression fix
This commit is contained in:
Yuya Ochiai 2016-12-12 21:41:15 +09:00 committed by GitHub
parent 2f9526f415 d4f3ca23d3
commit 1f11e8efd0
2 changed files with 31 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/browser/components/SettingsPage.jsx
View file

@ -1,5 +1,6 @@
const React = require('react');
const {Button, Checkbox, Col, FormGroup, Grid, Navbar, Row} = require('react-bootstrap');
const ReactDOM = require('react-dom');
const {Button, Checkbox, Col, FormGroup, FormControl, ControlLabel, Grid, Navbar, Row} = require('react-bootstrap');
const {ipcRenderer, remote} = require('electron');
const AutoLaunch = require('auto-launch');
@ -114,7 +115,7 @@ const SettingsPage = React.createClass({
},
handleChangeTrayIconTheme() {
this.setState({
trayIconTheme: !this.refs.trayIconTheme.props.checked
trayIconTheme: ReactDOM.findDOMNode(this.refs.trayIconTheme).value
});
},
handleChangeAutoStart() {
@ -189,16 +190,19 @@ const SettingsPage = React.createClass({
}
if (process.platform === 'linux') {
options.push(
<Checkbox
key='inputTrayIconTheme'
ref='trayIconTheme'
type='select'
value={this.state.trayIconTheme}
onChange={this.handleChangeTrayIconTheme}
>{'Icon theme (Need to restart the application)'}
<option value='light'>{'Light'}</option>
<option value='dark'>{'Dark'}</option>
</Checkbox>);
<FormGroup>
<ControlLabel>{'Icon theme (Need to restart the application)'}</ControlLabel>
<FormControl
componentClass='select'
key='inputTrayIconTheme'
ref='trayIconTheme'
value={this.state.trayIconTheme}
onChange={this.handleChangeTrayIconTheme}
>
<option value='light'>{'Light'}</option>
<option value='dark'>{'Dark'}</option>
</FormControl>
</FormGroup>);
}
options.push(
<Checkbox

21
src/main.js
View file

@ -153,12 +153,21 @@ const trayImages = (() => {
}
case 'linux':
{
const theme = config.trayIconTheme || 'light';
return {
normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconTemplate.png')),
unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconUnreadTemplate.png')),
mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconMentionTemplate.png'))
};
const theme = config.trayIconTheme;
try {
return {
normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconTemplate.png')),
unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconUnreadTemplate.png')),
mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', theme, 'MenuIconMentionTemplate.png'))
};
} catch (e) {
//Fallback for invalid theme setting
return {
normal: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconTemplate.png')),
unread: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconUnreadTemplate.png')),
mention: nativeImage.createFromPath(path.resolve(assetsDir, 'linux', 'light', 'MenuIconMentionTemplate.png'))
};
}
}
default:
return {};