+
+
@@ -12,4 +24,5 @@
-
\ No newline at end of file
+
+
\ No newline at end of file
diff --git a/app/DotnetRunnerApp.js b/app/DotnetRunnerApp.js
index e9d6401..a4e09f3 100644
--- a/app/DotnetRunnerApp.js
+++ b/app/DotnetRunnerApp.js
@@ -1,4 +1,4 @@
-const { BrowserWindow, Menu } = require('electron');
+const { BrowserWindow, Menu, ipcMain } = require('electron');
const { getApplications } = require('./data/applicationStore');
const { shell } = require('electron');
const ipcMessages = require('./ipcMessages');
@@ -82,6 +82,7 @@ module.exports = class DotnetRunnerApp {
{
label: 'Options',
submenu: [{
+ id: 'config-apps',
label: 'Configure Applicaions',
click: this._preferencesOnCLick.bind(this)
}, {
@@ -89,20 +90,25 @@ module.exports = class DotnetRunnerApp {
click: this._displayPreferences.bind(this)
}]
}, {
+ id: 'tasks',
label: 'Tasks',
submenu: [{
+ id: 'start-all',
label: 'Start all',
accelerator: 'Ctrl+s',
click: this._startAllApps.bind(this)
}, {
+ id: 'stop-all',
label: 'Stop all',
accelerator: 'Ctrl+Shift+S',
click: this._stopAllApps.bind(this)
}, {
+ id: 'clear-all',
label: 'Clear all',
accelerator: 'Ctrl+Shift+C',
click: this._clearAllApps.bind(this)
}, {
+ id: 'purge-all',
label: 'Purge',
accelerator: 'Ctrl+Shift+P',
click: this._purge.bind(this)
@@ -142,15 +148,24 @@ module.exports = class DotnetRunnerApp {
}
_startAllApps() {
+ this._disableTasks();
+ this._disableConfigAppMenu();
this._sendMessage(ipcMessages.startAllApplications);
+ ipcMain.once(ipcMessages.taskComplete, this._onTaskComplete.bind(this));
}
_stopAllApps() {
+ this._disableTasks();
+ this._disableConfigAppMenu();
this._sendMessage(ipcMessages.stopAllApplications);
+ ipcMain.once(ipcMessages.taskComplete, this._onTaskComplete.bind(this));
}
_clearAllApps() {
+ this._disableTasks();
+ this._disableConfigAppMenu();
this._sendMessage(ipcMessages.clearAllApplicationLogs);
+ ipcMain.once(ipcMessages.taskComplete, this._onTaskComplete.bind(this));
}
_purge() {
@@ -161,6 +176,43 @@ module.exports = class DotnetRunnerApp {
this._mainWindow.send(message);
}
+ _disableTasks() {
+ const menu = this._menu.getApplicationMenu().getMenuItemById('tasks');
+
+ if (!menu || !menu.submenu || !menu.submenu.items)
+ return;
+
+ menu.submenu.items.forEach(x => x.enabled = false);
+ }
+
+ _enableTasks() {
+ const menu = this._menu.getApplicationMenu().getMenuItemById('tasks');
+
+ if (!menu || !menu.submenu || !menu.submenu.items)
+ return;
+
+ menu.submenu.items.forEach(x => x.enabled = true);
+ }
+
+ _disableConfigAppMenu() {
+ const menu = this._menu.getApplicationMenu().getMenuItemById('config-apps') || {};
+
+ menu.enabled = false;
+ }
+
+ _enableConfigAppMenu() {
+ const menu = this._menu.getApplicationMenu().getMenuItemById('config-apps') || {};
+
+ menu.enabled = true;
+ }
+
+ _onTaskComplete(e, task) {
+ if (task === ipcMessages.startAllApplications || task === ipcMessages.stopAllApplications || task === ipcMessages.clearAllApplicationLogs)
+ this._enableConfigAppMenu();
+
+ this._enableTasks();
+ }
+
/**
* @returns {Menu}
*/
diff --git a/app/SplashScreenApp.js b/app/SplashScreenApp.js
index 5fa08bf..008c907 100644
--- a/app/SplashScreenApp.js
+++ b/app/SplashScreenApp.js
@@ -72,7 +72,6 @@ module.exports = class SplashScreenApp {
show: false
});
-
this._splashWindow
.loadFile('app/browserWindows/splashScreen/splashScreen.html');
diff --git a/app/browserWindows/main/main.css b/app/browserWindows/main/main.css
index 54261cb..b975e92 100644
--- a/app/browserWindows/main/main.css
+++ b/app/browserWindows/main/main.css
@@ -14,7 +14,11 @@
.footer {
padding: 5px;
- border-top: solid 1px rgba(128, 128, 128, 0.35);;
+ border-top: solid 1px rgba(128, 128, 128, 0.35);
+}
+
+.footer-content {
+ min-height: 36px;
}
html, body {
@@ -28,4 +32,15 @@ body {
.runningProcessCount, #github {
cursor: pointer;
+}
+
+.batch-run-message.hide {
+ display: none;
+}
+
+div.batch-run-message {
+ padding: 5px;
+ width: 500px;
+ text-align: center;
+ margin: 0px;
}
\ No newline at end of file
diff --git a/app/browserWindows/main/main.html b/app/browserWindows/main/main.html
index dd87f50..0c3589a 100644
--- a/app/browserWindows/main/main.html
+++ b/app/browserWindows/main/main.html
@@ -29,9 +29,13 @@