Thilo Graf
211f85966a
CTimeOsd: remove unused var timescale
...
Conflicts:
src/gui/timeosd.cpp
2013-04-08 10:01:04 +04:00
Stefan Seyfried
b79b13a411
CChannelList: fix "prev bouquet" if empty bouquets are present
...
also do proper wrap-around when selecting previous / next bouquet
2013-04-08 09:59:18 +04:00
Jacek Jendrzej
6d56cc0696
revert commit f4ae5e17ce
2013-04-08 09:59:04 +04:00
Michael Liebmann
9a9a347ee3
* src/gui/audioplayer.cpp: Fix segfault in audioplayer osd
2013-04-07 22:07:38 +01:00
Thilo Graf
276fa6273e
CProgressBar: use correct default colors in constructor
2013-04-07 20:37:54 +02:00
Stefan Seyfried
d2463705f4
luainstance: return render width from RenderString
...
Return the string's renderwidth from RenderString. If boxh is < 0
then the string is not rendered and only the width is determined.
2013-04-07 18:54:57 +02:00
Stefan Seyfried
53c6e48d40
luainstance: remove utf8 parameter from RenderString, add center
...
Everybody should always be using utf8 anyway, so remove the "utf8"
parameter from RenderString and replace it with a "center" parameter
which centers the string horizontally in its box.
new usage:
RenderString(font, text, x, y, color, boxwidth, boxheight, center)
defaults:
color = COL_MENUCONTENT, boxwidth = window's width minus x
boxheight = 0, center = 0
2013-04-07 18:18:38 +02:00
Stefan Seyfried
e2061907da
luainstance: export customcolor.h colors, too
2013-04-07 18:18:02 +02:00
Stefan Seyfried
304c7e8daa
fontrenderer: allow using customcolor.h colors for fonts
2013-04-07 18:15:49 +02:00
Stefan Seyfried
4a1cb03e82
audioplayer: don't free curl_handle too early
2013-04-07 17:57:58 +02:00
Stefan Seyfried
6605e928be
remove obsoleted framebuffer_spark.cpp
2013-04-07 17:37:23 +02:00
Stefan Seyfried
6cabfb0a71
test_menu: fix path to demo picture
2013-04-07 17:26:53 +02:00
Stefan Seyfried
0b9156b309
mp3dec: recover from PCM write errors without crashing
2013-04-07 17:20:42 +02:00
Stefan Seyfried
8d8ce4c55a
cc_frm: fix invalid cast
2013-04-06 22:20:58 +02:00
Stefan Seyfried
2ba024168d
nhttpd: fix streaming with non-standard port
2013-04-06 22:20:47 +02:00
Stefan Seyfried
80e7f9753b
CChannelList: fix "prev bouquet" if empty bouquets are present
...
also do proper wrap-around when selecting previous / next bouquet
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
e0facfa2e0
revert commit f4ae5e17ce
2013-04-06 22:13:47 +02:00
Stefan Seyfried
28890886fc
luainstance: work around a signed/unsigned problem on ppc
2013-04-06 19:06:46 +02:00
Stefan Seyfried
454a80f3ac
fontrenderer: use background color of framebuffer
2013-04-06 17:47:06 +02:00
Stefan Seyfried
351f47c3a0
CScanTs: silence valgrind
2013-04-06 16:59:39 +02:00
Stefan Seyfried
14783a7581
CScanTs: add destructor to avoid leaks
2013-04-06 16:59:13 +02:00
Stefan Seyfried
2ed1f7eee2
CScanTs: revert to pu/cc code
2013-04-06 16:58:19 +02:00
Michael Liebmann
d4740238dd
* Supplement to commit adfbfe0...
...
- epgview: Fix colors in progress bar
2013-04-06 15:18:12 +01:00
Stefan Seyfried
899fcaf8ca
osd_setup: bring progressbar locales closer to mainline
2013-04-06 15:20:46 +02:00
Stefan Seyfried
6a955ecef0
fix build / progressbar setup after pu/cc merge
...
* CProgressBar::PB_MONO is no longer available
* PB color setup is split over two configuration variables
Fix this while still keeping seamless update compatibility.
2013-04-06 14:41:06 +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
Stefan Seyfried
8ba673497e
Revert "src/gui/channellist.cpp: fix to 36e95d7fbc if more bouquets empty"
...
This reverts commit f4ae5e17ce
2013-04-06 13:33:29 +02:00
Stefan Seyfried
21cb7fc249
CChannelList: fix "prev bouquet" if empty bouquets are present
...
also do proper wrap-around when selecting previous / next bouquet
2013-04-06 13:15:40 +02:00
Stefan Seyfried
37d70cd345
cc_frm: fix invalid cast
2013-04-06 12:28:18 +02:00
Stefan Seyfried
a6cf7313d5
luainstance: allow any color for PaintBox, disable debug
2013-04-06 12:26:24 +02:00
Stefan Seyfried
237ab8f9c7
glthread: add power button
2013-04-06 12:11:26 +02:00
Stefan Seyfried
843e9f395a
glthread: blit OSD manually
...
to help debugging of framebuffer issues, only blit the openGL
framebuffer after an explicit blit() call
2013-04-06 12:06:18 +02:00
Stefan Seyfried
069bf46578
nhttpd: fix streaming with non-standard port
2013-04-06 11:49:47 +02:00
Stefan Seyfried
7a9b744a22
test_menu: disable
2013-04-06 11:47:08 +02:00
Stefan Seyfried
4d2f580af0
test_menu: fix build
2013-04-06 11:46:50 +02:00
Stefan Seyfried
b46a806cb9
acinclude: workaround for packages with empty FOO_CFLAGS
...
should probably be fixed differently but works for now ;-)
2013-04-06 11:38:17 +02:00
Stefan Seyfried
d88ba86e90
imageinfo: remove reference to removed frameBuffer pointer
2013-04-06 11:32:30 +02:00
Stefan Seyfried
575c7c1da3
framebuffer_ng: add getScreen*Rel() functions
2013-04-06 11:29:27 +02:00
Stefan Seyfried
5ad0b6b6dc
Merge branch 'check/pu-cc' into master
...
needs buildfixing...
Conflicts:
data/Makefile.am
src/driver/framebuffer.h
src/driver/volume.cpp
src/gui/bedit/bouqueteditor_bouquets.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/bouquetlist.cpp
src/gui/channellist.cpp
src/gui/filebrowser.cpp
src/gui/imageinfo.cpp
src/gui/infoviewer.cpp
src/gui/streaminfo2.cpp
src/gui/widget/textbox.cpp
2013-04-06 11:21:55 +02:00
Thilo Graf
6fa592323b
CChannellist: add missig frame for timscale
2013-04-06 10:21:22 +02:00
Thilo Graf
d7ce847471
CComponentsInfoBox: move statement for check of image name
...
Ensure empty pic object otherwise it can be retained on exit
of paintPicture(), if an instance of Infobox already exists.
supplement to 095c0e1b04
2013-04-06 08:49: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
Thilo Graf
210ae1491d
CProgressBar: remove wrong intital value for frame thickness
...
Default value is 0, and should remain as specified in the base class.
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
Stefan Seyfried
230096c050
msgbox: add rounded corners
...
This is not entirely correct, as the corners will be wong
if a msgbox without header or footer is used. But as the
only place where this is used is ShowMsg2UTF() which has
header and footer, it does not matter right now.
2013-04-05 18:29:08 +04:00
Stefan Seyfried
6bc2a8a5d8
neutrino: do not display expired events in channel list
2013-04-05 16:32:43 +04:00
Stefan Seyfried
227bf9f2e8
dvbsubtitle: free avcodec context in destructor
2013-04-05 15:54:12 +04:00
Stefan Seyfried
be1b73b7a0
channellist: limit context-menu on non-unlocked bouquets
...
don't allow adding of channels from locked bouquets to favorites
or unlocked bouquets to avoit circumvention of bouquet locks
2013-04-05 15:53:30 +04:00
Stefan Seyfried
27493de2ef
neutrino: add the possibility to lock bouquets by default
...
This basically inverts the "locked" attribute of bouquets.xml and
allows to selectively enable only favourites or similar.
Conflicts:
src/gui/channellist.cpp
2013-04-05 15:52:58 +04:00
[CST] Focus
d79d592d27
gui/channellist.cpp: move info/menu/zap icons from head to button bar;
...
add play button icon for PiP;
rework CChannelList::paintButtonBar;
handle PiP key binding in addition to play button
2013-04-05 15:15:44 +04:00
