Commit Graph

184 Commits

Author SHA1 Message Date
vanhofen
3d37c18a62 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
------------------
Commit: 318b4926e7
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)
2016-10-25 12:22:47 +02:00
vanhofen
b7f8c2c220 moviebrowser: port configuration of moviebrowser fonts from NI-Neutrino
Origin commit data
------------------
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
2016-10-25 12:19:48 +02:00
vanhofen
248b6c8684 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
------------------
Commit: 5a70a3f78e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)
2016-10-10 16:45:30 +02:00
vanhofen
892603fe68 rename customcolor.h -> color_custom.h; reduce unneeded inludes
Origin commit data
------------------
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
2016-10-10 14:19:55 +02:00
vanhofen
caa5ae6099 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
------------------
Commit: 58a62c81ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 22:20:14 +02:00
vanhofen
ec6570d703 osd_setup: auto-calc size of font_size structs
Origin commit data
------------------
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
2016-08-15 22:15:15 +02:00
vanhofen
2be5df305e Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 3d04798d9b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 19:08:28 +02:00
vanhofen
e49ee18fb3 fonts: add and use own font for all footers
Origin commit data
------------------
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
2016-08-15 19:02:42 +02:00
vanhofen
4d2040dd5f Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Origin commit data
------------------
Commit: 76b68b0a26
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 12:32:24 +02:00
vanhofen
db2e5a11d9 colors: make footer text color configurable
Origin commit data
------------------
Commit: 8c7952011e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)

Origin message was:
------------------
- colors: make footer text color configurable
2016-08-15 12:16:49 +02:00
vanhofen
2dc8a2a968 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
------------------
Commit: fd5029560e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-15 (Mon, 15 Aug 2016)
2016-08-15 00:19:32 +02:00
vanhofen
70abfb3339 colors: make footer background color configurable
TODO: footer text color and maybe footer font


Origin commit data
------------------
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
2016-08-15 00:14:47 +02:00
vanhofen
41083ff567 Merge branch 'cst-next' of git://coolstreamtech.de/cst-public-gui-neutrino into ni/cst-next
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: afb6e0d4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)
2016-08-04 12:02:35 +02:00
vanhofen
e3daec4e2d eventlist: allow to disable epgplus
Origin commit data
------------------
Commit: 5837b922b1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-04 (Thu, 04 Aug 2016)

Origin message was:
------------------
- eventlist: allow to disable epgplus
2016-08-04 09:44:36 +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
Jacek Jendrzej
1486711d16 some never read compil warning fixes
Origin commit data
------------------
Commit: 0d9fbd5378
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-24 (Sun, 24 Apr 2016)
2016-04-24 17:18:37 +02:00
Jacek Jendrzej
c91323b5c1 i for last commit
Origin commit data
------------------
Commit: 72ac0747e8
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)
2016-04-17 14:01:00 +02:00
Jacek Jendrzej
2f5086ec0e remove unused and some clang compil fixes
Origin commit data
------------------
Commit: 374a172aef
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-17 (Sun, 17 Apr 2016)
2016-04-17 13:46:16 +02:00
defans
b441082c18 osd-setup: enable/disable screensaver options by conditions
Origin commit data
------------------
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
2016-01-16 12:33:20 +01:00
Thilo Graf
68287b17d1 COsdSetup: fix possible crash on font setup in wizard mode
Channellist is not initialized in wizard mode.


Origin commit data
------------------
Commit: 53bab09bda
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-01-14 (Thu, 14 Jan 2016)
2016-01-14 22:08:01 +01:00
defans
5ea6166a84 screensaver: add optional colored property
Origin commit data
------------------
Commit: 0f2c73aed3
Author: defans <defans@bluepeercrew.us>
Date: 2016-01-07 (Thu, 07 Jan 2016)
2016-01-10 22:02:00 +01:00
Thilo Graf
9401f2e8d1 COsdSetup: kill instance of osd_menu_colors
Suggested, by svenhoefer


Origin commit data
------------------
Commit: 14124c7dd6
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)
2015-12-29 16:55:08 +01:00
vanhofen
b1956fde38 add menu item to force usertitles for color buttons in infobar
Origin commit data
------------------
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
2015-12-29 14:31:52 +01:00
Thilo Graf
acae623f95 clean up: remove useless line in osd_setup.cpp
Origin commit data
------------------
Commit: 961d6ce888
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)
2015-12-29 12:55:03 +01:00
Thilo Graf
d1e7fb48b3 COsdSetup: try to fix multiple item arrangement while open osd settings
Origin commit data
------------------
Commit: a78721f640
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-29 (Tue, 29 Dec 2015)
2015-12-29 12:46:29 +01:00
Thilo Graf
0bf2981502 Screensaver: add option to show current time instead images
Origin commit data
------------------
Commit: 0b3576b4a7
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)
2015-12-27 22:26:23 +01:00
Thilo Graf
2781eba3d9 Screeansaver: add optional random images
Origin commit data
------------------
Commit: ff667dfef3
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-27 (Sun, 27 Dec 2015)
2015-12-27 19:46:14 +01:00
Thilo Graf
8ccd3b0ae6 tmp revert: remove osd setup for gradients
Origin commit data
------------------
Commit: d77b7b2995
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-12-24 (Thu, 24 Dec 2015)
2015-12-27 14:42:28 +01:00
Thilo Graf
c6905d2f03 Colors: init global color gradient implementation
Origin commit data
------------------
Commit: 523b273af8
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-11-19 (Thu, 19 Nov 2015)
2015-12-27 14:42:27 +01:00
[CST] Focus
d00a6dbf84 gui/osd_setup.cpp, gui/miscsettings_menu.cpp: do not delete items added to menu - menu dtor do it
Origin commit data
------------------
Commit: 60c45ec06c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-06-19 (Fri, 19 Jun 2015)
2015-06-19 15:48:15 +03:00
vanhofen
f5213a4ec0 osd_setup: fix active status of ca_dotmatrix and ca_frame
Origin commit data
------------------
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
2015-06-18 21:18:32 +02:00
vanhofen
4ac078dcee infoviewer_bb: add own color for CA-bar
Origin commit data
------------------
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
2015-06-18 21:18:32 +02:00
vanhofen
1f4d26123c infoviewer_bb: show/hide dotmatrix in CA-bar; default show
Origin commit data
------------------
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
2015-06-18 21:18:32 +02:00
vanhofen
2dbe4bdc46 infoviewer_bb: add frame to CA-bar; default off
Origin commit data
------------------
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
2015-06-18 21:18:32 +02:00
vanhofen
7882347718 start_wizard: use a global enum; switch detection from bool to int
Origin commit data
------------------
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
2015-05-15 03:46:50 +02:00
[CST] Focus
e6042e8c77 gui/osd_setup.cpp: add option to switch one/two color gradient mode
Origin commit data
------------------
Commit: 56070ca390
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-05-07 (Thu, 07 May 2015)
2015-05-07 16:40:29 +03:00
vanhofen
3689c8fef8 osd_setup: try to bring more structure in infoviewer setup
Origin commit data
------------------
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
2015-05-05 11:43:17 +02:00
vanhofen
cc9f8c6450 themes: move colored_events settings to themes setup
Origin commit data
------------------
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
2015-05-05 11:43:17 +02:00
vanhofen
939ed343f7 infoviewer: add color-to-color gradient feature; THX to TangoCash ...
... for basic inspiration and dbt for some optimizations


Origin commit data
------------------
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
2015-05-04 09:41:41 +02:00
Thilo Graf
61656865d0 Merge branch 'cst-next.pre' into cst-next
Origin commit data
------------------
Commit: a58f1621b4
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-30 (Thu, 30 Apr 2015)
2015-04-30 09:20:43 +02:00
Thilo Graf
4ce9ca0882 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
------------------
Commit: 7044df1f9f
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)
2015-04-29 12:01:11 +02:00
Thilo Graf
6261b3b869 themes: use hintbox and header gradient option in theme settings
Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.


Origin commit data
------------------
Commit: 01516cf943
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-04-29 (Wed, 29 Apr 2015)

Origin message was:
------------------
themes: use hintbox and header gradient option in theme settings

Color gradient feature was originally intended for use
inside theme settings and it's not really suitable for
generally use as default in all themes at the moment, so it makes more
sense to have options in theme settings and let the user decide
to customize this, unless enough other gui parts can use this feature.
2015-04-29 10:16:55 +02:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
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.
2015-04-24 09:11:04 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
2015-04-16 13:39:35 +02:00
vanhofen
bc0984621f channellist: allow show/hide bottom infobox
Origin commit data
------------------
Commit: 7f35a67426
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-14 (Tue, 14 Apr 2015)

Origin message was:
------------------
- channellist: allow show/hide bottom infobox
2015-04-14 11:08:24 +02:00
Thilo Graf
0652b6ab05 COsdSetup: use paint for apply new gradient settings, reduced flicker effects
Origin commit data
------------------
Commit: eb3971e909
Author: Thilo Graf <dbt@novatux.de>
Date: 2015-03-03 (Tue, 03 Mar 2015)
2015-03-29 22:40:14 +02:00
vanhofen
65b51ac358 osd_setup: improve/clarify screensaver off option
Origin commit data
------------------
Commit: 026c8b4389
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-01-08 (Thu, 08 Jan 2015)

Origin message was:
------------------
- osd_setup: improve/clarify screensaver off option
2015-01-08 20:01:15 +01:00
vanhofen
68bb115812 screensaver: allow no screensaver_timeout to show first pic only
Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.


Origin commit data
------------------
Commit: b85aa43d87
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: allow no screensaver_timeout to show first pic only

 Thats usefull when you have just one plain black pic in your
 screensaver directory. So you'll get a blank screen w/o pic changes.
2014-12-29 23:50:18 +01:00
vanhofen
a58875b8da screensaver: remove audioplayer_screensaver; add screensaver_delay
Origin commit data
------------------
Commit: df18f1f4e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-29 (Mon, 29 Dec 2014)

Origin message was:
------------------
- screensaver: remove audioplayer_screensaver; add screensaver_delay
2014-12-29 23:50:18 +01:00
vanhofen
42c011a1f3 screensaver: move configuration to own submenu
Origin commit data
------------------
Commit: 3206e35e20
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)

Origin message was:
------------------
- screensaver: move configuration to own submenu
2014-12-29 22:13:02 +01:00