Compare commits

..

10 Commits

Author SHA1 Message Date
sparks-alec bb400f98ef bump version number 2024-11-11 14:06:19 -05:00
sparks-alec 0f893e0168 Merge pull request #283 from stagehacks/mac-frame
Add frame to window on mac app
2024-11-10 20:23:26 -05:00
jwetzell 553ed3f76d add shortcut to toggle sidebar 2024-11-10 15:45:40 -06:00
jwetzell c9504933d2 enable frame on mac window 2024-11-10 15:45:27 -06:00
sparks-alec d68325b1a5 Update README.md 2024-11-03 22:25:18 -05:00
sparks-alec 75ac344846 remove message that may result in too many messages to QLab 2024-11-02 22:16:38 -04:00
sparks-alec 97c118bf99 debounce .draw() 2024-11-02 22:15:59 -04:00
jwetzell a6bcac5adf bump version to v1.2.1 2024-10-30 21:00:58 -05:00
jwetzell 98180dcfc4 Merge pull request #276 from tm1000/bugfix/delete-devices
Delete devices by null coalesce if never connected
2024-10-30 20:57:02 -05:00
Andrew Nagy eb7867f687 Fix bug in deleting devices 2024-10-30 18:55:38 -07:00
9 changed files with 54 additions and 18 deletions
+29
View File
@@ -0,0 +1,29 @@
{
"version": "0.2.0",
"configurations": [
{
"type": "node",
"request": "launch",
"name": "Electron: Main",
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron",
"runtimeArgs": ["--remote-debugging-port=9223", "."],
"windows": {
"runtimeExecutable": "${workspaceFolder}/node_modules/.bin/electron.cmd"
}
},
{
"name": "Electron: Renderer",
"type": "chrome",
"request": "attach",
"port": 9223,
"webRoot": "${workspaceFolder}",
"timeout": 30000
}
],
"compounds": [
{
"name": "Electron: All",
"configurations": ["Electron: Main", "Electron: Renderer"]
}
]
}
+1 -1
View File
@@ -2,7 +2,7 @@
"editor.defaultFormatter": "esbenp.prettier-vscode",
"editor.formatOnSave": true,
"editor.codeActionsOnSave": {
"source.fixAll.eslint": true
"source.fixAll.eslint": "explicit"
},
"eslint.validate": ["javascript"],
"html.validate.styles": false // accept templates inside HTML style attributes
+1 -1
View File
@@ -25,4 +25,4 @@ A dashboard for everything in your show.
- Shure ULXD Wireless
- DiGico SD Consoles
- PosiStageNet
- Livestream Studio (soon)
- Livestream Studio
+1 -2
View File
@@ -40,6 +40,7 @@ const menuTemplate = [
{ role: 'togglefullscreen' },
{
label: 'Toggle Sidebar',
accelerator: 'CommandOrControl+B',
id: 'toggleSidebar',
click(menuItem, window, event) {
mainWindow.webContents.send('toggleSidebar');
@@ -151,9 +152,7 @@ const menuTemplate = [
const windowMac = {
width: 1500,
height: 900,
titleBarStyle: 'customButtonsOnHover',
transparent: false,
frame: false,
show: false,
vibrancy: 'window',
visualEffectState: 'followWindow',
+2 -2
View File
@@ -1,12 +1,12 @@
{
"name": "cue-view",
"version": "1.2.0",
"version": "1.2.1",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "cue-view",
"version": "1.2.0",
"version": "1.2.1",
"license": "CC BY-SA 4.0",
"dependencies": {
"@jwetzell/posistagenet": "^1.1.0",
+1 -1
View File
@@ -1,7 +1,7 @@
{
"name": "cue-view",
"productName": "Cue View",
"version": "1.2.0",
"version": "1.2.2",
"description": "A dashboard for everything in your show",
"main": "main.js",
"scripts": {
+1 -1
View File
@@ -73,7 +73,7 @@ exports.data = function data(_device, oscData) {
return;
}
if (json.status === 'error') {
device.send('/workspaces');
// device.send('/workspaces');
return;
}
}
+4 -4
View File
@@ -257,13 +257,13 @@ module.exports.deleteActive = function deleteActive() {
if (choice) {
if (device.plugin.config.connectionType === 'TCPsocket') {
device.connection.destroy();
device.connection?.destroy();
} else if (device.plugin.config.connectionType === 'UDPsocket') {
device.connection.close();
device.connection?.close();
} else if (device.plugin.config.connectionType === 'multicast') {
device.connection.close();
device.connection?.close();
} else if (device.plugin.config.connectionType.startsWith('osc')) {
device.connection.close();
device.connection?.close();
}
VIEW.removeDeviceFromList(device);
delete devices[device.id];
+14 -6
View File
@@ -100,13 +100,21 @@ module.exports.draw = function draw(device) {
const d = device;
const $deviceDrawArea = document.getElementById(`device-${d.id}-draw-area`);
if ($deviceDrawArea) {
const scriptEl = $deviceDrawArea.contentWindow.document.createRange().createContextualFragment(generateBodyHTML(d));
$deviceDrawArea.contentWindow.document.body.replaceChildren(scriptEl);
} else {
drawDeviceFrame(d.id);
if (device.drawTimeout !== undefined) {
clearTimeout(device.drawTimeout);
}
d.drawn = true;
d.drawTimeout = setTimeout(() => {
if ($deviceDrawArea) {
const scriptEl = $deviceDrawArea.contentWindow.document
.createRange()
.createContextualFragment(generateBodyHTML(d));
$deviceDrawArea.contentWindow.document.body.replaceChildren(scriptEl);
} else {
drawDeviceFrame(d.id);
}
d.drawn = true;
}, 200);
};
module.exports.update = function update(device, type, data) {