Commit Graph

4326 Commits

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


Origin commit data
------------------
Commit: 230096c050
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-04-05 18:29:08 +04:00
Stefan Seyfried
a3bd83cd53 neutrino: do not display expired events in channel list
Origin commit data
------------------
Commit: 6bc2a8a5d8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-01-22 (Sun, 22 Jan 2012)
2013-04-05 16:32:43 +04:00
Stefan Seyfried
29998498f3 dvbsubtitle: free avcodec context in destructor
Origin commit data
------------------
Commit: 227bf9f2e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-31 (Wed, 31 Oct 2012)
2013-04-05 15:54:12 +04:00
Stefan Seyfried
1f0eb08e26 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


Origin commit data
------------------
Commit: be1b73b7a0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-08-14 (Tue, 14 Aug 2012)
2013-04-05 15:53:30 +04:00
Stefan Seyfried
9ba28c1287 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


Origin commit data
------------------
Commit: 27493de2ef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-30 (Sun, 30 Oct 2011)
2013-04-05 15:52:58 +04:00
[CST] Focus
ea33de8f9a 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


Origin commit data
------------------
Commit: d79d592d27
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-05 (Fri, 05 Apr 2013)
2013-04-05 15:15:44 +04:00
[CST] Focus
1d17890343 dutch.locale: update
Origin commit data
------------------
Commit: 83cbc1cbef
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-05 14:54:22 +04:00
[CST] Focus
297c368291 driver/record.cpp: add record duration to stop menu
Origin commit data
------------------
Commit: 1c2f2a5750
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-04 (Thu, 04 Apr 2013)
2013-04-05 14:54:22 +04:00
Stefan Seyfried
51a9a3b894 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


Origin commit data
------------------
Commit: e09bc260da
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-10-03 (Mon, 03 Oct 2011)
2013-04-05 14:50:28 +04: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
Thilo Graf
9c2de0fdf4 CTimeOsd: remove unused var timescale
Origin commit data
------------------
Commit: c4d9f76b6b
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-04 09:56:51 +02:00
[CST] Focus
71f85c907c zapit/src/bouquets.cpp: use FindChannelFuzzy() on cable-only box to help importing old bouquets
Origin commit data
------------------
Commit: 87abc0d1c4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:32:23 +04:00
[CST] Focus
03226d57d5 zapit/src/getservices.cpp: fix FindChannelFuzzy for mixed frontends
Origin commit data
------------------
Commit: 4e2a08dba4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:30:28 +04:00
[CST] Focus
5545ae8ad9 zapit/src/femanager.cpp: add cached have_sat/cable flags
Origin commit data
------------------
Commit: 6753630b68
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-02 (Tue, 02 Apr 2013)
2013-04-02 14:30:01 +04:00
Thilo Graf
03b22f2d23 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


Origin commit data
------------------
Commit: 860be9a412
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-02 09:31:05 +02:00
Thilo Graf
17d13ef103 CComponents: move item type enum to cc_types.h
Origin commit data
------------------
Commit: d391bedd5f
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)
2013-04-02 09:31:05 +02:00
Thilo Graf
2b3fda7bb2 CComponentsPIP: remove unsuitable filename
Origin commit data
------------------
Commit: d87290c2bc
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-02 09:31:05 +02:00
vanhofen
1ef13b7d00 eventlist: fix delete of cc_infozone
Origin commit data
------------------
Commit: 825ec2f5cc
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-02 (Tue, 02 Apr 2013)

Origin message was:
------------------
- eventlist: fix delete of cc_infozone
2013-04-02 01:28:38 +02:00
defans
57a62f6cb5 eventlist: add right infobox with current eventinfo
* use getScreen{Width/Height}Rel()


Origin commit data
------------------
Commit: 68cf021581
Author: defans <defans@bluepeercrew.us>
Date: 2013-04-01 (Mon, 01 Apr 2013)

Origin message was:
------------------
- eventlist: add right infobox with current eventinfo

* use getScreen{Width/Height}Rel()
2013-04-01 22:06:19 +02:00
Michael Liebmann
2e51731543 Sort locales
Origin commit data
------------------
Commit: d4e54571a4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)

Origin message was:
------------------
* Sort locales
2013-04-01 19:25:21 +01:00
[CST] Focus
f84899764e deutsch.locale: remove 'coolstream' after merge
Origin commit data
------------------
Commit: 4d1bf5c3d6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-01 (Mon, 01 Apr 2013)
2013-04-01 16:30:36 +04:00
vanhofen
544669f8c9 bouqueteditor_chanselect.cpp: fix height
Conflicts:
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Commit: 7754b8f54e
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-29 (Fri, 29 Mar 2013)

Origin message was:
------------------
- bouqueteditor_chanselect.cpp: fix height

Conflicts:
	src/gui/bedit/bouqueteditor_chanselect.cpp
2013-04-01 16:21:18 +04:00
Jacek Jendrzej
30c9a0e022 src/gui/channellist.cpp: fix to 36e95d7fbcd22dfbb94d03867f10634f7a72df63 if more bouquets empty
Origin commit data
------------------
Commit: 25653df890
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-27 (Wed, 27 Mar 2013)
2013-04-01 16:19:51 +04:00
Jacek Jendrzej
74eeae3a1e data/satellites.xml: update Eurobird 9A (9.0E)
Origin commit data
------------------
Commit: cecbd13107
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
data/satellites.xml: update Eurobird 9A (9.0E)
2013-04-01 16:18:42 +04:00
vanhofen
a09ae782bf epgplus.cpp: use getScreen{Width/Height}Rel()
Origin commit data
------------------
Commit: f7ebed39cb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- epgplus.cpp: use getScreen{Width/Height}Rel()
2013-04-01 16:18:31 +04:00
vanhofen
204d3ca7bb osd_progressbar_setup: rework locales; marginal changes in code
Conflicts:
	data/locale/deutsch.locale


Origin commit data
------------------
Commit: c20d1ef6eb
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-26 (Tue, 26 Mar 2013)

Origin message was:
------------------
- osd_progressbar_setup: rework locales; marginal changes in code

Conflicts:
	data/locale/deutsch.locale
2013-04-01 16:14:29 +04:00
Stefan Seyfried
a8e77f8b06 filebrowser: simplify code using font pointers and ...
... make size, time and mode fields scale with fontsize


Origin commit data
------------------
Commit: 6bb85ef71d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-01 16:05:40 +04:00
Stefan Seyfried
d4ca138d16 infoviewer: make oldinfo a member of the class
Origin commit data
------------------
Commit: 1ee9088f28
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-01 15:48:00 +04:00
Stefan Seyfried
c7be049732 channellist: refactor to avoid duplicated code
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Commit: 0d318fd296
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)
2013-04-01 15:47:10 +04:00
Stefan Seyfried
bfa1e02cac CVolume: remove duplicate code
Origin commit data
------------------
Commit: e3e333582c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-24 (Sun, 24 Mar 2013)
2013-04-01 15:43:37 +04:00