vanhofen
8704cb914a
Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
data/locale/deutsch.locale
data/locale/english.locale
src/gui/osd_setup.cpp
src/neutrino.cpp
src/neutrino.h
src/system/locals.h
src/system/locals_intern.h
Origin commit data
------------------
Commit: ba8bdde8c8
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-13 (Mon, 13 Feb 2017)
2017-02-13 21:41:04 +01:00
Michael Liebmann
0c20bf9af6
neutrino: Add switch osd resolution when supported from hardware
...
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
Origin commit data
------------------
Commit: 7b158903f8
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-02-13 (Mon, 13 Feb 2017)
Origin message was:
------------------
neutrino: Add switch osd resolution when supported from hardware
- At the moment supported hardware: CS HD2
Currently known problems:
-------------------------
- Display menus after changing resolution (Reboot required)
- Display headers after changing resolution hd => fullhd (Reboot required)
- Display infobar after changing resolution hd => fullhd (Reboot required)
- Screenshot broken (With new driver and set resolution to 1280x720)
2017-02-13 12:51:14 +01:00
vanhofen
e97d93f824
NI-code: Rename hardware defined macros for coolstream stb
...
Origin commit data
------------------
Commit: f02c3dc1db
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-12 (Sun, 12 Feb 2017)
Origin message was:
------------------
- NI-code: Rename hardware defined macros for coolstream stb
2017-02-12 21:57:06 +01:00
vanhofen
4d15c4d61b
Merge branch 'pu/fb-modules' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/neutrino.cpp
src/system/settings.h
Origin commit data
------------------
Commit: 25f1346ad7
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-02-09 (Thu, 09 Feb 2017)
2017-02-09 20:22:37 +01:00
vanhofen
54af49f2d0
rename screen_x/yres to font_scaling_x/y
...
Origin commit data
------------------
Commit: aeec37af89
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-12 (Thu, 12 Jan 2017)
Origin message was:
------------------
- rename screen_x/yres to font_scaling_x/y
2017-02-09 18:13:19 +01:00
Michael Liebmann
a4326eaf79
Remove obsolete 'contrast_fonts' code from osd menu
...
Origin commit data
------------------
Commit: 6803a8dff3
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-31 16:36:40 +01:00
vanhofen
e28f6df00a
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/components/cc_detailsline.cpp
src/gui/movieplayer.cpp
src/gui/osd_setup.cpp
src/neutrino.cpp
Origin commit data
------------------
Commit: 609d466302
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 16:32:43 +01:00
Michael Liebmann
8300ae9620
CMoviePlayerGui: Bind enable/disable FileTime to enableInfoClock()
...
Origin commit data
------------------
Commit: dc4ce280ed
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-01-30 (Mon, 30 Jan 2017)
2017-01-30 07:15:46 +01:00
vanhofen
7fa810e183
Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/screensaver.cpp
Origin commit data
------------------
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de >
Date: 2017-01-25 (Wed, 25 Jan 2017)
2017-01-25 21:02:22 +01:00
Michael Liebmann
5d96f62893
Remove obsolete 'contrast_fonts' code from osd menu
...
Origin commit data
------------------
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com >
Date: 2017-01-24 (Tue, 24 Jan 2017)
2017-01-25 16:33:45 +01:00
vanhofen
9eb559aa8f
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/osd_setup.cpp
Origin commit data
------------------
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-30 (Fri, 30 Dec 2016)
2016-12-30 21:54:46 +01:00
Thilo Graf
4e593fbc79
settings: add explicit button font
...
Fonts for menu foot and button font are not not necessarily the same thing.
TODO: locales
Origin commit data
------------------
Commit: 65ac231940
Author: Thilo Graf <dbt@novatux.de >
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-30 20:33:26 +01:00
vanhofen
65cf83258c
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Conflicts:
src/gui/themes.cpp
src/neutrino.cpp
src/system/settings.h
version_pseudo.h
Origin commit data
------------------
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-29 (Thu, 29 Dec 2016)
2016-12-29 00:59:00 +01:00
vanhofen
ff22643691
themes: allow progressbar-settings in themes
...
Origin commit data
------------------
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-29 (Thu, 29 Dec 2016)
Origin message was:
------------------
- themes: allow progressbar-settings in themes
2016-12-29 00:47:34 +01:00
vanhofen
0b8fb6f5bd
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
...
Origin commit data
------------------
Commit: 00c8eebe8a
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-27 (Tue, 27 Dec 2016)
2016-12-27 16:04:31 +01:00
vanhofen
798f41e70a
osd-setup: allow higher osd-timeouts; up to 240 sec. now
...
Origin commit data
------------------
Commit: 6370ceb010
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-27 (Tue, 27 Dec 2016)
Origin message was:
------------------
- osd-setup: allow higher osd-timeouts; up to 240 sec. now
2016-12-27 14:21:29 +01:00
FlatTV
c9624a74ec
OSD Menu: Add progressbar color
...
Origin commit data
------------------
Commit: 2570e06e7d
Author: FlatTV <FlatTV@gmx.de >
Date: 2016-12-26 (Mon, 26 Dec 2016)
2016-12-26 14:58:51 +01:00
vanhofen
2aa7616434
infoviewer_bb: disable broken infobar_casystem_dotmatrix code
...
Origin commit data
------------------
Commit: b197cf2dba
Author: vanhofen <vanhofen@gmx.de >
Date: 2016-12-12 (Mon, 12 Dec 2016)
Origin message was:
------------------
- infoviewer_bb: disable broken infobar_casystem_dotmatrix code
2016-12-12 11:25:42 +01:00
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