Commit Graph

43 Commits

Author SHA1 Message Date
Jacek Jendrzej
6be63f736c Merge branch 'master' into pu/mp 2017-08-23 13:10:49 +02:00
Jacek Jendrzej
e58e72635b fxi possible buffer overflow 2017-08-23 13:00:24 +02:00
Jacek Jendrzej
05e8d727bd Merge branch 'master' into pu/mp 2017-05-28 22:30:05 +02:00
svenhoefer
bf852064bc - buttons: use OFFSET defines 2017-05-16 10:31:25 +02:00
M. Liebmann
03c5d11572 src/gui/widget/buttons.cpp: Use system/stacktrace.h ...
... instead of driver/stacktrace
2017-03-14 00:13:35 +01:00
Stefan Seyfried
2819e651c3 Merge remote-tracking branch 'tuxbox/pu/fb-modules'
only compile tested ;-)
2017-02-12 21:29:10 +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
svenhoefer
104d21e784 - rename customcolor.h -> color_custom.h; reduce unneeded inludes 2016-10-10 14:19:55 +02:00
svenhoefer
54f2ac510f - fonts: add and use own font for all footers 2016-08-15 19:02:42 +02:00
svenhoefer
cc5258e6d5 - colors: make footer background color configurable
TODO: footer text color and maybe footer font
2016-08-15 00:14:47 +02:00
svenhoefer
bc39d1e14e - colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable
2016-08-14 21:55:18 +02:00
Jacek Jendrzej
49c86a38b4 avoid division by zero 2016-04-21 18:14:46 +02: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
cf91f2eccb merge neutrino-mp menu/buttons/icons changes, (C) martii 2014-07-17 17:02:25 +04: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
ecd62d81d1 Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes
2014-02-15 20:22:07 +01:00
Jacek Jendrzej
e9725e393e paintButtons: fix alternative button text size 2014-02-04 19:32:47 +01:00
Stefan Seyfried
32661dd6fc paintButtons: fix auto-spacing of buttins / labels
in space-restricted setups, buttons would be painted outside
of the assigned space due to errors in position calculations
2013-12-03 11:52:42 +01:00
Stefan Seyfried
76f1f6f007 paintButtons: fix auto-spacing of buttins / labels
in space-restricted setups, buttons would be painted outside
of the assigned space due to errors in position calculations
2013-12-02 00:52:55 +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
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
e09bc260da neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Conflicts:
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/stringinput.cpp
2013-04-05 14:50:28 +04: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
satbaby
840ba47db1 buttons.cpp: -fix skip last button txt 2012-10-18 17:11:56 +02:00
Stefan Seyfried
ae1b98aa38 Merge branch 'uncool/dvbsi++' commit '6e0bc85a6c0'
This is the last commit before the "menu hints" started.
Needs buildfixing...

Conflicts:
	configure.ac
	src/daemonc/remotecontrol.cpp
	src/daemonc/remotecontrol.h
	src/driver/audiodec/basedec.cpp
	src/driver/fb_window.cpp
	src/driver/rcinput.cpp
	src/driver/volume.cpp
	src/global.h
	src/gui/channellist.cpp
	src/gui/eventlist.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/plugins.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/neutrino.cpp
	src/sectionsd/dmx.cpp
	src/sectionsd/dmxapi.cpp
	src/sectionsd/sectionsd.cpp
	src/system/setting_helpers.cpp
	src/zapit/include/zapit/client/zapittypes.h
	src/zapit/include/zapit/frontend_c.h
	src/zapit/include/zapit/satconfig.h
	src/zapit/include/zapit/scan.h
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/pmt.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/sdt.cpp
	src/zapit/src/zapit.cpp
2012-07-23 01:02:29 +02:00
satbaby
c4c5e6cd4c buttons.cpp:fix to workaround for to small screen 2012-05-02 18:31:20 +02:00
satbaby
0a06e39e2c buttons.cpp:fix to workaround for to small screen 2012-05-02 18:05:07 +02:00
satbaby
4be74a3fac buttons.cpp:workaround for to small screen 2012-05-02 15:17:00 +02:00
Stefan Seyfried
2f65aea744 neutrino: make button bar use available space intelligently
modify the paintButtons() function, so that it spreads the buttons
over the available width with constant space between them.
Port over all users to the new method and clean up quite some custom
button drawing code on the way.

Attention: This code is GPL v3+ only for now!
2012-04-17 19:33:49 +02:00
satbaby
2b72b7c57e paintButtons: add max txt length option
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1960 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-08 16:45:41 +00:00
micha-bbg
e1c109a4ac - Declaration of parameter 'show' added (r1810)
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1811 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-03 05:41:44 +00:00
micha-bbg
b9ac051420 Display error EPG (Buttons are partially drawn out of the EPG screen)
- Use ::paintButtons (buttons.cpp) calculating to the height FunctionBar.


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1810 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-03 02:32:56 +00:00
thilo
6cf6bbefe8 *neutrino: space between buttons widened
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1193 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-22 10:39:52 +00:00
thilo
e1f887af72 *neutrino buttonbars: reworked painting of buttonbar in
channellist,
stringinput (also cleared some char format problems),
audioplayer,
bouqueteditor_bouqets,
bouqueteditor_channels,
bouqueteditor_chanselect,
bookmarkmanager,,
bouquetlist,
filebrowser,
epgplus,
epgview,
pictureviewer,
timerlist,
upnpbrowser

TODO:
This is still not a final solution. I would like to see buttonhandling in
own class for better integration and handling of window structure.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1179 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-21 09:08:10 +00:00
satbaby
249352e5dc osd fixes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@668 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-15 11:04:22 +00:00
satbaby
1593513c1f -fix center txt
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@664 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-07-14 08:04:45 +00:00
focus
56674d5561 Fixes for non-standart icon sizes. Not complete yet, work in progress. Probably will broke commit #568
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@569 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-05-06 09:39:29 +00:00
satbaby
5ac3f5c8a7 f-fix warning
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@551 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-04-22 11:46:29 +00:00
focus
1ec1b2fb81 #286, 288, 285, 242, 282, 296, 293
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@549 e54a6e83-5905-42d5-8d5c-058d10e6a962
2010-04-21 09:36:33 +00:00
mrcolor
bc5bd4154e our current experimental Neutrino branch
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@27 e54a6e83-5905-42d5-8d5c-058d10e6a962
2009-12-08 11:05:11 +00:00