mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-31 17:31:20 +02:00
Code Issues Packages Projects Releases Wiki Activity
11,162 Commits 1 Branch 51 Tags
1941f8b99d415d801c14fb16ca6ccb6a5a911c63
Commit Graph

426 Commits

Author SHA1 Message Date
martii
dff38fc6ee locale: rename in => word.in 2014-05-06 12:31:32 +02:00
martii
5fb5ea91bf gui/infoviewer, gui/eventlist: localization fixes 2014-05-06 12:28:25 +02:00
martii
ab42e7f032 gui/infoviewer: use localized value for minutes 2014-05-06 12:26:19 +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
0be3cb731d CInfoViewer: Fix display progress bar with large fonts 2014-02-13 18:26:03 +01:00
[CST] Focus
e8be660b09 gui/infoviewer.cpp: restore channel id in showMovieTitle(), 
else infoviewer do not process some events after playback stop
 2014-02-04 17:42:42 +04:00
[CST] Focus
5135e30773 gui/infoviewer.cpp: update movieplayer position also in timeshift mode; 
fix messages in timeshift mode: while infobar is visible, all but key events was dropped,
preventing ie record timer stop etc.
 2014-01-29 17:26:45 +04: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
6995e1a765 - adapt ShowHint handling from martii's neutrino-mp 2014-01-22 12:11:52 +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
78bdef9c0a CInfoViewer: Not start clock thread 2013-12-11 15:55:14 +01:00
Stefan Seyfried
5976f03ca2 Merge remote-tracking branch 'check/next-cc' 2013-12-07 18:28:56 +01:00
svenhoefer
ce7bad6e16 - infoviewer: use space instead of dot as seperator for clock 2013-12-03 12:41:41 +01:00
Thilo Graf
fcb7b88ff0 CInfoViewer: use correct corners and text color for time display 
Assigning of these properties are required after theme or color changes.
 2013-12-01 22:37:43 +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
Thilo Graf
8a2185c32e CInfoViewer: add missing color type for time display 
On changed theme colors, it's required to set the current color values
otherwise the old values remain, this does not look so good.
 2013-11-29 10:08:19 +01:00
M. Liebmann
90985f11d2 Adapting certain files to the changed font handling of info clock 2013-11-28 16:07:48 +01:00
Thilo Graf
ef374d7f8d CInfoViewer: show time with CComponentsFrmClock object 
This replaces old code that displayed time in infobar.
 2013-11-26 11:56:23 +01:00
martii
c83263d5cd gui/infoviewer: disable infoclock if radiotext is active 2013-11-25 13:11:08 +01:00
svenhoefer
5ce5730f84 - movieplayer: show channellogo in infobar 2013-11-15 09:22:12 +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
4bc6e43ad4 global.h: Use forward-declarations to reduce number of dependencies 2013-11-13 10:40:03 +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
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
ab1c33f024 Fix infoviewer global font zoom faktor 
Change the zoom factor made ​​time display broken, left side
 2013-10-03 18:01:15 +02:00
Thilo Graf
648218fc99 CInfoViewer: fix missing displaying content of infobar.txt 
Text from infobar.txt was not painted after channel switch or in
virtual zap mode.
Thx snafed for suggestion.

TODO: many flicker effects in "virtual zap mode"
 2013-10-01 10:09:08 +02:00
Thilo Graf
93f177b8aa CInfoViewer: remove unused code 
Logo background handling can be done with CComponentsChannelLogo object soon.
 2013-10-01 10:09:07 +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
Thilo Graf
33ec56ad6f CComponents: remove member setCornerRadius(), 
setCorner() replaces this function, 2nd parameter sets type
 2013-09-19 08:24:40 +02:00
Stefan Seyfried
32de6beef0 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
 2013-09-01 19:46:10 +02:00
[CST] Focus
036ef3399a gui/infoviewer.cpp: fix shadow 2013-07-30 15:24:51 +04:00
[CST] Focus
bbe63318b8 gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode 2013-07-30 11:13:50 +04:00
Michael Liebmann
c60c5c5ce3 Replace color indexes of the text colors by real color values for RenderString() 
- If necessary, Correct data types of the color values
 2013-07-21 22:00:58 +02:00
Stefan Seyfried
7cfe54dc2f 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
 2013-07-06 19:01:15 +02:00
Michael Liebmann
31e2dae622 Fix paint VolumeBar on InfoViewer 2013-07-03 07:30:09 +02:00
Stefan Seyfried
93a428c817 infoviewer: always paint 'no epg...' in the same place 2013-05-31 12:25:58 +02:00
Stefan Seyfried
06ea41f003 infoviewer: simplify show_current_next() 2013-05-31 12:24:54 +02:00
Stefan Seyfried
da79e3b205 infoviewer: always paint 'no epg...' in the same place 2013-05-31 11:33:47 +02:00
Stefan Seyfried
a579bd092b infoviewer: simplify show_current_next() 2013-05-31 11:33:04 +02:00
Stefan Seyfried
a7f1e0e25e Merge remote-tracking branch 'check/next-cc' 
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
 2013-05-24 20:24:39 +02:00
Stefan Seyfried
6b72095f5a neutrino: explicitly include vfd/lcd header 
Instead of including it everywhere through global.h, just include
the lcd/vfd header where needed. Add a tiny helper header "display.h"
to divert between vfd.h (coolstream) and lcdd.h (everything else).
 2013-05-11 17:17:33 +02:00
Stefan Seyfried
8253c4d67c Merge remote-tracking branch 'check/next-cc' 
needs some build-fixing and merge errors are likely :-(

Conflicts:
	configure.ac
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/unmaintained/dutch.locale
	lib/libdvbsub/Makefile.am
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/daemonc/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/framebuffer.cpp
	src/driver/framebuffer.h
	src/driver/pictureviewer/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/driver/volume.cpp
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/audioplayer.cpp
	src/gui/bedit/Makefile.am
	src/gui/bedit/bouqueteditor_chanselect.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/components/Makefile.am
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/keybind_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/test_menu.cpp
	src/gui/test_menu.h
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am
	src/system/setting_helpers.cpp
	src/system/settings.h
	src/zapit/include/zapit/client/zapitclient.h
	src/zapit/include/zapit/femanager.h
	src/zapit/include/zapit/getservices.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/capmt.cpp
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
 2013-05-10 10:06:47 +02:00
svenhoefer
7d5ecda6e5 - infoviewer: get width of timescale from progressbar object ... 
.. to remove hardcoded timescale width in showInfoFile()
 2013-05-10 09:33:25 +02:00
Thilo Graf
19f2d556ee CInfoViewer: use correct text color in showInfoFile() 2013-04-27 22:20:10 +02:00
Thilo Graf
54d0f8b42b CInfoViewer: add member killInfobarText() 
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.
 2013-04-27 22:20:10 +02:00
Thilo Graf
e30f4d2764 CInfoViewer: ensure hide on deleted info file 2013-04-27 22:20:09 +02:00