Commit Graph

82 Commits

Author SHA1 Message Date
vanhofen
ec95250a62 framebuffer: better name for getWindowWidth/Height() functions
getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.


Origin commit data
------------------
Commit: 86cdc12c8f
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-22 (Mon, 22 Jan 2018)

Origin message was:
------------------
- framebuffer: better name for getWindowWidth/Height() functions

getScreenWidth/HeightRel() was confusing because it depends on users window settings.
Replace names in old unused framebuffer code too.
2018-01-22 12:06:15 +01:00
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
2017-03-15 23:39:43 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
2017-03-13 12:40:04 +01:00
vanhofen
c4de218cb2 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	src/driver/Makefile.am
	src/driver/framebuffer.h
	src/gui/bookmarkmanager.cpp
	src/gui/filebrowser.cpp
	src/gui/widget/buttons.cpp
	src/system/httptool.cpp


Origin commit data
------------------
Commit: dd6244f33e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 13:19:03 +01:00
vanhofen
0707fef642 Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/epgview.h


Origin commit data
------------------
Commit: e61a23cb74
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-08 (Wed, 08 Feb 2017)
2017-02-08 08:02:39 +01:00
Stefan Seyfried
aaab6db1b9 start modularizing framebuffer acceleration architecture
This is just copied framebuffer.{h,cpp} => fb_generic.{h,cpp}
The idea is to implement CFrameBuffer as generic framebuffer class that
does work on almost every hardware without acceleration and / or
hardware dependencies.
CFbAccel will be a derived class (and different on many architectures)
which implements the accelerated functions.
This does not yet compile, verbatim copies to track development history.


Origin commit data
------------------
Commit: 5c2ee5e137
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-05 (Sun, 05 Feb 2017)
2017-02-07 17:23:42 +01:00
vanhofen
bc33663742 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)
2016-08-26 19:13:47 +02:00
Michael Liebmann
4246a31ba6 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
2016-08-19 17:40:48 +02:00
vanhofen
4cf2b60722 NI \o/
Origin commit data
------------------
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)
2016-05-19 22:59:54 +02:00
Thilo Graf
b82a6b0ed4 CFrameBuffer: outsource code for icon path detecting
Unified handling and makes it possible to use in other objects.


Origin commit data
------------------
Commit: 97343d1190
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-03-17 (Thu, 17 Mar 2016)
2016-03-17 10:25:26 +01:00
Michael Liebmann
52e28a66d3 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Commit: f628ca6af8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-28 (Thu, 28 Jan 2016)
2016-01-28 05:32:50 +01:00
Michael Liebmann
b4a84c445e CFrameBuffer::paintBoxRel2Buf(): Align buffer at 4 byte boundary...
...for hw blit on apollo/kronos hardware


Origin commit data
------------------
Commit: 95f11ce7af
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
2016-01-26 09:51:48 +01:00
Michael Liebmann
12044a313d Use framebuffer_ng on cool_hardware
Origin commit data
------------------
Commit: 4d74e78d97
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
2016-01-26 06:13:54 +01:00
Michael Liebmann
710cbf3190 Adapt neutrino-mp for CST hardware part #1
- Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
 (no frontend found, segfault)


Origin commit data
------------------
Commit: 403d02ec2b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)

Origin message was:
------------------
Adapt neutrino-mp for CST hardware part #1

 - Fix compile for cst hardware
 - Code tested on kronos and apollo hardware, is ok
 - On Nevis hardware will be compiled, but not working
  (no frontend found, segfault)
2016-01-16 07:26:04 +01:00
Stefan Seyfried
8822421c6b Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)
2015-12-28 16:15:14 +01:00
Thilo Graf
72a289a90c components: rework classes
- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large


Origin commit data
------------------
Commit: 0146511f38
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-18 (Wed, 18 Nov 2015)

Origin message was:
------------------
components: rework classes

- outsourced some classes cc_item.cpp/h, cc_draw.cpp/h
- added extra methodes for simple use of some basic components extra.cpp/h
- rework clock handling: use timer class, reworked members for
 enable/disable clock with external timer events,
 tryed to fix some display issues related with infoclock and
 time osd clock in moviebrowser, channellist, menuus
- reworked hide/kill handling, removed parameter for hide(), try to use
 cached backgrounds for other constallations, paint cache, image cache (all beta)
- reworked shadow/frame handling, add shadow modes for left/right
 arrangement, TODO: repaint for existant instances required
- reworked color gradient assignment (beta)

... Note: I had a data crash in my local git tree
and i tryed to restore my historie, but most was lost. Therefore here
the commit is large
2015-12-27 14:42:27 +01:00
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
2015-12-13 17:41:55 +01:00
vanhofen
6a4659bf77 framebuffer: revival of showFrame() function to allow ...
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
2015-05-05 12:01:04 +02:00
Stefan Seyfried
ec1a9fce17 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


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
2014-12-25 18:03:08 +01:00
vanhofen
e110ce1095 framebuffer.h: define CORNER_NONE
Origin commit data
------------------
Commit: 46b4d9e866
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-11 (Sat, 11 Oct 2014)

Origin message was:
------------------
- framebuffer.h: define CORNER_NONE
2014-10-11 11:07:14 +02:00
Thilo Graf
3ffddab216 CComponents: add setColBodyGradient() to set gradient properties
This provides possibility to set relevant gradiant properties in cc sub classes


Origin commit data
------------------
Commit: f9147d185a
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:08:08 +04:00
Michael Liebmann
9fc90622cf CFrameBuffer: Add functions to draw color gradients
Origin commit data
------------------
Commit: a428a1f583
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-09-20 (Sat, 20 Sep 2014)
2014-09-25 11:05:46 +04:00
[CST] Focus
955bd37b56 driver/framebuffer.h: increase fade time, with 1750 there is no visible fade effect at all
Origin commit data
------------------
Commit: aa0c780dbf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-10 (Thu, 10 Jul 2014)
2014-07-17 17:02:56 +04:00
Thilo Graf
d21e16b938 CFrameBuffer: reduce fade time
10000 seems to bee too much for nice handling


Origin commit data
------------------
Commit: c41b4fd015
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-30 (Fri, 30 May 2014)
2014-06-23 18:43:47 +02:00
Thilo Graf
9148b5bdf6 CFrameBuffer: add function to get icon base path
Origin commit data
------------------
Commit: 06a5f568a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-03 (Sat, 03 May 2014)
2014-05-16 09:08:24 +02:00
Stefan Seyfried
80b809a370 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.


Origin commit data
------------------
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
2013-11-10 16:55:53 +01:00
[CST] Focus
9fc9267701 driver/framebuffer.cpp: switch from window_size to window width/height,
allow 50% min window size


Origin commit data
------------------
Commit: 0dc92e99f9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-07 (Thu, 07 Nov 2013)
2013-11-07 17:25:15 +04:00
Stefan Seyfried
158bd2c244 Merge branch 'check/next-cc'
Origin commit data
------------------
Commit: 50977ef2f5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 09:36:49 +02:00
vanhofen
4bcbf90dc1 osd_setup: introduce g_settings.window_size to scale some windows
* remove g_settings.big_windows
* add setup window (use up/down to change size)


Origin commit data
------------------
Commit: 6ed30528f9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-09-02 (Mon, 02 Sep 2013)

Origin message was:
------------------
- osd_setup: introduce g_settings.window_size to scale some windows

* remove g_settings.big_windows
* add setup window (use up/down to change size)
2013-09-02 20:59:26 +02:00
Stefan Seyfried
2c76238007 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


Origin commit data
------------------
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)
2013-09-01 19:46:10 +02:00
Michael Liebmann
d31569ad28 Activate reworked mute icon handling for apollo hardware
Origin commit data
------------------
Commit: 677a3ba116
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-08-24 (Sat, 24 Aug 2013)
2013-08-24 15:51:29 +02:00
[CST] Focus
036017927a driver/framebuffer.h: add empty blit for neutrino-mp patches
Origin commit data
------------------
Commit: cd8ee4a1c8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-05 (Fri, 05 Jul 2013)
2013-07-18 14:51:58 +04:00
Stefan Seyfried
fce4dbbe72 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


Origin commit data
------------------
Commit: d5d5a60261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
2013-06-16 21:22:14 +02:00
Michael Liebmann
06973062e0 Fix compile neutrino don't use USE_NEVIS_GXA
Origin commit data
------------------
Commit: 2b03fd0ddc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)

Origin message was:
------------------
* Fix compile neutrino don't use USE_NEVIS_GXA
2013-05-28 20:49:24 +02:00
Stefan Seyfried
b6e65d0300 Merge remote-tracking branch 'check/next-cc'
needs buildfixing in framebuffer class...

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fontrenderer.cpp
	src/driver/volume.cpp
	src/gui/audiomute.cpp
	src/gui/audioplayer.cpp
	src/gui/osd_setup.cpp
	src/gui/widget/stringinput.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a7f1e0e25e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-24 (Fri, 24 May 2013)
2013-05-24 20:24:39 +02:00
Michael Liebmann
f72058e32e CFrameBuffer::waitForIdle: Added a parameter
to identify the execution at Debug Output
- For example: name of the calling function


Origin commit data
------------------
Commit: d460c50bd5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-17 (Fri, 17 May 2013)

Origin message was:
------------------
* CFrameBuffer::waitForIdle: Added a parameter

 to identify the execution at Debug Output
- For example: name of the calling function
2013-05-18 14:44:20 +01:00
Michael Liebmann
36663ad335 CFrameBuffer: Rework paintBoxFrame()
- Rounded corners can be displayed individually
- Improved rendering of circular arcs
- Remove duplicate code in paintBoxRel()


Origin commit data
------------------
Commit: b089d9bf20
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-16 (Thu, 16 May 2013)

Origin message was:
------------------
* CFrameBuffer: Rework paintBoxFrame()

- Rounded corners can be displayed individually
- Improved rendering of circular arcs
- Remove duplicate code in paintBoxRel()
2013-05-16 11:01:41 +01:00
Michael Liebmann
2b64c52a2f Rework handling muteicon
- Integrated for monitoring the mute icon into the frame buffer class.
 If the icon is overwritten by an element, it is restored from the
 framebuffer.

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 1049b337bb
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Rework handling muteicon

- Integrated for monitoring the mute icon into the frame buffer class.
 If the icon is overwritten by an element, it is restored from the
 framebuffer.

Signed-off-by: Thilo Graf <dbt@novatux.de>
2013-05-16 11:01:41 +01:00
vanhofen
f549c03355 framebuffer: add possibility to force small windows
Origin commit data
------------------
Commit: 742cc81f46
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-05-10 (Fri, 10 May 2013)

Origin message was:
------------------
- framebuffer: add possibility to force small windows
2013-05-10 10:31:46 +02:00
Stefan Seyfried
f6c0718366 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


Origin commit data
------------------
Commit: 8253c4d67c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-10 (Fri, 10 May 2013)
2013-05-10 10:06:47 +02:00
Thilo Graf
51e81122b5 CVolumeBar: rework volumebar handling
Use CComponenets and separates the gui part from driver part

- add new class CVolumeBar as CComponentsForm
- Various changes for reworked volume bar handling in some classes
- Move AudioMute() from CVolume to new class CAudioMute
- Use CComponentsPicture to paint muteicon


Origin commit data
------------------
Commit: 8baec6d62a
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-05-04 (Sat, 04 May 2013)
2013-05-08 05:11:24 +01: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
vanhofen
b659d5c95a strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp


Origin commit data
------------------
Commit: 4714a30f83
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on

Conflicts:
	src/gui/bedit/bouqueteditor_bouquets.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/bedit/bouqueteditor_chanselect.cpp
2013-04-01 15:42:38 +04:00
vanhofen
0df9a58c45 strech most windows to full screen
* switchable with existing switch for 'big_windows'
* 'big_windows' default is on


Origin commit data
------------------
Commit: 759966f935
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-25 (Mon, 25 Mar 2013)

Origin message was:
------------------
- strech most windows to full screen

* switchable with existing switch for 'big_windows'
* 'big_windows' default is on
2013-03-25 09:45:22 +01:00
[CST] Bas
896ca77074 merge neutrino-apollo
Origin commit data
------------------
Commit: e7833b099f
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-18 (Fri, 18 Jan 2013)
2013-01-18 10:59:27 +04:00
[CST] Focus
d3a71db0b1 merge public git changes
Origin commit data
------------------
Commit: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
2013-01-09 19:30:07 +04:00
Stefan Seyfried
108eb8ac26 framebuffer: start cleanup / refactoring
in order to not clash with upstream all the time, copy the files
over to framebuffer_ng.{cpp,h} and include this from old include file.


Origin commit data
------------------
Commit: 21e27d463f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-05 (Sat, 05 Jan 2013)
2013-01-05 14:41:50 +01:00
Stefan Seyfried
398f17e65a Merge branch 'uncool/dvbsi++' commit d7a2395633
Conflicts:
	src/driver/framebuffer.cpp


Origin commit data
------------------
Commit: 8d69036be5
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-03 (Thu, 03 Jan 2013)
2013-01-03 09:46:11 +01:00
Jacek Jendrzej
d7a2395633 src/driver/framebuffer.cpp: fix fb for Threads use
Origin commit data
------------------
Commit: 3bbaddec39
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-01-02 (Wed, 02 Jan 2013)
2013-01-02 15:55:19 +01:00