mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-02 18:31:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
12,946 Commits 2 Branches 9 Tags
fbcd8ed13c074586dbfeb027aa9079de525938a9
Commit Graph

475 Commits

Author SHA1 Message Date
martii
e3f14bf90a gui/infoviewer, gui/eventlist: localization fixes 
Origin commit data
------------------
Commit: 5fb5ea91bf
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
 2014-05-06 12:28:25 +02:00
martii
f7a2fe227c gui/infoviewer: use localized value for minutes 
Origin commit data
------------------
Commit: ab42e7f032
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
 2014-05-06 12:26:19 +02:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
Michael Liebmann
9de76bc073 CInfoViewer: Fix display progress bar with large fonts 
Origin commit data
------------------
Commit: 0be3cb731d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)
 2014-02-13 18:26:03 +01:00
[CST] Focus
4a43f8b4d1 gui/infoviewer.cpp: restore channel id in showMovieTitle(), 
else infoviewer do not process some events after playback stop


Origin commit data
------------------
Commit: e8be660b09
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
 2014-02-04 17:42:42 +04:00
[CST] Focus
4a6379a0d6 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.


Origin commit data
------------------
Commit: 5135e30773
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
 2014-01-29 17:26:45 +04: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
8a02f4f089 adapt ShowHint handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowHint handling from martii's neutrino-mp
 2014-01-22 12:11:52 +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
740b52cbcc CInfoViewer: Not start clock thread 
Origin commit data
------------------
Commit: 78bdef9c0a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-12-11 (Wed, 11 Dec 2013)
 2013-12-11 15:55:14 +01:00
Stefan Seyfried
ffcb0147ac Merge remote-tracking branch 'check/next-cc' 
Origin commit data
------------------
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 Dec 2013)
 2013-12-07 18:28:56 +01:00
vanhofen
3fd1beaac3 - infoviewer: use space instead of dot as seperator for clock 
Origin commit data
------------------
Commit: ce7bad6e16
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-03 (Tue, 03 Dec 2013)

Origin message was:
------------------
 - infoviewer: use space instead of dot as seperator for clock
 2013-12-03 12:41:41 +01:00
Thilo Graf
1966c5d0ac CInfoViewer: use correct corners and text color for time display 
Assigning of these properties are required after theme or color changes.


Origin commit data
------------------
Commit: fcb7b88ff0
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-12-01 (Sun, 01 Dec 2013)
 2013-12-01 22:37:43 +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
Thilo Graf
8e63deb93f 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.


Origin commit data
------------------
Commit: 8a2185c32e
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-29 (Fri, 29 Nov 2013)
 2013-11-29 10:08:19 +01: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
Thilo Graf
32baf72e16 CInfoViewer: show time with CComponentsFrmClock object 
This replaces old code that displayed time in infobar.


Origin commit data
------------------
Commit: ef374d7f8d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-11-26 (Tue, 26 Nov 2013)
 2013-11-26 11:56:23 +01:00
martii
b64c3bd5c5 gui/infoviewer: disable infoclock if radiotext is active 
Origin commit data
------------------
Commit: c83263d5cd
Author: martii <m4rtii@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)
 2013-11-25 13:11:08 +01:00
vanhofen
2471b33db0 movieplayer: show channellogo in infobar 
Origin commit data
------------------
Commit: 5ce5730f84
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-15 (Fri, 15 Nov 2013)

Origin message was:
------------------
- movieplayer: show channellogo in infobar
 2013-11-15 09:22:12 +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
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
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
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
3b3597ae9a Fix infoviewer global font zoom faktor 
Change the zoom factor made ​​time display broken, left side


Origin commit data
------------------
Commit: ab1c33f024
Author: defans <defans@bluepeercrew.us>
Date: 2013-10-03 (Thu, 03 Oct 2013)
 2013-10-03 18:01:15 +02:00
Thilo Graf
1b666d196b 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"


Origin commit data
------------------
Commit: 648218fc99
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-10-01 10:09:08 +02:00
Thilo Graf
e0d485befc CInfoViewer: remove unused code 
Logo background handling can be done with CComponentsChannelLogo object soon.


Origin commit data
------------------
Commit: 93f177b8aa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-09-29 (Sun, 29 Sep 2013)
 2013-10-01 10:09:07 +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
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
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
[CST] Focus
8f3db3d809 gui/infoviewer.cpp: fix shadow 
Origin commit data
------------------
Commit: 036ef3399a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 15:24:51 +04:00
[CST] Focus
df055e6ce1 gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode 
Origin commit data
------------------
Commit: bbe63318b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
 2013-07-30 11:13:50 +04: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
Michael Liebmann
5e2fac3491 Fix paint VolumeBar on InfoViewer 
Origin commit data
------------------
Commit: 31e2dae622
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-26 (Wed, 26 Jun 2013)
 2013-07-03 07:30:09 +02:00
Stefan Seyfried
38ea5ba88c infoviewer: always paint 'no epg...' in the same place 
Origin commit data
------------------
Commit: 93a428c817
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 12:25:58 +02:00
Stefan Seyfried
6b1267e8e0 infoviewer: simplify show_current_next() 
Origin commit data
------------------
Commit: 06ea41f003
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 12:24:54 +02:00
Stefan Seyfried
fc9a9433d0 infoviewer: always paint 'no epg...' in the same place 
Origin commit data
------------------
Commit: da79e3b205
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 11:33:47 +02:00
Stefan Seyfried
139f4576f0 infoviewer: simplify show_current_next() 
Origin commit data
------------------
Commit: a579bd092b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-31 (Fri, 31 May 2013)
 2013-05-31 11:33:04 +02:00
Stefan Seyfried
b6e65d0300 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


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
 2013-05-24 20:24:39 +02:00
Stefan Seyfried
748b384771 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).


Origin commit data
------------------
Commit: 6b72095f5a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-11 (Sat, 11 May 2013)
 2013-05-11 17:17:33 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
 2013-05-10 10:06:47 +02:00
vanhofen
2511e2a700 infoviewer: get width of timescale from progressbar object ... 
.. to remove hardcoded timescale width in showInfoFile()


Origin commit data
------------------
Commit: 7d5ecda6e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- 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
15d4254054 CInfoViewer: use correct text color in showInfoFile() 
Origin commit data
------------------
Commit: 19f2d556ee
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
 2013-04-27 22:20:10 +02:00
Thilo Graf
6458c5cfb1 CInfoViewer: add member killInfobarText() 
Ensure that no unnecessary instance of Components infobox is generated
and paint only changed text.


Origin commit data
------------------
Commit: 54d0f8b42b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-26 (Fri, 26 Apr 2013)
 2013-04-27 22:20:10 +02:00
Thilo Graf
c1a2832e55 CInfoViewer: ensure hide on deleted info file 
Origin commit data
------------------
Commit: e30f4d2764
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-25 (Thu, 25 Apr 2013)
 2013-04-27 22:20:09 +02:00
Jacek Jendrzej
b08214b3a9 CInfoViewer::showInfoFile -check file size 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: 6d088357c3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-24 (Wed, 24 Apr 2013)
 2013-04-26 18:31:40 +02:00