Commit Graph

248 Commits

Author SHA1 Message Date
vanhofen
5840ed0f0c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: d78bb26321
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-09 (Fri, 09 Dec 2016)
2016-12-09 17:20:52 +01:00
Jacek Jendrzej
ae401c28a8 src/gui/osd_setup.cpp fix menu item (possible segfault)
Origin commit data
------------------
Commit: 2649e909df
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-12-09 (Fri, 09 Dec 2016)
2016-12-09 16:16:02 +01:00
vanhofen
e7f6c23261 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/system/settings.h


Origin commit data
------------------
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
2016-12-02 22:00:25 +01:00
Thilo Graf
da753e0b80 Messages: add localized osd timeout option for interactive/static messages
TODO: add locales for hints


Origin commit data
------------------
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)
2016-12-02 21:32:15 +01:00
vanhofen
f81b4fad5f fix last merge
Origin commit data
------------------
Commit: 4360b7b2e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)

Origin message was:
------------------
- fix last merge
2016-11-20 18:45:39 +01:00
vanhofen
2ec43b9834 osd_setup: use proven font styles (bold, w/o offset) for msgboxes
Origin commit data
------------------
Commit: 5c54638d59
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)

Origin message was:
------------------
- osd_setup: use proven font styles (bold, w/o offset) for msgboxes
2016-11-20 18:38:52 +01:00
vanhofen
15205310c6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 18:36:35 +01:00
Thilo Graf
ae117fae66 Messages: add option to change size of message text
Include default size and localized setup.

TODO: localize for nederlands and slovak, current english only.


Origin commit data
------------------
Commit: 4988df1dd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)
2016-11-20 01:08:14 +01:00
vanhofen
6a8537342f osd_setup: change moviebrowser's default font sizes
Origin commit data
------------------
Commit: 8495ac091e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-11 (Fri, 11 Nov 2016)

Origin message was:
------------------
- osd_setup: change moviebrowser's default font sizes
2016-11-11 15:31:56 +01:00
vanhofen
5582d5a8d5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 5b7c68825e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-08 (Tue, 08 Nov 2016)
2016-11-08 22:05:31 +01:00
Jacek Jendrzej
bf0624760c src/gui/osd_setup.cpp supplement to 7bafa13c , fix segfault if clock is NULL#
Origin commit data
------------------
Commit: ddd9bd3ca9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-11-07 (Mon, 07 Nov 2016)
2016-11-07 22:54:53 +01:00
vanhofen
6cbee866fd Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 11:41:02 +02:00
Michael Liebmann
ca4121947f Use forceSaveScreen() in COsdSetup & CTimerList
Origin commit data
------------------
Commit: e5402057d3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-10-29 (Sat, 29 Oct 2016)
2016-10-29 10:38:06 +02:00
Jacek Jendrzej
7bafa13c7e src/gui/osd_setup.cpp try to fix segfault, call from channellist
Origin commit data
------------------
Commit: 682b6f578e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-10-28 (Fri, 28 Oct 2016)
2016-10-28 20:50:52 +02:00
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