phlux/mattermostest
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'master' into release/v1.1.0

Browse Source
This commit is contained in:
Yuya Ochiai
2016-03-22 23:24:04 +09:00
parent 960c5782bd ef8eebc8d0
commit ab18e33f7f
25 changed files with 229 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/browser/index.html
View File

@@ -3,7 +3,7 @@
<head>
<meta charset="UTF-8">
<title>electron-mattermost</title>
<title>Mattermost</title>
<link rel="stylesheet" href="modules/bootstrap/css/bootstrap.min.css">
</head>

2
src/browser/index.jsx
View File

@@ -240,7 +240,7 @@ var MattermostView = React.createClass({
var currentURL = url.parse(webview.getURL());
var destURL = url.parse(e.url);
if (currentURL.host === destURL.host) {
window.open(e.url, 'electron-mattermost');
window.open(e.url, 'Mattermost');
} else {
// if the link is external, use default browser.
require('shell').openExternal(e.url);

4
src/browser/settings.jsx
View File

@@ -72,7 +72,7 @@ var SettingsPage = React.createClass({
var options = [];
if (process.platform === 'win32' || process.platform === 'linux') {
options.push(<Input ref="hideMenuBar" type="checkbox" label="Hide menubar (Press Alt to show menubar)" checked={ this.state.hideMenuBar } onChange={ this.handleChangeHideMenuBar } />);
options.push(<Input ref="hideMenuBar" type="checkbox" label="Hide Menu Bar (Press Alt to show Menu Bar)" checked={ this.state.hideMenuBar } onChange={ this.handleChangeHideMenuBar } />);
}
var options_row = (options.length > 0) ? (
<Row>
@@ -202,7 +202,7 @@ var TeamListItemNew = React.createClass({
<div className="form-group">
<label for="inputTeamURL">URL</label>
{ ' ' }
<input type="url" className="form-control" id="inputTeamURL" placeholder="http://example.com/team" value={ this.state.url } onChange={ this.handleURLChange } />
<input type="url" className="form-control" id="inputTeamURL" placeholder="https://example.com/team" value={ this.state.url } onChange={ this.handleURLChange } />
</div>
{ ' ' }
<Button type="submit" disabled={ !this.shouldEnableAddButton() }>Add</Button>

7
src/main.js
View File

@@ -50,9 +50,6 @@ var mainWindow = null;
var trayIcon = null;
var willAppQuit = false;
// For toast notification on windows
app.setAppUserModelId('yuya-oc.electron-mattermost');
// Quit when all windows are closed.
app.on('window-all-closed', function() {
// On OS X it is common for applications and their menu bar
@@ -166,7 +163,9 @@ app.on('ready', function() {
// follow Electron's defaults
window_options = {};
}
window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
if (process.platform === 'linux') {
window_options.icon = path.resolve(__dirname, 'resources/appicon.png');
}
window_options.fullScreenable = true;
mainWindow = new BrowserWindow(window_options);
mainWindow.setFullScreenable(true); // fullscreenable option has no effect.

8
src/main/menus/app.js
View File

@@ -29,7 +29,13 @@ var createTemplate = function(mainWindow) {
label: first_menu_name,
submenu: [{
label: 'About ' + app_name,
role: 'about'
role: 'about',
click: function(item, focusedWindow) {
electron.dialog.showMessageBox(mainWindow, {
buttons: ["OK"],
message: `${app_name} Desktop ${electron.app.getVersion()}`
});
}
}, {
label: 'Settings',
click: function(item, focusedWindow) {

5
src/package.json
View File

@@ -1,7 +1,8 @@
{
"name": "electron-mattermost",
"name": "mattermost-desktop",
"productName": "Mattermost",
"version": "1.0.7",
"description": "Electron-based desktop application for Mattermost",
"description": "Mattermost Desktop application for Windows, Mac and Linux",
"main": "main.js",
"author": "Yuya Ochiai",
"license": "MIT",

BIN
src/resources/appicon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 124 KiB