X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Ficons.py;h=9c344ee36bb668725bf9733e492cc6367f35e26f;hb=fd7428c2ec6946a7d9741c044c7b16194ae19262;hp=72812def356e2e8cde3b94e59f852f5f533e97cb;hpb=15a43ab3378c0aa46af8ce75b3303d15947ac4a6;p=drlaunch

diff --git a/src/icons.py b/src/icons.py
index 72812de..9c344ee 100755
--- a/src/icons.py
+++ b/src/icons.py
@@ -53,9 +53,9 @@ class Icons(gobject.GObject):
 	self.h={}
 
 	# setup allicons
-	maxsz=4
-	for x in xrange(maxsz):
-	    for y in xrange(maxsz):
+	maxsz=config.getMaxSize()
+	for x in xrange(maxsz[0]):
+	    for y in xrange(maxsz[1]):
 		k=(x,y)
 		ico=Icon(self.isconfig)
 		self.allicons[k]=ico
@@ -96,8 +96,8 @@ class Icons(gobject.GObject):
 	old=self.icons
 	self.icons={}
 
-	for x in xrange(sz):
-	    for y in xrange(sz):
+	for x in xrange(sz[0]):
+	    for y in xrange(sz[1]):
 		k=(x,y)
 		ico=self.allicons[k]
 		self.icons[k]=ico
@@ -112,16 +112,19 @@ class Icons(gobject.GObject):
 
 	self.size=sz
 
+    def getSize(self):
+	return(self.size)
+
     def signalLongpress(self, icon):
-	print "signalLongpress()", icon
+	#print "signalLongpress()", icon
 	self.emit('long-press', icon)
 
     def signalClick(self, icon):
-	print "signalClick()", icon
+	#print "signalClick()", icon
 	self.emit('click', icon)
 
     def signalTrippleClick(self, icon):
-	print "signalTrippleClick()", icon
+	#print "signalTrippleClick()", icon
 	self.emit('tripple-click', icon)
 
     def get(self, x, y):
@@ -151,8 +154,11 @@ class Icons(gobject.GObject):
 	    appname=wapps[k]
 	    if appname!=None:
 		app=apps.readOne(appname)
-		app['icon2']=getIcon(app['icon'])
-		self.get(x,y).setApp(app)
+		if app!=None:
+		    app['icon2']=getIcon(app['icon'])
+		    self.get(x,y).setApp(app)
+	    else:
+		self.get(x,y).setApp(None)
 
 #	for f in fn:
 #	    dt=apps.readOne(f)
@@ -165,9 +171,6 @@ class Icons(gobject.GObject):
 #		y+=1
 ##	    self.icons.append(p)
 
-	print "end of Icons init"
-
-
 gobject.type_register(Icons)
 Icons.register_signals()