diff --git a/assets/webconfig/content/dashboard.html b/assets/webconfig/content/dashboard.html index 6c7bb44e..0b322fd0 100644 --- a/assets/webconfig/content/dashboard.html +++ b/assets/webconfig/content/dashboard.html @@ -20,16 +20,24 @@ - - Components + + Capturing Hardware - + + + + Screen Capture + unknown + + + + USB Capture + unknown + + - - - @@ -42,17 +50,17 @@ - + - + - + diff --git a/assets/webconfig/css/hyperion.css b/assets/webconfig/css/hyperion.css index ca9c6b20..9f2ce55b 100644 --- a/assets/webconfig/css/hyperion.css +++ b/assets/webconfig/css/hyperion.css @@ -76,9 +76,11 @@ table.input-group{width:100%} /*table*/ table.borderless td,table.borderless th{border: none !important;} +table.borderless td:first-child{width: 25px !important;} .borderless {margin-bottom:0px} table label{margin:0} table.first_cell_borderless td:first-child,table.first_cell_borderless th:first-child{border: none !important;} +table.first_cell_borderless td:first-child{width: 25px !important;} /*Header*/ .navbar-brand{padding-top:4px;padding-bottom:0px;padding-left:2;} diff --git a/assets/webconfig/index.html b/assets/webconfig/index.html index 747c2ed7..24b711a8 100644 --- a/assets/webconfig/index.html +++ b/assets/webconfig/index.html @@ -214,7 +214,7 @@
  • Image Processing
    • -
  • Capturing Hardware
    • +
  • Capturing Hardware
  • Network
  • Remote Control
  • Effects Configurator
    • diff --git a/assets/webconfig/js/content_dashboard.js b/assets/webconfig/js/content_dashboard.js index d672edaf..22722901 100644 --- a/assets/webconfig/js/content_dashboard.js +++ b/assets/webconfig/js/content_dashboard.js @@ -51,36 +51,23 @@ $(document).ready(function () { instances_html += ''; var instance_components = ""; - var global_components = ""; for (var idx = 0; idx < components.length; idx++) { if (components[idx].name != "ALL") { - if (components[idx].name != "FORWARDER" && components[idx].name != "GRABBER" && components[idx].name != "V4L") { - var comp_enabled = components[idx].enabled ? "checked" : ""; - const general_comp = "general_comp_" + components[idx].name; - var componentBtn = ''; + if (components[idx].name === "FORWARDER" && window.currentHyperionInstance != 0) + continue; - instance_components += ''; - } else { - var comp_enabled = components[idx].enabled ? "checked" : ""; - const general_comp = "general_comp_" + components[idx].name; - var componentBtn = ''; + var comp_enabled = components[idx].enabled ? "checked" : ""; + const general_comp = "general_comp_" + components[idx].name; + var componentBtn = ''; - global_components += ''; - } + instance_components += ''; } } @@ -88,7 +75,6 @@ $(document).ready(function () { instances_html += ''; $('.instances').prepend(instances_html); - $('.glob_components').html(global_components); updateUiOnInstance(window.currentHyperionInstance); updateHyperionInstanceListing(); @@ -113,6 +99,11 @@ $(document).ready(function () { } // add more info + var screenCapture = window.serverConfig.instCapture.systemEnable ? $.i18n('general_enabled') : $.i18n('general_disabled'); + $('#dash_screen_capture').html(screenCapture); + var usbCapture = window.serverConfig.instCapture.v4lEnable ? $.i18n('general_enabled') : $.i18n('general_disabled'); + $('#dash_usb_capture').html(usbCapture); + var fbPort = window.serverConfig.flatbufServer.enable ? window.serverConfig.flatbufServer.port : $.i18n('general_disabled'); $('#dash_fbPort').html(fbPort); var pbPort = window.serverConfig.protoServer.enable ? window.serverConfig.protoServer.port : $.i18n('general_disabled'); diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js index a2428ef2..a7b9a5e6 100755 --- a/assets/webconfig/js/content_index.js +++ b/assets/webconfig/js/content_index.js @@ -312,7 +312,7 @@ $(document).ready(function () { $("#navbar_brand_logo").css("display", "none"); else $("#navbar_brand_logo").css("display", ""); - }); + }); $('#side-menu li a, #side-menu li ul li a').click(function() { console.log('test'); diff --git a/assets/webconfig/js/content_remote.js b/assets/webconfig/js/content_remote.js index c5d58f25..cf446dbf 100644 --- a/assets/webconfig/js/content_remote.js +++ b/assets/webconfig/js/content_remote.js @@ -201,7 +201,7 @@ $(document).ready(function () { }); for (const comp of components) { - if (comp.name === "ALL") + if (comp.name === "ALL" || (comp.name === "FORWARDER" && window.currentHyperionInstance != 0)) continue; const enable_style = (comp.enabled ? "checked" : ""); diff --git a/libsrc/api/API.cpp b/libsrc/api/API.cpp index 630133f6..b3413318 100644 --- a/libsrc/api/API.cpp +++ b/libsrc/api/API.cpp @@ -205,20 +205,8 @@ bool API::setComponentState(const QString &comp, bool &compState, QString &reply if (component != COMP_INVALID) { - if (component == COMP_FORWARDER || - component == COMP_GRABBER || - component == COMP_V4L || - component == COMP_FLATBUFSERVER || - component == COMP_PROTOSERVER) - { - QMetaObject::invokeMethod(_instanceManager, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState)); - return true; - } - else - { - QMetaObject::invokeMethod(_hyperion, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState)); - return true; - } + QMetaObject::invokeMethod(_hyperion, "compStateChangeRequest", Qt::QueuedConnection, Q_ARG(hyperion::Components, component), Q_ARG(bool, compState)); + return true; } replyMsg = QString("Unknown component name: %1").arg(comp); return false; diff --git a/libsrc/hyperion/HyperionIManager.cpp b/libsrc/hyperion/HyperionIManager.cpp index 72c03ece..f1080156 100644 --- a/libsrc/hyperion/HyperionIManager.cpp +++ b/libsrc/hyperion/HyperionIManager.cpp @@ -90,7 +90,6 @@ bool HyperionIManager::startInstance(quint8 inst, bool block, QObject* caller, i connect(hyperion, &Hyperion::videoMode, this, &HyperionIManager::requestVideoMode); // to Hyperion connect(this, &HyperionIManager::newVideoMode, hyperion, &Hyperion::newVideoMode); - connect(this, &HyperionIManager::compStateChangeRequest, hyperion, &Hyperion::compStateChangeRequest); // add to queue and start _startQueue << inst;
    protoproto unknown
    flatflat unknown
    jsonjson unknown
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '
    ' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + '