Commit Graph

6601 Commits

Author SHA1 Message Date
gixxpunk
6c6dafe56f try to fix segfault on neutrino shutdown
Origin commit data
------------------
Commit: 86c126c937
Author: gixxpunk <thomas.harfmann@gmail.com>
Date: 2014-11-12 (Wed, 12 Nov 2014)

Origin message was:
------------------
- try to fix segfault on neutrino shutdown
2014-11-13 10:41:10 +01:00
[CST] Focus
a1de277d8d gui/streaminfo2.cpp: fix stream info on nvod channels
Origin commit data
------------------
Commit: 52397f7df6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-12 (Wed, 12 Nov 2014)
2014-11-12 12:21:20 +03:00
Jacek Jendrzej
fd7cdb9af7 CPersonalizeGui::addPersonalizedItems() fix digikey shortcut after use Personalize-Menu
Origin commit data
------------------
Commit: 5b58992de2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
2014-11-11 21:28:03 +01:00
[CST] Focus
cfeb0036dc neutrino: try to fix parental bypass by
quit from audio player / picture viewer / movie player and starting channel in PiP


Origin commit data
------------------
Commit: 5bd14ea4b8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
2014-11-11 14:40:52 +03:00
[CST] Focus
c665815487 gui/widget/stringinput.cpp: fix screen save/restore
Origin commit data
------------------
Commit: d20fc8f1bc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-11 (Tue, 11 Nov 2014)
2014-11-11 14:40:52 +03:00
martii
fca89727ca parental protection: make zaptime configurable
Conflicts:
	data/locale/english.locale
	src/gui/channellist.cpp
	src/gui/parentallock_setup.cpp
	src/neutrino.cpp


Origin commit data
------------------
Commit: a12f4c0274
Author: martii <m4rtii@gmx.de>
Date: 2013-06-23 (Sun, 23 Jun 2013)
2014-11-11 14:40:52 +03:00
[CST] Focus
4ebdce0041 gui/movieplayer.cpp: fix volume values in audio selection
Origin commit data
------------------
Commit: 493098040d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-09 (Sun, 09 Nov 2014)
2014-11-11 14:40:52 +03: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
419e281a1e CLuaMenuChangeObserver::changeNotify: Fix segfault in item type 'chooser'
Origin commit data
------------------
Commit: 02137ca987
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
2014-11-10 07:35:43 +01:00
Michael Liebmann
041c10224c Enable gradient for header CColorChooser
- Supplement to commit baf7ffea36


Origin commit data
------------------
Commit: 8765b94037
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-11-10 (Mon, 10 Nov 2014)
2014-11-10 07:35:42 +01:00
vanhofen
d1710ce269 deutsch.locale: update
Origin commit data
------------------
Commit: bdcb043521
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- deutsch.locale: update
2014-11-07 17:38:05 +01:00
vanhofen
e9197be684 pluginlist: use keyhelper to get hotkeys; allow colored keys from plugin.cfg
Origin commit data
------------------
Commit: 269cd4cef8
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- pluginlist: use keyhelper to get hotkeys; allow colored keys from plugin.cfg
2014-11-07 15:42:25 +01:00
vanhofen
bfabdefb6e CPluginsExec::exec(): show possible script output
Origin commit data
------------------
Commit: 7f2c69aa82
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- CPluginsExec::exec(): show possible script output
2014-11-07 15:41:11 +01:00
vanhofen
8262f7ffbd user_menue: minor optimizations
Origin commit data
------------------
Commit: 348add4acd
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: minor optimizations
2014-11-07 15:39:53 +01:00
vanhofen
5295a76dfc user_menue: fix wrong changes in 4064861b43
Origin commit data
------------------
Commit: 5ec409b264
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: fix wrong changes in 4064861b43
2014-11-07 13:55:05 +01:00
vanhofen
4064861b43 user_menue: allow colored keys from plugin.cfg
Origin commit data
------------------
Commit: 19f7e04c77
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- user_menue: allow colored keys from plugin.cfg
2014-11-07 12:20:47 +01:00
vanhofen
4695c00999 plugins: Fix assignment of prefered keys
New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto

If entry is missing key is auto-assigned


Origin commit data
------------------
Commit: c0a0cdb221
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: Fix assignment of prefered keys

New keyword in plugin.cfg: key=<key>
* key=red
* key=green
* key=yellow
* key=blue
* key=auto

If entry is missing key is auto-assigned
2014-11-07 12:17:29 +01:00
vanhofen
6ac49b606c plugins: don't add hidden plugins to usermenu; ...
... use CPuginsExec::exec() to execute and drop CUserMenu::exec()


Origin commit data
------------------
Commit: c0b130c490
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-07 (Fri, 07 Nov 2014)

Origin message was:
------------------
- plugins: don't add hidden plugins to usermenu; ...

... use CPuginsExec::exec() to execute and drop CUserMenu::exec()
2014-11-07 09:44:53 +01:00
Jacek Jendrzej
dc7c34f153 nhttpd_controlapi.html move info to point 6.
Origin commit data
------------------
Commit: 6f3c77734c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 21:18:59 +01:00
Jacek Jendrzej
908faff363 zapit: channel.h - change comparative criteria for freq sort
Origin commit data
------------------
Commit: ce87898d8f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 19:29:09 +01:00
Jacek Jendrzej
2846dee71f CFrameBuffer::paintBoxRel: check boxBuf if not NULL
Origin commit data
------------------
Commit: 644dc460a2
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 17:31:11 +01:00
Jacek Jendrzej
3905eb0fda fix some possible errors
Origin commit data
------------------
Commit: d5d6c4de62
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 14:40:44 +01:00
Jacek Jendrzej
9d4fbf8584 nhttpd controlapi: change for subchannel to subchannel zap
Origin commit data
------------------
Commit: c8f0c68cf6
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 14:38:30 +01:00
vanhofen
5858675c2c plugins: allow empty menu hints
Origin commit data
------------------
Commit: 95eab2a48d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- plugins: allow empty menu hints
2014-11-06 12:36:07 +01:00
vanhofen
4d59eee6be plugins: disable unused cfg-params
Origin commit data
------------------
Commit: c8522bae71
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- plugins: disable unused cfg-params
2014-11-06 12:36:07 +01:00
vanhofen
2d6cf7401b user_menue: fix hint icons for 'singe-added' plugins
Origin commit data
------------------
Commit: b93cb83c7c
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-06 (Thu, 06 Nov 2014)

Origin message was:
------------------
- user_menue: fix hint icons for 'singe-added' plugins
2014-11-06 12:36:07 +01:00
[CST] Focus
055f781e36 gui/videosettings.cpp: fix analog output options on zee2
Origin commit data
------------------
Commit: 9700fbcf23
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 14:30:03 +03:00
Janus
f24cc8f36d api4: fix name compare to realname compare
Origin commit data
------------------
Commit: 3f9d17c806
Author: Janus <janus@debian>
Date: 2014-11-06 (Thu, 06 Nov 2014)
2014-11-06 11:56:19 +01:00
[CST] Focus
4ec1243a30 gui/movieplayer.cpp: fix file info display,
bug from commit 7bf0c37de4


Origin commit data
------------------
Commit: 6586588409
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)
2014-11-05 16:37:03 +03:00
[CST] Focus
9591a5dbdc gui/moviebrowser.cpp: allow to delete any file + xml
Origin commit data
------------------
Commit: 50a90906a0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)
2014-11-05 16:35:41 +03:00
Jacek Jendrzej
2975355d08 CMoviePlayerGui::selectAudioPid() add Analog Audio on/off option
Origin commit data
------------------
Commit: 592e0ed631
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-04 (Tue, 04 Nov 2014)
2014-11-05 09:20:02 +01:00
Gaucho316
a20f07e1bc nhttpd controlapi: allow zapping to subchannels
based on idea by Moritz Venn <moritz.venn@freaque.net>

Signed-off-by: Christian Schuett <Gaucho316@hotmail.com>


Origin commit data
------------------
Commit: 59ca850ecc
Author: Gaucho316 <Gaucho316@hotmail.com>
Date: 2014-11-02 (Sun, 02 Nov 2014)
2014-11-05 09:20:02 +01:00
Jacek Jendrzej
675317d248 nhttpd:controlapi.cpp fix getallsubchannels
Origin commit data
------------------
Commit: 847b08aedb
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-05 (Wed, 05 Nov 2014)
2014-11-05 09:20:02 +01:00
vanhofen
14b8ff64dc re-enable front-panel settings for Trinity; re-sort vfd_setup
Origin commit data
------------------
Commit: 3c52e2b87f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-11-04 (Tue, 04 Nov 2014)

Origin message was:
------------------
- re-enable front-panel settings for Trinity; re-sort vfd_setup
2014-11-04 14:59:23 +01:00
Janus
36eb992029 add CBouquetManager writenames menu
Origin commit data
------------------
Commit: 93d62fd11a
Author: Janus <janus@debian>
Date: 2014-11-03 (Mon, 03 Nov 2014)

Origin message was:
------------------
-add CBouquetManager writenames menu
2014-11-03 14:16:53 +01:00
Janus
745a6f38d8 api4 : fix value assignment to write_names
Origin commit data
------------------
Commit: 04be550075
Author: Janus <janus@debian>
Date: 2014-10-31 (Fri, 31 Oct 2014)
2014-10-31 16:03:01 +01:00
[CST] Focus
7ac423fda6 gui/channellist.cpp: add channel move to bouquet
Origin commit data
------------------
Commit: 121d2f6339
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)
2014-10-28 15:13:22 +03:00
[CST] Focus
c1e99a0667 locals: add locale for 'move to'
Origin commit data
------------------
Commit: 1a30d7d921
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-28 (Tue, 28 Oct 2014)
2014-10-28 15:11:28 +03:00
[CST] Focus
214b476dc5 gui/channellist.cpp: disable 'other' bouquet edit
Origin commit data
------------------
Commit: e099cd4413
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 14:02:34 +03:00
[CST] Focus
9124a015ee neutrino.cpp: move webtv 'provider' to the end of list
Origin commit data
------------------
Commit: 9a09a79de6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 13:54:02 +03:00
[CST] Focus
8e236b7468 gui/miscsettings_menu.cpp: add option to enable/disable empty favorites in bouquet list
Origin commit data
------------------
Commit: 8772d219f1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 13:52:23 +03:00
[CST] Focus
5d410952bb locals: add locales for show empty favorites option
Origin commit data
------------------
Commit: 2d7b746685
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 13:51:32 +03:00
[CST] Focus
e42c4b234b zapit/src/bouquets.cpp: fix compile warning
Origin commit data
------------------
Commit: d7be8258f8
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 13:49:52 +03:00
[CST] Focus
6e6e8e5254 Revert "zapit/src/bouquets.cpp: do not add webtv channels to 'Other' bouquet"
This reverts commit ed40db1743.


Origin commit data
------------------
Commit: 709942f72a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 13:12:43 +03:00
[CST] Focus
7cbf846c4b zapit/src/zapit.cpp: keep old defaults, channel name present in both bouquets and ubouquets
Origin commit data
------------------
Commit: a6b585f880
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-27 (Mon, 27 Oct 2014)
2014-10-27 12:16:59 +03:00
Janus
a116bc31b8 api4 : use zapit.conf writeChannelsNames [0..3] to decide writing DVB-names in bouquets
Origin commit data
------------------
Commit: e01f57395b
Author: Janus <janus@debian>
Date: 2014-10-25 (Sat, 25 Oct 2014)
2014-10-27 12:13:51 +03:00
Janus
0b60aaea08 api4 : fix name/uname view with optional attributes
Origin commit data
------------------
Commit: 2644b30b6a
Author: Janus <janus@debian>
Date: 2014-10-23 (Thu, 23 Oct 2014)
2014-10-27 12:13:47 +03:00
Janus
19297de041 api4 : add bouquetID and make BQHeaderAttr optional
Origin commit data
------------------
Commit: f352e8eb50
Author: Janus <janus@debian>
Date: 2014-10-20 (Mon, 20 Oct 2014)
2014-10-27 12:13:37 +03:00
[CST] Focus
91ab55276f gui/scan_setup.cpp: in easeymenu mode, not allow start fastscan direct, without auto-diseqc configuration
Origin commit data
------------------
Commit: 60b1664057
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-23 (Thu, 23 Oct 2014)
2014-10-23 18:20:22 +04:00
[CST] Focus
9382250c10 zapit/src/bouquets.cpp: fix possible crash, if no channel name present in bouquets xml
Origin commit data
------------------
Commit: f8f299eadc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-23 (Thu, 23 Oct 2014)
2014-10-23 18:19:28 +04:00