mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-30 00:41:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
13,692 Commits 1 Branch 51 Tags
bccecb30589191406c79f57ca3b5130fe20e8692
Commit Graph

610 Commits

Author SHA1 Message Date
[CST] Focus
416646bbff merge neutrino-mp progressbar code, (C) martii 2014-07-17 17:02:37 +04:00
M. Liebmann
2ecd9918cb CChannelList: Use CComponentsChannelLogo for display channellogo 2014-06-29 13:25:32 +02:00
Thilo Graf
5670e87d77 CChannelList: disable paint of clock background, it's not required here 2014-06-28 01:09:17 +02:00
Thilo Graf
253579909f CChannelList/COsdSetup: use showOsdChanlistSetup() from OSD-Setup 
This removes multiple code parts from COsdSetup without
loss of functionality.
 2014-06-23 18:43:47 +02:00
Thilo Graf
69e2debb02 COSDFader: rename member functions, adapt implementations 
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.
 2014-06-23 18:43:47 +02:00
svenhoefer
df1c8ac00d - channellist: add colored progressbars 
* thx to bazi98, martii and benny
 2014-06-23 17:05:44 +02:00
svenhoefer
649d1b1f9d - change RenderString() default to UTF8 2014-06-11 23:07:13 +02:00
svenhoefer
8b91cda918 - change getRenderWidth() default to UTF8 2014-06-11 23:07:00 +02:00
martii
3a52a97fce zapit/bouquets: rename bAlwaysLocked => bLockCount 2014-05-25 18:43:46 +02:00
martii
abe03ad749 zapit/bouquets: count locked bouquets a channels is in, and honor lock in all bouquets 2014-05-25 18:43:38 +02:00
Thilo Graf
4a28d853d2 CChannelList: ensure erase of clock after stopping 2014-05-22 20:38:21 +02:00
martii
00c1a8af01 gui/channellist: use localized value for minutes 2014-05-06 12:21:07 +02:00
Stefan Seyfried
44ba8fafca Merge remote-tracking branch 'check/next-cc' 
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp
 2014-04-27 19:14:06 +02:00
Thilo Graf
a573b02b85 CComponentsPIP: use a default frame with thickness 2 and small corner radius 2014-04-02 08:40:21 +02:00
Stefan Seyfried
ecd62d81d1 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes
 2014-02-15 20:22:07 +01:00
M. Liebmann
ddc826ab51 CComponentsFrmClock: Fix thread handling 
- Set clock activ = false for default
 2014-02-13 18:26:04 +01:00
Stefan Seyfried
78f51baf66 Merge remote-tracking branch 'check/next-cc-fixed' 2014-01-26 00:33:08 +01:00
Thilo Graf
5ea7ec48df 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
b414474323 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
 2014-01-23 14:08:37 +01:00
svenhoefer
53f5801d6f - adapt ShowMsg handling from martii's neutrino-mp 2014-01-22 12:37:21 +01:00
Stefan Seyfried
7d379dcb30 Merge remote-tracking branch 'check/next-cc' 2013-12-29 22:12:09 +01:00
svenhoefer
9fb63a20d9 - channellist: channellogos can be disabled 2013-12-28 23:39:51 +01:00
Stefan Seyfried
7d87ce9c54 Merge remote-tracking branch 'check/next-cc' 
untested, probably needs some buildfixing
 2013-12-22 21:25:05 +01:00
M. Liebmann
d591acff42 CChannelList: Fix display header clock 2013-12-17 08:35:31 +01:00
Jacek Jendrzej
9ef0e68ba2 CChannelList::~CChannelList(): delete remove unnecessary 2013-12-16 13:39:55 +01:00
Jacek Jendrzej
7e2d12e5d5 CChannelList::~CChannelList(): fix possible segfault 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
 2013-12-15 17:40:25 +01:00
M. Liebmann
713003aa84 CComponentsFrmClock: Use blinking function for InfoClock & Channellist 2013-12-11 15:55:14 +01:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-30 20:17:31 +01:00
Stefan Seyfried
bf8ec4d89e Revert "Revert "global.h: Use forward-declarations to reduce number of dependencies"" 
This reverts commit 3c8d47fa49.

No Idea why this was reverted, so revert again :-)
 2013-11-30 18:26:47 +01:00
martii
15b2b2ec05 remove widest_number definition and usage, add Font::getMaxDigitWidth() method instead 
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
 2013-11-29 23:02:50 +01:00
[CST] Focus
edaa65d51d gui/channellist.cpp: fix empty box paint, if no logo found 2013-11-29 17:27:10 +04:00
[CST] Focus
3b707458be gui/channellist.cpp: disable screen save for detail line 2013-11-29 17:27:10 +04:00
M. Liebmann
90985f11d2 Adapting certain files to the changed font handling of info clock 2013-11-28 16:07:48 +01:00
svenhoefer
3c8d47fa49 Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit 4bc6e43ad4.
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
548448456a Merge branch 'check/next-cc' 
Only compile-tested.
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +01:00
Stefan Seyfried
b93a372b54 Merge branch 'check/next-cc' 
Compiles on most platforms, starts. Not really tested.
 2013-11-10 16:55:53 +01:00
martii
4eb66ba4b2 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>
 2013-11-09 17:03:03 +01:00
Thilo Graf
6dd1da0628 revert 6ee7fac1a5 
Was bad idea to rename. Other Classes can also inherit this. See CMenuTarget
 2013-10-26 23:25:59 +02:00
Thilo Graf
6ee7fac1a5 CComponents: rename hide() to hideCC() 
There are too many name conflicts with hide-members in other classes.
 2013-10-24 21:39:04 +02:00
Thilo Graf
f7798affc6 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.
 2013-10-24 21:19:07 +02:00
Thilo Graf
9f150435a7 CChannelList: set some clock item properties in dependency from header 2013-10-24 21:19:06 +02:00
Stefan Seyfried
d244a5991a 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
 2013-10-21 22:58:55 +02:00
defans
88b92d3d90 fix possible segfault in channallist 
fix segfaut channallist in movieplayer mode with active minitv
 2013-10-09 23:13:23 +02:00
Thilo Graf
f6d04bfbba CChannelList: fix color of inactive channel in bouquets on active quickzap mode 
supplement to 32ca9b848c
see also:
http://www.dbox2world.net/index.php?page=Thread&postID=157903#post157903
 2013-10-09 22:50:57 +02:00
Thilo Graf
01fdbba7b7 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.
 2013-10-09 22:50:57 +02:00
Thilo Graf
3788a5a5ec CChannelList: use matching data types for output 2013-10-09 22:50:57 +02:00
Thilo Graf
30c7010c6b 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.
 2013-10-02 10:21:11 +02:00
Stefan Seyfried
c68ffa2155 remove all fb->blit() calls 
TODO: check if plugins etc. need extra treatment
 2013-09-28 13:01:03 +02:00
[CST] Focus
173403120f gui/channellist.cpp: fix reset 'new' channel flag 2013-09-26 19:46:25 +04:00