mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-29 16:31:11 +02:00
Code Issues Packages Projects Releases Wiki Activity
9,569 Commits 1 Branch 51 Tags
c388c7029e29716d4a087c3762dbd931784c80c5
Commit Graph

477 Commits

Author SHA1 Message Date
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
[CST] Focus
8d52885a5e gui/channellist.cpp: add menu option to reset all 'new' channels 2013-09-25 17:08:34 +04:00
Christian Schuett
32ca9b848c CChannelList: mark current channel if not selected 
Signed-off-by: Thilo Graf <dbt@novatux.de>
 2013-09-19 09:28:42 +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
[CST] Focus
8a8f996ca0 channel list: restrict adding channels to favorits only, 
show empty bouquets only in channel add mode
 2013-09-18 12:57:56 +04:00
Jacek Jendrzej
be74a66d7b channellist: disable scale window size with miniTV 2013-09-05 20:42:16 +02:00
[CST] Focus
0e72bf5905 gui/channellist.cpp: disable show bouquet name on VFD 2013-09-03 18:23:20 +04:00
Stefan Seyfried
50977ef2f5 Merge branch 'check/next-cc' 2013-09-03 09:36:49 +02:00
Michael Liebmann
83ee284269 src/gui/channellist.cpp: Fix OSD (headerclock) 2013-09-02 23:50:12 +02:00
svenhoefer
ebd5f54753 - channellist: disable miniTV in movieplayer-mode 2013-09-02 22:37:07 +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
Jacek Jendrzej
4c8e32101c CChannelList::paintItem:-fix description width with scrambled icon 2013-09-01 17:03:32 +02:00
[CST] Focus
853baa6f29 gui/channellist.cpp: fix quick zap and virtual zap, when 
empty bouquets present and zap cycle in current bouquet is disabled
 2013-07-30 11:13:50 +04:00
[CST] Focus
291a990be3 gui/channellist.cpp: fix selected after direct record 2013-07-30 11:13:50 +04:00
Jacek Jendrzej
d5876963e7 CChannelList::paint(): reduce background paint in miniTV mode 2013-07-23 19:24:42 +02:00
Thilo Graf
72c4deb17c CChannelList: use matching datatype for color 2013-07-21 22:04:10 +02: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
Thilo Graf
03ef18cdb9 CComponentsFrmClock: set font only with fontrender object 2013-06-18 19:33:34 +02:00
Stefan Seyfried
d5d5a60261 Merge branch 'check/next-cc' 
it compiles, but is not really tested...

Conflicts:
	src/driver/netfile.cpp
	src/driver/volume.cpp
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bookmarkmanager.cpp
	src/gui/bouquetlist.cpp
	src/gui/eventlist.cpp
	src/gui/movieplayer.cpp
	src/gui/pictureviewer.cpp
	src/gui/scan.cpp
	src/gui/test_menu.h
	src/gui/timerlist.cpp
	src/gui/update.cpp
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/system/flashtool.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/femanager.cpp
 2013-06-16 21:22:14 +02:00
Michael Liebmann
f0de4567ae CChannelList: Use one instance of CComponentsFrmClock for multiple instances of CChannelList 2013-06-12 01:32:24 +02:00
Michael Liebmann
0128a61708 * CChannelList: using CComponentsHeader to paint header 
- using CComponentsFrmClock to paint clock in header
 2013-06-01 19:37:46 +02:00
Jacek Jendrzej
daf539b141 - channllist: fix new_zap_mode handling 2013-06-01 08:30:37 +02:00
Stefan Seyfried
a33086568b neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-30 11:19:39 +02:00
Stefan Seyfried
6a48922350 neutrino: fix possible div-by-zero in scrollbar calculation 2013-05-29 15:33:21 +02:00
svenhoefer
e492048eab - channellist: using small buttons in buttonbar 2013-05-26 23:06:58 +02:00
Jacek Jendrzej
a01551d360 ChannelList::quickZap -record mode- should zap if possible, else display transponderlist 2013-05-25 13:05:55 +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
Michael Liebmann
a48e7fa200 * CChannelList: prevent possible compile error 2013-05-19 08:41:05 +01:00
svenhoefer
273a83fa3f - channellist: colored_events to right infobox 2013-05-18 23:59:06 +02:00
Jacek Jendrzej
c32266e8f4 channellist.cpp fix compil -comparison between signed and unsigned integer expressions 2013-05-13 08:48:29 +02:00
svenhoefer
2ab63ce14d - channellist: disable 'displayNext' when additional infos enabled 
* otherwise there is no possibility to disable 'displayNext'
  except exiting the channellist
 2013-05-12 23:41:36 +02:00
svenhoefer
4277b8e283 - channellist: show infotext when epg.info2 is empty ... 
... and 'description' is selected in additional infos

* fix double paint of infozone
 2013-05-12 23:06:57 +02:00
svenhoefer
e170aec2d9 - channellist: show current event in additional info box 2013-05-12 22:26:10 +02:00