From 8d7137136b4e460af6fedf59ca11d7287dac4ec6 Mon Sep 17 00:00:00 2001 From: brindosch Date: Tue, 17 Jan 2017 21:53:35 +0100 Subject: [PATCH] priorities rework, webc update (#366) * update * update * tabs test * update * test * ... * fix editor * update ui * fix visual glitch if help is off * fix fadecandy error and th [skip ci] --- assets/webconfig/content/colors.html | 3 +- assets/webconfig/content/connection_lost.html | 2 +- assets/webconfig/content/effects.html | 50 +-- .../content/effects_configurator.html | 6 +- assets/webconfig/content/general.html | 17 +- assets/webconfig/content/grabber.html | 32 +- assets/webconfig/content/kodiconf.html | 17 +- assets/webconfig/content/leds.html | 125 +++---- assets/webconfig/content/logging.html | 3 +- assets/webconfig/content/network.html | 81 +---- assets/webconfig/content/remote.html | 8 +- assets/webconfig/content/restart.html | 35 ++ assets/webconfig/content/support.html | 6 +- assets/webconfig/content/webconfig.html | 17 +- .../css/bootstrap-colorpicker.min.css.map | 1 - assets/webconfig/css/hyperion.css | 135 ++++++++ .../images/ui-icons_444444_256x240.png | Bin 7006 -> 0 bytes .../images/ui-icons_555555_256x240.png | Bin 7074 -> 0 bytes .../images/ui-icons_777620_256x240.png | Bin 4676 -> 0 bytes .../images/ui-icons_777777_256x240.png | Bin 7013 -> 0 bytes .../images/ui-icons_cc0000_256x240.png | Bin 4632 -> 0 bytes .../images/ui-icons_ffffff_256x240.png | Bin 6313 -> 0 bytes .../webconfig/css/jquery-ui/jquery-ui.min.css | 7 - .../css/jquery-ui/jquery-ui.structure.min.css | 5 - .../css/jquery-ui/jquery-ui.theme.min.css | 5 - assets/webconfig/i18n/de.json | 130 ++++++-- assets/webconfig/i18n/en.json | 123 +++++-- assets/webconfig/index.html | 156 ++++----- assets/webconfig/js/content_colors.js | 73 +++- assets/webconfig/js/content_effects.js | 77 +++-- .../js/content_effectsconfigurator.js | 4 +- assets/webconfig/js/content_general.js | 105 +++++- assets/webconfig/js/content_grabber.js | 35 +- assets/webconfig/js/content_index.js | 3 +- assets/webconfig/js/content_kodi.js | 14 +- assets/webconfig/js/content_leds.js | 314 ++++++++---------- assets/webconfig/js/content_logging.js | 17 +- assets/webconfig/js/content_network.js | 91 ++++- assets/webconfig/js/content_remote.js | 64 +++- assets/webconfig/js/content_webconfig.js | 14 +- assets/webconfig/js/hyperion.js | 47 ++- assets/webconfig/js/ledsim.js | 141 ++++++++ assets/webconfig/js/lib/dialog.min.js | 1 + assets/webconfig/js/lib/download.min.js | 2 + assets/webconfig/js/lib/draggable.min.js | 1 + assets/webconfig/js/lib/jquery-ui.min.js | 13 - assets/webconfig/js/lib/jsoneditor.js | 29 +- assets/webconfig/js/lib/jsoneditor.js.map | 1 - assets/webconfig/js/localStorage.js | 120 ------- assets/webconfig/js/settings.js | 121 +++++++ assets/webconfig/js/ui_utils.js | 222 +++++++++---- assets/webconfig/js/wizard.js | 98 +++--- config/hyperion.config.json.commented | 42 +-- config/hyperion.config.json.default | 14 +- include/hyperion/PriorityMuxer.h | 2 +- libsrc/effectengine/EffectEngine.cpp | 4 +- .../hyperion/schemas/hyperion.schema-2.json | 63 ++-- libsrc/jsonserver/JsonClientConnection.cpp | 123 +++---- libsrc/jsonserver/schema/schema-clear.json | 2 + libsrc/jsonserver/schema/schema-color.json | 2 + libsrc/jsonserver/schema/schema-effect.json | 2 + libsrc/jsonserver/schema/schema-image.json | 2 + .../schema/schema-sourceselect.json | 4 +- libsrc/leddevice/schemas/schema-adalight.json | 2 +- .../leddevice/schemas/schema-fadecandy.json | 2 +- .../leddevice/schemas/schema-sk6812spi.json | 3 + libsrc/leddevice/schemas/schema-ws281x.json | 3 + .../utils/jsonschema/QJsonSchemaChecker.cpp | 2 +- src/hyperion-aml/hyperion-aml.cpp | 2 +- src/hyperion-dispmanx/hyperion-dispmanx.cpp | 2 +- .../hyperion-framebuffer.cpp | 2 +- src/hyperion-osx/hyperion-osx.cpp | 2 +- src/hyperion-remote/hyperion-remote.cpp | 2 +- src/hyperion-v4l2/hyperion-v4l2.cpp | 2 +- src/hyperion-x11/hyperion-x11.cpp | 2 +- 75 files changed, 1713 insertions(+), 1144 deletions(-) create mode 100644 assets/webconfig/content/restart.html delete mode 100644 assets/webconfig/css/bootstrap-colorpicker.min.css.map delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_444444_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_555555_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_777620_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_777777_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_cc0000_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/images/ui-icons_ffffff_256x240.png delete mode 100644 assets/webconfig/css/jquery-ui/jquery-ui.min.css delete mode 100644 assets/webconfig/css/jquery-ui/jquery-ui.structure.min.css delete mode 100644 assets/webconfig/css/jquery-ui/jquery-ui.theme.min.css create mode 100644 assets/webconfig/js/ledsim.js create mode 100644 assets/webconfig/js/lib/dialog.min.js create mode 100644 assets/webconfig/js/lib/download.min.js create mode 100644 assets/webconfig/js/lib/draggable.min.js delete mode 100644 assets/webconfig/js/lib/jquery-ui.min.js delete mode 100755 assets/webconfig/js/lib/jsoneditor.js.map delete mode 100644 assets/webconfig/js/localStorage.js create mode 100644 assets/webconfig/js/settings.js diff --git a/assets/webconfig/content/colors.html b/assets/webconfig/content/colors.html index 51c8c730..16152f1a 100644 --- a/assets/webconfig/content/colors.html +++ b/assets/webconfig/content/colors.html @@ -7,8 +7,7 @@

Color calibration, smoothing (color transistions) and detection of blackbars.

-
- +
diff --git a/assets/webconfig/content/connection_lost.html b/assets/webconfig/content/connection_lost.html index d5b8f2db..fe55226e 100644 --- a/assets/webconfig/content/connection_lost.html +++ b/assets/webconfig/content/connection_lost.html @@ -37,7 +37,7 @@ function tryReconnect() function connectionLostAction() { connectionLost = true; - connectionTimer = window.setInterval(tryReconnect, 5000); + connectionTimer = window.setInterval(tryReconnect, 4000); } diff --git a/assets/webconfig/content/effects.html b/assets/webconfig/content/effects.html index be45f63c..d006d263 100644 --- a/assets/webconfig/content/effects.html +++ b/assets/webconfig/content/effects.html @@ -6,57 +6,9 @@

Setting up a booteffect/color that is visible after Hyperion startup. Configure a background effect/color which is active, when all capture sources are disabled (also temporarily via Kodi Watch)

-
-
-
-
Effect Paths
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
Kodi Watch
-
-
-
-
- -
-
-
-
-
-
-
-
-
-
-
Kodi Watch
-
-
-
-
- -
-
-
-
-
-
-
+
- diff --git a/assets/webconfig/content/effects_configurator.html b/assets/webconfig/content/effects_configurator.html index f7530777..4e0dd90a 100644 --- a/assets/webconfig/content/effects_configurator.html +++ b/assets/webconfig/content/effects_configurator.html @@ -7,14 +7,14 @@
-
+
-
- +
+ +
-
-
-
diff --git a/assets/webconfig/content/grabber.html b/assets/webconfig/content/grabber.html index cd3b6932..4ac9ca33 100644 --- a/assets/webconfig/content/grabber.html +++ b/assets/webconfig/content/grabber.html @@ -7,37 +7,7 @@

Hyperion supports two ways on how to get captured pictures for processing and output. The platform grabber which captures internal at the device you are running Hyperion on (best qualitiy) and the USB Grabber which gathers from a connected device the necessary pictures (more calibration work and configuration).

-
-
-
-
Kodi Watch
-
-
-
-
- -
-
-
-
-
-
- -
-
-
Kodi Watch
-
-
-
-
- -
-
-
-
-
-
-
+
diff --git a/assets/webconfig/content/kodiconf.html b/assets/webconfig/content/kodiconf.html index 9106f650..7db6f27a 100644 --- a/assets/webconfig/content/kodiconf.html +++ b/assets/webconfig/content/kodiconf.html @@ -10,22 +10,7 @@ HINT 1: In any case you need to enable the remote control for Kodi. Please checkout Wiki for instructions. LINK
HINT 2: If you just use a USB-Grabber you could enable the Kodi Watch for this separately at the USB-Grabber page. -
-
-
-
Kodi Watch
-
-
-
-
- -
-
-
-
-
-
-
+
diff --git a/assets/webconfig/content/leds.html b/assets/webconfig/content/leds.html index 6ae1e6bd..41624227 100644 --- a/assets/webconfig/content/leds.html +++ b/assets/webconfig/content/leds.html @@ -1,12 +1,3 @@ - - -

LED Hardware

@@ -38,7 +27,6 @@
@@ -79,58 +67,27 @@
-
- +
+
-