Commit Graph

  • 7744c61ce9 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox gixxpunk 2017-09-29 15:25:21 +02:00
  • 5275b9fc28 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox gixxpunk 2017-09-29 15:25:21 +02:00
  • 384b18ad8e Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-29 10:49:27 +02:00
  • 43eeb40008 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-29 10:49:27 +02:00
  • 20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now vanhofen 2017-09-29 08:27:42 +02:00
  • 3df3b9eafe rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now vanhofen 2017-09-29 08:27:42 +02:00
  • 9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-29 08:35:05 +02:00
  • c75a12894f Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-29 08:35:05 +02:00
  • 1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now vanhofen 2017-09-29 08:27:42 +02:00
  • 369436124b rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now vanhofen 2017-09-29 08:27:42 +02:00
  • d639455da5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-28 23:43:36 +02:00
  • d6bf987c5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-28 23:43:36 +02:00
  • cce794bbac hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ... vanhofen 2017-09-28 23:41:24 +02:00
  • 97bc00bb1c hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ... vanhofen 2017-09-28 23:41:24 +02:00
  • c1535b5567 several memleak fixes; Dziekuje. vanhofen 2017-09-28 15:23:38 +02:00
  • 1e1394fb56 several memleak fixes; Dziekuje. vanhofen 2017-09-28 15:23:38 +02:00
  • cce7d1b424 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-28 14:43:25 +02:00
  • dcb2262e2f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-28 14:43:25 +02:00
  • 2417d86939 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-28 14:14:20 +02:00
  • c9bdd532dc Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-28 14:14:20 +02:00
  • c1f30d17dd bouqueteditor: clear details in infobox if no channels available vanhofen 2017-09-28 14:01:05 +02:00
  • 11ec707695 bouqueteditor: clear details in infobox if no channels available vanhofen 2017-09-28 14:01:05 +02:00
  • 9ca041f38b bouqueteditor: clear details in infobox if no channels available vanhofen 2017-09-28 14:01:05 +02:00
  • 6162f07cb0 bouqueteditor: clear details in infobox if no channels available vanhofen 2017-09-28 14:01:05 +02:00
  • 2aa2cc738f fix clang compil, use swap() Jacek Jendrzej 2017-09-28 13:43:51 +02:00
  • e4c46f69bf fix clang compil, use swap() Jacek Jendrzej 2017-09-28 13:43:51 +02:00
  • 92abcdc76d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 14:31:32 +02:00
  • a037d9fd78 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 14:31:32 +02:00
  • 8d9241ff68 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 14:30:28 +02:00
  • 093a970ca5 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 14:30:28 +02:00
  • 5bbee58487 menue: only add hint_height to full_height, if we really have a hint vanhofen 2017-09-27 14:26:22 +02:00
  • 85e3acf202 menue: only add hint_height to full_height, if we really have a hint vanhofen 2017-09-27 14:26:22 +02:00
  • 81b6ac9b3d menue: only add hint_height to full_height, if we really have a hint vanhofen 2017-09-27 14:26:22 +02:00
  • 2b25a2880d menue: only add hint_height to full_height, if we really have a hint vanhofen 2017-09-27 14:26:22 +02:00
  • 120ebdbe64 bouqueteditor_channels: allow to navigate with left/right through the bouquets vanhofen 2017-09-27 14:13:28 +02:00
  • 226bcb07ec bouqueteditor_channels: allow to navigate with left/right through the bouquets vanhofen 2017-09-27 14:13:28 +02:00
  • 79983f7af6 bouqueteditor_channels: allow to navigate with left/right through the bouquets vanhofen 2017-09-27 14:13:28 +02:00
  • 20d3536d63 bouqueteditor_channels: allow to navigate with left/right through the bouquets vanhofen 2017-09-27 14:13:28 +02:00
  • 894b1c146a Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 11:56:03 +02:00
  • fa8fc40b60 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 11:56:03 +02:00
  • 68cb4281d6 bouqueteditor: some more timeout-fixes vanhofen 2017-09-27 11:50:47 +02:00
  • 6a9ccee0bf bouqueteditor: some more timeout-fixes vanhofen 2017-09-27 11:50:47 +02:00
  • f6b2da8a5d Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-27 11:53:43 +02:00
  • 137506620f Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-27 11:53:43 +02:00
  • 1dd887d5fc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 11:53:23 +02:00
  • 7da79f28df Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 11:53:23 +02:00
  • 8dfa791177 bouqueteditor: some more timeout-fixes vanhofen 2017-09-27 11:50:47 +02:00
  • e5ffb25127 bouqueteditor: some more timeout-fixes vanhofen 2017-09-27 11:50:47 +02:00
  • ab4decf40e Revert "CMenuWidget: simplify menu_left_exit code, add missing break" Jacek Jendrzej 2017-09-27 11:11:12 +02:00
  • 2c554b1ae7 Revert "CMenuWidget: simplify menu_left_exit code, add missing break" Jacek Jendrzej 2017-09-27 11:11:12 +02:00
  • 25804788d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-27 10:48:51 +02:00
  • bc98eb31d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-27 10:48:51 +02:00
  • fc14107b0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 10:48:30 +02:00
  • 8c9fd751f7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-27 10:48:30 +02:00
  • b786ce7397 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 09:58:18 +02:00
  • 3d2186eafe Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-27 09:58:18 +02:00
  • ff62bdcdb7 fix some timout-off-bugs in bouquetlist and channellist vanhofen 2017-09-27 09:13:07 +02:00
  • 219ae6b8d4 fix some timout-off-bugs in bouquetlist and channellist vanhofen 2017-09-27 09:13:07 +02:00
  • 6c32f7b375 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser vanhofen 2017-09-27 08:53:13 +02:00
  • a33872ac9c fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser vanhofen 2017-09-27 08:53:13 +02:00
  • 18fd66d365 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" vanhofen 2017-09-27 08:33:15 +02:00
  • 7d0a8b9698 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" vanhofen 2017-09-27 08:33:15 +02:00
  • f6405d15f0 network-setup: add header-icon to network-test vanhofen 2017-09-27 08:32:42 +02:00
  • 2c4ee6e484 network-setup: add header-icon to network-test vanhofen 2017-09-27 08:32:42 +02:00
  • 0721dcc47f network-setup: fix text-alignment for network-test vanhofen 2017-09-26 23:16:26 +02:00
  • f72b23a71b network-setup: fix text-alignment for network-test vanhofen 2017-09-26 23:16:26 +02:00
  • 22cdf620c7 fix some timout-off-bugs in bouquetlist and channellist vanhofen 2017-09-27 09:13:07 +02:00
  • fe5d653cfc fix some timout-off-bugs in bouquetlist and channellist vanhofen 2017-09-27 09:13:07 +02:00
  • 7eefaebe15 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser vanhofen 2017-09-27 08:53:13 +02:00
  • 2bcb920dae fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser vanhofen 2017-09-27 08:53:13 +02:00
  • f184e79594 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" vanhofen 2017-09-27 08:33:15 +02:00
  • fced13d10f bouqueteditor: fix timeout; editor doesn't open when timeout was "off" vanhofen 2017-09-27 08:33:15 +02:00
  • 7a1c365f54 network-setup: add header-icon to network-test vanhofen 2017-09-27 08:32:42 +02:00
  • cca97df195 network-setup: add header-icon to network-test vanhofen 2017-09-27 08:32:42 +02:00
  • 51e5eb8f07 network-setup: fix text-alignment for network-test vanhofen 2017-09-26 23:16:26 +02:00
  • f97ed339ad network-setup: fix text-alignment for network-test vanhofen 2017-09-26 23:16:26 +02:00
  • 0ac696ebaf Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-26 16:13:18 +02:00
  • 7e2a8d3b7e Merge branch 'ni/tuxbox' into ni/mp/tuxbox vanhofen 2017-09-26 16:13:18 +02:00
  • 63398f923d Revert "epgview: swap RC_info and RC_help in EPG view" vanhofen 2017-09-26 16:08:55 +02:00
  • f3f0829b2a Revert "epgview: swap RC_info and RC_help in EPG view" vanhofen 2017-09-26 16:08:55 +02:00
  • fa1a2351bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-26 16:01:46 +02:00
  • 553da74b03 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox vanhofen 2017-09-26 16:01:46 +02:00
  • 0b3c315cae Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 13:38:07 +02:00
  • 76904502ed Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 13:38:07 +02:00
  • e0c5fe6321 menue: fix coordinates for savescreen function vanhofen 2017-09-25 13:51:56 +02:00
  • 94b5fa194b menue: fix coordinates for savescreen function vanhofen 2017-09-25 13:51:56 +02:00
  • 1165d734ec bouqueteditor_bouquets: RC_yellow now stops move bouquets too vanhofen 2017-09-25 13:08:06 +02:00
  • 838b6a7bc0 bouqueteditor_bouquets: RC_yellow now stops move bouquets too vanhofen 2017-09-25 13:08:06 +02:00
  • 3adca6f79c Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 13:02:04 +02:00
  • ebe98d8075 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 13:02:04 +02:00
  • a856e0c40e menue: add missing delete vanhofen 2017-09-25 22:27:26 +02:00
  • edf0c893c7 menue: add missing delete vanhofen 2017-09-25 22:27:26 +02:00
  • 079772e63d Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 12:52:04 +02:00
  • a25626adc1 Merge branch 'master' into pu/mp Jacek Jendrzej 2017-09-26 12:52:04 +02:00
  • 816a0ae326 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken" Jacek Jendrzej 2017-09-26 12:39:36 +02:00
  • 1c18f1eff5 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken" Jacek Jendrzej 2017-09-26 12:39:36 +02:00
  • cb235bd82c menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets vanhofen 2017-09-25 08:42:26 +02:00
  • 2de769148b menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets vanhofen 2017-09-25 08:42:26 +02:00
  • 459deeca9f osd-setup: use 0 as a localized value for timeout-settings vanhofen 2017-09-25 08:42:26 +02:00
  • 85d5c2b48f osd-setup: use 0 as a localized value for timeout-settings vanhofen 2017-09-25 08:42:26 +02:00