svenhoefer
9041bff59c
- remove w_max()-calls to define menu-width, because ...
...
w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
5ab6b53054
global.h: Use forward-declarations to reduce number of dependencies
2015-04-16 13:39:35 +02:00
Stefan Seyfried
b5a64e6887
Merge remote-tracking branch 'check/cst-next'
...
*needs buildfixing*
Conflicts:
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/Makefile.am
src/driver/audiodec/Makefile.am
src/driver/pictureviewer/Makefile.am
src/driver/vfd.cpp
src/gui/bedit/Makefile.am
src/gui/components/Makefile.am
src/gui/luainstance.cpp
src/gui/widget/Makefile.am
src/nhttpd/tuxboxapi/coolstream/Makefile.am
src/system/Makefile.am
2015-01-26 17:26:26 +01:00
[CST] Focus
3da439030b
neutrino: try to prevent using chanellist/bouquetlist while channels init in progress
2015-01-13 16:10:24 +03: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
[CST] Focus
823549949d
gui/bouquetlist.cpp: mark only changed bouquets/services to save;
...
enable menu save screen, do not repaint after menu;
allow open empty channel list
2014-10-10 15:26:32 +04:00
martii
e84782bc4c
drop explicit CMenuForwarder icon assignments
...
Conflicts:
src/gui/3dsetup.cpp
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/keybind_setup.cpp
src/gui/mediaplayer.cpp
src/gui/mediaplayer_setup.cpp
src/gui/moviebrowser.cpp
src/gui/network_setup.cpp
src/gui/nfs.cpp
src/gui/osd_setup.cpp
src/gui/osdlang_setup.cpp
src/gui/parentallock_setup.cpp
src/gui/personalize.cpp
src/gui/proxyserver_setup.cpp
src/gui/record_setup.cpp
src/gui/scan_setup.cpp
src/gui/screensetup.cpp
src/gui/settings_manager.cpp
src/gui/timerlist.cpp
src/gui/update_menue.cpp
src/gui/vfd_setup.cpp
src/gui/videosettings.cpp
src/neutrino_menue.cpp
2014-09-15 11:44:08 +04:00
martii
b21cb152b5
system/settings: move theme colors to dedicated struct
...
Conflicts:
src/driver/pictureviewer/pictureviewer.cpp
src/gui/epgview.cpp
src/gui/osd_setup.cpp
src/gui/pluginlist.cpp
src/neutrino.cpp
2014-09-12 18:29:21 +04:00
[CST] Focus
420af7a4dc
neutrino: sync keybind and usermenu code with neutrino-mp, code (C) martii
2014-09-05 17:49:11 +04:00
Thilo Graf
69e2debb02
COSDFader: rename member functions, adapt implementations
...
Stop() is not exactly attributable if fader class used as inherited and
Fade() don't tell really what done and related to return value 'bool'...
especially as the fader class members have been not documented.
2014-06-23 18:43:47 +02:00
svenhoefer
649d1b1f9d
- change RenderString() default to UTF8
2014-06-11 23:07:13 +02:00
svenhoefer
8b91cda918
- change getRenderWidth() default to UTF8
2014-06-11 23:07:00 +02:00
Stefan Seyfried
44ba8fafca
Merge remote-tracking branch 'check/next-cc'
...
build-tested only, needs fixing
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/Makefile.am
src/driver/rcinput.cpp
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/Makefile.am
src/gui/bouquetlist.cpp
src/gui/hdd_menu.cpp
src/gui/luainstance.cpp
src/gui/luainstance.h
src/gui/moviebrowser.cpp
src/gui/movieplayer.cpp
src/gui/pluginlist.cpp
src/gui/plugins.cpp
src/gui/plugins.h
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/gui/user_menue.cpp
src/gui/videosettings.cpp
src/gui/widget/menue.cpp
src/neutrino.cpp
src/neutrinoMessages.h
src/system/locals.h
src/system/locals_intern.h
src/zapit/include/zapit/scan.h
src/zapit/src/femanager.cpp
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
2014-04-27 19:14:06 +02:00
[CST] Focus
330c8af7c2
gui/bouquetlist.cpp: show epg icon for bouquets selected to scan epg
2014-04-02 17:32:38 +04:00
[CST] Focus
b7604664a4
gui/bouquetlist.cpp: another fix for bouquet epg scan option :D
2014-03-28 19:04:36 +04:00
[CST] Focus
eb1ef76495
gui/bouquetlist.cpp: another fix for bouquet epg scan option
2014-03-28 18:40:20 +04:00
[CST] Focus
4d8a633532
gui/bouquetlist.cpp: fix warning
2014-03-28 18:00:27 +04:00
[CST] Focus
6934981f30
gui/bouquetlist.cpp: fix crash
2014-03-28 16:12:31 +04:00
[CST] Focus
e11434f417
gui/bouquetlist.cpp: add menu option to switch bouquet epg scan on/off
2014-03-27 18:56:49 +04:00
[CST] Focus
90768b15ac
gui/bouquetlist.cpp: allow to delete whole satellite from satellite bouquet view
2014-03-13 16:06:20 +04:00
[CST] Focus
040b2a958e
gui/bouquetlist.cpp: fix inactive color when called to add channel to bouquet
2014-03-06 16:09:10 +04:00
Thilo Graf
bcf4e4fbf9
revert cd5fd9dab3
...
use an easier solution, based up neutrino-mp
2014-01-26 20:30:41 +01:00
Stefan Seyfried
78f51baf66
Merge remote-tracking branch 'check/next-cc-fixed'
2014-01-26 00:33:08 +01:00
Stefan Seyfried
f625a18324
Revert "Fix compiler warnings (-Wconversion)"
...
This reverts commit cd5fd9dab3
2014-01-26 00:32:23 +01:00
M. Liebmann
cd5fd9dab3
Fix compiler warnings (-Wconversion)
...
- THX SatBaby for the info
2014-01-25 23:06:27 +01:00
Thilo Graf
5ea7ec48df
CComponentsHeader: rework constructors, add CComponentsHeaderLocalized
...
Member initVarHeader() now used with parameters, so it's possible
to remove multiple code in constructors, but some class must be
renamed to CComponentsHeaderLocalized.
2014-01-24 23:09:56 +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
martii
4d0eea3b23
gui/bouquetlist: fix 73152bd and 4dcc804
2013-12-13 16:53:05 +01:00
martii
73152bd30b
gui/bouquetlist: use Font::getMaxDigitWidth()
2013-12-13 16:44:59 +01:00
svenhoefer
014dd3ac7b
Revert "- add missing include of vfd header"
...
This reverts commit 3845feb0e4
2013-11-13 23:39:55 +01:00
svenhoefer
3845feb0e4
- add missing include of vfd header
2013-11-13 10:40:18 +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
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
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
Thilo Graf
acb256ba53
CBouquetList: use required type
...
fix some possible compiler warnings
2013-10-02 10:07:34 +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
1d63e4048e
src/gui/bouquetlist.cpp: do not add dublicate channels while copy bouquet to favorite,
...
if favorite bouquet already exist
2013-09-25 17:08:34 +04: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
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
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
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
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
6c41ffbe47
- neutrino: don't save screen while paint headers
2013-05-28 10:42:39 +02:00
svenhoefer
2204631859
- bookmarkmanager/bouquetlist: add missing includes
2013-05-27 22:08:24 +02:00
svenhoefer
a9012e4699
- bouquetlist: using CComponentsHeader to paint header
2013-05-27 21:19:23 +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
Stefan Seyfried
c0c008190e
neutrino: make g_channel_list_changed private
...
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.
2013-04-17 10:21:33 +04:00
Stefan Seyfried
744ed878de
neutrino: make g_channel_list_changed private
...
Add a setter function MarkChannelListChanged() instead for
bouquet/channel list. This avoids sometimes not reloading
channels after changes in the service menu.
2013-04-14 19:42:28 +02:00
