Commit Graph

40 Commits

Author SHA1 Message Date
vanhofen
9db42a7d2b drop easymenu
Origin commit data
------------------
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu
2017-09-13 13:35:23 +02:00
vanhofen
80917aa811 disable youtube, when youtube_dev_id is empty
Origin commit data
------------------
Commit: 5ce13c651d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-06 (Sat, 06 Aug 2016)

Origin message was:
------------------
- disable youtube, when youtube_dev_id is empty
2016-08-06 22:52:37 +02:00
[CST] Focus
065559402c gui/mediaplayer.cpp: disable audio play while movieplayer playback active
Origin commit data
------------------
Commit: 55fe41a626
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-02 (Wed, 02 Mar 2016)
2016-03-02 15:07:09 +03:00
Thilo Graf
d937358782 Infoclock: unify handling in some classes with singleton
Origin commit data
------------------
Commit: 59d9b7068e
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-02-29 (Mon, 29 Feb 2016)
2016-02-29 08:05:05 +01:00
Michael Liebmann
54e7e45ab9 Disable multimedia plugins and video functions...
...(movie player & upnp browser) when movieplayer is in use


Origin commit data
------------------
Commit: 189b2e0fb0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2015-12-08 (Tue, 08 Dec 2015)
2015-12-08 12:01:25 +01:00
vanhofen
6a4659bf77 framebuffer: revival of showFrame() function to allow ...
... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons


Origin commit data
------------------
Commit: edc8527379
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-05-05 (Tue, 05 May 2015)

Origin message was:
------------------
- framebuffer: revival of showFrame() function to allow ...

... pictures like start.jpg, mp3.jpg etc. from /var/tuxbox/icons
2015-05-05 12:01:04 +02:00
vanhofen
92960161a9 remove w_max()-calls to define menu-width, because ...
w-max() returns a pixel-value, but menus need a percentage-value.


Origin commit data
------------------
Commit: 9041bff59c
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-04-24 (Fri, 24 Apr 2015)

Origin message was:
------------------
- remove w_max()-calls to define menu-width, because ...

 w-max() returns a pixel-value, but menus need a percentage-value.
2015-04-24 09:11:04 +02:00
vanhofen
cb354188c7 plugins: simplify integratePlugins(); ...
* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper


Origin commit data
------------------
Commit: 389c4c232f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-10 (Mon, 10 Nov 2014)

Origin message was:
------------------
- plugins: simplify integratePlugins(); ...

* CPluginsExec(): switch to singleton
* move CPluginsExec() to pluginlist.cpp|h
 because it's not really a settings_helper
2014-11-10 22:41:08 +01:00
Michael Liebmann
a203233a18 integrated plugins: Add direct keys
Origin commit data
------------------
Commit: ddd41e05ef
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
2014-10-16 09:49:19 +02:00
vanhofen
a84a6d47c4 add plugins to mutimedia menu
Origin commit data
------------------
Commit: a14d63b93b
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-09-28 (Sun, 28 Sep 2014)

Origin message was:
------------------
- add plugins to mutimedia menu
2014-09-29 14:38:47 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
2014-09-15 11:44:08 +04:00
gixxpunk
bf4208f78d upnp browser: add menu hint
Origin commit data
------------------
Commit: f8840a8d5a
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2014-05-08 (Thu, 08 May 2014)

Origin message was:
------------------
- upnp browser: add menu hint
2014-05-08 21:32:48 +02:00
[CST] Focus
a3fc0c698d gui/mediaplayer.cpp: fix memleak
Origin commit data
------------------
Commit: ddbc7fd44a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-29 (Fri, 29 Nov 2013)
2013-11-29 17:27:11 +04:00
Michael Liebmann
c6eeb420d4 InfoClock: Fix display clock in movie browser, file browser etc.
Origin commit data
------------------
Commit: 7466d6f19c
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-22 (Fri, 22 Nov 2013)
2013-11-22 10:01:35 +01:00
Michael Liebmann
5dfd0448a3 Audioplayer: Remove special handling for display mute icon
- Supplement to 5aa9f6a272


Origin commit data
------------------
Commit: 1c3ee43410
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
2013-11-04 17:12:48 +01:00
Michael Liebmann
5aa9f6a272 Audioplayer: Remove special handling for display mute icon
Origin commit data
------------------
Commit: bace5ce91b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-04 (Mon, 04 Nov 2013)
2013-11-04 17:00:34 +01:00
[CST] Focus
e091a84f2b as requested, implement 'easy' menu mode for novice users;
default behavior should not be changed, easy mode forced by /var/etc/.easymenu file inside image;
at the moment switch between modes is done by main menu -> 'stop' button -> enter pin code,
restart needed after mode switch


Origin commit data
------------------
Commit: 606bd01878
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
2013-10-25 13:03:26 +04:00
[CST] Focus
b31f146866 gui/mediaplayer.cpp: make upnpbrowsergui static
Origin commit data
------------------
Commit: e2f4eff598
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
2013-09-03 18:23:20 +04:00
[CST] Focus
499d23e6a6 Merge branch 'next' into next-cc
Conflicts:
	data/locale/english.locale
	src/driver/framebuffer.cpp
	src/gui/channellist.cpp
	src/gui/eventlist.cpp
	src/gui/moviebrowser.cpp


Origin commit data
------------------
Commit: 6f8ef9ec46
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-02 (Sun, 02 Jun 2013)
2013-06-02 10:46:42 +04:00
[CST] Focus
ab0c4b8879 gui/mediaplayer.cpp: add youtube feeds playback menu item
Origin commit data
------------------
Commit: bc16511047
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-29 (Wed, 29 May 2013)
2013-05-29 18:09:46 +04:00
Michael Liebmann
287c48a9df Various changes for reworked mute icon handling in some classes
- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer


Origin commit data
------------------
Commit: bf1c7bfdb7
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-05-13 (Mon, 13 May 2013)

Origin message was:
------------------
* Various changes for reworked mute icon handling in some classes

- mute icon disabled for moviebrowser, upnpbrowser, pictureviewer
- extra handling for audioplayer
2013-05-16 11:01:41 +01:00
[CST] Focus
c54a1188b7 neutrino GUI: more places to disable anything record-related, if recording_type is RECORDING_OFF
Origin commit data
------------------
Commit: e14043dbfb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-04-09 (Tue, 09 Apr 2013)
2013-04-09 18:37:25 +04:00
Jacek Jendrzej
a7f29d472d src/gui/mediaplayer.cpp: fix memleaks when using CMenuForwarder
Origin commit data
------------------
Commit: ed8734e2b9
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-11-20 (Tue, 20 Nov 2012)
2012-11-20 13:21:33 +01:00
[CST] Focus
82b1c38c34 gui/mediaplayer.cpp: return result from audio/movie players,
thanks satbaby for patch


Origin commit data
------------------
Commit: a4df1e2939
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-11-16 (Fri, 16 Nov 2012)
2012-11-16 15:52:02 +04:00
Jacek Jendrzej
9868a4308b remove doubles include
Origin commit data
------------------
Commit: a3bfab0bcd
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-09-11 (Tue, 11 Sep 2012)
2012-09-11 20:31:33 +02:00
[CST] Focus
0511411cda gui/mediaplayer.cpp: add menu hints
Origin commit data
------------------
Commit: 221e3f1588
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-07-08 (Sun, 08 Jul 2012)
2012-07-08 21:38:18 +04:00
[CST] Focus
af4205e76b GUI: remove CMenuWidget->hide() calls - CMenuWidget->exec() always hide before return
Origin commit data
------------------
Commit: 0319c4faad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-05-07 (Mon, 07 May 2012)
2012-05-07 15:37:02 +04:00
Thilo Graf
3ce9367ec8 neutrino media player menu: call moviebrowser from media player object
We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: f7bf5932a9
Author: Thilo Graf <dbt@novatux.de>
Date: 2012-01-17 (Tue, 17 Jan 2012)

Origin message was:
------------------
*neutrino media player menu: call moviebrowser from media player object

We had 2 ways to open the moviebrowser and one was with parental lock, the
other without.
btw: Is it really necessary to lock here?
Moviebrowser got its own configurable parental lock.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2064 e54a6e83-5905-42d5-8d5c-058d10e6a962
2012-01-17 19:44:42 +00:00
Thilo Graf
07554a0dcc neutrino: port personalize feature from tuxbox
This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: aaa988db5f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-12-28 (Wed, 28 Dec 2011)

Origin message was:
------------------
*neutrino: port personalize feature from tuxbox

This is a partial port of original neutrino personalize feature
and includes also moving of user menu settings from key setup into this setup,
but it's not completley yet in some details and so I think it's a lot to do.
I hope it works fine and the many user requests are justifying this feature.

TODO:
- doc into wiki
- adapt for yWeb
- some reworks for user menu settings and plugin management
- add timer and rework tv radio mode switch item(s)
and many more...

please report: http://www.dbox2world.net/board293-coolstream-hd1/board314-coolstream-development/9565-diskussion-neutrino-goes-neutrinohd-welche-features-funktionen-aus-dem-tuxbox-cvs-%C3%BCbernehmen/

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2010 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-28 00:19:15 +00:00
gixxpunk
27d51d7f56 mediaplayer.cpp: exit on menu button
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1931 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 7c43728084
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2011-12-02 (Fri, 02 Dec 2011)

Origin message was:
------------------
- mediaplayer.cpp: exit on menu button

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1931 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-12-02 18:12:39 +00:00
Thilo Graf
fbafbc1865 neutrino menu: remove parameter 'mwidth' from widget constructor
Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 8b5857909b
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-26 (Sat, 26 Nov 2011)

Origin message was:
------------------
*neutrino menu: remove parameter 'mwidth' from widget constructor

Hope we don't need it anymore...

*neutrino menu: remove select functions

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1909 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 23:48:30 +00:00
Thilo Graf
1c20f5c16a neutrino menu: fix 'memory ' of selected items in submenues
Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: eff98c661e
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-11-26 (Sat, 26 Nov 2011)

Origin message was:
------------------
*neutrino menu: fix 'memory ' of selected items in submenues

Add small helper class to manage missing values
e.g. needed for deallocated widget objects.
This class we can also use for other things in future!

In this context I added a vector for 'selected' values needed for
deeper and deallocated submenues.
The identification of widgets working now with a new widget parameter named 'w_index'.
setSelected() and getSelected() functions are still working, but are not needed, if we use an index

-add define for default widget index
-add new header file for enums
-adapted many menu classes for this parameter

Hope it' works fine. If you find any menu without a 'memory', please add an index.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1908 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-11-25 23:48:18 +00:00
Michael Liebmann
9765d68841 Remove old DBox2 identifier (patch by svenhoefer)
- Renaming NEUTRINO_ICON_BUTTON_DBOX* to NEUTRINO_ICON_BUTTON_MENU*
- Changed menu icons


git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1839 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: fa2f642e4f
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2011-11-07 (Mon, 07 Nov 2011)
2011-11-07 20:48:41 +00:00
Stefan Seyfried
d909e0b6df neutrino: add configure switch to disable upnp
Add a --disable-upnp switch to disable the UPNP browser for
those who want to use more modern external solutions.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@1830 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1bb7728e6d
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-11-05 (Sat, 05 Nov 2011)
2011-11-05 17:10:42 +00:00
Stefan Seyfried
932de4c110 neutrino: add MODE_VIDEO to CMediaPlayerMenu::showMenu()
This allows to create a "movieplayer shortcut" key.
Additionally, this probably fixes some memory leaks.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1243 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 5e31ebc2f2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-03-04 (Fri, 04 Mar 2011)
2011-03-04 18:58:08 +00:00
Thilo Graf
9f1e14d625 neutrino: cleanup unused members and includes
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 026a27a521
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-21 (Mon, 21 Feb 2011)

Origin message was:
------------------
*neutrino: cleanup unused members and includes

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1182 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-21 09:08:32 +00:00
Thilo Graf
5a789fcefe neutrino mediaplayer: remember audio- and internetplayer contents
create and hold the audio player objects while runtime

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1128 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 00b7ca8e08
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-09 (Wed, 09 Feb 2011)

Origin message was:
------------------
*neutrino mediaplayer: remember audio- and internetplayer contents
create and hold the audio player objects while runtime

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1128 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-02-09 10:28:45 +00:00
Thilo Graf
ca1189074a neutrino: fix audio shortcut,
- moved subtitle handling to audioplayer,
- neutrino_menue: changed object handling in mediaplayer forwarder
- mediaplayer: usage modes added

user can now open the mediaplayer menu with audio button,
repeatedly pressing as usual the audio button starts up the audio player,
button 'W' starts the internet player.

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1106 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: dbe50dc9c4
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-02-02 (Wed, 02 Feb 2011)
2011-02-02 21:42:40 +00:00
Thilo Graf
7f026a620c neutrino multimedia-menu: add singelton,
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 1125c6ab1f
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
*neutrino multimedia-menu: add singelton,
use singelton for creating or destroying for movieplayer instance

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1066 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-26 11:05:33 +00:00
Thilo Graf
a26b49fcfe neutrino multimedia menu: add new files
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1062 e54a6e83-5905-42d5-8d5c-058d10e6a962


Origin commit data
------------------
Commit: 0f19268d05
Author: Thilo Graf <dbt@novatux.de>
Date: 2011-01-26 (Wed, 26 Jan 2011)

Origin message was:
------------------
*neutrino multimedia menu: add new files

git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1062 e54a6e83-5905-42d5-8d5c-058d10e6a962
2011-01-26 11:05:11 +00:00