Commit Graph

4363 Commits

Author SHA1 Message Date
Stefan Seyfried
a32380d4b2 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.


Origin commit data
------------------
Commit: d2463705f4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 18:54:57 +02:00
Stefan Seyfried
565b3ccffa 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


Origin commit data
------------------
Commit: 53c6e48d40
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)

Origin message was:
------------------
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
77afbdd4f6 luainstance: export customcolor.h colors, too
Origin commit data
------------------
Commit: e2061907da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 18:18:02 +02:00
Stefan Seyfried
88eb281013 fontrenderer: allow using customcolor.h colors for fonts
Origin commit data
------------------
Commit: 304c7e8daa
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 18:15:49 +02:00
Stefan Seyfried
a48908da87 audioplayer: don't free curl_handle too early
Origin commit data
------------------
Commit: 4a1cb03e82
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 17:57:58 +02:00
Stefan Seyfried
c35bc270db remove obsoleted framebuffer_spark.cpp
Origin commit data
------------------
Commit: 6605e928be
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 17:37:23 +02:00
Stefan Seyfried
3c16c08f9d test_menu: fix path to demo picture
Origin commit data
------------------
Commit: 6cabfb0a71
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 17:26:53 +02:00
Stefan Seyfried
d3b3c19334 mp3dec: recover from PCM write errors without crashing
Origin commit data
------------------
Commit: 0b9156b309
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-07 (Sun, 07 Apr 2013)
2013-04-07 17:20:42 +02:00
Stefan Seyfried
691b4639b9 cc_frm: fix invalid cast
Origin commit data
------------------
Commit: 8d8ce4c55a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:20:58 +02:00
Stefan Seyfried
96bb27184b nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Commit: 2ba024168d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:20:47 +02:00
Stefan Seyfried
105fa78aa2 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 80e7f9753b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:14:06 +02:00
Jacek Jendrzej
07e4bd384d revert commit b212f46c3d
Origin commit data
------------------
Commit: e0facfa2e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 22:13:47 +02:00
Stefan Seyfried
b720c0664d luainstance: work around a signed/unsigned problem on ppc
Origin commit data
------------------
Commit: 28890886fc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 19:06:46 +02:00
Stefan Seyfried
ac3511b85e fontrenderer: use background color of framebuffer
Origin commit data
------------------
Commit: 454a80f3ac
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 17:47:06 +02:00
Stefan Seyfried
9c9250e262 CScanTs: silence valgrind
Origin commit data
------------------
Commit: 351f47c3a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:59:39 +02:00
Stefan Seyfried
6dfd0861bf CScanTs: add destructor to avoid leaks
Origin commit data
------------------
Commit: 14783a7581
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:59:13 +02:00
Stefan Seyfried
ed0a43474b CScanTs: revert to pu/cc code
Origin commit data
------------------
Commit: 2ed1f7eee2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 16:58:19 +02:00
Michael Liebmann
6720ef7539 Supplement to commit dde336f...
- epgview: Fix colors in progress bar


Origin commit data
------------------
Commit: d4740238dd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-06 (Sat, 06 Apr 2013)

Origin message was:
------------------
* Supplement to commit dde336f...

- epgview: Fix colors in progress bar
2013-04-06 15:18:12 +01:00
Stefan Seyfried
c64dc2ffa5 osd_setup: bring progressbar locales closer to mainline
Origin commit data
------------------
Commit: 899fcaf8ca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 15:20:46 +02:00
Stefan Seyfried
bb76cc5a40 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.


Origin commit data
------------------
Commit: 6a955ecef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 14:41:06 +02:00
Stefan Seyfried
f0f32ff08f 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


Origin commit data
------------------
Commit: 8b689f4b26
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 14:28:16 +02:00
Stefan Seyfried
32075530f5 Revert "src/gui/channellist.cpp: fix to eb9cc7950d if more bouquets empty"
This reverts commit b212f46c3d.

a better solution without duplicating code is available


Origin commit data
------------------
Commit: 8ba673497e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 13:33:29 +02:00
Stefan Seyfried
619d1f2c69 CChannelList: fix "prev bouquet" if empty bouquets are present
also do proper wrap-around when selecting previous / next bouquet


Origin commit data
------------------
Commit: 21cb7fc249
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 13:15:40 +02:00
Stefan Seyfried
b55db8111a cc_frm: fix invalid cast
Origin commit data
------------------
Commit: 37d70cd345
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 12:28:18 +02:00
Stefan Seyfried
a5629dc67c luainstance: allow any color for PaintBox, disable debug
Origin commit data
------------------
Commit: a6cf7313d5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 12:26:24 +02:00
Stefan Seyfried
4797427a3b glthread: add power button
Origin commit data
------------------
Commit: 237ab8f9c7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 12:11:26 +02:00
Stefan Seyfried
33edabc16f glthread: blit OSD manually
to help debugging of framebuffer issues, only blit the openGL
framebuffer after an explicit blit() call


Origin commit data
------------------
Commit: 843e9f395a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 12:06:18 +02:00
Stefan Seyfried
b620a0b9e1 nhttpd: fix streaming with non-standard port
Origin commit data
------------------
Commit: 069bf46578
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:49:47 +02:00
Stefan Seyfried
6240ca93fb test_menu: disable
Origin commit data
------------------
Commit: 7a9b744a22
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:47:08 +02:00
Stefan Seyfried
1251002158 test_menu: fix build
Origin commit data
------------------
Commit: 4d2f580af0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:46:50 +02:00
Stefan Seyfried
001cfaa9bc acinclude: workaround for packages with empty FOO_CFLAGS
should probably be fixed differently but works for now ;-)


Origin commit data
------------------
Commit: b46a806cb9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:38:17 +02:00
Stefan Seyfried
93accc2dda imageinfo: remove reference to removed frameBuffer pointer
Origin commit data
------------------
Commit: d88ba86e90
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:32:30 +02:00
Stefan Seyfried
45434cf54a framebuffer_ng: add getScreen*Rel() functions
Origin commit data
------------------
Commit: 575c7c1da3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:29:27 +02:00
Stefan Seyfried
f1e664b75e 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


Origin commit data
------------------
Commit: 5ad0b6b6dc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 11:21:55 +02:00
Thilo Graf
1fe3cbe0b3 CChannellist: add missig frame for timscale
Origin commit data
------------------
Commit: 6fa592323b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 10:21:22 +02:00
Thilo Graf
604d4e0f99 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 ab59797ae5


Origin commit data
------------------
Commit: d7ce847471
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-06 (Sat, 06 Apr 2013)
2013-04-06 08:49:16 +02:00
Thilo Graf
ab0e31bd05 Progressbars: use default frame thickness
It's unnecessary overhead to set the value everywhere, except it's needed.


Origin commit data
------------------
Commit: f70a30defa
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-06 08:33:51 +02:00
Thilo Graf
ff40ada214 CProgressBar: remove wrong intital value for frame thickness
Default value is 0, and should remain as specified in the base class.


Origin commit data
------------------
Commit: 210ae1491d
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-06 08:33:51 +02:00
Michael Liebmann
dde336facd Fix order of colors for some progress bars
Origin commit data
------------------
Commit: adfbfe079c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)

Origin message was:
------------------
* Fix order of colors for some progress bars
2013-04-05 19:43:50 +01:00
Michael Liebmann
64c8fa2e62 CComponentsPicture: initVarPicture() not execute if pic_name is blank
Origin commit data
------------------
Commit: bd47ef2060
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
* CComponentsPicture: initVarPicture() not execute if pic_name is blank
2013-04-04 16:10:15 +01:00
Michael Liebmann
ab59797ae5 CComponentsInfoBox: CComponentsPicture not create when no image to draw
Origin commit data
------------------
Commit: 095c0e1b04
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
* CComponentsInfoBox: CComponentsPicture not create when no image to draw
2013-04-04 16:10:15 +01:00
vanhofen
3a045fdc0a infoviewer: remove frame from timescale inside infoviewer
Origin commit data
------------------
Commit: 85ab392a09
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)

Origin message was:
------------------
- infoviewer: remove frame from timescale inside infoviewer
2013-04-04 14:41:13 +02:00
Jacek Jendrzej
ba1e24ee31 CComponents: don't paint the same box with different colors as background
Origin commit data
------------------
Commit: d18217effb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-04 12:19:31 +02:00
Michael Liebmann
2faaf46d20 CNeutrinoEventList: Fix flicker when page is changed
Origin commit data
------------------
Commit: a841aa3790
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-03 (Wed, 03 Apr 2013)

Origin message was:
------------------
* CNeutrinoEventList: Fix flicker when page is changed
2013-04-04 10:11:49 +01:00
Thilo Graf
c3dfd001a8 CComponentsInfoBox: prevent background paint in infobox
Background for text is not needed here


Origin commit data
------------------
Commit: 4e7f81a126
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-04 09:56:53 +02:00
Thilo Graf
6004ccf321 CComponentsText: add member to control background paint on textbox objects
Origin commit data
------------------
Commit: 3a4543b8d2
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-04 09:56:53 +02:00
Thilo Graf
c49dd9ab02 CNeutrinoEventList: use CComponentsText instead CComponentsInfoBox
add doPaintBg(false), causes no paint or repaint and save of item
background.

CC-Items comes with its own hide(), but it's not very sensefull
to store or paint background here.

NOTE: CComponentsText is more of appropriate for embedded text items
than CComponentsInfoBox. CComponentsInfoBox is more made for hint or
messageboxes.


Origin commit data
------------------
Commit: 399dbad350
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-03 (Wed, 03 Apr 2013)
2013-04-04 09:56:52 +02:00
Thilo Graf
3c0d3d4279 CComponentsText: paint always background before painting text
Ensures erase of old text, usefully to avoid often
repaints of embedded textbox objects or text items


Origin commit data
------------------
Commit: e23b03fde9
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-03 (Wed, 03 Apr 2013)
2013-04-04 09:56:52 +02:00
Thilo Graf
0fc70f3bb6 CComponents: disable debug spam
Origin commit data
------------------
Commit: bdbea07e71
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-04 09:56:52 +02:00
Thilo Graf
b655e3fc36 CNeutrinoEventList: remove include of textbox.h
Is already included by cc.h


Origin commit data
------------------
Commit: 5cd01b8cc8
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-04 09:56:51 +02:00