Commit Graph

632 Commits

Author SHA1 Message Date
Jacek Jendrzej
2e696818d1 Merge branch 'master' into pu/mp 2017-09-27 09:58:18 +02:00
svenhoefer
95157b1f8f - fix some timout-off-bugs in bouquetlist and channellist 2017-09-27 09:57:19 +02:00
M. Liebmann
abfb02aa47 Merge branch 'master' into pu/mp 2017-09-21 09:07:15 +02:00
svenhoefer
6ee3e54741 - add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
a70f3cb025 Merge branch 'master' into pu/mp 2017-06-16 14:19:26 +02:00
svenhoefer
fd84cedf90 - channellist: use CComponentsScrollbar
Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-06-15 21:51:28 +02:00
Jacek Jendrzej
4c3002cb26 Merge branch 'master' into pu/mp 2017-06-15 12:32:31 +02:00
Thilo Graf
340a6992a1 CChannelList: add instance check for header clock object
Only for sure.
2017-06-15 01:01:54 +02:00
Jacek Jendrzej
05e8d727bd Merge branch 'master' into pu/mp 2017-05-28 22:30:05 +02:00
Thilo Graf
4f5d216120 CChannelList: simplify calls of logo paints, avoid possible dub paints 2017-05-28 20:42:33 +02:00
Jacek Jendrzej
152c4e3fe4 Merge branch 'master' into pu/mp 2017-05-11 16:44:05 +02:00
Thilo Graf
942a27e3ef cc_frm_header.cpp/h: remove CTextBox types for title allignment
Title object has only width of current text content. This causes CTextBox
types have not a really visible effect. Now we have only three align types for title
and these are related to cc-text object position.

Involved classes adjusted too.
2017-05-11 12:15:16 +02:00
Jacek Jendrzej
020f044c07 Merge branch 'master' into pu/mp 2017-05-08 12:57:22 +02:00
Thilo Graf
9fd3b27d61 CChannelList: fix code indentation 2017-05-08 08:26:21 +02:00
Thilo Graf
c8f6888d8f CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.
2017-05-07 18:33:25 +02:00
Thilo Graf
761bac8ca1 CChannelList: use enums for additional modes
Readability
2017-05-07 18:33:25 +02:00
Jacek Jendrzej
c926f1ea91 Merge branch 'master' into pu/mp 2017-05-07 18:27:59 +02:00
Thilo Graf
cf7a21032c CChannelList: delete and reset minitv object inside unified scope 2017-05-07 14:18:47 +02:00
Thilo Graf
1359248f72 CChannelList: add connection to ResetModuls()
Ensures re init after font changes.
2017-05-07 14:18:47 +02:00
Thilo Graf
d7f839dcc9 CChannelList: remove init of cc_minitv from constructor.
Is not a member of CChannelList and already inititialized
as static outside of constructor.
2017-05-06 23:18:43 +02:00
Thilo Graf
86c18141dd CChannelList: add missing compare for existant header object. 2017-05-06 22:46:20 +02:00
Jacek Jendrzej
0b2f2afe01 Merge branch 'master' into pu/mp 2017-05-05 13:27:14 +02:00
Thilo Graf
81001410f3 CChannelList: rework details line handling, fix hide() after setup
Detailsline is handling hide() by itself.

After channellist setup, eg. switching additional infos and channellist
window has different size, artefacts were possible.
2017-05-03 21:29:41 +02:00
Jacek Jendrzej
74c0b58e71 Merge branch 'master' into pu/mp 2017-05-02 13:18:29 +02:00
Thilo Graf
1e4967e114 CChannelList: Ensure new initialize of modules on palette changes while runtime. 2017-04-29 22:46:50 +02:00
Jacek Jendrzej
0ef6e3fe98 Merge branch 'master' into pu/mp 2017-04-27 14:27:27 +02:00
Jacek Jendrzej
6cb58546d8 src/gui/channellist.cpp remove unused logo_off 2017-04-27 14:26:27 +02:00
Thilo Graf
85f4992ca8 CChannelList: don't assign logo if disabled 2017-04-27 11:26:36 +02:00
Jacek Jendrzej
f292ba6b69 Merge branch 'master' into pu/mp 2017-04-24 21:33:15 +02:00
svenhoefer
fe5f84c1d0 - scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
89bda2d the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
Thilo Graf
fbe8889fa9 CChannelList: remove unused logo object
Not required since
68835056c3: add possibility to show channellogo
2017-04-23 17:15:17 +02:00
Thilo Graf
0943c467e2 CChannelList/CUpnpBrowserGui: add missing reinit for corner modes
Required eg. if corner settings has been changed by user on runtime.
2017-04-23 17:01:05 +02:00
svenhoefer
0b2eb4bfb3 Merge branch 'master' into pu/mp 2017-04-22 16:13:02 +02:00
Thilo Graf
9ef6c49a23 CComponentsHeader/CChannelList: unify methode names 2017-04-21 23:07:14 +02:00
Thilo Graf
68835056c3 CComponentsHeader: add possibility to show channellogo
Contains methode setChannelLogo() with parameters
for channel id, channel name and optional
alignment (primary between title and clock). Default
alignment is centered.
Optional parameter to set logo height is available too.

Hope it works on first try. To see how it works, take look
at channellist class.
2017-04-21 22:47:23 +02:00
svenhoefer
11a28c07d6 Merge branch 'master' into pu/mp 2017-04-19 21:35:56 +02:00
svenhoefer
42aca4a4c9 - channelist: rename bool pig_on_win to minitv_is_active 2017-04-12 10:04:04 +02:00
svenhoefer
31979a4f87 - channellist: one more missing OFFSET define 2017-04-12 10:04:03 +02:00
svenhoefer
f4a0e8faf1 - channelist: use OFFSET defines for bottom detailsbox 2017-04-12 09:31:21 +02:00
svenhoefer
7e6746e2aa - channellist: a bit more offset for item; fix progressbar's width
use OFFSET defines for logo in header and in right infozone
2017-04-11 23:12:41 +02:00
svenhoefer
763f16ccca - channellist: simplify MaxChanNr() function 2017-04-11 23:12:41 +02:00
svenhoefer
8bdb16cec6 Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp
2017-03-13 16:14:33 +01:00
svenhoefer
5b0faeab8c - unify DetailsLine-names; move define to settings.h 2017-03-13 12:40:04 +01:00
Stefan Seyfried
abec1c311b Merge remote-tracking branch 'tuxbox/master' 2017-03-04 19:32:30 +01:00
svenhoefer
1aa5e929db - channelist: use OFFSET-defines for channels w/o EPG too 2017-02-26 01:01:15 +01:00
Stefan Seyfried
8b47699447 Merge remote-tracking branch 'tuxbox/master' 2017-02-11 11:18:45 +01:00
M. Liebmann
db8ea57da2 Merge branch 'master' into pu/fb-modules 2017-02-09 22:58:09 +01:00
Thilo Graf
a56bb97b50 Revert "CChannelList: delete with red yes button"
This reverts commit 3689684968.

User request: Is not desired
2017-02-09 22:43:00 +01:00
Stefan Seyfried
2303d94300 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-07 17:23:42 +01:00
Stefan Seyfried
9082ddf287 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-05 13:37:53 +01:00