add FileList component for browsing files and directories

diff --git a/configure.ac b/configure.ac
index a985afd..d9776ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -46,6 +46,7 @@ data/Makefile
 data/fonts/Makefile
 data/countries/Makefile
 data/defaults/Makefile
+data/extensions/Makefile
 lib/Makefile
 lib/actions/Makefile
 lib/base/Makefile

diff --git a/data/Makefile.am b/data/Makefile.am
index 5dd9da7..c866eac 100644 (file)
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 AUTOMAKE_OPTIONS = gnu
 
-SUBDIRS = countries fonts defaults
+SUBDIRS = countries fonts defaults extensions
 
 installdir = $(DATADIR)/enigma2
 

diff --git a/data/extensions/Makefile.am b/data/extensions/Makefile.am
new file mode 100644 (file)
index 0000000..e1663dd
--- /dev/null
+++ b/data/extensions/Makefile.am
@@ -0,0 +1,6 @@
+AUTOMAKE_OPTIONS = gnu
+
+installdir = $(DATADIR)/enigma2/extensions
+
+install_DATA = \
+       *.png

diff --git a/data/extensions/directory.png b/data/extensions/directory.png
new file mode 100644 (file)
index 0000000..eb561c7
Binary files /dev/null and b/data/extensions/directory.png differ

diff --git a/lib/python/Components/FileList.py b/lib/python/Components/FileList.py
new file mode 100644 (file)
index 0000000..a6b5bf2
--- /dev/null
+++ b/lib/python/Components/FileList.py
@@ -0,0 +1,64 @@
+from HTMLComponent import *
+from GUIComponent import *
+
+from MenuList import MenuList
+
+from Tools.Directories import *
+
+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
+
+def FileEntryComponent(name, absolute, isDir = False):
+       res = [ (absolute, isDir) ]
+       res.append((eListboxPythonMultiContent.TYPE_TEXT, 35, 1, 200, 20, 0, RT_HALIGN_LEFT ,name))
+       if isDir:
+               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/directory.png"))
+       else:
+               # FIXME: detect file extensions correctly
+               png = loadPNG(resolveFilename(SCOPE_SKIN_IMAGE, "/extensions/" + name[-3:] + ".png"))
+       if png is not None:
+               res.append((eListboxPythonMultiContent.TYPE_PIXMAP_ALPHATEST, 10, 2, 20, 20, png))
+       
+       return res
+
+class FileList(HTMLComponent, GUIComponent, MenuList):
+       def __init__(self, directory, showDirectories = True, showFiles = True):
+               GUIComponent.__init__(self)
+               self.l = eListboxPythonMultiContent()
+
+               self.showDirectories = showDirectories
+               self.showFiles = showFiles
+               self.changeDir(directory)
+
+               self.l.setFont(0, gFont("Regular", 18))
+               
+       def getSelection(self):
+               return self.l.getCurrentSelection()[0]
+       
+       def changeDir(self, directory):
+               self.list = []
+               
+               directories = os.listdir(directory)
+               
+               if directory != "/" and self.showDirectories:
+                       self.list.append(FileEntryComponent(name = "..", absolute = '/'.join(directory.split('/')[:-2]) + '/', isDir = True))
+               for x in directories:
+                       if os.path.isdir(directory + x):
+                               if self.showDirectories:
+                                       self.list.append(FileEntryComponent(name = x, absolute = directory + x + "/" , isDir = True))
+                       elif self.showFiles:
+                                       self.list.append(FileEntryComponent(name = x, absolute = directory + x , isDir = False))
+               self.l.setList(self.list)
+                               
+       def GUIcreate(self, parent):
+               self.instance = eListbox(parent)
+               self.instance.setContent(self.l)
+               self.instance.setItemHeight(23)
\ No newline at end of file

diff --git a/lib/python/Components/Makefile.am b/lib/python/Components/Makefile.am
index 7416ea3..14eb23c 100644 (file)
--- a/lib/python/Components/Makefile.am
+++ b/lib/python/Components/Makefile.am
@@ -12,5 +12,5 @@ install_PYTHON = \
        EpgList.py ScrollLabel.py Timezones.py Language.py HelpMenuList.py \
        BlinkingPixmap.py Pixmap.py ConditionalWidget.py Slider.py LanguageList.py \
        PluginList.py PluginComponent.py RecordingConfig.py About.py UsageConfig.py \
-       FIFOList.py ServiceEventTracker.py Input.py TimerSanityCheck.py
+       FIFOList.py ServiceEventTracker.py Input.py TimerSanityCheck.py FileList.py
 

diff --git a/lib/python/Components/__init__.py b/lib/python/Components/__init__.py
index 38be156..c006cba 100644 (file)
--- a/lib/python/Components/__init__.py
+++ b/lib/python/Components/__init__.py
@@ -6,4 +6,5 @@ __all__ = ["ActionMap", "Button", "Clock", "ConfigList", "EventInfo",
        "components", "config", "TimerList", "TimeInput", "MovieList", 
        "InputDevice",  "ServicePosition", "IPAddress", "VariableIP", "IPGateway",
        "IPNameserver", "Network", "RFmon", "DiskInfo", "NimManager", "TimerEntry",
-       "Lcd", "EpgList" "ScrollLabel", "Timezones", "HelpMenuList", "TimerSanityCheck"]
+       "Lcd", "EpgList" "ScrollLabel", "Timezones", "HelpMenuList", "TimerSanityCheck",
+       "FileList" ]

diff --git a/lib/python/Plugins/test/plugin.py b/lib/python/Plugins/test/plugin.py
index 1500dd8..0a37533 100644 (file)
--- a/lib/python/Plugins/test/plugin.py
+++ b/lib/python/Plugins/test/plugin.py
@@ -5,6 +5,7 @@ from Components.ActionMap import NumberActionMap
 from Components.Label import Label
 from Components.Input import Input
 from Components.GUIComponent import *
+from Components.FileList import FileEntryComponent, FileList
 from Plugins.Plugin import PluginDescriptor
 
 import os
@@ -12,21 +13,23 @@ import os
 class Test(Screen):
        skin = """
                <screen position="100,100" size="550,400" title="Test" >
-                       <widget name="text" position="0,0" size="550,25" font="Regular;20" />
+                       <!--widget name="text" position="0,0" size="550,25" font="Regular;20" /-->
+                       <widget name="list" position="10,0" size="190,250" scrollbarMode="showOnDemand" />
                </screen>"""
-               
        def __init__(self, session, args = None):
                self.skin = Test.skin
                Screen.__init__(self, session)
 
-               self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
+               self["list"] = FileList("/")
+
+               #self["text"] = Input("1234", maxSize=True, type=Input.NUMBER)
                                
-               self["actions"] = NumberActionMap(["WizardActions", "InputActions"], 
+               self["actions"] = NumberActionMap(["WizardActions", "InputActions"],
                {
-                       "ok": self.close,
+                       "ok": self.ok,
                        "back": self.close,
-                       "left": self.keyLeft,
-                       "right": self.keyRight,
+#                      "left": self.keyLeft,
+#                      "right": self.keyRight,
                        "1": self.keyNumberGlobal,
                        "2": self.keyNumberGlobal,
                        "3": self.keyNumberGlobal,
@@ -45,6 +48,11 @@ class Test(Screen):
        def keyRight(self):
                self["text"].right()
        
+       def ok(self):
+               selection = self["list"].getSelection()
+               if selection[1] == True: # isDir
+                       self["list"].changeDir(selection[0])
+       
        def keyNumberGlobal(self, number):
                print "pressed", number
                self["text"].number(number)