- fixed lib/Makefile.am for "components" directory

 - hopefully simplified components

3 files changed, 6 insertions, 6 deletions

diff --git a/lib/Makefile.am b/lib/Makefile.am
index a09b9bc1..72efc401 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1 +1 @@
-SUBDIRS = base dvb dvb_si gdi network service driver nav gui python
+SUBDIRS = base dvb dvb_si gdi network service driver nav gui python components
diff --git a/mytest.py b/mytest.py
index 2f6cecfd..4712ba11 100644
--- a/mytest.py
+++ b/mytest.py
@@ -101,16 +101,16 @@ class Session:
 	def keyEvent(self, code):
 #		print "code " + str(code)
 		if code == 32:
-			self.currentDialog.data["okbutton"]["instance"].push()
+			self.currentDialog["okbutton"].instance.push()
 
 		if code == 33:
-			self.currentDialog.data["channelSwitcher"]["instance"].push()
+			self.currentDialog["channelSwitcher"].instance.push()
 		
 		if code >= 0x30 and code <= 0x39:
 			try:
-				self.currentDialog.data["menu"]["instance"].moveSelection(code - 0x31)
+				self.currentDialog["menu"].instance.moveSelection(code - 0x31)
 			except:
-				self.currentDialog.data["list"]["instance"].moveSelection(code - 0x31)
+				self.currentDialog["list"].instance.moveSelection(code - 0x31)
 
 	def close(self):
 		self.delayTimer.start(0, 1)
diff --git a/skin.py b/skin.py
index 936dcc96..5684c583 100644
--- a/skin.py
+++ b/skin.py
@@ -94,7 +94,7 @@ def applyGUIskin(screen, parent, skin, name):
 		
 		# get corresponding gui object
 		try:
-			guiObject = screen.data[wname]["instance"]
+			guiObject = screen[wname].instance
 		except:
 			raise str("component with name '" + wname + "' was not found in skin of screen '" + name + "'!")