diff --git a/.vs/launch.vs.json b/.vs/launch.vs.json new file mode 100644 index 00000000..37627ab1 --- /dev/null +++ b/.vs/launch.vs.json @@ -0,0 +1,17 @@ +{ + "version": "0.2.1", + "defaults": {}, + "configurations": [ + { + "type": "default", + "project": "CMakeLists.txt", + "projectTarget": "hyperiond.exe (bin\\hyperiond.exe)", + "name": "Run hyperion with debug option and external console", + "args": [ + "-d", + "-c" + ], + "externalConsole": true + } + ] +} diff --git a/assets/webconfig/content/dashboard.html b/assets/webconfig/content/dashboard.html index a83ef2e9..593ef73a 100644 --- a/assets/webconfig/content/dashboard.html +++ b/assets/webconfig/content/dashboard.html @@ -16,6 +16,28 @@ Status
+ + + + + + + + + + + + + + + + + + +
+ + Capturing Hardware +
Screen-Grabberdisabled
Video-Grabberdisabled
@@ -28,22 +50,22 @@ - + - + - + - + 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 e8154e01..24b711a8 100644 --- a/assets/webconfig/index.html +++ b/assets/webconfig/index.html @@ -207,22 +207,22 @@
  • Dashboard
  • General
  • - Configuration + LED-Instances
    • -
  • Capturing Hardware
    • -
  • Network
    • +
  • Capturing Hardware
    • +
  • Network
  • Remote Control
  • Effects Configurator
  • Support
  • System
    • protoproto unknown
    flatflat unknown
    jsonjson unknown
    websocketwebsocket unknown
    '; instances_html += ''; instances_html += ''; - instances_html += ''; + instances_html += ''; instances_html += ''; instances_html += '
    '; @@ -40,7 +39,7 @@ $(document).ready(function () { instances_html += '' + $.i18n('dashboard_infobox_label_title') + ''; instances_html += '
    ' + $.i18n('conf_leds_contr_label_contrtype') + '' + $.i18n('conf_leds_contr_label_contrtype') + '' + window.serverConfig.device.type + '
    '; @@ -50,28 +49,39 @@ $(document).ready(function () { instances_html += '' + $.i18n('dashboard_componentbox_label_title') + ''; instances_html += ''; - var tab_components = ""; + var componentBtn = ""; + var instance_components = ""; for (var idx = 0; idx < components.length; idx++) { if (components[idx].name != "ALL") { - 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; - tab_components += '' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + ''; + + if ((components[idx].name === "GRABBER" && !window.serverConfig.instCapture.systemEnable) || (components[idx].name === "V4L" && !window.serverConfig.instCapture.v4lEnable)) + { + componentBtn = ''; + } else { + var comp_enabled = components[idx].enabled ? "checked" : ""; + const general_comp = "general_comp_" + components[idx].name; + componentBtn = ''; + } + + instance_components += '' + $.i18n('general_comp_' + components[idx].name) + '' + componentBtn + ''; } } - instances_html += '' + tab_components + ''; + instances_html += '' + instance_components + ''; instances_html += '
    '; $('.instances').prepend(instances_html); + updateUiOnInstance(window.currentHyperionInstance); updateHyperionInstanceListing(); @@ -83,7 +93,7 @@ $(document).ready(function () { for (var idx = 0; idx < components.length; idx++) { if (components[idx].name != "ALL") { $("#general_comp_" + components[idx].name).bootstrapToggle(); - $("#general_comp_" + components[idx].name).bootstrapToggle(hyperion_enabled ? "enable" : "disable") + $("#general_comp_" + components[idx].name).bootstrapToggle(hyperion_enabled ? "enable" : "disable"); $("#general_comp_" + components[idx].name).change(e => { requestSetComponentState(e.currentTarget.id.split('_')[2], e.currentTarget.checked); }); @@ -92,6 +102,11 @@ $(document).ready(function () { } // add more info + var screenGrabber = window.serverConfig.instCapture.systemEnable ? $.i18n('general_enabled') : $.i18n('general_disabled'); + $('#dash_screen_grabber').html(screenGrabber); + var videoGrabber = window.serverConfig.instCapture.v4lEnable ? $.i18n('general_enabled') : $.i18n('general_disabled'); + $('#dash_video_grabber').html(videoGrabber); + 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_grabber.js b/assets/webconfig/js/content_grabber.js index 5b3e177c..c9c37133 100755 --- a/assets/webconfig/js/content_grabber.js +++ b/assets/webconfig/js/content_grabber.js @@ -24,10 +24,10 @@ $(document).ready(function () { } } else { $('#conf_cont').addClass('row'); - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt')); - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_screengrabber', 'btn_submit_screengrabber')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_instCapture_heading_title"), 'editor_container_instCapt', 'btn_submit_instCapt', 'panel-system')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_fg_heading_title"), 'editor_container_screengrabber', 'btn_submit_screengrabber', 'panel-system')); if (VIDEOGRABBER_AVAIL) { - $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_videograbber', 'btn_submit_videograbber')); + $('#conf_cont').append(createOptPanel('fa-camera', $.i18n("edt_conf_v4l2_heading_title"), 'editor_container_videograbber', 'btn_submit_videograbber', 'panel-system')); } } diff --git a/assets/webconfig/js/content_index.js b/assets/webconfig/js/content_index.js index 124ca20c..26fd19d9 100755 --- a/assets/webconfig/js/content_index.js +++ b/assets/webconfig/js/content_index.js @@ -307,12 +307,17 @@ $(document).ready(function () { window.scrollTo(0, 0); }); - $(window).scroll(function(){ + $(window).scroll(function() { if ($(window).scrollTop() > 65) $("#navbar_brand_logo").css("display", "none"); else $("#navbar_brand_logo").css("display", ""); - }); + }); + + $('#side-menu li a, #side-menu li ul li a').click(function() { + $('#side-menu').find('.active').toggleClass('inactive'); // find all active classes and set inactive; + $(this).addClass('active'); + }); }); function suppressDefaultPwWarning() { @@ -349,7 +354,7 @@ $("#btn_darkmode").off().on("click", function (e) { }); // Menuitem toggle; -function SwitchToMenuItem(target) { +function SwitchToMenuItem(target, item) { document.getElementById(target).click(); // Get