Add reload and force reconntect options to app menu
This commit is contained in:
parent
68b5ad7dcf
commit
f611bd1272
6
main.js
6
main.js
|
@ -6,8 +6,8 @@ const {app, BrowserWindow, shell} = require('electron')
|
||||||
let mainWindow
|
let mainWindow
|
||||||
|
|
||||||
// Require other app modules
|
// Require other app modules
|
||||||
const trayService = require(__dirname+'/js/tray-service')
|
const trayService = require(__dirname+'/modules/tray-service')
|
||||||
const menuService = require(__dirname+'/js/menu-service')
|
const menuService = require(__dirname+'/modules/menu-service')
|
||||||
|
|
||||||
function initApp() {
|
function initApp() {
|
||||||
createWindow()
|
createWindow()
|
||||||
|
@ -33,7 +33,7 @@ function createWindow () {
|
||||||
menuService.createMenu()
|
menuService.createMenu()
|
||||||
|
|
||||||
// Open the DevTools.
|
// Open the DevTools.
|
||||||
// mainWindow.webContents.openDevTools()
|
mainWindow.webContents.openDevTools()
|
||||||
|
|
||||||
// Emitted when the window is closed.
|
// Emitted when the window is closed.
|
||||||
mainWindow.on('closed', function () {
|
mainWindow.on('closed', function () {
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
* Module for Menu functions.
|
* Module for Menu functions.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const {app, Menu} = require('electron')
|
const {app, Menu, BrowserWindow} = require('electron')
|
||||||
|
|
||||||
let menuService = {}
|
let menuService = {}
|
||||||
|
|
||||||
|
@ -12,6 +12,25 @@ menuService.createMenu = () => {
|
||||||
const application = {
|
const application = {
|
||||||
label: 'Chimeverse',
|
label: 'Chimeverse',
|
||||||
submenu: [
|
submenu: [
|
||||||
|
{
|
||||||
|
label: 'Reconnect',
|
||||||
|
accelerator: 'CmdOrCtrl+R',
|
||||||
|
click: () => {
|
||||||
|
let activeWindow = BrowserWindow.getFocusedWindow()
|
||||||
|
activeWindow.reload()
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
label: 'Force logout',
|
||||||
|
accelerator: 'CmdOrCtrl+D',
|
||||||
|
click: () => {
|
||||||
|
let activeWindow = BrowserWindow.getFocusedWindow()
|
||||||
|
activeWindow.webContents.send('force-logout-event');
|
||||||
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
type: 'separator',
|
||||||
|
},
|
||||||
{
|
{
|
||||||
label: 'Quit',
|
label: 'Quit',
|
||||||
accelerator: 'Command+Q',
|
accelerator: 'Command+Q',
|
||||||
|
@ -35,9 +54,7 @@ menuService.createMenu = () => {
|
||||||
accelerator: 'Shift+CmdOrCtrl+Z',
|
accelerator: 'Shift+CmdOrCtrl+Z',
|
||||||
role: 'redo',
|
role: 'redo',
|
||||||
},
|
},
|
||||||
{
|
|
||||||
type: 'separator',
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
label: 'Cut',
|
label: 'Cut',
|
||||||
accelerator: 'CmdOrCtrl+X',
|
accelerator: 'CmdOrCtrl+X',
|
25
renderer.js
25
renderer.js
|
@ -106,6 +106,16 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
chimeverseService.logout = () => {
|
||||||
|
let credentials = SettingsServise.getCredentials()
|
||||||
|
credentials.then((result) => {
|
||||||
|
let remove = chimeverseService.settings.removeCredentials(result.login)
|
||||||
|
remove.then(() => {
|
||||||
|
chimeverseService.system.reloadWindow()
|
||||||
|
})
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
chimeverseService.addChimeVersePluign = () => {
|
chimeverseService.addChimeVersePluign = () => {
|
||||||
converse.plugins.add('chimeVerse', {
|
converse.plugins.add('chimeVerse', {
|
||||||
initialize: (event) => {
|
initialize: (event) => {
|
||||||
|
@ -118,13 +128,7 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService)
|
||||||
$rootScope.$broadcast('ChimeVerseService:connected')
|
$rootScope.$broadcast('ChimeVerseService:connected')
|
||||||
})
|
})
|
||||||
_converse.api.listen.on('logout', () => {
|
_converse.api.listen.on('logout', () => {
|
||||||
let credentials = SettingsServise.getCredentials()
|
chimeverseService.logout()
|
||||||
credentials.then((result) => {
|
|
||||||
let remove = chimeverseService.settings.removeCredentials(result.login)
|
|
||||||
remove.then(() => {
|
|
||||||
chimeverseService.system.reloadWindow()
|
|
||||||
})
|
|
||||||
})
|
|
||||||
})
|
})
|
||||||
_converse.api.listen.on('messageAdded', (data) => {
|
_converse.api.listen.on('messageAdded', (data) => {
|
||||||
chimeverseService._notifyMessage(data)
|
chimeverseService._notifyMessage(data)
|
||||||
|
@ -161,9 +165,16 @@ angApp.factory('ChimeVerseService', ($rootScope, SettingsServise, SystemService)
|
||||||
|
|
||||||
angApp.controller('AppController', function ($scope, $rootScope, ChimeVerseService) {
|
angApp.controller('AppController', function ($scope, $rootScope, ChimeVerseService) {
|
||||||
|
|
||||||
|
const { ipcRenderer } = require('electron');
|
||||||
|
|
||||||
$scope.showLoginForm = false
|
$scope.showLoginForm = false
|
||||||
$scope.connectSpinner = true
|
$scope.connectSpinner = true
|
||||||
|
|
||||||
|
ipcRenderer.on('force-logout-event', () => {
|
||||||
|
ChimeVerseService.logout()
|
||||||
|
ipcRenderer.getCurrentWindow().reload()
|
||||||
|
})
|
||||||
|
|
||||||
$rootScope.$on('ChimeVerseService:connected', function () {
|
$rootScope.$on('ChimeVerseService:connected', function () {
|
||||||
$scope.connectSpinner = false
|
$scope.connectSpinner = false
|
||||||
$scope.$apply()
|
$scope.$apply()
|
||||||
|
|
Loading…
Reference in New Issue