Commit Graph

593 Commits

Author SHA1 Message Date
Thilo Graf
5ad73f09aa CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.


Origin commit data
------------------
Commit: 5ea7ec48df
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-01-18 (Sat, 18 Jan 2014)

Origin message was:
------------------
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized

Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.
2014-01-24 23:09:56 +01:00
Stefan Seyfried
a112e8fb49 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
2014-01-22 12:37:21 +01:00
Stefan Seyfried
3aaf6770ea Merge remote-tracking branch 'check/next-cc'
Origin commit data
------------------
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)
2013-12-29 22:12:09 +01:00
vanhofen
afaa1a5180 channellist: channellogos can be disabled
Origin commit data
------------------
Commit: 9fb63a20d9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-28 (Sat, 28 Dec 2013)

Origin message was:
------------------
- channellist: channellogos can be disabled
2013-12-28 23:39:51 +01:00
Stefan Seyfried
8d876ff4ef Merge remote-tracking branch 'check/next-cc'
untested, probably needs some buildfixing


Origin commit data
------------------
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
2013-12-22 21:25:05 +01:00
Michael Liebmann
fec7c8c5cc CChannelList: Fix display header clock
Origin commit data
------------------
Commit: d591acff42
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-17 (Tue, 17 Dec 2013)
2013-12-17 08:35:31 +01:00
Jacek Jendrzej
b5b62cd21c CChannelList::~CChannelList(): delete remove unnecessary
Origin commit data
------------------
Commit: 9ef0e68ba2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-16 (Mon, 16 Dec 2013)
2013-12-16 13:39:55 +01:00
Jacek Jendrzej
5b32d13822 CChannelList::~CChannelList(): fix possible segfault
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 7e2d12e5d5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-15 (Sun, 15 Dec 2013)
2013-12-15 17:40:25 +01:00
Michael Liebmann
6043b903f2 CComponentsFrmClock: Use blinking function for InfoClock & Channellist
Origin commit data
------------------
Commit: 713003aa84
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-10 (Tue, 10 Dec 2013)
2013-12-11 15:55:14 +01:00
Stefan Seyfried
4c7a2f38df Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 20:17:31 +01:00
Stefan Seyfried
963a1c795d Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies""
This reverts commit d6c1108d7e.

No Idea why this was reverted, so revert again :-)


Origin commit data
------------------
Commit: bf8ec4d89e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
2013-11-30 18:26:47 +01:00
martii
4c2c559da3 remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>


Origin commit data
------------------
Commit: 15b2b2ec05
Author: martii <m4rtii@gmx.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 23:02:50 +01:00
[CST] Focus
51d9846f9c gui/channellist.cpp: fix empty box paint, if no logo found
Origin commit data
------------------
Commit: edaa65d51d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
2013-11-29 17:27:10 +04:00
[CST] Focus
d99f4e83b1 gui/channellist.cpp: disable screen save for detail line
Origin commit data
------------------
Commit: 3b707458be
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-28 (Thu, 28 Nov 2013)
2013-11-29 17:27:10 +04:00
Michael Liebmann
cd77f46e24 Adapting certain files to the changed font handling of info clock
Origin commit data
------------------
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)
2013-11-28 16:07:48 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies"
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 23:40:16 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 14:04:15 +01:00
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
2013-11-13 10:40:03 +01:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
2013-11-09 17:03:03 +01:00
Thilo Graf
5f9bb84b28 revert 2649ca147a
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget


Origin commit data
------------------
Commit: 6dd1da0628
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-26 23:25:59 +02:00
Thilo Graf
2649ca147a CComponents: rename hide() to hideCC()
There are too many name conflicts with hide-members in other classes.


Origin commit data
------------------
Commit: 6ee7fac1a5
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
2013-10-24 21:39:04 +02:00
Thilo Graf
41d131eb32 CComponents: add unfied header file for general include of cc classes
Provides a unified header file, so it is not required to select a
certain header file.


Origin commit data
------------------
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
2013-10-24 21:19:07 +02:00
Thilo Graf
09d5a7fd85 CChannelList: set some clock item properties in dependency from header
Origin commit data
------------------
Commit: 9f150435a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-24 21:19:06 +02:00
Stefan Seyfried
e6cbfe61bc Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
2013-10-21 22:58:55 +02:00
defans
0cfd79c056 fix possible segfault in channallist
fix segfaut channallist in movieplayer mode with active minitv


Origin commit data
------------------
Commit: 88b92d3d90
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-09 (Wed, 09 Oct 2013)
2013-10-09 23:13:23 +02:00
Thilo Graf
356def18ae CChannelList: fix color of inactive channel in bouquets on active quickzap mode
supplement to 7b7fddd348
see also:
http://www.dbox2world.net/index.php?page=Thread&postID=157903#post157903


Origin commit data
------------------
Commit: f6d04bfbba
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-09 (Wed, 09 Oct 2013)
2013-10-09 22:50:57 +02:00
Thilo Graf
70b1de9d5e CChannelList: style fixes
unititialize variables 'r_icon_w', 'p_event':
Variable 'r_icon_w' and Variable 'p_event' were reassigned with value
before the old one has been used.

Scope of the variable 'buf', 'cFrom', 'rec_mode', 'first' can be reduced.


Origin commit data
------------------
Commit: 01fdbba7b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)
2013-10-09 22:50:57 +02:00
Thilo Graf
d402f4df1c CChannelList: use matching data types for output
Origin commit data
------------------
Commit: 3788a5a5ec
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)
2013-10-09 22:50:57 +02:00
Thilo Graf
620b091539 CChannelList: use CComponentsPIP object for minitv
It's working with unified other implementations of minitv e.g. imageinfo,
streaminfo and can provide better options for an
implementation with native pip. Possible variants will follow soon.


Origin commit data
------------------
Commit: 30c7010c6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-02 (Wed, 02 Oct 2013)
2013-10-02 10:21:11 +02:00
Stefan Seyfried
14d73c9280 remove all fb->blit() calls
TODO: check if plugins etc. need extra treatment


Origin commit data
------------------
Commit: c68ffa2155
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-28 (Sat, 28 Sep 2013)
2013-09-28 13:01:03 +02:00
[CST] Focus
73abb320ba gui/channellist.cpp: fix reset 'new' channel flag
Origin commit data
------------------
Commit: 173403120f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-26 (Thu, 26 Sep 2013)
2013-09-26 19:46:25 +04:00
[CST] Focus
362cf44e16 gui/channellist.cpp: add menu option to reset all 'new' channels
Origin commit data
------------------
Commit: 8d52885a5e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-25 (Wed, 25 Sep 2013)
2013-09-25 17:08:34 +04:00
Gaucho316
7b7fddd348 CChannelList: mark current channel if not selected
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 32ca9b848c
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2013-09-19 (Thu, 19 Sep 2013)
2013-09-19 09:28:42 +02:00
Thilo Graf
975673532a CComponents: remove member setCornerRadius(),
setCorner() replaces this function, 2nd parameter sets type


Origin commit data
------------------
Commit: 33ec56ad6f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-15 (Sun, 15 Sep 2013)
2013-09-19 08:24:40 +02:00
[CST] Focus
0e6ac2687c channel list: restrict adding channels to favorits only,
show empty bouquets only in channel add mode


Origin commit data
------------------
Commit: 8a8f996ca0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-18 (Wed, 18 Sep 2013)
2013-09-18 12:57:56 +04:00
Jacek Jendrzej
f401cda8fb channellist: disable scale window size with miniTV
Origin commit data
------------------
Commit: be74a66d7b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-05 (Thu, 05 Sep 2013)
2013-09-05 20:42:16 +02:00
[CST] Focus
6363adf75b gui/channellist.cpp: disable show bouquet name on VFD
Origin commit data
------------------
Commit: 0e72bf5905
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 18:23:20 +04:00
Stefan Seyfried
158bd2c244 Merge branch 'check/next-cc'
Origin commit data
------------------
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 09:36:49 +02:00
Michael Liebmann
6e1c1f5c50 src/gui/channellist.cpp: Fix OSD (headerclock)
Origin commit data
------------------
Commit: 83ee284269
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-09-02 (Mon, 02 Sep 2013)
2013-09-02 23:50:12 +02:00
vanhofen
d9afd3ffd5 channellist: disable miniTV in movieplayer-mode
Origin commit data
------------------
Commit: ebd5f54753
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- channellist: disable miniTV in movieplayer-mode
2013-09-02 22:37:07 +02:00
Stefan Seyfried
2c76238007 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Jacek Jendrzej
0adda1f225 CChannelList::paintItem:-fix description width with scrambled icon
Origin commit data
------------------
Commit: 4c8e32101c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 17:03:32 +02:00
[CST] Focus
dd8cc134fe gui/channellist.cpp: fix quick zap and virtual zap, when
empty bouquets present and zap cycle in current bouquet is disabled


Origin commit data
------------------
Commit: 853baa6f29
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
2013-07-30 11:13:50 +04:00
[CST] Focus
caa9cd7e5d gui/channellist.cpp: fix selected after direct record
Origin commit data
------------------
Commit: 291a990be3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-29 (Mon, 29 Jul 2013)
2013-07-30 11:13:50 +04:00
Jacek Jendrzej
e274e633c8 CChannelList::paint(): reduce background paint in miniTV mode
Origin commit data
------------------
Commit: d5876963e7
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-07-23 (Tue, 23 Jul 2013)
2013-07-23 19:24:42 +02:00
Thilo Graf
0b4015aecd CChannelList: use matching datatype for color
Origin commit data
------------------
Commit: 72c4deb17c
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-07-15 (Mon, 15 Jul 2013)
2013-07-21 22:04:10 +02:00
Michael Liebmann
7b6498d39f Replace color indexes of the text colors by real color values for RenderString()
- If necessary, Correct data types of the color values


Origin commit data
------------------
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
2013-07-21 22:00:58 +02:00
Stefan Seyfried
6830b68cac Merge branch 'check/next-cc'
again: it compiles, but is not really tested...

Conflicts:
	acinclude.m4
	src/driver/volume.cpp
	src/gui/infoviewer.cpp
	src/gui/osd_setup.cpp
	src/gui/start_wizard.cpp
	src/zapit/src/getservices.cpp


Origin commit data
------------------
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
2013-07-06 19:01:15 +02:00