mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-16 01:43:35 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,492 Commits 2 Branches 9 Tags
dbc81968f9bd66b6742a1f7d67a8ef7d1b94177c
Commit Graph

12492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jacek Jendrzej
384b18ad8e Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4fc73acffc
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 10:49:27 +02:00
vanhofen
20451a9be6 rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: 99cc7f850a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 10:34:23 +02:00
vanhofen
9351a0bf31 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/gui/bookmarkmanager.cpp


Origin commit data
------------------
Commit: 537ea51fcf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)
 2017-09-29 08:35:05 +02:00
vanhofen
1776ae664d rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now 
Origin commit data
------------------
Commit: ebc621f3b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-29 (Fri, 29 Sep 2017)

Origin message was:
------------------
- rcinput: simplify calcTimeoutEnd() calls; 0 is "off" by default now
 2017-09-29 08:27:42 +02:00
vanhofen
d639455da5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: d2c54a405b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 23:43:36 +02:00
vanhofen
cce794bbac hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ... 
Origin commit data
------------------
Commit: 54606af779
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- hdd-info: rework CHDDInfoWidget::paint(); use current gui-standards ...
 2017-09-28 23:41:24 +02:00
vanhofen
c1535b5567 several memleak fixes; Dziekuje. 
Origin commit data
------------------
Commit: 0f9cb1dc50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- several memleak fixes; Dziekuje.
 2017-09-28 15:23:38 +02:00
vanhofen
cce7d1b424 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: bfe2d81fc3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 14:43:25 +02:00
Jacek Jendrzej
2417d86939 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 452f155f04
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 14:14:20 +02:00
vanhofen
c1f30d17dd bouqueteditor: clear details in infobox if no channels available 
Origin commit data
------------------
Commit: 386c2b4d09
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- bouqueteditor: clear details in infobox if no channels available
 2017-09-28 14:12:32 +02:00
vanhofen
9ca041f38b bouqueteditor: clear details in infobox if no channels available 
Origin commit data
------------------
Commit: 91baf27971
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-28 (Thu, 28 Sep 2017)

Origin message was:
------------------
- bouqueteditor: clear details in infobox if no channels available
 2017-09-28 14:01:05 +02:00
Jacek Jendrzej
2aa2cc738f fix clang compil, use swap() 
Origin commit data
------------------
Commit: 0f26434550
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-28 (Thu, 28 Sep 2017)
 2017-09-28 13:43:51 +02:00
vanhofen
92abcdc76d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 28006917aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 14:31:32 +02:00
Jacek Jendrzej
8d9241ff68 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 7ae7765460
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 14:30:28 +02:00
vanhofen
5bbee58487 menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: 58e05cfd99
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:29:51 +02:00
vanhofen
81b6ac9b3d menue: only add hint_height to full_height, if we really have a hint 
Origin commit data
------------------
Commit: eb60c52a97
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- menue: only add hint_height to full_height, if we really have a hint
 2017-09-27 14:26:22 +02:00
vanhofen
120ebdbe64 bouqueteditor_channels: allow to navigate with left/right through the bouquets 
add corresponding context-icons to header


Origin commit data
------------------
Commit: e94e0780b0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor_channels: allow to navigate with left/right through the bouquets

add corresponding context-icons to header
 2017-09-27 14:20:11 +02:00
vanhofen
79983f7af6 bouqueteditor_channels: allow to navigate with left/right through the bouquets 
add corresponding context-icons to header


Origin commit data
------------------
Commit: 4d9aff730e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor_channels: allow to navigate with left/right through the bouquets

add corresponding context-icons to header
 2017-09-27 14:13:28 +02:00
Jacek Jendrzej
894b1c146a Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1fc8437a34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:56:03 +02:00
vanhofen
68cb4281d6 bouqueteditor: some more timeout-fixes 
Origin commit data
------------------
Commit: c00013ea52
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: some more timeout-fixes
 2017-09-27 11:55:22 +02:00
vanhofen
f6b2da8a5d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 0e00551506
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:53:43 +02:00
vanhofen
1dd887d5fc Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 581d635af7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:53:23 +02:00
vanhofen
8dfa791177 bouqueteditor: some more timeout-fixes 
Origin commit data
------------------
Commit: e5569d9840
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: some more timeout-fixes
 2017-09-27 11:50:47 +02:00
Jacek Jendrzej
ab4decf40e Revert "CMenuWidget: simplify menu_left_exit code, add missing break" 
This reverts commit a381903b02.


Origin commit data
------------------
Commit: 1deaebf1cf
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 11:11:12 +02:00
vanhofen
25804788d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: b718ddff50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 10:48:51 +02:00
vanhofen
fc14107b0b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6818aad0ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 10:48:30 +02:00
Jacek Jendrzej
b786ce7397 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 2e696818d1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-27 (Wed, 27 Sep 2017)
 2017-09-27 09:58:18 +02:00
vanhofen
ff62bdcdb7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 95157b1f8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:57:19 +02:00
vanhofen
6c32f7b375 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser 
Origin commit data
------------------
Commit: f0e7069878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
 2017-09-27 09:57:10 +02:00
vanhofen
18fd66d365 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" 
Origin commit data
------------------
Commit: db80514499
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
 2017-09-27 09:50:14 +02:00
vanhofen
f6405d15f0 network-setup: add header-icon to network-test 
Origin commit data
------------------
Commit: db5af2d9ca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- network-setup: add header-icon to network-test
 2017-09-27 09:50:14 +02:00
vanhofen
0721dcc47f network-setup: fix text-alignment for network-test 
Origin commit data
------------------
Commit: b37deab766
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

Origin message was:
------------------
- network-setup: fix text-alignment for network-test
 2017-09-27 09:50:14 +02:00
vanhofen
22cdf620c7 fix some timout-off-bugs in bouquetlist and channellist 
Origin commit data
------------------
Commit: 5405ea7aee
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in bouquetlist and channellist
 2017-09-27 09:13:07 +02:00
vanhofen
7eefaebe15 fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser 
Origin commit data
------------------
Commit: 5b8f7b86bf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- fix some timout-off-bugs in epgplus, epgview, eventlist and filebrowser
 2017-09-27 08:53:13 +02:00
vanhofen
f184e79594 bouqueteditor: fix timeout; editor doesn't open when timeout was "off" 
Origin commit data
------------------
Commit: 798661b006
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- bouqueteditor: fix timeout; editor doesn't open when timeout was "off"
 2017-09-27 08:33:15 +02:00
vanhofen
7a1c365f54 network-setup: add header-icon to network-test 
Origin commit data
------------------
Commit: 30b1c76aad
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-27 (Wed, 27 Sep 2017)

Origin message was:
------------------
- network-setup: add header-icon to network-test
 2017-09-27 08:32:42 +02:00
vanhofen
51e5eb8f07 network-setup: fix text-alignment for network-test 
Origin commit data
------------------
Commit: b692d24fda
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)

Origin message was:
------------------
- network-setup: fix text-alignment for network-test
 2017-09-26 23:16:26 +02:00
vanhofen
0ac696ebaf Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: 09be0b85b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 16:13:18 +02:00
vanhofen
63398f923d Revert "epgview: swap RC_info and RC_help in EPG view" 
This reverts commit 3c2ba0b757.

Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: eba2c14d8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 16:08:55 +02:00
vanhofen
fa1a2351bb Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/driver/fb_accel_sti.cpp
	src/gui/audioplayer.cpp
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: b3319a4561
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 16:01:46 +02:00
Jacek Jendrzej
0b3c315cae Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 0abeb742bd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 13:38:07 +02:00
vanhofen
e0c5fe6321 menue: fix coordinates for savescreen function 
Origin commit data
------------------
Commit: 96bb48b281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: fix coordinates for savescreen function
 2017-09-26 13:36:33 +02:00
vanhofen
1165d734ec bouqueteditor_bouquets: RC_yellow now stops move bouquets too 
Origin commit data
------------------
Commit: a961191863
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- bouqueteditor_bouquets: RC_yellow now stops move bouquets too
 2017-09-26 13:36:33 +02:00
Jacek Jendrzej
3adca6f79c Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: e4d0065909
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 13:02:04 +02:00
vanhofen
a856e0c40e menue: add missing delete 
Origin commit data
------------------
Commit: 77643f3b3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add missing delete
 2017-09-26 13:00:49 +02:00
Jacek Jendrzej
079772e63d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:52:04 +02:00
Jacek Jendrzej
816a0ae326 Revert "src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken" 
This reverts commit 9566002cf8.


Origin commit data
------------------
Commit: ca09c92542
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)
 2017-09-26 12:41:05 +02:00
vanhofen
cb235bd82c menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets 
* get bottom menu offset from CMenuSeparator()->getHeight()


Origin commit data
------------------
Commit: 33a596d175
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: user smaller vertical offset for hintboxes to keep it in sync with other vertical offsets

* get bottom menu offset from CMenuSeparator()->getHeight()
 2017-09-26 12:41:05 +02:00
vanhofen
459deeca9f osd-setup: use 0 as a localized value for timeout-settings 
Origin commit data
------------------
Commit: 7c429c17e0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- osd-setup: use 0 as a localized value for timeout-settings
 2017-09-26 12:41:05 +02:00
vanhofen
25d195e7bb menue: add possibility to add localized values in CMenuOptionNumberChooser seperately 
Origin commit data
------------------
Commit: d9e540b865
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)

Origin message was:
------------------
- menue: add possibility to add localized values in CMenuOptionNumberChooser seperately
 2017-09-26 12:41:05 +02:00