git.cweiske.de
/
enigma2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
send write error messages down to service events
[enigma2.git]
/
lib
/
python
/
Components
/
FileList.py
diff --git
a/lib/python/Components/FileList.py
b/lib/python/Components/FileList.py
index 7621ccb0dd9352469ff8dd28cc5923d352d003c6..01358d532fc0b51222e69cd98bdd2af953ea4fb4 100644
(file)
--- a/
lib/python/Components/FileList.py
+++ b/
lib/python/Components/FileList.py
@@
-2,21
+2,14
@@
from HTMLComponent import *
from GUIComponent import *
import re
from GUIComponent import *
import re
+from os import path as os_path, listdir
from MenuList import MenuList
from Components.Harddisk import harddiskmanager
from MenuList import MenuList
from Components.Harddisk import harddiskmanager
-from Tools.Directories import
*
+from Tools.Directories import
SCOPE_SKIN_IMAGE, resolveFilename
-from enigma import *
-
-RT_HALIGN_LEFT = 0
-RT_HALIGN_RIGHT = 1
-RT_HALIGN_CENTER = 2
-RT_HALIGN_BLOCK = 4
-
-RT_VALIGN_TOP = 0
-RT_VALIGN_CENTER = 8
-RT_VALIGN_BOTTOM = 16
+from enigma import RT_HALIGN_LEFT, loadPNG, eListbox, eListboxPythonMultiContent, \
+ eServiceReference, eServiceCenter, gFont
EXTENSIONS = {
"mp3": "music",
EXTENSIONS = {
"mp3": "music",
@@
-65,7
+58,8
@@
class FileList(MenuList, HTMLComponent, GUIComponent):
self.changeDir(directory)
self.l.setFont(0, gFont("Regular", 18))
self.changeDir(directory)
self.l.setFont(0, gFont("Regular", 18))
-
+ self.l.setItemHeight(23)
+
def getSelection(self):
if self.l.getCurrentSelection() is None:
return None
def getSelection(self):
if self.l.getCurrentSelection() is None:
return None
@@
-111,11
+105,11
@@
class FileList(MenuList, HTMLComponent, GUIComponent):
directories.sort()
files.sort()
else:
directories.sort()
files.sort()
else:
- files =
os.
listdir(directory)
+ files = listdir(directory)
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
files.sort()
tmpfiles = files[:]
for x in tmpfiles:
- if os
.
path.isdir(directory + x):
+ if os
_
path.isdir(directory + x):
directories.append(directory + x + "/")
files.remove(x)
directories.append(directory + x + "/")
files.remove(x)
@@
-193,4
+187,3
@@
class FileList(MenuList, HTMLComponent, GUIComponent):
def postWidgetCreate(self, instance):
instance.setContent(self.l)
def postWidgetCreate(self, instance):
instance.setContent(self.l)
- instance.setItemHeight(23)