gnue/designer/src Icons.py LayoutEditor.py

[Jason Cater]

CVSROOT:        /home/cvs
Module name:    gnue
Changes by:     Jason Cater <address@hidden>    01/11/20 14:53:01

Modified files:
        designer/src   : Icons.py LayoutEditor.py 

Log message:
        fixed bug in calculating the icon directory path; fixed layout editor 
to refresh a page after a modification

CVSWeb URLs:
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/Icons.py.diff?cvsroot=OldCVS&tr1=1.6&tr2=1.7&r1=text&r2=text
http://savannah.gnu.org/cgi-bin/viewcvs/gnue/designer/src/LayoutEditor.py.diff?cvsroot=OldCVS&tr1=1.29&tr2=1.30&r1=text&r2=text

Patches:
Index: gnue/designer/src/Icons.py
diff -u gnue/designer/src/Icons.py:1.6 gnue/designer/src/Icons.py:1.7
--- gnue/designer/src/Icons.py:1.6      Mon Nov 19 22:37:55 2001
+++ gnue/designer/src/Icons.py  Tue Nov 20 14:53:01 2001
@@ -40,7 +40,7 @@
 treeIconMap = {}
 treeIconList = myImageList(16,16,false)
 
-iconlocation = "%s/%s" % (os.environ['INSTALL_PREFIX'][:-1],'shared/images')
+iconlocation = os.path.join(os.environ['INSTALL_PREFIX'],'shared/images')
 
 if sys.platform != 'win32': 
   icontype = wxBITMAP_TYPE_XPM
@@ -56,11 +56,14 @@
 
 for f in ('block','datasource','entry','import','pagewidget',
           'page','trigger','properties'):
+  print 'looking for %s/destree_%s.%s' % (iconlocation, f,iconextension)
   if os.path.isfile('%s/destree_%s.%s' % (iconlocation, f,iconextension)):
     GDebug.printMesg(0,'%s/destree_%s.%s' % (iconlocation, f,iconextension))
+    print 'Adding %s/destree_%s.%s' % (iconlocation, f,iconextension)
     treeIconMap[f] = treeIconList.AddIcon(
         wxIcon('%s/destree_%s.%s' % (iconlocation, f,iconextension), icontype))
   else:
+    print "Adding a null icon"
     treeIconMap[f] = treeIconList.AddIcon(wxNullIcon)
 
 
Index: gnue/designer/src/LayoutEditor.py
diff -u gnue/designer/src/LayoutEditor.py:1.29 
gnue/designer/src/LayoutEditor.py:1.30
--- gnue/designer/src/LayoutEditor.py:1.29      Mon Nov 19 21:00:16 2001
+++ gnue/designer/src/LayoutEditor.py   Tue Nov 20 14:53:01 2001
@@ -98,10 +98,10 @@
 
     if page != None and page != self.page: 
       self.page = page 
-      self.panel = self.page.__panel
       self.notebook.SetSelection(self._notebookMap[page])
       try: 
-        self.workspace = page.__workspacee
+        self.workspace = page.__workspace
+        self.panel = self.page.__panel
       except AttributeError: 
         # This simply means we are setting up 
         # our notebook for the first time. 
@@ -146,7 +146,7 @@
           self._setCurrentPage(page)
         
       if object in (self._form, self.page) or object in self.widgetList: 
-        self.drawPage(self.page)
+        self.refreshPage(self.page)
 
 
   def onDeleteObject (self, object, handler):
@@ -162,6 +162,15 @@
         self.notebook.DeletePage(index)
       if hasattr(object, '_widgetHandler') and object._widgetHandler != None:
         object._widgetHandler.Destroy()
+
+  def refreshPage(self, page): 
+    try: 
+      page.__panel.Destroy()
+      del page.__panel
+    except AttributeError: 
+      pass
+
+    self.drawPage(page)
 
 
   def drawPage(self, page):