diff --git a/resources/skins/Default/720p/movieinfo.xml b/resources/skins/Default/720p/movieinfo.xml
deleted file mode 100644
index 27494b1..0000000
--- a/resources/skins/Default/720p/movieinfo.xml
+++ /dev/null
@@ -1,218 +0,0 @@
-
-
- 1
- 240
- 20
-
- dialogeffect
-
-
- WindowOpen
- WindowClose
-
- background image
- 0
- 0
- 800
- 680
- ConfluenceDialogBack.png
-
-
- Dialog Header image
- 40
- 16
- 720
- 40
- Confluencedialogheader.png
-
-
- header label
- 40
- 20
- 720
- 30
- font13_title
-
- center
- center
- selected
- black
-
-
-
- Close Window button
- 710
- 15
- 64
- 32
-
- -
- PreviousMenu
- ConfluenceDialogCloseButton-focus.png
- ConfluenceDialogCloseButton.png
- 10
- 10
- 10
- 10
- system.getbool(input.enablemouse)
-
-
-
- 760
- 100
- 25
- 495
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 30
- 131
- true
- IntegerGreaterThan(Container(32).NumPages,1)
- vertical
-
-
-
- Dialog Header image
- 33
- 85
- 104
- 149
-
-
-
-
- rating
- 34
- 240
- 102
- 20
- true
- left
- center
- false
-
- false
- font10
- white
- black
- false
-
-
-
- rating
- 34
- 260
- 102
- 20
- true
- left
- center
- false
-
- false
- font10
- white
- black
- false
-
-
-
- kinopoisk
- 34
- 292
- 102
- 38
-
-
-
-
- filepath
- 180
- 70
- 550
- 60
- 470
- left
- top
- font18
- Нет описания
- center
- center
- white
- black
- true
-
-
- 615
- 50
-
-
- close
- 350
- 0
- 320
- 40
- center
- center
- font12_title
-
- 33
- 60
- 30
- 30
-
-
-
- play
- 20
- -50
- 320
- 40
- center
- center
- font12_title
-
- 60
- 30
- 33
- 33
-
-
-
- libtorrent
- 350
- -50
- 320
- 40
- center
- center
- font12_title
-
- 131
- 60
- 22
- 22
-
-
-
- tclient
- 20
- 0
- 320
- 40
- center
- center
- font12_title
-
- 22
- 22
- 131
- 131
-
-
-
-
-
diff --git a/resources/skins/Default/720p/reviews.xml b/resources/skins/Default/720p/reviews.xml
deleted file mode 100644
index ccc51dc..0000000
--- a/resources/skins/Default/720p/reviews.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-
-
- 1
- 240
- 20
-
- dialogeffect
-
-
- WindowOpen
- WindowClose
-
- background image
- 0
- 0
- 800
- 680
- DialogBack.png
-
-
- Dialog Header image
- 40
- 16
- 720
- 40
- dialogheader.png
-
-
- header label
- 40
- 20
- 720
- 30
- font13_title
-
- center
- center
- selected
- black
-
-
-
- Close Window button
- 710
- 15
- 64
- 32
-
- -
- PreviousMenu
- DialogCloseButton-focus.png
- DialogCloseButton.png
- 10
- 10
- 10
- 10
- system.getbool(input.enablemouse)
-
-
-
- 760
- 100
- 25
- 495
- ScrollBarV.png
- ScrollBarV_bar.png
- ScrollBarV_bar_focus.png
- ScrollBarNib.png
- ScrollBarNib.png
- 22
- 22
- true
- IntegerGreaterThan(Container(32).NumPages,1)
- vertical
-
-
-
- Dialog Header image
- 33
- 85
- 104
- 149
-
-
-
-
-
- filepath
- 60
- 70
- 690
- 60
- 530
- left
- top
- font12
- Нет отзывов
- center
- center
- white
- black
- true
-
-
- 615
- 50
-
-
- close
- 20
- 0
- 650
- 40
- center
- center
- font12_title
-
- 60
- 60
- 60
- 60
-
-
-
-
-
-
diff --git a/resources/skins/Default/media/ConfluenceDialogBack.png b/resources/skins/Default/media/ConfluenceDialogBack.png
deleted file mode 100644
index 812801a..0000000
Binary files a/resources/skins/Default/media/ConfluenceDialogBack.png and /dev/null differ
diff --git a/resources/skins/Default/media/ConfluenceDialogCloseButton-focus.png b/resources/skins/Default/media/ConfluenceDialogCloseButton-focus.png
deleted file mode 100644
index fdde65c..0000000
Binary files a/resources/skins/Default/media/ConfluenceDialogCloseButton-focus.png and /dev/null differ
diff --git a/resources/skins/Default/media/ConfluenceDialogCloseButton.png b/resources/skins/Default/media/ConfluenceDialogCloseButton.png
deleted file mode 100644
index 7f5d105..0000000
Binary files a/resources/skins/Default/media/ConfluenceDialogCloseButton.png and /dev/null differ
diff --git a/resources/skins/Default/media/Confluencedialogheader.png b/resources/skins/Default/media/Confluencedialogheader.png
deleted file mode 100644
index af7ba85..0000000
Binary files a/resources/skins/Default/media/Confluencedialogheader.png and /dev/null differ
diff --git a/resources/skins/DialogReviews.py b/resources/skins/DialogReviews.py
deleted file mode 100644
index 959f46d..0000000
--- a/resources/skins/DialogReviews.py
+++ /dev/null
@@ -1,63 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import re
-import htmlentitydefs
-
-import xbmcgui
-
-pattern = re.compile("&(\w+?);")
-
-def html_entity_decode_char(m, defs=htmlentitydefs.entitydefs):
- try:
- return defs[m.group(1)]
- except KeyError:
- return m.group(0)
-
-def html_entity_decode(string):
- return pattern.sub(html_entity_decode_char, string)
-
-KEY_BUTTON_BACK = 275
-KEY_KEYBOARD_ESC = 61467
-ACTION_PREVIOUS_MENU = 10
-ACTION_NAV_BACK = 92
-class DialogReviews(xbmcgui.WindowXMLDialog):
- def onInit(self):
- print "DialogReviews(): Window Initialized"
- self.reviews_box = self.getControl(32)
- self.reviews_box.setText(self.get_reviews())
-
- self.setFocus(self.getControl(22))
-
- def onAction(self, action):
- buttonCode = action.getButtonCode()
- if (action == ACTION_NAV_BACK or action == ACTION_PREVIOUS_MENU):
- self.close()
- if (buttonCode == KEY_BUTTON_BACK or buttonCode == KEY_KEYBOARD_ESC):
- self.close()
-
- def onClick(self, controlID):
- if (controlID == 2 or controlID == 22):
- self.close()
-
-
- def onFocus(self, controlID):
- #print "onFocus(): control %i" % controlID
- pass
-
-
- def doModal(self, movieHtml):
- self.movieHtml = movieHtml
- xbmcgui.WindowXMLDialog.doModal(self)
-
-
- def get_reviews(self):
- reviews_texts = re.compile('',re.S).findall(self.movieHtml)
- reviews_autors = re.compile('',re.S).findall(self.movieHtml)
- reviews_dates = re.compile('([^<]+)
',re.S).findall(self.movieHtml)
- texts = ''
- i = 0
- for text in reviews_texts:
- texts = texts+"\n[B][COLOR purple]"+reviews_autors[i]+"[/COLOR][/B] [I]"+reviews_dates[i]+"[/I]\n"
- texts = texts+html_entity_decode(text)+"\n"
- i = i + 1
- return texts
diff --git a/resources/skins/DialogXml.py b/resources/skins/DialogXml.py
deleted file mode 100644
index ad29c21..0000000
--- a/resources/skins/DialogXml.py
+++ /dev/null
@@ -1,83 +0,0 @@
-# -*- coding: utf-8 -*-
-import sys
-
-import xbmcgui
-import Localization
-import xbmc
-
-KEY_BUTTON_BACK = 275
-KEY_KEYBOARD_ESC = 61467
-ACTION_PREVIOUS_MENU = 10
-ACTION_NAV_BACK = 92
-
-
-class DialogXml(xbmcgui.WindowXMLDialog):
- def onInit(self):
- print "onInit(): Window Initialized"
- localize = Localization.localize
- color = '[COLOR %s]%s[/COLOR]'
- self.movie_label = self.getControl(32)
- self.movie_label.setText(self.movieInfo['desc'])
-
- if self.movieInfo.get('views'):
- self.view_label = self.getControl(34)
- self.view_label.setLabel(color % ('blue', localize('Views:')) + self.movieInfo['views'])
-
- self.view_label = self.getControl(35)
- self.ratingcolor = 'green'
- self.ratingint = int(self.movieInfo['rating'])
- if (self.ratingint < 70):
- self.ratingcolor = 'red'
- self.view_label.setLabel(
- color % ('blue', localize('Rating:')) + color % (self.ratingcolor, self.movieInfo['rating']))
-
- self.movie_label = self.getControl(1)
- self.movie_label.setLabel(self.movieInfo['title'])
-
- self.movie_label = self.getControl(32)
- self.movie_label.setText(self.movieInfo['desc'])
-
- self.poster = self.getControl(31)
- self.poster.setImage(self.movieInfo['poster'])
-
- self.poster = self.getControl(36)
- self.poster.setImage(self.movieInfo['kinopoisk'])
- self.getControl(22).setLabel(localize('Close'))
- self.getControl(33).setLabel(localize('Download via T-client'))
- self.getControl(30).setLabel(localize('Download via Libtorrent'))
- self.getControl(131).setLabel(localize('Play'))
-
- self.setFocus(self.getControl(22))
-
- def onAction(self, action):
- buttonCode = action.getButtonCode()
- if (action == ACTION_NAV_BACK or action == ACTION_PREVIOUS_MENU):
- self.close()
- if (buttonCode == KEY_BUTTON_BACK or buttonCode == KEY_KEYBOARD_ESC):
- self.close()
-
- def onClick(self, controlID):
- if (controlID == 2 or controlID == 22):
- self.close()
- if (controlID == 30):
- self.RunPlugin('downloadLibtorrent')
- if (controlID == 33):
- self.RunPlugin('downloadFilesList')
- if (controlID == 131):
- self.RunPlugin('openTorrent&external=1')
-
- def RunPlugin(self, action):
- if self.link:
- exec_str = 'XBMC.RunPlugin(%s)' % \
- ('%s?action=%s&url=%s') % \
- (sys.argv[0], action, self.link)
- xbmc.executebuiltin(exec_str)
-
- def onFocus(self, controlID):
- # print "onFocus(): control %i" % controlID
- pass
-
- def doModal(self, movieInfo, url):
- self.movieInfo = movieInfo
- self.link = url
- xbmcgui.WindowXMLDialog.doModal(self)
diff --git a/resources/skins/__init__.py b/resources/skins/__init__.py
deleted file mode 100644
index e69de29..0000000
diff --git a/searchwindow.py b/searchwindow.py
index c9e7207..a9a8c64 100644
--- a/searchwindow.py
+++ b/searchwindow.py
@@ -99,7 +99,8 @@ class SearchWindow(pyxbmct.AddonDialogWindow):
'last_query': None,
'last_link': None,
'last_filename': None,
- 'route': [{'mode': 'close', 'params': {}, 'last_listing_item': 0}]
+ 'route': [{'mode': 'close', 'params': {}, 'last_listing_item': 0},
+ {"last_listing_item": 0, "params": {}, "mode": "history"}]
}
def set_controls(self):