Commit Graph

522 Commits

Author SHA1 Message Date
Jacek Jendrzej
c498d7a32b Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 152c4e3fe4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 16:44:05 +02:00
Thilo Graf
653c5af07c 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.


Origin commit data
------------------
Commit: 942a27e3ef
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-11 (Thu, 11 May 2017)
2017-05-11 12:15:16 +02:00
Jacek Jendrzej
79ea801225 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 020f044c07
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 12:57:22 +02:00
Thilo Graf
7b32c620cf CChannelList: fix code indentation
Origin commit data
------------------
Commit: 9fd3b27d61
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-08 (Mon, 08 May 2017)
2017-05-08 08:26:21 +02:00
Thilo Graf
56ae8eb9b5 CChannelList: change scope of bool unlocked
Scope of the variable 'unlocked' can be reduced.


Origin commit data
------------------
Commit: c8f6888d8f
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:33:25 +02:00
Thilo Graf
5bb1f36a42 CChannelList: use enums for additional modes
Readability


Origin commit data
------------------
Commit: 761bac8ca1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:33:25 +02:00
Jacek Jendrzej
70509251fe Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: c926f1ea91
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 18:27:59 +02:00
Thilo Graf
d7b5cb3caf CChannelList: delete and reset minitv object inside unified scope
Origin commit data
------------------
Commit: cf7a21032c
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 14:18:47 +02:00
Thilo Graf
4fb21cadc2 CChannelList: add connection to ResetModuls()
Ensures re init after font changes.


Origin commit data
------------------
Commit: 1359248f72
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-07 (Sun, 07 May 2017)
2017-05-07 14:18:47 +02:00
Thilo Graf
dceb593867 CChannelList: remove init of cc_minitv from constructor.
Is not a member of CChannelList and already inititialized
as static outside of constructor.


Origin commit data
------------------
Commit: d7f839dcc9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 23:18:43 +02:00
Thilo Graf
4853fffbf5 CChannelList: add missing compare for existant header object.
Origin commit data
------------------
Commit: 86c18141dd
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-06 (Sat, 06 May 2017)
2017-05-06 22:46:20 +02:00
Jacek Jendrzej
36e33154a1 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0b2f2afe01
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-05 (Fri, 05 May 2017)
2017-05-05 13:27:14 +02:00
Thilo Graf
2eefbfab7a 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.


Origin commit data
------------------
Commit: 81001410f3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-05-03 (Wed, 03 May 2017)
2017-05-03 21:29:41 +02:00
Jacek Jendrzej
c1ea61150a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 74c0b58e71
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-05-02 (Tue, 02 May 2017)
2017-05-02 13:18:29 +02:00
Thilo Graf
c898ce7b87 CChannelList: Ensure new initialize of modules on palette changes while runtime.
Origin commit data
------------------
Commit: 1e4967e114
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-29 (Sat, 29 Apr 2017)
2017-04-29 22:46:50 +02:00
Jacek Jendrzej
ad27563c6a Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0ef6e3fe98
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 14:27:27 +02:00
Jacek Jendrzej
a7595ce3c7 src/gui/channellist.cpp remove unused logo_off
Origin commit data
------------------
Commit: 6cb58546d8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 14:26:27 +02:00
Thilo Graf
1a35e5c955 CChannelList: don't assign logo if disabled
Origin commit data
------------------
Commit: 85f4992ca8
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)
2017-04-27 11:26:36 +02:00
Jacek Jendrzej
a76208e0a3 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: f292ba6b69
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-04-24 (Mon, 24 Apr 2017)
2017-04-24 21:33:15 +02:00
vanhofen
ce494cbd38 scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...
... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.


Origin commit data
------------------
Commit: fe5f84c1d0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)

Origin message was:
------------------
- scrollbars: avoid usage of COL_SCROLLBAR_PASSIVE_PLUS_0 ...

... outside of CComponentsScrollBar(). Since the color-changes in
9c8c262 the non-CC scrollbars looks weird.
2017-04-24 12:29:52 +02:00
Thilo Graf
a9acc7f975 CChannelList: remove unused logo object
Not required since
100032e7d4: add possibility to show channellogo


Origin commit data
------------------
Commit: fbe8889fa9
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 17:15:17 +02:00
Thilo Graf
92d733f523 CChannelList/CUpnpBrowserGui: add missing reinit for corner modes
Required eg. if corner settings has been changed by user on runtime.


Origin commit data
------------------
Commit: 0943c467e2
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-23 (Sun, 23 Apr 2017)
2017-04-23 17:01:05 +02:00
vanhofen
486beee495 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 0b2eb4bfb3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-22 (Sat, 22 Apr 2017)
2017-04-22 16:13:02 +02:00
Thilo Graf
3aa91ac91f CComponentsHeader/CChannelList: unify methode names
Origin commit data
------------------
Commit: 9ef6c49a23
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 23:07:14 +02:00
Thilo Graf
100032e7d4 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.


Origin commit data
------------------
Commit: 68835056c3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-21 (Fri, 21 Apr 2017)
2017-04-21 22:47:23 +02:00
vanhofen
4ad063d3f5 Merge branch 'master' into pu/mp
Origin commit data
------------------
Commit: 11a28c07d6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)
2017-04-19 21:35:56 +02:00
vanhofen
23a69c90bc channelist: rename bool pig_on_win to minitv_is_active
Origin commit data
------------------
Commit: 42aca4a4c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: rename bool pig_on_win to minitv_is_active
2017-04-12 10:04:04 +02:00
vanhofen
763cf5335b channellist: one more missing OFFSET define
Origin commit data
------------------
Commit: 31979a4f87
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channellist: one more missing OFFSET define
2017-04-12 10:04:03 +02:00
vanhofen
1100259455 channelist: use OFFSET defines for bottom detailsbox
Origin commit data
------------------
Commit: f4a0e8faf1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- channelist: use OFFSET defines for bottom detailsbox
2017-04-12 09:31:21 +02:00
vanhofen
5b73bc8358 channellist: a bit more offset for item; fix progressbar's width
use OFFSET defines for logo in header and in right infozone


Origin commit data
------------------
Commit: 7e6746e2aa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- 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
vanhofen
72837ad504 channellist: simplify MaxChanNr() function
Origin commit data
------------------
Commit: 763f16ccca
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-11 (Tue, 11 Apr 2017)

Origin message was:
------------------
- channellist: simplify MaxChanNr() function
2017-04-11 23:12:41 +02:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 16:14:33 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
2017-03-04 19:32:30 +01:00
vanhofen
4a8ef2e828 channelist: use OFFSET-defines for channels w/o EPG too
Origin commit data
------------------
Commit: 1aa5e929db
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-26 (Sun, 26 Feb 2017)

Origin message was:
------------------
- channelist: use OFFSET-defines for channels w/o EPG too
2017-02-26 01:01:15 +01:00
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
2017-02-11 11:18:45 +01:00
Michael Liebmann
c1dd0ff7de Merge branch 'master' into pu/fb-modules
Origin commit data
------------------
Commit: db8ea57da2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 22:58:09 +01:00
Thilo Graf
cef125aa09 Revert "CChannelList: delete with red yes button"
This reverts commit b7baafa2e5.

User request: Is not desired


Origin commit data
------------------
Commit: a56bb97b50
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 22:43:00 +01:00
Stefan Seyfried
f6d5a96838 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


Origin commit data
------------------
Commit: 2303d94300
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
Stefan Seyfried
84b16a8a24 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


Origin commit data
------------------
Commit: 9082ddf287
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-05 13:37:53 +01:00
Thilo Graf
dd7a7c7c01 Revert "CChannelList: ensure repaint of new header content"
This reverts commit ab6b3dfb19.


Origin commit data
------------------
Commit: 296aa5b901
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
2017-02-02 11:18:27 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
2017-02-01 22:03:40 +01:00
Thilo Graf
ab6b3dfb19 CChannelList: ensure repaint of new header content
Origin commit data
------------------
Commit: ea700ddf52
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:42 +01:00
Stefan Seyfried
a73e775906 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 21:36:09 +01:00
Jacek Jendrzej
794fb2d032 some inits
Origin commit data
------------------
Commit: 0056a53321
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 19:04:17 +01:00
Stefan Seyfried
c95aca9252 Merge remote-tracking branch 'tuxbox/master'
Origin commit data
------------------
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)
2017-01-22 22:59:39 +01:00
Jacek Jendrzej
bffd81375a some dead assignment
Origin commit data
------------------
Commit: 0ed24632b7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 18:41:25 +01:00
vanhofen
ff22643691 themes: allow progressbar-settings in themes
Origin commit data
------------------
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes
2016-12-29 00:47:34 +01:00
Jacek Jendrzej
63bfa0da60 fix next epginfo and sat/freq info for webtv
Origin commit data
------------------
Commit: af9c914013
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-12 (Mon, 12 Dec 2016)
2016-12-12 17:20:48 +01:00
vanhofen
9fc50664c7 channellist: try to fix right status-icon alignment
Origin commit data
------------------
Commit: 6b4ef6d3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- channellist: try to fix right status-icon alignment
2016-12-12 08:30:22 +01:00