Commit Graph

  • d2c7f7ca5a dboxinfo: fix merge error in header text vanhofen 2016-08-26 23:25:19 +02:00
  • b924f02705 dboxinfo: fix merge error in header text vanhofen 2016-08-26 23:25:19 +02:00
  • ad217fc956 framebuffer/fbaccel: merge NI code vanhofen 2016-08-26 23:13:52 +02:00
  • b8b459245f framebuffer/fbaccel: merge NI code vanhofen 2016-08-26 23:13:52 +02:00
  • f1adbec7b2 neutrino: fix segfault at startup; double 'delete hintBox' vanhofen 2016-08-26 23:12:48 +02:00
  • 9a0323fcc0 neutrino: fix segfault at startup; double 'delete hintBox' vanhofen 2016-08-26 23:12:48 +02:00
  • b61315b6a9 streaminfo2: fix merge error vanhofen 2016-08-26 20:02:43 +02:00
  • 1ebd4df379 streaminfo2: fix merge error vanhofen 2016-08-26 20:02:43 +02:00
  • bc33663742 Merge branch 'ni/mp' into ni/cst-next vanhofen 2016-08-26 19:13:47 +02:00
  • af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next vanhofen 2016-08-26 19:13:47 +02:00
  • 6e38f7b956 Merge branch 'cst-next' into nmp-cst-next_test Michael Liebmann 2016-08-26 16:52:10 +02:00
  • 73da438ec4 Merge branch 'cst-next' into nmp-cst-next_test Michael Liebmann 2016-08-26 16:52:10 +02:00
  • 01add923d6 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-26 16:06:36 +02:00
  • 8f2cbeb841 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-26 16:06:36 +02:00
  • 79d0c2e5da yWeb: depending display of logos in EPG plus from Tuxbox.DisplayLogos vanhofen 2016-08-26 15:56:11 +02:00
  • 7b820b8cef yWeb: depending display of logos in EPG plus from Tuxbox.DisplayLogos vanhofen 2016-08-26 15:56:11 +02:00
  • 5223eb01dc tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile() vanhofen 2016-08-26 15:14:09 +02:00
  • 3f71bf4b1f tuxboxapi: remove obsolete Tuxbox.LogosURL from getLogoFile() vanhofen 2016-08-26 15:14:09 +02:00
  • 55efa2e847 neutrinoyparser: move search for channellogos to neutrinoyparser vanhofen 2016-08-26 15:00:14 +02:00
  • 27da45f59e neutrinoyparser: move search for channellogos to neutrinoyparser vanhofen 2016-08-26 15:00:14 +02:00
  • 796c4bf5ea fix xmltv channellogos TangoCash 2016-08-25 11:37:20 +02:00
  • 58a479dc92 fix xmltv channellogos TangoCash 2016-08-25 11:37:20 +02:00
  • de29fd97eb nhttpd/neutrinoapi: fix getLogoFile() martii 2014-03-11 19:49:37 +01:00
  • cb4b093b11 nhttpd/neutrinoapi: fix getLogoFile() martii 2014-03-11 19:49:37 +01:00
  • c110c615b2 Update src/Makefile.am Michael Liebmann 2016-08-26 05:01:52 +02:00
  • b5984c6f04 Update src/Makefile.am Michael Liebmann 2016-08-26 05:01:52 +02:00
  • 9d30a0906d Merge branch 'cst-next' into nmp-cst-next Michael Liebmann 2016-08-24 09:54:34 +02:00
  • 0433da66aa Merge branch 'cst-next' into nmp-cst-next Michael Liebmann 2016-08-24 09:54:34 +02:00
  • 5ee03e8537 CImageInfoNI: Fix display imagesize for root1 sysfs on HD2 hardware Michael Liebmann 2016-08-23 21:52:20 +02:00
  • 853e75e0d7 CImageInfoNI: Fix display imagesize for root1 sysfs on HD2 hardware Michael Liebmann 2016-08-23 21:52:20 +02:00
  • ec7f1939e7 CImageInfoNI::paint_NET_Info: Fix max_bit for hd2 hardware Michael Liebmann 2016-08-23 21:21:42 +02:00
  • 4de4c4eb19 CImageInfoNI::paint_NET_Info: Fix max_bit for hd2 hardware Michael Liebmann 2016-08-23 21:21:42 +02:00
  • 234dd9ee3b Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 16:05:08 +02:00
  • 406b6f1557 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 16:05:08 +02:00
  • 5a24dc1ce5 CComponentsFooter: don't use default parameters for privat member Thilo Graf 2016-08-23 15:59:40 +02:00
  • c7fb4c5343 CComponentsFooter: don't use default parameters for privat member Thilo Graf 2016-08-23 15:59:40 +02:00
  • 934cf9dd44 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 15:40:06 +02:00
  • f4009864bf Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 15:40:06 +02:00
  • 6398975e24 controlapi: remove unused variable outType from xmltv functions vanhofen 2016-08-23 15:39:09 +02:00
  • 5490f62ef3 controlapi: remove unused variable outType from xmltv functions vanhofen 2016-08-23 15:39:09 +02:00
  • 6c8f53938a themes: add three new material themes vanhofen 2016-08-23 15:12:02 +02:00
  • 5494e305de themes: add three new material themes vanhofen 2016-08-23 15:12:02 +02:00
  • c0e2dff77f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 14:31:41 +02:00
  • a0aa276626 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-23 14:31:41 +02:00
  • 765957f617 yhook: avoid parameters from xml closing tag vanhofen 2016-08-23 14:26:51 +02:00
  • a1ddaab2c1 yhook: avoid parameters from xml closing tag vanhofen 2016-08-23 14:26:51 +02:00
  • 2891e335b1 controlapi: add xmltv support TangoCash 2016-08-23 14:26:24 +02:00
  • 518c0f534c controlapi: add xmltv support TangoCash 2016-08-23 14:26:24 +02:00
  • cc1bf6a654 themes: fix infobar_casystem_alpha in DarkOrange theme vanhofen 2016-08-22 23:47:06 +02:00
  • 108a77a4b3 themes: fix infobar_casystem_alpha in DarkOrange theme vanhofen 2016-08-22 23:47:06 +02:00
  • cf2f3e11fe colors: smoother interplay; use 1px frames vanhofen 2016-08-22 23:30:06 +02:00
  • 568677787e colors: smoother interplay; use 1px frames vanhofen 2016-08-22 23:30:06 +02:00
  • 1f3c68ccc2 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-22 21:50:20 +02:00
  • dd5091c844 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-22 21:50:20 +02:00
  • e371ec3383 CComponentsWindow: fix possible holes between frame and footer Thilo Graf 2016-08-22 21:11:38 +02:00
  • 955fafb035 CComponentsWindow: fix possible holes between frame and footer Thilo Graf 2016-08-22 21:11:38 +02:00
  • d2c96fd9e7 CMenuWidget: assign all layer colors out of header init Thilo Graf 2016-08-21 20:45:12 +02:00
  • e6b7e1921a CMenuWidget: assign all layer colors out of header init Thilo Graf 2016-08-21 20:45:12 +02:00
  • 5e16a9f6b4 CComponentsButton: reduce shadow width Thilo Graf 2016-08-21 15:12:01 +02:00
  • caca66caf5 CComponentsButton: reduce shadow width Thilo Graf 2016-08-21 15:12:01 +02:00
  • 27f527bb45 CComponentsWindow: simplify statements Thilo Graf 2016-08-21 14:22:08 +02:00
  • 78b38c9d31 CComponentsWindow: simplify statements Thilo Graf 2016-08-21 14:22:08 +02:00
  • cdd40d98b0 CComponentsFooter: use background color of footer inside chain object Thilo Graf 2016-08-20 23:54:40 +02:00
  • a593f3eec3 CComponentsFooter: use background color of footer inside chain object Thilo Graf 2016-08-20 23:54:40 +02:00
  • a8292eae0b src/gui/lua/lua_cc_window.cpp use setButtonLabels real window width Jacek Jendrzej 2016-08-22 20:59:06 +02:00
  • 52f7933b22 src/gui/lua/lua_cc_window.cpp use setButtonLabels real window width Jacek Jendrzej 2016-08-22 20:59:06 +02:00
  • 5d24be488e Complete missing lua api versions: Michael Liebmann 2016-08-22 04:25:33 +02:00
  • bacde0846a Complete missing lua api versions: Michael Liebmann 2016-08-22 04:25:33 +02:00
  • d07f21c2bc icons: transparent background for clock_face icon vanhofen 2016-08-22 17:47:39 +02:00
  • 5e22721cc4 icons: transparent background for clock_face icon vanhofen 2016-08-22 17:47:39 +02:00
  • 8f904a91ec analogclock: Save background for using transparent clock images Michael Liebmann 2016-08-22 16:13:46 +02:00
  • dd5f370fcc analogclock: Save background for using transparent clock images Michael Liebmann 2016-08-22 16:13:46 +02:00
  • c9f0b15a1d Complete missing lua api versions: Michael Liebmann 2016-08-22 04:25:33 +02:00
  • 16595ad9d7 Complete missing lua api versions: Michael Liebmann 2016-08-22 04:25:33 +02:00
  • 5b2085abb0 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-21 21:08:03 +02:00
  • e203488ad9 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-21 21:08:03 +02:00
  • fcfb4c41e5 lua_cc_window: add setDimensionsAll option Jacek Jendrzej 2016-08-21 18:29:10 +02:00
  • 5ff20dd0fd lua_cc_window: add setDimensionsAll option Jacek Jendrzej 2016-08-21 18:29:10 +02:00
  • 7e874ddf64 lua_cc_picture: add cpicture getHeight / getWidth option Jacek Jendrzej 2016-08-21 16:17:28 +02:00
  • f6600ae127 lua_cc_picture: add cpicture getHeight / getWidth option Jacek Jendrzej 2016-08-21 16:17:28 +02:00
  • 46b77c77e6 src/gui/components/cc_frm_window.cpp dont paint over screen size Jacek Jendrzej 2016-08-20 16:20:16 +02:00
  • f30dc8988d src/gui/components/cc_frm_window.cpp dont paint over screen size Jacek Jendrzej 2016-08-20 16:20:16 +02:00
  • f1912db720 2:supplement to 5ac8d0085b Jacek Jendrzej 2016-08-20 13:59:15 +02:00
  • eb7f2c4fa8 2:supplement to 0dc1041788 Jacek Jendrzej 2016-08-20 13:59:15 +02:00
  • 882bdf5b2d supplement to 5ac8d0085b Jacek Jendrzej 2016-08-20 09:54:12 +02:00
  • 04498b79f4 supplement to 0dc1041788 Jacek Jendrzej 2016-08-20 09:54:12 +02:00
  • 6192e893ab Fix merge conflicts Michael Liebmann 2016-08-19 17:58:43 +02:00
  • a19fe6bed0 Fix merge conflicts Michael Liebmann 2016-08-19 17:58:43 +02:00
  • eb0c679fa9 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-19 22:15:42 +02:00
  • c50acb9909 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-19 22:15:42 +02:00
  • 5ac8d0085b src/gui/lua/lua_cc_text.cpp if dx and dy is not set and text have parent use Height and Width size from parent Jacek Jendrzej 2016-08-19 21:17:45 +02:00
  • 0dc1041788 src/gui/lua/lua_cc_text.cpp if dx and dy is not set and text have parent use Height and Width size from parent Jacek Jendrzej 2016-08-19 21:17:45 +02:00
  • 1f6f0e5604 framebuffer_ng: Add OnAfterSetPallette() Michael Liebmann 2016-08-19 18:12:45 +02:00
  • 5d86ff2594 framebuffer_ng: Add OnAfterSetPallette() Michael Liebmann 2016-08-19 18:12:45 +02:00
  • 4a87f27fc3 framebuffer_ng: Add getIconPath() Michael Liebmann 2016-08-19 17:57:34 +02:00
  • da1a8cbfd6 framebuffer_ng: Add getIconPath() Michael Liebmann 2016-08-19 17:57:34 +02:00
  • 4246a31ba6 Merge branch 'cst-next' into nmp-cst-next Michael Liebmann 2016-08-19 17:40:48 +02:00
  • 2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next Michael Liebmann 2016-08-19 17:40:48 +02:00
  • 141df6c65a Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-17 21:38:03 +02:00
  • c743021398 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next vanhofen 2016-08-17 21:38:03 +02:00