watched history, torr2http dialog

pull/1/head
DiMartinoXBMC 2015-12-24 20:18:56 +03:00
parent a5704f7cc3
commit fef0902fdf
3 changed files with 82 additions and 71 deletions

View File

@ -2,12 +2,9 @@
<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="NEW" beforePath="" afterPath="$PROJECT_DIR$/icons/watched.png" />
<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" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Anteoloader.py" afterPath="$PROJECT_DIR$/Anteoloader.py" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/changelog.txt" afterPath="$PROJECT_DIR$/changelog.txt" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Core.py" afterPath="$PROJECT_DIR$/Core.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/Localization.py" afterPath="$PROJECT_DIR$/Localization.py" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/addon.xml" afterPath="$PROJECT_DIR$/addon.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/functions.py" afterPath="$PROJECT_DIR$/functions.py" />
</list> </list>
<ignored path="plugin.video.torrenter.iws" /> <ignored path="plugin.video.torrenter.iws" />
<ignored path=".idea/workspace.xml" /> <ignored path=".idea/workspace.xml" />
@ -37,10 +34,10 @@
<splitter split-orientation="horizontal" split-proportion="0.5145808"> <splitter split-orientation="horizontal" split-proportion="0.5145808">
<split-first> <split-first>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="functions.py" pinned="false" current-in-tab="true"> <file leaf-file-name="functions.py" pinned="false" current-in-tab="false">
<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.5183333"> <state vertical-scroll-proportion="-10.724138">
<caret line="1758" column="13" selection-start-line="1758" selection-start-column="13" selection-end-line="1758" selection-end-column="13" /> <caret line="1758" column="13" selection-start-line="1758" selection-start-column="13" selection-end-line="1758" selection-end-column="13" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -173,6 +170,16 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file leaf-file-name="changelog.txt" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.08108108">
<caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="tmdbs.py" pinned="false" current-in-tab="false"> <file leaf-file-name="tmdbs.py" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/resources/scrapers/tmdbs.py"> <entry file="file://$PROJECT_DIR$/resources/scrapers/tmdbs.py">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
@ -334,8 +341,8 @@
<file leaf-file-name="Core.py" pinned="false" current-in-tab="true"> <file leaf-file-name="Core.py" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Core.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.565"> <state vertical-scroll-proportion="0.67833334">
<caret line="491" column="0" selection-start-line="491" selection-start-column="0" selection-end-line="491" selection-end-column="0" /> <caret line="495" column="0" selection-start-line="495" selection-start-column="0" selection-end-line="495" selection-end-column="0" />
<folding> <folding>
<element signature="e#24#837#1" expanded="false" /> <element signature="e#24#837#1" expanded="false" />
<element signature="e#6151#18116#0" expanded="false" /> <element signature="e#6151#18116#0" expanded="false" />
@ -458,7 +465,6 @@
<option value="$PROJECT_DIR$/../torrenter.searcher.NNMClubRu/addon.xml" /> <option value="$PROJECT_DIR$/../torrenter.searcher.NNMClubRu/addon.xml" />
<option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/addon.xml" /> <option value="$PROJECT_DIR$/../torrenter.searcher.RiperAM/addon.xml" />
<option value="$PROJECT_DIR$/resources/settings.xml" /> <option value="$PROJECT_DIR$/resources/settings.xml" />
<option value="$PROJECT_DIR$/changelog.txt" />
<option value="$PROJECT_DIR$/AceStream.py" /> <option value="$PROJECT_DIR$/AceStream.py" />
<option value="$PROJECT_DIR$/../../myshows.me-kodi-repo/repo/torrenter.searcher.EZTV/EZTV.py" /> <option value="$PROJECT_DIR$/../../myshows.me-kodi-repo/repo/torrenter.searcher.EZTV/EZTV.py" />
<option value="$PROJECT_DIR$/../torrenter.searcher.EZTV/EZTV.py" /> <option value="$PROJECT_DIR$/../torrenter.searcher.EZTV/EZTV.py" />
@ -479,6 +485,7 @@
<option value="$PROJECT_DIR$/Core.py" /> <option value="$PROJECT_DIR$/Core.py" />
<option value="$PROJECT_DIR$/addon.xml" /> <option value="$PROJECT_DIR$/addon.xml" />
<option value="$PROJECT_DIR$/functions.py" /> <option value="$PROJECT_DIR$/functions.py" />
<option value="$PROJECT_DIR$/changelog.txt" />
</list> </list>
</option> </option>
</component> </component>
@ -792,12 +799,6 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<updated>1420801533300</updated> <updated>1420801533300</updated>
</task> </task>
<task id="LOCAL-00117" summary="include btclient">
<created>1438544896770</created>
<option name="number" value="00117" />
<option name="project" value="LOCAL" />
<updated>1438544896770</updated>
</task>
<task id="LOCAL-00118" summary="import optz"> <task id="LOCAL-00118" summary="import optz">
<created>1438545525111</created> <created>1438545525111</created>
<option name="number" value="00118" /> <option name="number" value="00118" />
@ -1086,7 +1087,13 @@
<option name="project" value="LOCAL" /> <option name="project" value="LOCAL" />
<updated>1450884379697</updated> <updated>1450884379697</updated>
</task> </task>
<option name="localTasksCounter" value="166" /> <task id="LOCAL-00166" summary="watched history, torr2http dialog">
<created>1450977459508</created>
<option name="number" value="00166" />
<option name="project" value="LOCAL" />
<updated>1450977459509</updated>
</task>
<option name="localTasksCounter" value="167" />
<servers /> <servers />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
@ -1095,6 +1102,7 @@
<layout> <layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.13277134" 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" show_stripe_button="true" weight="0.13277134" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.32925472" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="true" content_ui="tabs" />
<window_info id="Python Console" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32814237" 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" show_stripe_button="true" weight="0.32814237" 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" show_stripe_button="true" weight="0.26837417" sideWeight="0.5" order="7" 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" show_stripe_button="true" weight="0.26837417" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
@ -1103,7 +1111,6 @@
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" 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" show_stripe_button="true" weight="0.1319149" sideWeight="0.5" order="2" side_tool="true" content_ui="tabs" />
<window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25226244" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.25226244" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
<window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="SLIDING" type="SLIDING" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="0" 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" show_stripe_button="true" 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" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
@ -1127,7 +1134,6 @@
<option name="myLimit" value="2678400000" /> <option name="myLimit" value="2678400000" />
</component> </component>
<component name="VcsManagerConfiguration"> <component name="VcsManagerConfiguration">
<MESSAGE value="kickass fix" />
<MESSAGE value="listen_on fix" /> <MESSAGE value="listen_on fix" />
<MESSAGE value="fix nothing" /> <MESSAGE value="fix nothing" />
<MESSAGE value="RussakHH stable roll-back" /> <MESSAGE value="RussakHH stable roll-back" />
@ -1152,7 +1158,8 @@
<MESSAGE value="ace magnet" /> <MESSAGE value="ace magnet" />
<MESSAGE value="info" /> <MESSAGE value="info" />
<MESSAGE value="log update" /> <MESSAGE value="log update" />
<option name="LAST_COMMIT_MESSAGE" value="log update" /> <MESSAGE value="watched history, torr2http dialog" />
<option name="LAST_COMMIT_MESSAGE" value="watched history, torr2http dialog" />
</component> </component>
<component name="XDebuggerManager"> <component name="XDebuggerManager">
<breakpoint-manager> <breakpoint-manager>
@ -1348,13 +1355,6 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.10608424">
<caret line="4" column="0" selection-start-line="4" selection-start-column="0" selection-end-line="4" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/README.txt"> <entry file="file://$PROJECT_DIR$/README.txt">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.079563186"> <state vertical-scroll-proportion="0.079563186">
@ -1599,52 +1599,9 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.565">
<caret line="491" column="0" selection-start-line="491" selection-start-column="0" selection-end-line="491" selection-end-column="0" />
<folding>
<element signature="e#24#837#1" expanded="false" />
<element signature="e#6151#18116#0" expanded="false" />
<element signature="e#19564#26647#0" expanded="false" />
<element signature="e#26691#30120#0" expanded="false" />
<element signature="e#33280#34507#0" expanded="false" />
<element signature="e#34607#38961#0" expanded="false" />
<element signature="e#39009#41097#0" expanded="false" />
<element signature="e#41139#42869#0" expanded="false" />
<element signature="e#42919#47680#0" expanded="false" />
<element signature="e#47745#54159#0" expanded="false" />
<element signature="e#54223#56733#0" expanded="false" />
<element signature="e#56780#57646#0" expanded="false" />
<element signature="e#57695#59884#0" expanded="false" />
<element signature="e#60041#61400#0" expanded="false" />
<element signature="e#61456#61873#0" expanded="false" />
<element signature="e#61923#62074#0" expanded="false" />
<element signature="e#62126#70775#0" expanded="false" />
<element signature="e#70824#70863#0" expanded="false" />
<element signature="e#70912#71692#0" expanded="false" />
<element signature="e#71742#74228#0" expanded="false" />
<element signature="e#74273#75473#0" expanded="false" />
<element signature="e#75521#77338#0" expanded="false" />
<element signature="e#77383#78255#0" expanded="false" />
<element signature="e#78949#82527#0" expanded="false" />
<element signature="e#83868#83964#0" expanded="false" />
<element signature="e#84025#89351#0" expanded="false" />
<element signature="e#89395#89452#0" expanded="false" />
<element signature="e#89506#92740#0" expanded="false" />
<element signature="e#92795#94430#0" expanded="false" />
<element signature="e#95159#96143#0" expanded="false" />
<element signature="e#96185#96961#0" expanded="false" />
<element signature="e#97003#97098#0" expanded="false" />
<element signature="e#97148#97296#0" expanded="false" />
<element signature="e#97342#97626#0" expanded="false" />
</folding>
</state>
</provider>
</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.5183333"> <state vertical-scroll-proportion="-10.724138">
<caret line="1758" column="13" selection-start-line="1758" selection-start-column="13" selection-end-line="1758" selection-end-column="13" /> <caret line="1758" column="13" selection-start-line="1758" selection-start-column="13" selection-end-line="1758" selection-end-column="13" />
<folding> <folding>
<element signature="e#24#832#1" expanded="false" /> <element signature="e#24#832#1" expanded="false" />
@ -1776,5 +1733,56 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/changelog.txt">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.08108108">
<caret line="3" column="40" selection-start-line="3" selection-start-column="40" selection-end-line="3" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Core.py">
<provider selected="true" editor-type-id="text-editor">
<state vertical-scroll-proportion="0.67833334">
<caret line="495" column="0" selection-start-line="495" selection-start-column="0" selection-end-line="495" selection-end-column="0" />
<folding>
<element signature="e#24#837#1" expanded="false" />
<element signature="e#6151#18116#0" expanded="false" />
<element signature="e#19564#26647#0" expanded="false" />
<element signature="e#26691#30120#0" expanded="false" />
<element signature="e#33280#34507#0" expanded="false" />
<element signature="e#34607#38961#0" expanded="false" />
<element signature="e#39009#41097#0" expanded="false" />
<element signature="e#41139#42869#0" expanded="false" />
<element signature="e#42919#47680#0" expanded="false" />
<element signature="e#47745#54159#0" expanded="false" />
<element signature="e#54223#56733#0" expanded="false" />
<element signature="e#56780#57646#0" expanded="false" />
<element signature="e#57695#59884#0" expanded="false" />
<element signature="e#60041#61400#0" expanded="false" />
<element signature="e#61456#61873#0" expanded="false" />
<element signature="e#61923#62074#0" expanded="false" />
<element signature="e#62126#70775#0" expanded="false" />
<element signature="e#70824#70863#0" expanded="false" />
<element signature="e#70912#71692#0" expanded="false" />
<element signature="e#71742#74228#0" expanded="false" />
<element signature="e#74273#75473#0" expanded="false" />
<element signature="e#75521#77338#0" expanded="false" />
<element signature="e#77383#78255#0" expanded="false" />
<element signature="e#78949#82527#0" expanded="false" />
<element signature="e#83868#83964#0" expanded="false" />
<element signature="e#84025#89351#0" expanded="false" />
<element signature="e#89395#89452#0" expanded="false" />
<element signature="e#89506#92740#0" expanded="false" />
<element signature="e#92795#94430#0" expanded="false" />
<element signature="e#95159#96143#0" expanded="false" />
<element signature="e#96185#96961#0" expanded="false" />
<element signature="e#97003#97098#0" expanded="false" />
<element signature="e#97148#97296#0" expanded="false" />
<element signature="e#97342#97626#0" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>

View File

@ -1,5 +1,8 @@
English changelog at http://bit.ly/1MfSVUP English changelog at http://bit.ly/1MfSVUP
[B]Version 2.4.2[/B]
[+] Добавлена функция История Просмотров
[B]Version 2.4.1[/B] [B]Version 2.4.1[/B]
[+] Плеер Torrent2HTTP от anteo теперь по-умолчанию для новых пользователей [+] Плеер Torrent2HTTP от anteo теперь по-умолчанию для новых пользователей

BIN
icons/watched.png 100644

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB