Commit Graph

114 Commits

Author SHA1 Message Date
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
Thilo Graf
566b0f9f34 CTestMenu: add form sample
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6c5bc2d28
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-20 23:14:59 +01:00
Thilo Graf
b337697b1e CCDraw: add function for blink effect for cc items
NOTE: experimental, for examples see CTestMenu class


Origin commit data
------------------
Branch: ni/coolstream
Commit: 717dec02c5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 14:09:19 +01:00
Thilo Graf
67e279d287 CTestMenu: add sample for hintbox with timeout
Origin commit data
------------------
Branch: ni/coolstream
Commit: 43c1349ffa
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-10 (Thu, 10 Nov 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-11-10 11:19:09 +01:00
Thilo Graf
ffb8bca931 CTestMenu: add sample for message box with parameter CMsgBox::mbNoYes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d12e059c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-27 (Thu, 27 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-27 12:17:33 +02:00
Thilo Graf
9b87a54518 CTestMenu: ensure remove hintbox from screen after pressed exit button.
call of hide() was missed.

Use hintbox object on stack.
Is completely sufficient here.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 912ca8647e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-22 (Sat, 22 Oct 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:28 +02:00
Thilo Graf
5db54fc647 Try to rework footer
* try to fix enableButtonShadow(), seems an init is missing
* shadow fixed


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e631fd0ce
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-09-24 (Sat, 24 Sep 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
8ca8486085 Shadow: try to optimize shadow areas
* cleanup inner part of box on round corners, frames considered
* adopt implementations in some gui classes
* some debug lines removed
* test menu adopted
* try to fix corner caluculation to avoid transparent holes


Origin commit data
------------------
Branch: ni/coolstream
Commit: a17d61de8c
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-30 (Tue, 30 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
b6542d383c CTestMenu: adopt for last changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: b233c06af3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-27 (Sat, 27 Aug 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-24 10:31:25 +02:00
Thilo Graf
b158d49540 CTestMenu: shadow for circle
TODO: not really nice at the moment


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1888189fb3
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Thilo Graf
6c4c454434 shadow: paint shadow layer with multiple renderboxes
Should help to paint a clean shadow frame


Origin commit data
------------------
Branch: ni/coolstream
Commit: 307b2763bd
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-08-18 (Thu, 18 Aug 2016)

Origin message was:
------------------
shadow: paint shadow layer with multiple renderboxes

Should help to paint a clean shadow frame


------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
Thilo Graf
36d8d81fa6 CMsgBox: rework msgbox classes with Window class implementation
Replacing messagebox, hintbox_ext and some derivated parts with
basic class hintbox and derivated class CMsgBox. This should unify
window handling and avoids maintain of multiple classes with quasi
same purpose and adds more functionality.

TODO: fix and optimize details


Origin commit data
------------------
Branch: ni/coolstream
Commit: dde298b1b7
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-04 (Mon, 04 Apr 2016)



------------------
This commit was generated by Migit
2016-10-24 10:31:24 +02:00
vanhofen
e082f8a584 Merge branch 'ni/cst-next' into ni/mp/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d1fc0eee1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-12 (Wed, 12 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-12 17:06:06 +02:00
Thilo Graf
cdc1aa2ce2 test_menue.cpp: fix broken build with --enable-testing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 133ec1f2bb
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-11 (Tue, 11 Oct 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-10-11 00:43:38 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
vanhofen
a8cec5244c fonts: add and use own font for all footers
Origin commit data
------------------
Branch: ni/coolstream
Commit: 54f2ac510f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- fonts: add and use own font for all footers

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-08-15 19:02:42 +02:00
Thilo Graf
461b61badf CComponentsTimer: rework timer class
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4904279fd5
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-04-25 (Mon, 25 Apr 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-04-25 10:26:32 +02:00
Jacek Jendrzej
8a00af39be src/gui/test_menu.cpp fix pugixml compil
Origin commit data
------------------
Branch: ni/coolstream
Commit: 929bc61cf5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-03-12 (Sat, 12 Mar 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2016-03-12 13:48:42 +01:00
Thilo Graf
f9feb67162 CTestMenu: disable unused vars
prevents possible compiler warnings or builderrors with pedantic gcc settings


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ff903f7a6
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-07 (Sun, 07 Feb 2016)



------------------
This commit was generated by Migit
2016-02-16 09:39:05 +01:00
Stefan Seyfried
0a95a07654 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: b837d8697b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-12-28 16:15:14 +01:00
Thilo Graf
9e3882b7bc 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
------------------
Branch: ni/coolstream
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


------------------
This commit was generated by Migit
2015-12-27 14:42:27 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
vanhofen
e33323d5ba fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 89a11de651
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-06 (Wed, 06 May 2015)

Origin message was:
------------------
- fix and use ICONSDIR variable; move ICONSSDIR_VAR to global.h

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-05-06 22:58:54 +02:00
Thilo Graf
5a30eaff07 gui/test_menu.cpp: fix broken build
Fixed missing include that come with commit
098e322feb


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f9fc4b870
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-25 (Sat, 25 Apr 2015)



------------------
This commit was generated by Migit
2015-04-30 09:39:42 +02:00
Thilo Graf
946c0e8bc4 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2015-04-30 09:20:43 +02:00
vanhofen
32365276ef remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.


------------------
This commit was generated by Migit
2015-04-24 09:11:04 +02:00
Thilo Graf
c8b398ee3c CTestMenu: disable tuner test code
Doesn't work with newer frontend api, and not really required.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1f81228d7b
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-08-27 (Wed, 27 Aug 2014)



------------------
This commit was generated by Migit
2015-03-29 22:39:48 +02:00
Stefan Seyfried
c8e3ec41a9 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
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
Thilo Graf
73693185fe CTestMenu: remove window close statement
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07c5547965
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-09-07 (Sun, 07 Sep 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-09-25 11:02:39 +04:00
[CST] Focus
154d17dda5 gui/test_menu.cpp: sync fe test params; fix compile
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ec1873982
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-28 (Thu, 28 Aug 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-08-28 10:04:55 +04:00
Thilo Graf
ef023b8091 CTestMenu: remove unused variables
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0806a2c30d
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-07-19 (Sat, 19 Jul 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-08-26 17:26:49 +04:00
Thilo Graf
060a36dd6b CComponents: implement scroll functionality into CComponentsForm
CComponentsForm provides page scroll if found more
than one pre defined page and is working with all derivated sub classes from CComponentsForm .

Pages are defined with setPageNumber(0...n) in items (1st page = 0). The item page number property is
defined in variable cc_page_number. The highest page number sets the
count of pages inside container to required value. Thats compellingly!

To show a page, we can use setCurrentPage(0...n ) and paintCurPage() or use directly paintPage(0...n).
Note: global paint() will show the current page. Default page is 0 (as first).
Use setCurrentPage(0...n) to change this before first call of paint().
Note: In CComponentsWindow class, these methods are applied to window body.

For examples, take a look into CTestMenu


Origin commit data
------------------
Branch: ni/coolstream
Commit: 672757606c
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-26 (Thu, 26 Jun 2014)



------------------
This commit was generated by Migit
2014-06-27 20:49:41 +02:00
Thilo Graf
f2da159bdf CComponentsPicture: structure of class highly simplified
It should be now easier to use images as objects. An initialized
picture object should provide all relevant properties and some
functionalities of picture viewer.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5eb63b9515
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-06-20 (Fri, 20 Jun 2014)

Origin message was:
------------------
CComponentsPicture: structure of class highly simplified

It should be now easier to use images as objects. An initialized
picture object should provide all relevant properties and some
functionalities of picture viewer.


------------------
This commit was generated by Migit
2014-06-23 18:43:47 +02:00
Thilo Graf
7355917bb2 CTestMenu: clean up, change some sample comments for footer init
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e6ce8acc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-05 (Mon, 05 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-22 21:50:51 +02:00
Thilo Graf
1150003e56 CTestMenu: set dynamic size of buttons, use 1/10 of footer width
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2bde5a6d08
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-01 (Thu, 01 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-22 21:50:46 +02:00
Thilo Graf
ea451154d7 CComponentsButton, CComponentsFooter: rework bestfit of buttons inside chain
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9ffdb1cb98
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-05-01 (Thu, 01 May 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-22 21:50:45 +02:00
Thilo Graf
ea0fe91ab1 CTestMenu: add samples for new button handling in cc footer
Origin commit data
------------------
Branch: ni/coolstream
Commit: 45ce42e505
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-22 21:50:45 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
vanhofen
e401dbe50f menu: add possibility to add a footer to the menus; fix alignment of menus
add footer-keys to testmenu

 (some of this code is based on code by martii; thx)


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fba818cc2
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-04-11 (Fri, 11 Apr 2014)

Origin message was:
------------------
- menu: add possibility to add a footer to the menus; fix alignment of menus

 add footer-keys to testmenu

 (some of this code is based on code by martii; thx)


------------------
This commit was generated by Migit
2014-04-11 00:26:52 +02:00
Thilo Graf
06a7414a31 CComponentsHeader: rework context button handling
CComponentsHeader uses now CComponentsIconForm, which is now derived
from CComponentsFrmChain. Some methods should be now simplified and
allow to handle some modifications easier.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fe7b452c1
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-22 (Sat, 22 Mar 2014)



------------------
This commit was generated by Migit
2014-04-02 08:40:21 +02:00
Thilo Graf
7c70aaa6df CComponents: add new parameter 'parent'
Use strictly CComponentsForm as parent parameter in constructors.
Some parts have been cleaned up (Constructors, init methodes removed)

New parameter makes it possible already add current item in constructor.
So in mostly situations is it not necessary to use explicit addCCItem(),
but addCCItem()is still valid and necessary in certain situations.

Affected are all cc-classes and their derivates.
Some classes must or can be adapted later. The function is
not currently restricted, because usage of parent parameter is not explicit
defined in constructors, see CImageInfo, here yet are used addCCItem()
methodes.

Generally this parameter is located in the constructors before bool has_shadow,
but it is not sure whether it would be better to use this parameter as the first.
That remains to be clarified.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 23d7b62cf0
Author: Thilo Graf <dbt@novatux.de>
Date: 2014-03-03 (Mon, 03 Mar 2014)



------------------
This commit was generated by Migit
2014-03-03 09:43:39 +01:00
Stefan Seyfried
59b887d87a Merge remote-tracking branch 'check/next-cc'
...only build-tested, needs fixes


Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)



------------------
This commit was generated by Migit
2014-02-15 20:22:07 +01:00
Michael Liebmann
2c93f6538a CComponentsFrmClock: Fix thread handling
- Set clock activ = false for default


Origin commit data
------------------
Branch: ni/coolstream
Commit: ddc826ab51
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-02-13 (Thu, 13 Feb 2014)



------------------
This commit was generated by Migit
2014-02-13 18:26:04 +01:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
35830797d6 adapt ShowMsg handling from martii's neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-22 12:37:21 +01:00
Michael Liebmann
a46c558669 CScanSettings: convert char[...] configuration values to std::string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-01-19 20:57:38 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)

Origin message was:
------------------
Preparing the menu classes for Lua Part #2

- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


------------------
This commit was generated by Migit
2014-01-19 20:57:37 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
Only compile-tested.


Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)



------------------
This commit was generated by Migit
2013-11-30 20:17:31 +01:00
Michael Liebmann
e000305768 Adapting certain files to the changed font handling of info clock
Origin commit data
------------------
Branch: ni/coolstream
Commit: 90985f11d2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-26 (Tue, 26 Nov 2013)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2013-11-28 16:07:48 +01:00
vanhofen
a20dc41669 Revert "CTestMenu: fix build, add missing include"
This reverts commit 0a6202d57f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 633278a532
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)



------------------
This commit was generated by Migit
2013-11-13 23:39:37 +01:00