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

443 Commits

Author SHA1 Message Date
vanhofen
d0dc31ae8d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 16:30:58 +02:00
vanhofen
fb0a25d759 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox 
Conflicts:
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/info_menue.cpp
	src/gui/widget/menue.cpp
	src/nhttpd/yconfig.h
	src/system/helpers.h


Origin commit data
------------------
Commit: 9152c228ed
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
 2017-09-14 16:23:15 +02:00
Thilo Graf
bd57ddb2e8 CMenuWidget: replace paintBoxRel() calls with single PaintBoxRel() 
Paints background and shadow at once. Shadow is painted only on
reqiured parts of screen. This avoids possible flicker effects e.g.
with footer paint, on changing buttons, was to see with opkg_manager.


Origin commit data
------------------
Commit: 5678da177e
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)
 2017-09-14 12:14:41 +02:00
Thilo Graf
b257efcc29 CMenuWidget: use CComponentsFooter for paint footers in menues 
Another step for more unified window designs.


Origin commit data
------------------
Commit: 7f7054018b
Author: Thilo Graf <dbt@novatux.de>
Date: 2017-08-13 (Sun, 13 Aug 2017)
 2017-09-14 12:14:41 +02:00
vanhofen
883034a60d plugin-code: cleanup from many unused code; ... 
* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

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


Origin commit data
------------------
Commit: f2ec46311c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- plugin-code: cleanup from many unused code; ...

* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-14 12:14:41 +02:00
vanhofen
54cd0a93e0 menu: always add an offset to menus; not only in round-border-mode 
Signed-off-by: Thilo Graf <dbt@novatux.de>


Origin commit data
------------------
Commit: cd5fc80ebe
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode

Signed-off-by: Thilo Graf <dbt@novatux.de>
 2017-09-14 12:14:41 +02:00
vanhofen
c6c61f6b22 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Commit: 9e6dc9fbce
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)
 2017-09-12 22:32:07 +02:00
vanhofen
50c8b5cdba menu: fix right offset for very long right texts 
Origin commit data
------------------
Commit: c11ac03b4f
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- menu: fix right offset for very long right texts
 2017-09-12 22:30:35 +02:00
vanhofen
7650e3e748 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/plugins.cpp
	src/gui/plugins.h


Origin commit data
------------------
Commit: a11e7df409
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)
 2017-09-08 12:24:32 +02:00
vanhofen
d3bd8b5725 menue: fix my stupid typo that avoids scrollbars 
Origin commit data
------------------
Commit: 8115f33948
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- menue: fix my stupid typo that avoids scrollbars
 2017-09-08 12:15:11 +02:00
vanhofen
5dc6e26d36 plugin-code: cleanup from many unused code; ... 
* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.


Origin commit data
------------------
Commit: f0f0c1f55d
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-08 (Fri, 08 Sep 2017)

Origin message was:
------------------
- plugin-code: cleanup from many unused code; ...

* remove intergration conversion because we can use the integer as it is
* update headers

 Do we need /src/plugin.h anymore? Maybe this code could be merged into src/gui/plugins.h.
 2017-09-08 10:53:03 +02:00
vanhofen
4250a45ea5 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/Makefile.am


Origin commit data
------------------
Commit: 6488fbf13a
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)
 2017-09-07 16:41:06 +02:00
vanhofen
23ea286fa9 menu: always add an offset to menus; not only in round-border-mode 
Origin commit data
------------------
Commit: 65b8a7ae48
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-07 (Thu, 07 Sep 2017)

Origin message was:
------------------
- menu: always add an offset to menus; not only in round-border-mode
 2017-09-07 16:18:30 +02:00
vanhofen
7c75ab360f Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: 3c35e98212
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-25 (Fri, 25 Aug 2017)
 2017-08-25 14:15:22 +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
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
8f336e9552 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c654c35d70
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-08-07 (Mon, 07 Aug 2017)
 2017-08-07 15:59:38 +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
vanhofen
7a7aeb8aa6 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/audioplayer.cpp


Origin commit data
------------------
Commit: 197dfd1c41
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-18 (Sun, 18 Jun 2017)
 2017-06-18 00:58:47 +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
vanhofen
b162e3d2aa Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/components/cc_frm_footer.cpp


Origin commit data
------------------
Commit: c68ae57571
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-15 (Thu, 15 Jun 2017)
 2017-06-15 11:07:32 +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
c35224ff08 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
------------------
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)
 2017-06-10 11:43:50 +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
vanhofen
c271e77e9d Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	acinclude.m4


Origin commit data
------------------
Commit: a9842aa1d2
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-26 (Sun, 26 Mar 2017)
 2017-03-26 23:25:43 +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
vanhofen
aa7d4ff017 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/gui/scan_setup.cpp
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Commit: 55743aff0c
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)
 2017-03-15 23:39:43 +01: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
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
vanhofen
a360c99a70 Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Origin commit data
------------------
Commit: c3ed2ed700
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-01 (Wed, 01 Mar 2017)
 2017-03-01 13:10:36 +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
ba302de46b Merge branch 'ni/tuxbox' into ni/mp/tuxbox 
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)
 2017-02-12 22:17:17 +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
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