mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 15:41:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,375 Commits 2 Branches 9 Tags
1cde8743525cbd3f3a76dbf05ea1633c2c12286c
Commit Graph

514 Commits

Author SHA1 Message Date
Jacek Jendrzej
6824f87be8 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ed416416cd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-14 (Mon, 14 Aug 2017)
 2017-08-14 16:26:49 +02:00
vanhofen
d36efaeac5 Revert "neutrino: disable some menus in upnp & ts mode" 
This reverts commit 552e7c8777.

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


Origin commit data
------------------
Commit: 944ad7cb63
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
 2017-08-12 14:05:17 +02:00
vanhofen
4d0a512b6e Revert "neutrino: disable some menus in upnp & ts mode" 
This reverts commit 552e7c8777.


Origin commit data
------------------
Commit: 2e04d34a9c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-12 (Sat, 12 Aug 2017)
 2017-08-12 12:47:33 +02:00
Jacek Jendrzej
b01bf9414d Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 1763bb9e64
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-08-08 (Tue, 08 Aug 2017)
 2017-08-08 20:06:40 +02:00
vanhofen
8b89a1af9d menu: fix icon for CGenericMenuNext forwarder 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: 8c4fe6df2f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-08-08 14:25:12 +02:00
vanhofen
e21f270c04 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: 6d49aee959
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 08:20:56 +02:00
GetAway
552e7c8777 neutrino: disable some menus in upnp & ts mode 
to prevent inoperability of neutrino


Origin commit data
------------------
Commit: 90de51de38
Author: GetAway <get-away@t-online.de>
Date: 2017-08-06 (Sun, 06 Aug 2017)
 2017-08-07 07:52:41 +02:00
vanhofen
851752300e menu: fix icon for CGenericMenuNext forwarder 
Origin commit data
------------------
Commit: 27b111820f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-01 (Tue, 01 Aug 2017)

Origin message was:
------------------
- menu: fix icon for CGenericMenuNext forwarder
 2017-08-01 14:44:21 +02:00
Jacek Jendrzej
7cf343f927 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: d612fbc05f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 12:21:18 +02:00
vanhofen
56c0ac4ef1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/audioplayer.cpp
	src/gui/audioplayer.h


Origin commit data
------------------
Commit: 5433054b38
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:52:04 +02:00
Thilo Graf
ca401844b8 CMenuSeparator: clean up multiple code parts 
Origin commit data
------------------
Commit: 326a9634e1
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:04:40 +02:00
Thilo Graf
449d2a0fe4 CMenuOptionNumberChooser: clean up multiple code parts 
Origin commit data
------------------
Commit: f2e8f95e66
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:04:40 +02:00
Thilo Graf
e6175baf29 CMenuForwarder: clean up multiple code parts 
Origin commit data
------------------
Commit: 7b3ce6f330
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:04:40 +02:00
Thilo Graf
761c660670 CMenuOptionStringChooser: clean up multiple code parts 
Origin commit data
------------------
Commit: 284dba8c25
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:04:40 +02:00
Thilo Graf
ae5aad38f5 CMenuOptionChooser: clean up multiple code parts 
Origin commit data
------------------
Commit: 8899660dad
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:04:40 +02:00
Jacek Jendrzej
9159d45c90 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: 4c3002cb26
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 12:32:31 +02:00
vanhofen
a4aa97f4c5 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	data/icons/headers/pictureviewer.png
	data/locale/english.locale
	src/global.h
	src/gui/components/cc_frm_footer.h
	src/gui/eventlist.cpp
	src/gui/pictureviewer.cpp
	src/gui/widget/icons.h
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: a8ef409ff6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 10:37:41 +02:00
vanhofen
50f63cf847 menue: replace last fixed values ... 
... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation


Origin commit data
------------------
Commit: 5c783a5c50
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations

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

- removed TODO for height of hint calculation
 2017-06-15 01:01:55 +02:00
vanhofen
8aeb7304ab menue: replace last fixed values ... 
... with OFFSET defines and scale2Res()-calculations


Origin commit data
------------------
Commit: 57a146f8cf
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-09 (Fri, 09 Jun 2017)

Origin message was:
------------------
- menue: replace last fixed values ...

... with OFFSET defines and scale2Res()-calculations
 2017-06-09 12:40:08 +02:00
Jacek Jendrzej
4643ac3f51 Merge branch 'master' into pu/mp 
Origin commit data
------------------
Commit: ca83324763
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-06-07 (Wed, 07 Jun 2017)
 2017-06-07 16:20:47 +02:00
vanhofen
63b648fb3e menue: fix lcd4l-support for directly started items; ... 
this fixes missing lcd4l-support in mode_upnp


Origin commit data
------------------
Commit: da62cd195b
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)

Origin message was:
------------------
- menue: fix lcd4l-support for directly started items; ...

this fixes missing lcd4l-support in mode_upnp
 2017-03-26 23:21:29 +02:00
Michael Liebmann
bbaad5b19d Merge branch 'master' into pu/fb-setmode 
Origin commit data
------------------
Commit: 2677543cc4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 21:55:50 +01:00
vanhofen
14f84f0bec Merge remote-tracking branch 'neutrino-mp/master' into pu/mp 
Conflicts:
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/neutrinoyparser.cpp


Origin commit data
------------------
Commit: 8bdb16cec6
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 16:14:33 +01:00
vanhofen
30fd965086 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/channellist.cpp
	src/gui/components/cc_detailsline.cpp
	src/gui/widget/menue.cpp


Origin commit data
------------------
Commit: c4fa0eb30e
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 12:45:30 +01:00
vanhofen
9c009ade29 unify DetailsLine-names; move define to settings.h 
Origin commit data
------------------
Commit: 5b0faeab8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)

Origin message was:
------------------
- unify DetailsLine-names; move define to settings.h
 2017-03-13 12:40:04 +01:00
vanhofen
8c65bc5cf0 Merge branch 'pu/fb-setmode' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e2cf02f310
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 11:40:34 +01:00
Michael Liebmann
a3e6544398 CMenuWidget::calcSize: Add forgotten 'wi' 
Origin commit data
------------------
Commit: d0b02a9752
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 10:34:37 +01:00
Michael Liebmann
a84f479b62 CMenuWidget::calcSize: Use scale2Res() to adjust fixed sizes 
Origin commit data
------------------
Commit: 2ed30486c4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Michael Liebmann
b19cf5238c CMenuWidget::calcSize: Recalculation of min_width ... 
... for adjustment to the osd resolution


Origin commit data
------------------
Commit: 30db40da1a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-03-13 (Mon, 13 Mar 2017)
 2017-03-13 09:55:58 +01:00
Stefan Seyfried
b93f4e419a Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: abec1c311b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-03-04 (Sat, 04 Mar 2017)
 2017-03-04 19:32:30 +01:00
vanhofen
260127f781 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/movieplayer.cpp
	src/nhttpd/tuxboxapi/controlapi.cpp


Origin commit data
------------------
Commit: f30f4da574
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:09:50 +01:00
vanhofen
a9edf315db rename g_PluginList to g_Plugins; this isn't a list of plugins 
Origin commit data
------------------
Commit: 856c676430
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)

Origin message was:
------------------
- rename g_PluginList to g_Plugins; this isn't a list of plugins
 2017-03-01 13:03:50 +01:00
vanhofen
5df8b0409e Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 21:54:48 +01:00
Stefan Seyfried
706a5ba010 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 8b47699447
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-11 (Sat, 11 Feb 2017)
 2017-02-11 11:18:45 +01:00
Thilo Graf
829d045a99 CMenuWidget: remove dub code from init 
Origin commit data
------------------
Commit: 0435ca20a3
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 16:35:03 +01:00
Thilo Graf
a3f59e7c4a CMenuWidget: use only nameString as container for widget name 
neutrino_locale_t	name could be transformed always to real string to
unify this container


Origin commit data
------------------
Commit: 2dda93ed2b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-09 (Thu, 09 Feb 2017)
 2017-02-09 15:52:39 +01:00
vanhofen
26dae069c7 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: e0084d8913
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 13:13:34 +01:00
Thilo Graf
eff64072c2 Revert "CMenuWidget: ensure repaint of all header content if it is already painted" 
This reverts commit 04cec1bdf4.


Origin commit data
------------------
Commit: a2f9d4b462
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-02-02 (Thu, 02 Feb 2017)
 2017-02-02 11:18:27 +01:00
Stefan Seyfried
f9341822cf Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 7497722646
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-02-01 (Wed, 01 Feb 2017)
 2017-02-01 22:03:40 +01:00
Thilo Graf
04cec1bdf4 CMenuWidget: ensure repaint of all header content if it is already painted 
TODO: 	This should be controlled inside header base class.
	paint() method seems suitable.
	I Will try to implement it soon.


Origin commit data
------------------
Commit: 97ed7cdaf7
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-31 16:36:43 +01:00
Thilo Graf
686bc2ce6a CMenuWidget: add missing hide() for details line 
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.


Origin commit data
------------------
Commit: 76008371ff
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-31 16:36:42 +01:00
Stefan Seyfried
a73e775906 Merge remote-tracking branch 'tuxbox/master' 
Origin commit data
------------------
Commit: 48ff7b36a2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 21:36:09 +01:00
vanhofen
c64c3f48c6 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Origin commit data
------------------
Commit: fa6cac3836
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 16:33:02 +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
Thilo Graf
bfba1692ca Merge branch 'master' into pu/font 
Origin commit data
------------------
Commit: 3a0aaa6c29
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 12:23:51 +01:00
Thilo Graf
f0e520d0f3 CMenuWidget: ensure repaint of all header content if it is already painted 
TODO: 	This should be controlled inside header base class.
	paint() method seems suitable.
	I Will try to implement it soon.


Origin commit data
------------------
Commit: a72f3a7867
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 12:21:10 +01:00
Thilo Graf
b29b69a39b CMenuWidget: Forcing removal of details line during removing of hint box. 
Origin commit data
------------------
Commit: 6a3778ba93
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-30 (Mon, 30 Jan 2017)
 2017-01-30 11:27:55 +01:00
vanhofen
1d873df948 Merge branch 'pu/font' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/gui/volumebar.cpp


Origin commit data
------------------
Commit: cd8b9f9b04
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 22:37:31 +01:00
Thilo Graf
06b5acf1a7 CMenuWidget: add missing hide() for details line 
Details_line was not removed in all constellations when menu was closed.
Sample: open main menue and select an entry with connect-line, eg. plugins,
press key to come into submenu, then go back to main menue and close
menu with home key, result: it's possible that line is still on screen.


Origin commit data
------------------
Commit: a3ee3351b5
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-01-27 (Fri, 27 Jan 2017)
 2017-01-29 21:52:52 +01:00
vanhofen
ae640b35c1 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 4ace56d488
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-01-29 (Sun, 29 Jan 2017)
 2017-01-29 21:30:01 +01:00