Commit Graph

375 Commits

Author SHA1 Message Date
vanhofen
dd377dff8f Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp
	src/gui/widget/menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d4677a319
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-21 (Thu, 21 Sep 2017)



------------------
This commit was generated by Migit
2017-09-21 10:32:33 +02:00
vanhofen
bdbe2f5ab8 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6ee3e54741
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-09-20 21:29:53 +02:00
Jacek Jendrzej
049633bc07 src/gui/osd_setup.cpp disable hint paint in channellist-mode, is broken
Origin commit data
------------------
Branch: ni/coolstream
Commit: e308407b22
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-20 (Wed, 20 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-20 18:07:05 +02:00
vanhofen
daf4480f61 add and use FRAME_WIDTH defines; ...
replace other fixed frame widths with OFFSET defines


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6d58a3b1c9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-20 (Wed, 20 Sep 2017)

Origin message was:
------------------
- add and use FRAME_WIDTH defines; ...

replace other fixed frame widths with OFFSET defines


------------------
This commit was generated by Migit
2017-09-20 13:46:31 +02:00
vanhofen
83be9c1fe3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6dd6df52fb
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 21:53:44 +02:00
gixxpunk
570ba4305b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 315a87f2be
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 16:31:55 +02:00
Jacek Jendrzej
fac44e3ba4 osd_setup.cpp fix memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: 82a0cdeb68
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-18 (Mon, 18 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-18 14:57:11 +02:00
vanhofen
672ad153a3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcb50dacc6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-16 11:04:54 +02:00
vanhofen
308f44a17b Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/widget/colorchooser.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 10c224c00e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-16 (Sat, 16 Sep 2017)



------------------
This commit was generated by Migit
2017-09-16 11:03:04 +02:00
Jacek Jendrzej
37b9f2611e readd fontmenu scaling hint
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3732eb851a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-15 (Fri, 15 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-15 21:27:36 +02:00
vanhofen
e6d2ba00b3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)



------------------
This commit was generated by Migit
2017-09-12 22:32:07 +02:00
vanhofen
912d145b89 move CNITouchFileNotifier to CFlagFileNotifier
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0eadd27032
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- move CNITouchFileNotifier to CFlagFileNotifier

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

------------------
This commit was generated by Migit
2017-09-12 22:30:34 +02:00
vanhofen
88d02d6b60 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4bc4a80094
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:44:18 +02:00
vanhofen
ab5d217f63 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: eb76978295
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-09 (Sat, 09 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-09 08:43:52 +02:00
Jacek Jendrzej
a67cecd575 remove double includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6576729fd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-08 (Fri, 08 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-08 21:21:32 +02:00
vanhofen
4b44169b39 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: ff282cbad1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-27 (Sun, 27 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-27 23:56:52 +02:00
gixxpunk
3287a5ded5 re-add missing include
Origin commit data
------------------
Branch: ni/coolstream
Commit: 940569fb9e
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- re-add missing include

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

------------------
This commit was generated by Migit
2017-08-26 12:38:16 +02:00
vanhofen
7ec5908e8e remove possibility to change iconsets for infoviewer
Origin commit data
------------------
Branch: ni/coolstream
Commit: ae9435f75d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-26 (Sat, 26 Aug 2017)

Origin message was:
------------------
- remove possibility to change iconsets for infoviewer

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

------------------
This commit was generated by Migit
2017-08-26 10:19:37 +02:00
vanhofen
c09cdaff18 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e0cd8f75d8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-09 (Wed, 09 Aug 2017)


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

------------------
This commit was generated by Migit
2017-08-09 10:37:47 +02:00
vanhofen
aa022d1ee4 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/fb_generic.cpp
	src/gui/components/cc_frm_header.h
	src/gui/osd_setup.cpp
	src/gui/themes.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 644a634f3c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-08 (Tue, 08 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 15:54:12 +02:00
Thilo Graf
5e3d70752b COsdSetup: add slot to ensure clean up icon cache on changed resolution.
Some old icon data makes no sense with changed resolution.
In some cases it could happens that no icons are to see on screen
after changed resolution. This should fix this,


Origin commit data
------------------
Branch: ni/coolstream
Commit: 58d4f13bb7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
Thilo Graf
208498a730 Colorsettings: add possibility to change shadow color
Shadow color was bound to infobar color and it's not really
understandable why, because with some colors eg. black, the shadow is
grey or with other colors it is exaggerated colored and seems to be
not realistically and looks unusual if shadow is brighter or colorful
than foreground. Some themes will thank it.

TODO: update theme files with matching values if required


Origin commit data
------------------
Branch: ni/coolstream
Commit: c600b4c416
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-02 (Wed, 02 Aug 2017)



------------------
This commit was generated by Migit
2017-08-08 14:25:12 +02:00
vanhofen
5a43934c6b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
2017-06-10 11:43:50 +02:00
vanhofen
48db0bd94c Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/icons/filetypes/mp3.png
	data/icons/filetypes/picture.png
	src/gui/audioplayer.cpp
	src/gui/bouquetlist.cpp
	src/gui/filebrowser.cpp
	src/gui/followscreenings.cpp
	src/gui/followscreenings.h
	src/gui/osd_setup.cpp
	src/gui/record_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 75db11c2e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)



------------------
This commit was generated by Migit
2017-06-07 15:14:51 +02:00
Michael Liebmann
e2b33894eb Merge branch 'pu/fb-setmode'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 624f2b3154
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)


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

------------------
This commit was generated by Migit
2017-06-07 14:18:01 +02:00
vanhofen
71f9b0fd85 filebrowser: use a bit larger regular font by default
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 11aa9054bc
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-07 (Wed, 07 Jun 2017)

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default

Signed-off-by: Thilo Graf <dbt@novatux.de>


------------------
This commit was generated by Migit
2017-06-07 14:17:11 +02:00
vanhofen
27fb8a8db8 remove graphic progressbar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 675c0dc6f6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-06 (Tue, 06 Jun 2017)

Origin message was:
------------------
- remove graphic progressbar

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

------------------
This commit was generated by Migit
2017-06-06 00:09:31 +02:00
vanhofen
6755871162 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: e78936e478
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)


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

------------------
This commit was generated by Migit
2017-05-30 01:27:37 +02:00
vanhofen
ed2dc5803f filebrowser: use a bit larger regular font by default
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1b6994fd7
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-30 (Tue, 30 May 2017)

Origin message was:
------------------
- filebrowser: use a bit larger regular font by default

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

------------------
This commit was generated by Migit
2017-05-30 01:24:21 +02:00
vanhofen
d89ecbdf4d osd_setup: move unused fonts away from users choice
Origin commit data
------------------
Branch: ni/coolstream
Commit: c367becaec
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move unused fonts away from users choice

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

------------------
This commit was generated by Migit
2017-05-23 18:21:51 +02:00
vanhofen
049e4596d3 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3d8073b910
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)


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

------------------
This commit was generated by Migit
2017-05-23 17:59:21 +02:00
vanhofen
a93d950357 osd_setup: move channellist_show_channellogo to new logo menu; ...
align locales


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe50c85a3b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: move channellist_show_channellogo to new logo menu; ...

align locales


------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
49d1c9d622 osd_setup: add channellogo-setup menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: e9297bcc1c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-05-23 (Tue, 23 May 2017)

Origin message was:
------------------
- osd_setup: add channellogo-setup menu

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

------------------
This commit was generated by Migit
2017-05-23 17:58:53 +02:00
vanhofen
8af0c9668b Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bccd83b07
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-27 (Thu, 27 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-27 14:02:32 +02:00
gixxpunk
3ace53ce3e Merge branch 'master' of github.com:tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8f3783987a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2017-04-26 (Wed, 26 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-26 11:17:46 +02:00
Thilo Graf
0dfbcf92a9 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8554722323
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-25 (Tue, 25 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-25 11:46:41 +02:00
Thilo Graf
9ddf91b410 COsdSetup: reset channellist objects after changed window size
Ensures complete reinit of relevent modules inside channellist instance.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4de8c61c04
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-04-24 (Mon, 24 Apr 2017)



------------------
This commit was generated by Migit
2017-04-25 11:36:49 +02:00
vanhofen
6850970ff1 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 292d7a2d5d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-19 (Wed, 19 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-19 23:24:19 +02:00
Michael Liebmann
ff006b3f62 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2afb8fef86
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-16 (Sun, 16 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-16 19:42:14 +02:00
vanhofen
5bc6b7c1a1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/channellist.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7c12bba6e2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-13 (Thu, 13 Apr 2017)



------------------
This commit was generated by Migit
2017-04-13 10:02:31 +02:00
vanhofen
cca8fbd285 osd_setup: a bit smaller font for epgplus-items; ...
it's now aligned to epgview's fontsizes


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a17b434b6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-12 (Wed, 12 Apr 2017)

Origin message was:
------------------
- osd_setup: a bit smaller font for epgplus-items; ...

it's now aligned to epgview's fontsizes


------------------
This commit was generated by Migit
2017-04-12 09:31:22 +02:00
vanhofen
ebd68daa5e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30d4d6e7f0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:33:53 +02:00
vanhofen
1606092aa6 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0624cf4a1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:32:18 +02:00
Michael Liebmann
839daf7d73 Merge branch 'master' into pu/fb-setmode
Origin commit data
------------------
Branch: ni/coolstream
Commit: f0ae55707a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-04-08 (Sat, 08 Apr 2017)


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

------------------
This commit was generated by Migit
2017-04-08 14:17:34 +02:00
vanhofen
4df1b65ec0 osd_setup: add new epgplus font
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b7430969a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-04-08 (Sat, 08 Apr 2017)

Origin message was:
------------------
- osd_setup: add new epgplus font

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

------------------
This commit was generated by Migit
2017-04-08 14:11:28 +02:00
vanhofen
c3245e8661 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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: e7ff6d5493
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 21:59:40 +01:00
Michael Liebmann
e7d1a44693 Revert "- allow to force given osd resolution in "videosystem = auto" mode"
This reverts commit f3fe4a116f.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5ce34d5cf9
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-12 (Sun, 12 Mar 2017)



------------------
This commit was generated by Migit
2017-03-12 06:32:52 +01:00
vanhofen
73014e6c83 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/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 66cbc06b01
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)



------------------
This commit was generated by Migit
2017-03-06 23:54:02 +01:00
vanhofen
f3fe4a116f allow to force given osd resolution in "videosystem = auto" mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6fc24e990b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-06 (Mon, 06 Mar 2017)

Origin message was:
------------------
- allow to force given osd resolution in "videosystem = auto" mode

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

------------------
This commit was generated by Migit
2017-03-06 23:50:15 +01:00
vanhofen
5e5451332e Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
2017-02-28 16:55:39 +01:00