Commit Graph

326 Commits

Author SHA1 Message Date
vanhofen
59c83b2c70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:30:10 +02:00
vanhofen
01acc7d9ae Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp
	src/gui/osd_setup.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
2016-10-25 12:22:47 +02:00
vanhofen
c1bda7d95c moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82f7eff169
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)

Origin message was:
------------------
- moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino

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

------------------
This commit was generated by Migit
2016-10-25 12:19:48 +02:00
vanhofen
ca5c4b00d7 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
vanhofen
3739b4de04 Merge /home/svenhoefer/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/components/cc_detailsline.h
	src/gui/components/cc_item_infobox.h
	src/gui/infoviewer.cpp
	src/gui/upnpbrowser.cpp
	src/gui/widget/keyboard_input.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 16:45:30 +02:00
vanhofen
bb756163b1 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 104d21e784
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename customcolor.h -> color_custom.h; reduce unneeded inludes

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
vanhofen
af8fe3ebc6 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
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +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
5701ca06a8 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/osd_setup.cpp


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



------------------
This commit was generated by Migit
2016-08-15 22:20:14 +02:00
vanhofen
4130ca1100 osd_setup: auto-calc size of font_size structs
Origin commit data
------------------
Branch: ni/coolstream
Commit: 74345ecaa2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- osd_setup: auto-calc size of font_size structs

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

------------------
This commit was generated by Migit
2016-08-15 22:15:15 +02:00
vanhofen
d229e14601 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


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



------------------
This commit was generated by Migit
2016-08-15 19:08:28 +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
vanhofen
32bc6bd5ae Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 76b68b0a26
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)


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

------------------
This commit was generated by Migit
2016-08-15 12:32:24 +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
ceb8fea637 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h


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



------------------
This commit was generated by Migit
2016-08-15 00:19:32 +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
10fec22ab4 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/neutrino.cpp


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



------------------
This commit was generated by Migit
2016-08-04 12:02:35 +02:00
vanhofen
875a08f014 eventlist: allow to disable epgplus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5837b922b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- eventlist: allow to disable epgplus

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

------------------
This commit was generated by Migit
2016-08-04 09:44:36 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
beae26be1d some never read compil warning fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
e3fbc30fc5 i for last commit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 72ac0747e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-17 14:01:00 +02:00
Jacek Jendrzej
cd9cb4ba95 remove unused and some clang compil fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-17 13:46:16 +02:00
Michael Liebmann
339efc19e9 Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59fce4aafa
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 13:37:40 +01:00
defans
f805e428d6 osd-setup: enable/disable screensaver options by conditions
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fceac0245
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-16 (Sat, 16 Jan 2016)

Origin message was:
------------------
- osd-setup: enable/disable screensaver options by conditions

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

------------------
This commit was generated by Migit
2016-01-16 12:33:20 +01:00
Michael Liebmann
af2ffd931b Merge branch 'cst-next' into nmp-cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: f89463dc08
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-16 (Sat, 16 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 07:22:31 +01:00
Thilo Graf
913890f407 COsdSetup: fix possible crash on font setup in wizard mode
Channellist is not initialized in wizard mode.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 53bab09bda
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)



------------------
This commit was generated by Migit
2016-01-14 22:08:01 +01:00
defans
291e699330 screensaver: add optional colored property
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0f2c73aed3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-10 22:02:00 +01:00
Stefan Seyfried
a28613ab99 Merge remote-tracking branch 'uncool/cst-next'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9113716171
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-01 (Fri, 01 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-01 14:10:48 +01:00
Thilo Graf
b63d9ba511 COsdSetup: kill instance of osd_menu_colors
Suggested, by svenhoefer


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14124c7dd6
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)



------------------
This commit was generated by Migit
2015-12-29 16:55:08 +01:00
vanhofen
3b47fa1c0d add menu item to force usertitles for color buttons in infobar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3107e621ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-12-28 (Mon, 28 Dec 2015)

Origin message was:
------------------
- add menu item to force usertitles for color buttons in infobar

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

------------------
This commit was generated by Migit
2015-12-29 14:31:52 +01:00
Thilo Graf
b1c0ca0710 clean up: remove useless line in osd_setup.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 961d6ce888
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-29 12:55:03 +01:00
Thilo Graf
92800fe6a2 COsdSetup: try to fix multiple item arrangement while open osd settings
Origin commit data
------------------
Branch: ni/coolstream
Commit: a78721f640
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-29 12:46:29 +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
165cabba18 Screensaver: add option to show current time instead images
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 22:26:23 +01:00
Thilo Graf
1dedce338b Screeansaver: add optional random images
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff667dfef3
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 19:46:14 +01:00
Thilo Graf
01d8878732 tmp revert: remove osd setup for gradients
Origin commit data
------------------
Branch: ni/coolstream
Commit: d77b7b2995
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-24 (Thu, 24 Dec 2015)


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

------------------
This commit was generated by Migit
2015-12-27 14:42:28 +01:00
Thilo Graf
9f101bddbc Colors: init global color gradient implementation
Origin commit data
------------------
Branch: ni/coolstream
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)


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

------------------
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
[CST] Focus
17528389bf gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60c45ec06c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-19 (Fri, 19 Jun 2015)


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

------------------
This commit was generated by Migit
2015-06-19 15:48:15 +03:00
vanhofen
f06de2b111 osd_setup: fix active status of ca_dotmatrix and ca_frame
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d84a4387d
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-18 (Thu, 18 Jun 2015)

Origin message was:
------------------
- osd_setup: fix active status of ca_dotmatrix and ca_frame

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

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02: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
vanhofen
d90aa919c1 infoviewer_bb: show/hide dotmatrix in CA-bar; default show
Origin commit data
------------------
Branch: ni/coolstream
Commit: 59e2143e00
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: show/hide dotmatrix in CA-bar; default show

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

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
vanhofen
f942f65e70 infoviewer_bb: add frame to CA-bar; default off
Origin commit data
------------------
Branch: ni/coolstream
Commit: 398dfeeab1
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-06-17 (Wed, 17 Jun 2015)

Origin message was:
------------------
- infoviewer_bb: add frame to CA-bar; default off

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

------------------
This commit was generated by Migit
2015-06-18 21:18:32 +02:00
vanhofen
f26b53d4ad start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
Branch: ni/coolstream
Commit: af90286a30
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-15 (Fri, 15 May 2015)

Origin message was:
------------------
- start_wizard: use a global enum; switch detection from bool to int

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

------------------
This commit was generated by Migit
2015-05-15 03:46:50 +02:00
[CST] Focus
3764627637 gui/osd_setup.cpp: add option to switch one/two color gradient mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 56070ca390
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)


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

------------------
This commit was generated by Migit
2015-05-07 16:40:29 +03:00
vanhofen
de30c9b122 osd_setup: try to bring more structure in infoviewer setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca5d85986e
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- osd_setup: try to bring more structure in infoviewer setup

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

------------------
This commit was generated by Migit
2015-05-05 11:43:17 +02:00
vanhofen
d248f4b7c4 themes: move colored_events settings to themes setup
Origin commit data
------------------
Branch: ni/coolstream
Commit: cb5f052e83
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- themes: move colored_events settings to themes setup

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

------------------
This commit was generated by Migit
2015-05-05 11:43:17 +02:00
vanhofen
c1c0c51126 infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations


Origin commit data
------------------
Branch: ni/coolstream
Commit: 62daf1dc4c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-04 (Mon, 04 May 2015)

Origin message was:
------------------
- infoviewer: add color-to-color gradient feature; THX to TangoCash ...

... for basic inspiration and dbt for some optimizations


------------------
This commit was generated by Migit
2015-05-04 09:41:41 +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
Thilo Graf
2d1fb7b8ef COsdSetup: remove repaint call for gradient assignment
Is already executed by chooser object via slot inside showOsdSetup(), and
osd_menu object is not the required object.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7044df1f9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)



------------------
This commit was generated by Migit
2015-04-29 12:01:11 +02:00