projects
/
vuplus_dvbapp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bug_672_removed_pvr_device' into experimental
[vuplus_dvbapp]
/
lib
/
python
/
Screens
/
MovieSelection.py
diff --git
a/lib/python/Screens/MovieSelection.py
b/lib/python/Screens/MovieSelection.py
index
174a4f0
..
0468f8a
100644
(file)
--- a/
lib/python/Screens/MovieSelection.py
+++ b/
lib/python/Screens/MovieSelection.py
@@
-7,8
+7,9
@@
from Components.DiskInfo import DiskInfo
from Components.Pixmap import Pixmap
from Components.Label import Label
from Components.PluginComponent import plugins
from Components.Pixmap import Pixmap
from Components.Label import Label
from Components.PluginComponent import plugins
-from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations
+from Components.config import config, ConfigSubsection, ConfigText, ConfigInteger, ConfigLocations
, ConfigSet
from Components.Sources.ServiceEvent import ServiceEvent
from Components.Sources.ServiceEvent import ServiceEvent
+from Components.UsageConfig import defaultMoviePath
from Plugins.Plugin import PluginDescriptor
from Plugins.Plugin import PluginDescriptor
@@
-31,6
+32,7
@@
config.movielist.last_timer_videodir = ConfigText(default=resolveFilename(SCOPE_
config.movielist.videodirs = ConfigLocations(default=[resolveFilename(SCOPE_HDD)])
config.movielist.first_tags = ConfigText(default="")
config.movielist.second_tags = ConfigText(default="")
config.movielist.videodirs = ConfigLocations(default=[resolveFilename(SCOPE_HDD)])
config.movielist.first_tags = ConfigText(default="")
config.movielist.second_tags = ConfigText(default="")
+config.movielist.last_selected_tags = ConfigSet([], default=[])
def setPreferredTagEditor(te):
def setPreferredTagEditor(te):
@@
-168,7
+170,10
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
HelpableScreen.__init__(self)
self.tags = [ ]
HelpableScreen.__init__(self)
self.tags = [ ]
- self.selected_tags = None
+ if selectedmovie:
+ self.selected_tags = config.movielist.last_selected_tags.value
+ else:
+ self.selected_tags = None
self.selected_tags_ele = None
self.movemode = False
self.selected_tags_ele = None
self.movemode = False
@@
-183,8
+188,8
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
self["DescriptionBorder"] = Pixmap()
self["DescriptionBorder"].hide()
self["DescriptionBorder"] = Pixmap()
self["DescriptionBorder"].hide()
- if not
path
Exists(config.movielist.last_videodir.value):
- config.movielist.last_videodir.value =
resolveFilename(SCOPE_HDD
)
+ if not
file
Exists(config.movielist.last_videodir.value):
+ config.movielist.last_videodir.value =
defaultMoviePath(
)
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + config.movielist.last_videodir.value)
@@
-292,6
+297,7
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
self.close(None)
def saveconfig(self):
self.close(None)
def saveconfig(self):
+ config.movielist.last_selected_tags.value = self.selected_tags
config.movielist.moviesort.save()
config.movielist.listtype.save()
config.movielist.description.save()
config.movielist.moviesort.save()
config.movielist.listtype.save()
config.movielist.description.save()
@@
-339,8
+345,8
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
self["list"].setSortType(type)
def reloadList(self, sel = None, home = False):
self["list"].setSortType(type)
def reloadList(self, sel = None, home = False):
- if not
path
Exists(config.movielist.last_videodir.value):
- path =
resolveFilename(SCOPE_HDD
)
+ if not
file
Exists(config.movielist.last_videodir.value):
+ path =
defaultMoviePath(
)
config.movielist.last_videodir.value = path
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path)
config.movielist.last_videodir.value = path
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + path)
@@
-370,7
+376,7
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
def gotFilename(self, res):
if res is not None and res is not config.movielist.last_videodir.value:
def gotFilename(self, res):
if res is not None and res is not config.movielist.last_videodir.value:
- if
path
Exists(res):
+ if
file
Exists(res):
config.movielist.last_videodir.value = res
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res)
config.movielist.last_videodir.value = res
config.movielist.last_videodir.save()
self.current_ref = eServiceReference("2:0:1:0:0:0:0:0:0:0:" + res)
@@
-392,7
+398,7
@@
class MovieSelection(Screen, HelpableScreen, SelectionEventInfo):
def showTagsN(self, tagele):
if not self.tags:
self.showTagWarning()
def showTagsN(self, tagele):
if not self.tags:
self.showTagWarning()
- elif not tagele or
self.selected_tags_ele == tagele
or not tagele.value in self.tags:
+ elif not tagele or
(self.selected_tags and tagele.value in self.selected_tags)
or not tagele.value in self.tags:
self.showTagsMenu(tagele)
else:
self.selected_tags_ele = tagele
self.showTagsMenu(tagele)
else:
self.selected_tags_ele = tagele