Commit Graph

97 Commits

Author SHA1 Message Date
svenhoefer
08cdb2ee83 - cosmetics: align epg_id notation to channel_id
Signed-off-by: Thilo Graf <dbt@novatux.de>
2019-04-28 11:16:03 +02:00
Thilo Graf
f9b4aeef8c infobar timout: add member to get current timeout modes
Avoids  multiple code in some source files.
2018-04-10 10:29:39 +02:00
Stefan Seyfried
b982458d2d reduce dependencies on driver/rcinput.h
* add new header that only contains neutrino_msg_t and friends, often this
  is all that's needed instead of full rcinput.h
* directly include rcinput.h in some cpp files instead of relying on
  accidental inclusion in some header
* add class forward declarations to avoid dragging in rcinput indirectly
This could use more work to further reduce the impact; maybe separating
the CRCinput::key_* constants from the rcinput class would be good.
2018-01-13 20:08:20 +01:00
svenhoefer
c7d863a809 - infoviewer: rename text_cur_* => text_curr_*
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Some changes were required for this pick:

Same issues like here
6e3f7babf3
Build was broken because of item name setters had wrong object names.
2018-01-09 22:21:32 +01:00
svenhoefer
6e3f7babf3 - infoviewer: rename txt_cur_event_rest => txt_cur_rest
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>

Some changes were required for this pick:
Build was broken because of item name setters had wrong object names.
2018-01-09 22:13:06 +01:00
svenhoefer
c68539d8e7 - infoviewer: fix centering in numbox
Conflicts:
	src/gui/infoviewer.h

Signed-off-by: Thilo Graf <dbt@novatux.de>
2018-01-09 21:48:35 +01:00
svenhoefer
38e76f6a3f - infoviewer: cleanup from some unused code
Conflicts:
	src/gui/infoviewer.cpp

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:43 +01:00
svenhoefer
20cc2a2b17 - infoviewer: rework radiotext element; ...
use OFFSET defines, larger font, fix header width

Signed-off-by: Thilo Graf <dbt@novatux.de>
2017-12-01 14:26:37 +01:00
Jacek Jendrzej
ca83324763 Merge branch 'master' into pu/mp 2017-06-07 16:20:47 +02:00
M. Liebmann
cc05d272f2 CInfoViewer::showTitle: Add parameter forcePaintButtonBar 2017-02-28 15:04:09 +01:00
Stefan Seyfried
2303d94300 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-07 17:23:42 +01:00
Stefan Seyfried
9082ddf287 replace fontrenderer.h include with forward declaration
in order to flatten the build dependency tree further, include
fontrenderer.h directly where needed, in header files a forward
declaration is enough
2017-02-05 13:37:53 +01:00
Stefan Seyfried
13ab1ebc8a Merge remote-tracking branch 'tuxbox/master'
* needs compile fixes
* needs additional tests, of course :-)
2016-10-22 11:37:40 +02:00
M. Liebmann
eb1826ebee Display of livestream infos in IV if no EPG data available 2016-03-03 09:46:42 +01:00
svenhoefer
944dab5a8c - infoviewer: show movieplayers infoviewer in vzap mode if needed 2016-02-04 00:14:57 +01:00
Stefan Seyfried
f5c72d35c8 Merge remote-tracking branch 'n/cst-next-fixed' 2016-01-24 13:15:43 +01:00
Thilo Graf
98b73c0d09 CInfoViewer: use different modes with enums for virtual zap and number input mode
This should fix missing rounded corners in numbaur input mode too.

Thx defans for input !
2016-01-21 11:00:24 +01:00
Stefan Seyfried
572de2bbcb Merge remote-tracking branch 'cst-next' 2016-01-16 12:51:04 +01:00
svenhoefer
19d33dfb98 - infoviewer: some more little numbox-alignments 2016-01-10 21:57:59 +01:00
Stefan Seyfried
b837d8697b Merge remote-tracking branch 'uncool/cst-next' 2015-12-28 16:15:14 +01:00
Thilo Graf
523b273af8 Colors: init global color gradient implementation 2015-12-27 14:42:27 +01:00
Stefan Seyfried
eeee5bacab Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...
2015-12-13 17:41:55 +01:00
svenhoefer
45968b339d CInfoViewerBB: fix infobar ratio webtv
Signed-off-by: M. Liebmann <tuxcode.bbg@gmail.com>
2015-10-21 12:31:04 +02:00
[CST] Focus
329aea09be gui/infoviewer.cpp: remove some showTitle wrapper, use epg-id to get events 2015-09-24 12:25:39 +03:00
svenhoefer
62daf1dc4c - infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations
2015-05-04 09:41:41 +02:00
Stefan Seyfried
08daae7852 infoviewer: simplify clock handling 2015-03-27 13:27:22 +01:00
Stefan Seyfried
b74cf816cb infoviewer: simplify clock handling 2015-02-21 13:02:40 +01:00
Stefan Seyfried
8fcaeda6a4 infoviewer.h: replace includes with forward declaration 2015-02-14 14:31:12 +01:00
Stefan Seyfried
967f85eb5f infoviewer: use forward declaration instead of including infoviewer_bb 2015-02-14 14:31:11 +01:00
Stefan Seyfried
51b15fbc1d infoviewer.h: replace includes with forward declaration 2015-02-11 08:41:27 +01:00
Stefan Seyfried
ce5084ea52 infoviewer: use forward declaration instead of including infoviewer_bb 2015-02-10 15:38:21 +01:00
Stefan Seyfried
d37b3c0f9a Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp
2014-12-28 12:32:12 +01:00
Stefan Seyfried
69c4dbbdba Merge remote-tracking branch 'check/cst-next'
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp
2014-12-25 18:03:08 +01:00
Thilo Graf
a58bd6c235 CInfoViewer: rework init and paint of clock
This removes some dimension assignments in start() because of
already existant and usable dimension values that comes directly
from clock object.
2014-12-19 10:19:51 +01:00
svenhoefer
25f30a6fa4 - infoviewer: fix calculation for time_width ...
... because some fonts has larger ' ' than ':'.
* align clock with 10 px right offset (same as the other elements)
* align depending elements with new clock dimensions
2014-12-18 15:59:07 +01:00
[CST] Focus
d83d519c86 gui/movieplayer.cpp: add support for marked file list to play (file playback) and repeat modes,
original code (C) martii <m4rtii@gmx.de>
2014-09-17 20:13:49 +04:00
martii
e4801974be gui/infoviewer: remove no longer used class member "old_timestr" 2014-06-20 14:35:22 +02:00
Stefan Seyfried
b5e736e81b Merge branch 'check/next-cc'
Only compile-tested.
2013-11-30 20:17:31 +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
svenhoefer
5ce5730f84 - movieplayer: show channellogo in infobar 2013-11-15 09:22:12 +01: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
bbe63318b8 gui/infoviewer.cpp: disable EVT_NOEPG_YET in virtual zap mode 2013-07-30 11:13:50 +04: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
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
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
a09d7f4a7e CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content 2013-04-26 18:31:39 +02:00
Stefan Seyfried
8b689f4b26 Merge branch 'check/pu-cc' into master
...needs some build- and logical fixing...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/volume.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp
	src/gui/scan.cpp
	src/gui/timeosd.cpp
	src/gui/widget/progressbar.cpp
	src/gui/widget/progressbar.h
2013-04-06 14:28:16 +02:00
Thilo Graf
860be9a412 CComponents: add progressbar class to cc-items
CProgressbar moved into components sub directory and adapt includes.
Progressbar objects are now usable as cc-item

TODO:
-some color and size corrections
-found some dub codes for sig and snr-bars, needs rework
2013-04-02 09:31:05 +02:00
Stefan Seyfried
5033a9e4ef infoviewer: make oldinfo a member of the class 2013-03-25 18:02:46 +01:00