Commit Graph

356 Commits

Author SHA1 Message Date
vanhofen
37030339ad Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/screensaver.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 47d0b6efb5
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-25 (Wed, 25 Jan 2017)



------------------
This commit was generated by Migit
2017-01-25 21:02:22 +01:00
Michael Liebmann
a71c444da3 Remove obsolete 'contrast_fonts' code from osd menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: c741d46b63
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-01-24 (Tue, 24 Jan 2017)


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

------------------
This commit was generated by Migit
2017-01-25 16:33:45 +01:00
vanhofen
ab1e072620 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c2506804b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-30 (Fri, 30 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 21:54:46 +01:00
Thilo Graf
fb4d202f8e settings: add explicit button font
Fonts for menu foot and button font are not not necessarily the same thing.

TODO: locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: 65ac231940
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-30 20:33:26 +01:00
vanhofen
107026cb75 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
------------------
Branch: ni/coolstream
Commit: 4f2d36fe3e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)



------------------
This commit was generated by Migit
2016-12-29 00:59:00 +01:00
vanhofen
ea250639ac themes: allow progressbar-settings in themes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 888bfb6687
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-29 (Thu, 29 Dec 2016)

Origin message was:
------------------
- themes: allow progressbar-settings in themes

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

------------------
This commit was generated by Migit
2016-12-29 00:47: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
ba43886fb8 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0d262c596
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-20 21:40:42 +01:00
vanhofen
067c2ace42 settings-h: add SCROLLBAR_WIDTH define
Origin commit data
------------------
Branch: ni/coolstream
Commit: e427ae5bf6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-20 (Tue, 20 Dec 2016)

Origin message was:
------------------
- settings-h: add SCROLLBAR_WIDTH define

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

------------------
This commit was generated by Migit
2016-12-20 10:26:59 +01:00
vanhofen
31ae8918ea Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 90d4cab0b2
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)



------------------
This commit was generated by Migit
2016-12-13 11:21:50 +01:00
vanhofen
1216df550f settings.h: completion of 0caf40d664
Origin commit data
------------------
Branch: ni/coolstream
Commit: b22b276d18
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-13 (Tue, 13 Dec 2016)

Origin message was:
------------------
- settings.h: completion of 0caf40d664

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

------------------
This commit was generated by Migit
2016-12-13 11:10:58 +01:00
vanhofen
f673e1c62b usermenu: allow testmenu in usermenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fcf19b967
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-12 (Mon, 12 Dec 2016)

Origin message was:
------------------
- usermenu: allow testmenu in usermenu

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

------------------
This commit was generated by Migit
2016-12-12 20:35:29 +01:00
vanhofen
dbb517a861 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a141bafe7f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)


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

------------------
This commit was generated by Migit
2016-12-08 17:57:11 +01:00
vanhofen
976563831d settings.h: add OFFSET_INNER_NONE define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 62b8faf19c
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-08 (Thu, 08 Dec 2016)

Origin message was:
------------------
- settings.h: add OFFSET_INNER_NONE define

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

------------------
This commit was generated by Migit
2016-12-08 17:55:27 +01:00
vanhofen
243909caf8 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
------------------
Branch: ni/coolstream
Commit: ad1e3beb3d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 22:00:25 +01:00
Thilo Graf
4f2116df43 Messages: add localized osd timeout option for interactive/static messages
TODO: add locales for hints


Origin commit data
------------------
Branch: ni/coolstream
Commit: d6ecaf855b
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-12-02 (Fri, 02 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
vanhofen
48cc63df9e Message Timeouts: add possibilty to change timeout for static messages
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9607957e07
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-01 (Thu, 01 Dec 2016)



------------------
This commit was generated by Migit
2016-12-02 21:32:15 +01:00
vanhofen
0b8c62cd41 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: a19fc5532b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
2016-11-22 23:45:32 +01:00
Thilo Graf
ea9be5f37c Messages: try to fix API message handling
Passed timeout for messeages an popup's fired by yWeb API was not really
ok.
For popups now we have a setting with default value of 6 seconds timeout
Popups fired with ShowHint() use this as default. Value of 0 and -1
are ignored.
Messages fired with ShowMsg() should be fixed and interpret
value 0 or -1 as no timeout and will remain on the screen.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b97f72ed1
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-22 (Tue, 22 Nov 2016)



------------------
This commit was generated by Migit
2016-11-22 10:32:10 +01:00
vanhofen
4af96e1b6d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: d065c1f394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-21 00:14:20 +01:00
TangoCash
083df328e1 add option to read saved epg data frequently
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cd5dd8e23
Author: TangoCash <eric@loxat.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-20 19:24:08 +01:00
vanhofen
209ca4b776 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3caf9e47c1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 18:36:35 +01:00
Thilo Graf
c3ffba3c24 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
------------------
Branch: ni/coolstream
Commit: 4988df1dd9
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-11-20 (Sun, 20 Nov 2016)



------------------
This commit was generated by Migit
2016-11-20 01:08:14 +01:00
vanhofen
ff9095e66b Revert "Recording Menu: Add option "Always show timer pick list""
This reverts commit 5b4e8952fa.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 226ec2c57d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)



------------------
This commit was generated by Migit
2016-11-14 23:05:36 +01:00
vanhofen
06ab0e9f73 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ca86828ff1
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-14 23:02:33 +01:00
vanhofen
715af20490 followscreenings: allow to turn off followscreenings list
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6cb1d206f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-14 (Mon, 14 Nov 2016)

Origin message was:
------------------
- followscreenings: allow to turn off followscreenings list

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

------------------
This commit was generated by Migit
2016-11-14 22:58:43 +01:00
vanhofen
ea9e977f03 Merge branch 'pu/moviebrowser' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d598b3d28
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)


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

------------------
This commit was generated by Migit
2016-11-07 22:21:35 +01:00
vanhofen
16245bdc76 settings.h: add OFFSET_INNER_MIN define
Origin commit data
------------------
Branch: ni/coolstream
Commit: 11383271ad
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-07 (Mon, 07 Nov 2016)

Origin message was:
------------------
- settings.h: add OFFSET_INNER_MIN define

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

------------------
This commit was generated by Migit
2016-11-07 21:09:45 +01:00
FlatTV
5b4e8952fa Recording Menu: Add option "Always show timer pick list"
"when choosing recording from EPG, view Timer list even no further
entries found" yes/no


Origin commit data
------------------
Branch: ni/coolstream
Commit: f2437b5b06
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-30 (Sun, 30 Oct 2016)



------------------
This commit was generated by Migit
2016-10-30 11:32:42 +01:00
vanhofen
da08c55473 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c9aa1562e
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-29 (Sat, 29 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-29 11:41:02 +02:00
TangoCash
0e87207cab add possibility to add Name,Url,Port, Username and Password if needed.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3776340268
Author: TangoCash <eric@loxat.de>
Date: 2016-10-28 (Fri, 28 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-28 22:20:27 +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
108cf42786 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	lib/timerdclient/timerdtypes.h
	src/gui/channellist.cpp
	src/system/httptool.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0bb2f888c6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
2016-10-21 11:23:51 +02:00
TangoCash
5de9f564aa add multiple remote boxes
Origin commit data
------------------
Branch: ni/coolstream
Commit: f354089763
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
TangoCash
3d3605983f adding remote timer (experimental)
switch record timers to remote box or back with "play"-key


Origin commit data
------------------
Branch: ni/coolstream
Commit: 716e9f4d9b
Author: TangoCash <eric@loxat.de>
Date: 2016-10-21 (Fri, 21 Oct 2016)



------------------
This commit was generated by Migit
2016-10-21 10:47:37 +02:00
vanhofen
8f5cf54e49 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/cst-next
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6bfde8a3f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-13 16:04:30 +02:00
vanhofen
55a4cee8a9 settings.h: activate OFFSET defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4ee6375da
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-13 (Thu, 13 Oct 2016)

Origin message was:
------------------
- settings.h: activate OFFSET defines

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

------------------
This commit was generated by Migit
2016-10-13 15:12:15 +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
515240fd48 settings.h: add some definitions to use in future
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7782dcde01
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- settings.h: add some definitions to use in future

------------------
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
aa65a615f9 add and use OFFSET_INTER definition
Origin commit data
------------------
Branch: ni/coolstream
Commit: 98500fdeb6
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- add and use OFFSET_INTER definition

------------------
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
b59278067e rename SHADOW_OFFSET -> OFFSET_SHADOW
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d450c60d3
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)

Origin message was:
------------------
- rename SHADOW_OFFSET -> OFFSET_SHADOW

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

------------------
This commit was generated by Migit
2016-10-10 14:19:55 +02:00
FlatTV
8188f332ac Cam Menu: Allow switching to all or same transponder channels
while CI recording


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe69787b0a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-07 14:37:37 +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
d70425b838 neutrino: change some default timeouts
Origin commit data
------------------
Branch: ni/coolstream
Commit: a071ac9c73
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-10 (Wed, 10 Aug 2016)

Origin message was:
------------------
- neutrino: change some default timeouts

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

------------------
This commit was generated by Migit
2016-08-10 17:07:31 +02:00