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
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
Jacek Jendrzej
6d088357c3
CInfoViewer::showInfoFile -check file size
...
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com >
2013-04-26 18:31:40 +02:00
Thilo Graf
a09d7f4a7e
CInfoViewer: implement CComponentsInfoBox() to show infobar.txt content
2013-04-26 18:31:39 +02:00
Stefan Seyfried
c7a4927b53
infoviewer: remove unneeded blit()
2013-04-21 18:07:41 +02:00
Michael Liebmann
9e3e8e981b
* Infoviewer: Fix key handling for PiP
2013-04-19 00:38:34 +01:00
[CST] Focus
8bb70d1ab3
Merge branch 'pu/cc' into next-cc
...
Conflicts:
acinclude.m4
data/locale/deutsch.locale
data/locale/english.locale
src/driver/volume.cpp
src/eitd/SIlanguage.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bedit/bouqueteditor_chanselect.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/eventlist.cpp
src/gui/osd_setup.cpp
src/gui/scan.cpp
src/gui/scan.h
src/gui/test_menu.cpp
src/gui/timeosd.cpp
src/gui/widget/progressbar.cpp
src/gui/widget/progressbar.h
src/neutrino.cpp
src/nhttpd/yconfig.h
2013-04-17 13:32:12 +04:00
Stefan Seyfried
268c5b84e9
CInfoViewer: delete infoViewerBB in destructor
2013-04-17 10:21:33 +04:00
Stefan Seyfried
5e4603071e
CInfoViewer: delete infoViewerBB in destructor
2013-04-15 19:46:12 +02:00
Stefan Seyfried
17c624db4d
CInfoViewer: delete infoViewerBB in destructor
2013-04-14 19:15:46 +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
f70a30defa
Progressbars: use default frame thickness
...
It's unnecessary overhead to set the value everywhere, except it's needed.
2013-04-06 08:33:51 +02:00
Michael Liebmann
adfbfe079c
* Fix order of colors for some progress bars
2013-04-05 19:43:50 +01:00
svenhoefer
85ab392a09
- infoviewer: remove frame from timescale inside infoviewer
2013-04-04 14:41:13 +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
1ee9088f28
infoviewer: make oldinfo a member of the class
2013-04-01 15:48:00 +04:00
[CST] Focus
d60f6691d6
gui/infoviewer.cpp: fix tuner icon display
2013-03-26 19:54:29 +04:00
[CST] Focus
60cfc785cd
gui/infoviewer.cpp: update progress in file play mode while visible
2013-03-26 18:46:09 +04:00
[CST] Focus
bbc4285510
gui/infoviewer.cpp: show playback speed with play state icon
2013-03-26 17:40:04 +04:00
Stefan Seyfried
5033a9e4ef
infoviewer: make oldinfo a member of the class
2013-03-25 18:02:46 +01:00
Stefan Seyfried
8048673dec
Merge branch 'check/next' into master
...
Conflicts:
data/locale/english.locale
src/neutrino.cpp
src/system/setting_helpers.cpp
2013-03-07 17:10:11 +01:00
[CST] Focus
026592e8fe
Merge branch 'dvbsi++' into next
...
Conflicts:
src/neutrino.cpp
src/zapit/src/femanager.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-28 16:39:34 +04:00
Jacek Jendrzej
662955f9e7
src/gui/infoviewer.cpp: fix paint progressbar opt 1
2013-02-23 17:34:12 +01:00
Stefan Seyfried
0cf191822a
Merge branch 'check/dvbsi++' commit 5db16ee2ff
...
Conflicts:
src/eitd/sectionsd.cpp
src/gui/audioplayer.cpp
src/gui/channellist.cpp
src/gui/components/Makefile.am
src/gui/components/cc.h
src/gui/components/components.cpp
src/gui/moviebrowser.cpp
src/gui/scan.cpp
src/neutrino.cpp
src/zapit/src/bouquets.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2013-02-21 17:07:18 +01:00
Jacek Jendrzej
0fc78c5738
src/gui/infoviewer.cpp: fix div by zero
2013-02-16 21:25:02 +01:00
svenhoefer
0986c3af8a
- infoviewer.cpp: change width of infobar.txt-field ...
...
... in dependency from g_settings.infobar_progressbar
2013-02-14 19:14:47 +01:00
[CST] Focus
6174c657a1
Merge branch 'dvbsi++' into next
2013-02-13 15:34:41 +04:00
Jacek Jendrzej
63c66c1f4e
add progressbar opt to infobar
2013-02-12 18:03:50 +01:00
Jacek Jendrzej
158ad4243f
src/gui/infoviewer.cpp: fix channel name getRenderWidth for unicode
2013-02-11 10:39:34 +01:00
Stefan Seyfried
33332355b0
infoviewer: don't suppress valid 'next' events
2013-02-05 19:48:13 +01:00
[CST] Focus
f10ea0636d
gui/infoviewer.cpp: check live frontend for delivery system
2013-01-16 15:48:21 +04:00
Stefan Seyfried
f8f5467fdb
Merge branch 'uncool/dvbsi++' commit 4965619a79
...
Conflicts:
src/gui/widget/hintboxext.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
2012-12-30 21:35:20 +01:00
satbaby
59fa692bd0
supplement to 7bebdf91e0, simplification
2012-12-08 16:28:53 +01:00
satbaby
7bebdf91e0
add provider name to infobar , no gui option
2012-12-08 11:15:40 +01:00
Stefan Seyfried
57911bf009
infoviewer: make oldinfo a member of the class
2012-11-21 18:19:39 +01:00
Stefan Seyfried
c480e36746
Merge branch 'uncool/dvbsi++'
...
Conflicts:
src/driver/Makefile.am
src/driver/streamts.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/infoviewer_bb.cpp
src/gui/widget/textbox.h
2012-11-11 01:45:22 +01:00
Stefan Seyfried
f6392a99ef
tripledragon: fix LCD epg title after standby
2012-11-10 13:56:36 +01:00
satbaby
926e0ce141
initialize not initialized var
2012-11-05 09:24:51 +01:00
Stefan Seyfried
7e23ac7223
Merge branch 'uncool/dvbsi++' commit '7ea3a20a808'
...
...needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.cpp
src/gui/scan.cpp
src/gui/widget/buttons.cpp
src/gui/widget/menue.cpp
src/gui/widget/stringinput.cpp
src/neutrino.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
src/system/setting_helpers.cpp
src/zapit/src/capmt.cpp
2012-11-03 10:45:33 +01:00
[CST] Focus
5c6c284c2f
gui/infoviewer.cpp: add set/getUpdateTimer, dont set timer in start()
2012-11-02 16:09:25 +04:00
Stefan Seyfried
04b916dbb7
add various variable initializations to keep valgrind happy
2012-10-31 23:02:34 +01:00
[CST] Focus
67579409ba
gui/infoviewer.cpp: init and reset radiotext position and size
2012-10-25 18:02:57 +04:00
satbaby
2c302dc90d
NeutrinoMessages fix memleak , ported from tuxbox cvs
2012-10-21 18:45:39 +02:00
Stefan Seyfried
adb23b23ee
Merge branch 'uncool/dvbsi++' commit 'dc95ffa37c6'
...
...needs buildfixing...
Conflicts:
data/icons/shutdown.jpg
data/icons/start.jpg
lib/libtuxtxt/tuxtxt.h
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/framebuffer.cpp
src/driver/record.cpp
src/driver/volume.cpp
src/gui/audio_setup.cpp
src/gui/audioplayer.cpp
src/gui/epgview.cpp
src/gui/eventlist.cpp
src/gui/filebrowser.cpp
src/gui/infoviewer.cpp
src/gui/keybind_setup.cpp
src/gui/miscsettings_menu.cpp
src/gui/movieplayer.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/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrino_menue.cpp
src/system/Makefile.am
src/system/configure_network.cpp
src/system/httptool.cpp
src/system/setting_helpers.cpp
src/timerd/timermanager.cpp
src/zapit/include/zapit/frontend_c.h
src/zapit/src/Makefile.am
src/zapit/src/capmt.cpp
src/zapit/src/frontend.cpp
src/zapit/src/zapit.cpp
2012-10-14 12:51:07 +02:00
Thilo Graf
807dce9497
*CInfoViewer: don't show tuner icon with single boxes
2012-09-18 12:10:17 +02:00
[CST] Focus
1f4c39fdd3
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-09-13 15:00:34 +04:00
satbaby
576d3d9da0
infoviewer.cpp:fix showSysfsHdd
2012-09-13 12:59:18 +02:00
[CST] Focus
9fdbdbd343
Merge branch 'dvbsi++' of coolstreamtech.de:cst-public-gui-neutrino into dvbsi++
2012-09-13 11:24:13 +04:00
