projects
/
plugin.video.netflix.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
94f1971
)
feat(settings): Adds shortcut to inputstream settings
author
Sebastian Golasch
<public@asciidisco.com>
Tue, 7 Mar 2017 23:12:20 +0000
(
00:12
+0100)
committer
Sebastian Golasch
<public@asciidisco.com>
Tue, 7 Mar 2017 23:12:20 +0000
(
00:12
+0100)
resources/language/English/strings.po
patch
|
blob
|
history
resources/language/German/strings.po
patch
|
blob
|
history
resources/lib/Navigation.py
patch
|
blob
|
history
resources/settings.xml
patch
|
blob
|
history
diff --git
a/resources/language/English/strings.po
b/resources/language/English/strings.po
index 918b0d879b163fc3d1f07284f7bd974a51cd5f4d..114c47a510d0a2790b05cbffa5f1b741125b692a 100644
(file)
--- a/
resources/language/English/strings.po
+++ b/
resources/language/English/strings.po
@@
-156,3
+156,7
@@
msgstr ""
msgctxt "#30034"
msgid "ESN (set automatically, can be changed manually)"
msgstr ""
msgctxt "#30034"
msgid "ESN (set automatically, can be changed manually)"
msgstr ""
+
+msgctxt "#30035"
+msgid "Inputstream Addon Settings..."
+msgstr ""
diff --git
a/resources/language/German/strings.po
b/resources/language/German/strings.po
index cd7fa98e5fc0b172d1cdbdd594b451f03e350816..b94da20e34a87c12640e19e2870883b80227a37c 100644
(file)
--- a/
resources/language/German/strings.po
+++ b/
resources/language/German/strings.po
@@
-156,3
+156,7
@@
msgstr "Benutze Dolby Ton"
msgctxt "#30034"
msgid "ESN (set automatically, can be changed manually)"
msgstr "ESN (änderbar, wird auto. gesetzt)"
msgctxt "#30034"
msgid "ESN (set automatically, can be changed manually)"
msgstr "ESN (änderbar, wird auto. gesetzt)"
+
+msgctxt "#30035"
+msgid "Inputstream Addon Settings..."
+msgstr "Inputstream Addon Settings..."
diff --git
a/resources/lib/Navigation.py
b/resources/lib/Navigation.py
index 33711a7494714b174ad6b551a2e4a1fbc76c7bbb..37fa6ec2a94282d6feb3c4d728d6fdf6477a2202 100644
(file)
--- a/
resources/lib/Navigation.py
+++ b/
resources/lib/Navigation.py
@@
-6,6
+6,7
@@
import urllib
import urllib2
import json
import urllib
import urllib2
import json
+from xbmcaddon import Addon
from urlparse import parse_qsl
from utils import noop, log
from urlparse import parse_qsl
from utils import noop, log
@@
-45,6
+46,10
@@
class Navigation:
"""
params = self.parse_paramters(paramstring=paramstring)
"""
params = self.parse_paramters(paramstring=paramstring)
+ # open foreign settings dialog
+ if 'mode' in params.keys() and params['mode'] == 'openSettings':
+ return self.open_settings(params['url'])
+
# log out the user
if 'action' in params.keys() and params['action'] == 'logout':
return self.call_netflix_service({'method': 'logout'})
# log out the user
if 'action' in params.keys() and params['action'] == 'logout':
return self.call_netflix_service({'method': 'logout'})
@@
-537,3
+542,9
@@
class Navigation:
data = urllib2.urlopen(full_url).read()
parsed_json = json.loads(data)
return parsed_json.get('result', None)
data = urllib2.urlopen(full_url).read()
parsed_json = json.loads(data)
return parsed_json.get('result', None)
+
+ def open_settings(self, url):
+ """Opens a foreign settings dialog"""
+ is_addon = self.kodi_helper.get_inputstream_addon()
+ url = is_addon if url == 'is' else url
+ return Addon(url).openSettings()
diff --git
a/resources/settings.xml
b/resources/settings.xml
index 386f8dcc1965aae0108ee69995bfdf7346b8a87a..5c0faabbbf55f5f7df888cbdf199ed82daf42a8a 100644
(file)
--- a/
resources/settings.xml
+++ b/
resources/settings.xml
@@
-4,6
+4,7
@@
<setting id="email" type="text" label="30005" default=""/>
<setting id="password" type="text" option="hidden" label="30004" default=""/>
<setting id="logout" type="action" label="30017" action="RunPlugin(plugin://plugin.video.netflix/?action=logout)" option="close"/>
<setting id="email" type="text" label="30005" default=""/>
<setting id="password" type="text" option="hidden" label="30004" default=""/>
<setting id="logout" type="action" label="30017" action="RunPlugin(plugin://plugin.video.netflix/?action=logout)" option="close"/>
+ <setting id="is_settings" type="action" label="30035" action="RunPlugin(plugin://plugin.video.netflix/?mode=openSettings&url=is)" option="close"/>
</category>
<category label="30025">
<setting id="enablelibraryfolder" type="bool" label="30026" default="false"/>
</category>
<category label="30025">
<setting id="enablelibraryfolder" type="bool" label="30026" default="false"/>