Commit Graph

177 Commits

Author SHA1 Message Date
vanhofen
02db8d5f8a setting_helpers: replace another ostringstream by simple string
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0919ebe2df
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-02-10 (Sat, 10 Feb 2018)

Origin message was:
------------------
- setting_helpers: replace another ostringstream by simple string

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

------------------
This commit was generated by Migit
2018-02-10 21:20:33 +01:00
vanhofen
fb3e0391a4 remove obsolete code
Origin commit data
------------------
Branch: ni/coolstream
Commit: bf412e4c20
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-07 (Sun, 07 Jan 2018)

Origin message was:
------------------
- remove obsolete code

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

------------------
This commit was generated by Migit
2018-01-07 18:06:34 +01:00
vanhofen
68288c0213 Revert "- audio_select: copy full code from TangoCash"
This reverts commit a98e5fd8f7.

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/audio_select.cpp
	src/system/setting_helpers.cpp
	src/system/setting_helpers.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2cd2a8599c
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-01-03 (Wed, 03 Jan 2018)



------------------
This commit was generated by Migit
2018-01-03 11:55:54 +01:00
vanhofen
4620d01da3 neutrino: add "need_reboot" feature
Origin commit data
------------------
Branch: ni/coolstream
Commit: f6253de913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-14 (Tue, 14 Nov 2017)

Origin message was:
------------------
- neutrino: add "need_reboot" feature

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

------------------
This commit was generated by Migit
2017-11-14 22:43:39 +01:00
vanhofen
43f3c8bae2 some minor renamings
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3ded5d509
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-09 (Thu, 09 Nov 2017)

Origin message was:
------------------
- some minor renamings

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

------------------
This commit was generated by Migit
2017-11-09 20:56:57 +01:00
vanhofen
b9fd1ef634 cleanup from unsupported DUCKBOX_HARDWARE
Origin commit data
------------------
Branch: ni/coolstream
Commit: bc0de58721
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-11-08 (Wed, 08 Nov 2017)

Origin message was:
------------------
- cleanup from unsupported DUCKBOX_HARDWARE

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

------------------
This commit was generated by Migit
2017-11-08 09:28:34 +01:00
vanhofen
a98e5fd8f7 audio_select: copy full code from TangoCash
Just compile tested. Maybe some more alignments needed.


Origin commit data
------------------
Branch: ni/coolstream
Commit: e264e6334b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-10-12 (Thu, 12 Oct 2017)

Origin message was:
------------------
- audio_select: copy full code from TangoCash

Just compile tested. Maybe some more alignments needed.


------------------
This commit was generated by Migit
2017-10-12 08:52:32 +02:00
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 21:53:44 +02:00
vanhofen
333fccef85 setting_helpers: fix flagfile handling in CFlagFileNotifier()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 57bdeba636
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)

Origin message was:
------------------
- setting_helpers: fix flagfile handling in CFlagFileNotifier()

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

------------------
This commit was generated by Migit
2017-09-16 14:04:06 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
912d145b89 move CNITouchFileNotifier to CFlagFileNotifier
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0eadd27032
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move CNITouchFileNotifier to CFlagFileNotifier

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

------------------
This commit was generated by Migit
2017-09-12 22:30:34 +02:00
vanhofen
c09cdaff18 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-09 10:37:47 +02:00
vanhofen
aa022d1ee4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 15:54:12 +02:00
Thilo Graf
208498a730 Colorsettings: add possibility to change shadow color
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Branch: ni/coolstream
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
vanhofen
0e588328e0 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)


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

------------------
This commit was generated by Migit
2017-03-01 13:10:36 +01:00
vanhofen
9bd8b2b10c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)



------------------
This commit was generated by Migit
2017-03-01 13:09:50 +01:00
vanhofen
c1140e0c1c rename g_PluginList to g_Plugins; this isn't a list of plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins

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

------------------
This commit was generated by Migit
2017-03-01 13:03:50 +01:00
vanhofen
3b3c8d975b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5ef33794a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:59 +01:00
vanhofen
7e6242f666 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 047318afa8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-21 (Tue, 21 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 15:14:31 +01:00
Stefan Seyfried
90fa290ed5 libtuxtxt: remove unused fd parameter from tuxtx_main()
Origin commit data
------------------
Branch: ni/coolstream
Commit: 418819e261
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-19 (Sun, 19 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-21 06:38:48 +01:00
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
4ac4e963ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
3664527019 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00
vanhofen
45d33bdf00 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d39dc75c6d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-29 15:15:34 +01:00
FlatTV
902cc57d77 OSD Menu: Add progressbar color
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-12-26 (Mon, 26 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-26 14:58:51 +01:00
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
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
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
b98e8ec987 colors: make footer text color configurable
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7952011e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer text color configurable

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

------------------
This commit was generated by Migit
2016-08-15 12:16:49 +02:00
vanhofen
fb9eaf294f colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
Branch: ni/coolstream
Commit: cc5258e6d5
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer background color configurable

TODO: footer text color and maybe footer font


------------------
This commit was generated by Migit
2016-08-15 00:14:47 +02:00
vanhofen
1c1c5a05f3 colors: some internal renamings
* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


Origin commit data
------------------
Branch: ni/coolstream
Commit: bc39d1e14e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-14 (Sun, 14 Aug 2016)

Origin message was:
------------------
- colors: some internal renamings

* INFOBAR_SHADOW to SHADOW because it's not only used in infoviewer
* INFOBAR_SHADOW_TEXT to MENUFOOT_TEXT because it's the proper name

This is in preparation to make footer colors configurable


------------------
This commit was generated by Migit
2016-08-14 21:55:18 +02:00
vanhofen
9ebf5261fa setting_helpers: whitespace cleanup and code format changes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30a3093d9f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-30 (Mon, 30 May 2016)

Origin message was:
------------------
- setting_helpers: whitespace cleanup and code format changes

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

------------------
This commit was generated by Migit
2016-05-30 11:21:22 +02:00
vanhofen
ecdeaf0566 miscsettings_menu: allow to reset movieplayer plugin
Origin commit data
------------------
Branch: ni/coolstream
Commit: a4bd8cc5a8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-02-22 (Mon, 22 Feb 2016)

Origin message was:
------------------
- miscsettings_menu: allow to reset movieplayer plugin

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

------------------
This commit was generated by Migit
2016-02-22 21:06:46 +01:00
Michael Liebmann
8db42dd287 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
------------------
Branch: ni/coolstream
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)


------------------
This commit was generated by Migit
2016-01-16 07:26:04 +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
7278d8f00e infoviewer_bb: add own color for CA-bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd6ad52c8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add own color for CA-bar

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

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
Jacek Jendrzej
c30289f3f0 add pugixml
Origin commit data
------------------
Branch: ni/coolstream
Commit: 422c91d117
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-04-27 (Mon, 27 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-28 10:12:23 +02:00
Stefan Seyfried
189e55ec30 global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)


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

------------------
This commit was generated by Migit
2015-04-16 13:39:35 +02:00
Jacek Jendrzej
315f5a4b4d prevent possible segfault std::string if value NULL
Origin commit data
------------------
Branch: ni/coolstream
Commit: 40fe7fae34
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-03-20 (Fri, 20 Mar 2015)


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

------------------
This commit was generated by Migit
2015-03-20 11:57:12 +01:00
Stefan Seyfried
770e405c50 Merge remote-tracking branch 'check/cst-next'
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


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



------------------
This commit was generated by Migit
2014-12-28 12:32:12 +01: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
[CST] Focus
81086d87b2 gui/videosettings.cpp: split format key modes and auto-modes on apollo,
disable broken 14:9 pan&scan on apollo


Origin commit data
------------------
Branch: ni/coolstream
Commit: 68e240b4e7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-12-04 (Thu, 04 Dec 2014)



------------------
This commit was generated by Migit
2014-12-18 17:31:48 +03:00
vanhofen
b976eb95c9 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Branch: ni/coolstream
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


------------------
This commit was generated by Migit
2014-11-10 22:41:08 +01:00
vanhofen
f9e956d282 CPluginsExec::exec(): show possible script output
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7f2c69aa82
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- CPluginsExec::exec(): show possible script output

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

------------------
This commit was generated by Migit
2014-11-07 15:41:11 +01:00
vanhofen
8d64978b13 plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


Origin commit data
------------------
Branch: ni/coolstream
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


------------------
This commit was generated by Migit
2014-11-07 09:44:53 +01:00
[CST] Focus
f7c9ab84f6 gui/miscsettings_menu.cpp: fix settings sectionsd config
Origin commit data
------------------
Branch: ni/coolstream
Commit: 320c3b163c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-20 (Mon, 20 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-20 11:16:14 +04:00
Stefan Seyfried
d60e14c744 setting_helpers: write /etc/timezone for better compatibility
Origin commit data
------------------
Branch: ni/coolstream
Commit: c9c3c01e92
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-10-11 (Sat, 11 Oct 2014)


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

------------------
This commit was generated by Migit
2014-10-11 21:58:45 +02:00
vanhofen
806da764fd CPluginsExec::exec(): don't leave current menu when exiting integrated plugins
Origin commit data
------------------
Branch: ni/coolstream
Commit: cf53191122
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-10-01 (Wed, 01 Oct 2014)

Origin message was:
------------------
- CPluginsExec::exec(): don't leave current menu when exiting integrated plugins

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

------------------
This commit was generated by Migit
2014-10-02 15:04:05 +04:00
martii
070b342de4 overload access(2)
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/components/cc_item_picture.cpp
	src/gui/movieplayer.cpp
	src/gui/osdlang_setup.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoapi.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.h
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 81ca577fb8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-30 (Sun, 30 Jun 2013)



------------------
This commit was generated by Migit
2014-09-24 19:50:35 +04:00
martii
bca9371e65 system/settings: move theme colors to dedicated struct
Conflicts:
	src/driver/pictureviewer/pictureviewer.cpp
	src/gui/epgview.cpp
	src/gui/osd_setup.cpp
	src/gui/pluginlist.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b21cb152b5
Author: martii <m4rtii@gmx.de>
Date: 2014-01-06 (Mon, 06 Jan 2014)



------------------
This commit was generated by Migit
2014-09-12 18:29:21 +04:00