Permalink
Browse files

integrated webserver ... (#697)

* initial commit of webconfig

* update example config with webconfig and fix format of file
update debian postinst script for install example config
  • Loading branch information...
1 parent d2f4725 commit 7dfb9f19676a38e835cfeada2809d598b64cbe41 @redPanther redPanther committed with brindosch Jun 12, 2016
Showing with 8,952 additions and 76 deletions.
  1. +3 −3 CMakeLists.txt
  2. +1 −0 HyperionConfig.h.in
  3. +609 −0 assets/webconfig/css/index.css
  4. +69 −0 assets/webconfig/index.html
  5. +37 −0 assets/webconfig/js/app/api/ChromeLocalStorage.js
  6. +57 −0 assets/webconfig/js/app/api/ChromeNetwork.js
  7. +307 −0 assets/webconfig/js/app/api/ChromeTcpSocket.js
  8. +49 −0 assets/webconfig/js/app/api/LocalStorage.js
  9. +57 −0 assets/webconfig/js/app/api/Network.js
  10. +68 −0 assets/webconfig/js/app/api/Socket.js
  11. +229 −0 assets/webconfig/js/app/api/WebSocket.js
  12. +534 −0 assets/webconfig/js/app/controllers/AppController.js
  13. +201 −0 assets/webconfig/js/app/data/ServerControl.js
  14. +150 −0 assets/webconfig/js/app/main.js
  15. +108 −0 assets/webconfig/js/app/main_chrome.js
  16. +124 −0 assets/webconfig/js/app/models/Settings.js
  17. +56 −0 assets/webconfig/js/app/utils/Tools.js
  18. +64 −0 assets/webconfig/js/app/views/EffectsView.js
  19. +396 −0 assets/webconfig/js/app/views/MainView.js
  20. +199 −0 assets/webconfig/js/app/views/ServerList.js
  21. +259 −0 assets/webconfig/js/app/views/SettingsView.js
  22. +134 −0 assets/webconfig/js/app/views/Slider.js
  23. +375 −0 assets/webconfig/js/app/views/TransformView.js
  24. +17 −0 assets/webconfig/js/background.js
  25. +2,054 −0 assets/webconfig/js/vendor/require.js
  26. +594 −0 assets/webconfig/js/vendor/stapes.js
  27. +1,107 −0 assets/webconfig/js/vendor/tinycolor.js
  28. +32 −0 assets/webconfig/manifest.json
  29. +14 −0 assets/webconfig/manifest.webapp
  30. BIN assets/webconfig/res/colorwheel.png
  31. BIN assets/webconfig/res/fontello.ttf
  32. BIN assets/webconfig/res/fontello.woff
  33. BIN assets/webconfig/res/icon_128.png
  34. +1 −1 cmake/debian/postinst
  35. +84 −69 config/hyperion.config.json.example
  36. +27 −0 include/webconfig/WebConfig.h
  37. +4 −0 libsrc/CMakeLists.txt
  38. +1 −0 libsrc/boblightserver/BoblightClientConnection.cpp
  39. +1 −0 libsrc/effectengine/EffectEngine.cpp
  40. +53 −0 libsrc/webconfig/CMakeLists.txt
  41. +221 −0 libsrc/webconfig/QtHttpClientWrapper.cpp
  42. +51 −0 libsrc/webconfig/QtHttpClientWrapper.h
  43. +32 −0 libsrc/webconfig/QtHttpHeader.cpp
  44. +37 −0 libsrc/webconfig/QtHttpHeader.h
  45. +75 −0 libsrc/webconfig/QtHttpReply.cpp
  46. +55 −0 libsrc/webconfig/QtHttpReply.h
  47. +60 −0 libsrc/webconfig/QtHttpRequest.cpp
  48. +40 −0 libsrc/webconfig/QtHttpRequest.h
  49. +66 −0 libsrc/webconfig/QtHttpServer.cpp
  50. +48 −0 libsrc/webconfig/QtHttpServer.h
  51. +87 −0 libsrc/webconfig/StaticFileServing.cpp
  52. +31 −0 libsrc/webconfig/StaticFileServing.h
  53. +33 −0 libsrc/webconfig/WebConfig.cpp
  54. +5 −2 src/hyperiond/CMakeLists.txt
  55. +36 −1 src/hyperiond/hyperiond.cpp
View
@@ -116,10 +116,10 @@ find_package(GitVersion)
configure_file("${PROJECT_SOURCE_DIR}/HyperionConfig.h.in" "${PROJECT_BINARY_DIR}/HyperionConfig.h")
include_directories("${PROJECT_BINARY_DIR}")
-if(ENABLE_QT5)
- ADD_DEFINITIONS ( -DENABLE_QT5 )
+if( NOT ENABLE_QT5)
+ #ADD_DEFINITIONS ( -DENABLE_QT5 )
#find_package(Qt5Widgets)
-else()
+#else()
# Add specific cmake modules to find qt4 (default version finds first available QT which might not be qt4)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/qt4)
endif()
View
@@ -32,6 +32,7 @@
// Define to enable profiler for development purpose
#cmakedefine ENABLE_PROFILER
+#cmakedefine ENABLE_QT5
// the hyperion build id string
#define HYPERION_VERSION_ID "${HYPERION_VERSION_ID}"
Oops, something went wrong.

0 comments on commit 7dfb9f1

Please sign in to comment.