kodi 15 fix

pull/1/head
DiMartinoXBMC 2015-07-12 10:29:50 +03:00
parent ea10d7334c
commit 343dc097e3
2 changed files with 43 additions and 37 deletions

View File

@ -2,13 +2,7 @@
<project version="4"> <project version="4">
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment=""> <list default="true" id="56e91349-2444-4553-bc78-90c2bab49e9c" name="Default" comment="">
<change type="DELETED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\platform_pulsar.py" afterPath="" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/controlcenter.py" afterPath="$PROJECT_DIR$/controlcenter.py" />
<change type="MOVED" beforePath="C:\Users\Admin\AppData\Roaming\Kodi\addons\plugin.video.torrenter\resources\searchers\RuTrackerOrg.py" afterPath="$PROJECT_DIR$/resources/searchers/unused/RuTrackerOrg.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Libtorrent.py" afterPath="$PROJECT_DIR$/Libtorrent.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
@ -51,10 +45,20 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="true"> <file leaf-file-name="controlcenter.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/controlcenter.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5363322">
<caret line="395" column="0" selection-start-line="395" selection-start-column="0" selection-end-line="395" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Libtorrent.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7352941"> <state vertical-scroll-proportion="0.0">
<caret line="45" column="24" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="24" /> <caret line="45" column="24" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="24" />
<folding> <folding>
<element signature="e#852#865#0" expanded="true" /> <element signature="e#852#865#0" expanded="true" />
@ -107,7 +111,7 @@
<file leaf-file-name="functions.py" pinned="false" current-in-tab="true"> <file leaf-file-name="functions.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.4117647"> <state vertical-scroll-proportion="0.93079585">
<caret line="1770" column="55" selection-start-line="1770" selection-start-column="55" selection-end-line="1770" selection-end-column="55" /> <caret line="1770" column="55" selection-start-line="1770" selection-start-column="55" selection-end-line="1770" selection-end-column="55" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -314,7 +318,6 @@
<option value="$PROJECT_DIR$/resources/searchers/RuTorOrg.py" /> <option value="$PROJECT_DIR$/resources/searchers/RuTorOrg.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RuTrackerOrg/RuTrackerOrg.py" /> <option value="$PROJECT_DIR$/../torrenter.searcher.RuTrackerOrg/RuTrackerOrg.py" />
<option value="$PROJECT_DIR$/resources/searchers/ThePirateBaySe.py" /> <option value="$PROJECT_DIR$/resources/searchers/ThePirateBaySe.py" />
<option value="$PROJECT_DIR$/controlcenter.py" />
<option value="$PROJECT_DIR$/resources/searchers/TFileME.py" /> <option value="$PROJECT_DIR$/resources/searchers/TFileME.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.TFileME/addon.xml" /> <option value="$PROJECT_DIR$/../torrenter.searcher.TFileME/addon.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.TFileME/RuTrackerOrg.py" /> <option value="$PROJECT_DIR$/../torrenter.searcher.TFileME/RuTrackerOrg.py" />
@ -334,6 +337,7 @@
<option value="$PROJECT_DIR$/functions.py" /> <option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/Core.py" /> <option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/Libtorrent.py" /> <option value="$PROJECT_DIR$/Libtorrent.py" />
<option value="$PROJECT_DIR$/controlcenter.py" />
</list> </list>
</option> </option>
</component> </component>
@ -369,6 +373,7 @@
</navigator> </navigator>
<panes> <panes>
<pane id="Scope" /> <pane id="Scope" />
<pane id="Scratches" />
<pane id="ProjectPane"> <pane id="ProjectPane">
<subPane> <subPane>
<PATH> <PATH>
@ -443,7 +448,6 @@
</PATH> </PATH>
</subPane> </subPane>
</pane> </pane>
<pane id="Scratches" />
</panes> </panes>
</component> </component>
<component name="PropertiesComponent"> <component name="PropertiesComponent">
@ -626,12 +630,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00033" summary="myshows fix">
<created>1422468152950</created>
<option name="number" value="00033" />
<option name="project" value="LOCAL" />
<updated>1422468152950</updated>
</task>
<task id="LOCAL-00034" summary="sort"> <task id="LOCAL-00034" summary="sort">
<created>1422474825684</created> <created>1422474825684</created>
<option name="number" value="00034" /> <option name="number" value="00034" />
@ -920,7 +918,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1436608713301</updated> <updated>1436608713301</updated>
</task> </task>
<option name="localTasksCounter" value="82" /> <task id="LOCAL-00082" summary="android support in script.module.libtorrent">
<created>1436655689608</created>
<option name="number" value="00082" />
<option name="project" value="LOCAL" />
<updated>1436655689608</updated>
</task>
<option name="localTasksCounter" value="83" />
<servers /> <servers />
</component> </component>
<component name="TodoView" selected-index="0"> <component name="TodoView" selected-index="0">
@ -945,14 +949,14 @@
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="1" y="0" width="1918" height="1040" extended-state="0" /> <frame x="1" y="0" width="1918" height="1040" extended-state="0" />
<editor active="false" /> <editor active="true" />
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1319149" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" /> <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1319149" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Application Servers" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295583" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" /> <window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3295583" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31447965" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.31447965" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32842582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32842582" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" /> <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
@ -1323,13 +1327,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/controlcenter.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.24185249">
<caret line="385" column="0" selection-start-line="385" selection-start-column="0" selection-end-line="385" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/../torrenter.searcher.TFileME/addon.xml"> <entry file="file://$PROJECT_DIR$/../torrenter.searcher.TFileME/addon.xml">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.35416666"> <state vertical-scroll-proportion="0.35416666">
@ -1508,23 +1505,22 @@
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" /> <caret line="0" column="0" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Core.py"> <entry file="file://$PROJECT_DIR$/Libtorrent.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.0"> <state vertical-scroll-proportion="0.0">
<caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="40" /> <caret line="45" column="24" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="24" />
<folding> <folding>
<element signature="e#24#836#1" expanded="false" /> <element signature="e#852#865#0" expanded="true" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/functions.py"> <entry file="file://$PROJECT_DIR$/functions.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.4117647"> <state vertical-scroll-proportion="0.93079585">
<caret line="1770" column="55" selection-start-line="1770" selection-start-column="55" selection-end-line="1770" selection-end-column="55" /> <caret line="1770" column="55" selection-start-line="1770" selection-start-column="55" selection-end-line="1770" selection-end-column="55" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -1667,15 +1663,23 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Libtorrent.py"> <entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.7352941"> <state vertical-scroll-proportion="0.0">
<caret line="45" column="24" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="24" /> <caret line="34" column="0" selection-start-line="34" selection-start-column="0" selection-end-line="34" selection-end-column="40" />
<folding> <folding>
<element signature="e#852#865#0" expanded="true" /> <element signature="e#24#836#1" expanded="false" />
</folding> </folding>
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/controlcenter.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.5363322">
<caret line="395" column="0" selection-start-line="395" selection-start-column="0" selection-end-line="395" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
</component> </component>
</project> </project>

View File

@ -385,10 +385,12 @@ class ControlCenter(AddonDialogWindow):
xbmcgui.Dialog().ok(__language__(30415), slist) xbmcgui.Dialog().ok(__language__(30415), slist)
def installSearcher(self): def installSearcher(self):
xbmc.executebuiltin('Dialog.Close(all,true)')
xbmc.executebuiltin('XBMC.ActivateWindow(Addonbrowser,addons://search/%s)' % ('Torrenter Searcher')) xbmc.executebuiltin('XBMC.ActivateWindow(Addonbrowser,addons://search/%s)' % ('Torrenter Searcher'))
self.close() self.close()
def openUtorrent(self): def openUtorrent(self):
xbmc.executebuiltin('Dialog.Close(all,true)')
xbmc.executebuiltin('ActivateWindow(Videos,plugin://plugin.video.torrenter/?action=uTorrentBrowser)') xbmc.executebuiltin('ActivateWindow(Videos,plugin://plugin.video.torrenter/?action=uTorrentBrowser)')
self.close() self.close()