[Pythoncard-cvs] PythonCard/tools/resourceEditor resourceEditor.py,1.197,1.198

[Kevin A. <ka...@us...>]

Update of /cvsroot/pythoncard/PythonCard/tools/resourceEditor
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30527

Modified Files:
	resourceEditor.py 
Log Message:
changed initialization order, moved panel event binds


Index: resourceEditor.py
===================================================================
RCS file: /cvsroot/pythoncard/PythonCard/tools/resourceEditor/resourceEditor.py,v
retrieving revision 1.197
retrieving revision 1.198
diff -C2 -d -r1.197 -r1.198
*** resourceEditor.py	13 May 2004 02:40:25 -0000	1.197
--- resourceEditor.py	14 May 2004 18:22:43 -0000	1.198
***************
*** 51,54 ****
--- 51,72 ----
      
      def on_initialize(self, event):
+         self.filename = None
+         self.documentChanged = False
+         self.cmdLineArgs = {'debugmenu':0, 'logging':0, 'messagewatcher':0,
+                             'namespaceviewer':0, 'propertyeditor':0,
+                             'shell':0}
+ 
+         self.lastCaptured = None
+         self.startName = None
+         self.startPosition = (0, 0)
+         self.startSize = (0, 0)
+         self.offset = (0, 0)
+         self.startToolTip = ''
+ 
+         try:
+             self.readme = open('readme.txt').read()
+         except:
+             self.readme = ''
+ 
          # KEA 2002-06-27
          # copied from codeEditor.py
***************
*** 117,128 ****
              self.components[sizingHandle] = sizingHandleTemplate
  
-         self.lastCaptured = None
-         self.startName = None
-         self.startPosition = (0, 0)
-         self.startSize = (0, 0)
-         self.offset = (0, 0)
-         self.startToolTip = ''
-         self.createDC()
- 
          self.propertyEditorWindow = model.childWindow(self, PropertyEditor)
  
--- 135,138 ----
***************
*** 135,155 ****
          self.rsrc = resource.ResourceFile(path).getResource()
          
!         #self.updateStack(self.rsrc)
          self.updatePanel(self.rsrc)
          
-         self.filename = None
-         self.documentChanged = 0
-         self.cmdLineArgs = {'debugmenu':0, 'logging':0, 'messagewatcher':0,
-                             'namespaceviewer':0, 'propertyeditor':0,
-                             'shell':0}
- 
          self.configPath = os.path.join(configuration.homedir, 'resourceeditor')
          self.loadConfig()
  
-         try:
-             self.readme = open('readme.txt').read()
-         except:
-             self.readme = ''
- 
          """
          # KEA 2002-03-03
--- 145,162 ----
          self.rsrc = resource.ResourceFile(path).getResource()
          
!         self.createDC()
          self.updatePanel(self.rsrc)
+         # KEA 2004-05-14
+         # this actually should only occur once for the panel
+         # so I'm moving it into initialize which should work as long as
+         # the panel isn't destroyed while editing, opening new files, etc.
+         # KEA link up events for new dragging code
+         wx.EVT_LEFT_DOWN(self.panel, self.on_mouseDown)
+         wx.EVT_LEFT_UP(self.panel, self.on_mouseUp)
+         wx.EVT_MOTION(self.panel, self.on_mouseDrag)
          
          self.configPath = os.path.join(configuration.homedir, 'resourceeditor')
          self.loadConfig()
  
          """
          # KEA 2002-03-03
***************
*** 321,325 ****
                  self.components[sizingHandle].backgroundColor = self.resizingHandleColor
          # overly conservative, but effective
!         self.documentChanged = 1
  
      def hideSizingHandles(self):
--- 328,332 ----
                  self.components[sizingHandle].backgroundColor = self.resizingHandleColor
          # overly conservative, but effective
!         self.documentChanged = True
  
      def hideSizingHandles(self):
***************
*** 741,745 ****
              self.components[w.name] = w
          self.rebindEventsForDragging()
!         self.documentChanged = 0
          # could change the resource and title bar
          # here to give the user more feedback
--- 748,752 ----
              self.components[w.name] = w
          self.rebindEventsForDragging()
!         self.documentChanged = False
          # could change the resource and title bar
          # here to give the user more feedback
***************
*** 755,759 ****
                  f.write(desc)
                  f.close()
!                 self.documentChanged = 0
                  self.fileHistory.AddFileToHistory(self.filename)
                  return True
--- 762,766 ----
                  f.write(desc)
                  f.close()
!                 self.documentChanged = False
                  self.fileHistory.AddFileToHistory(self.filename)
                  return True
***************
*** 782,786 ****
              self.components[w.name] = w
          self.rebindEventsForDragging()
!         self.documentChanged = 0
  
      def getNewFileTemplates(self):
--- 789,793 ----
              self.components[w.name] = w
          self.rebindEventsForDragging()
!         self.documentChanged = False
  
      def getNewFileTemplates(self):
***************
*** 889,893 ****
                  f.close()
                  self.filename = path
!                 self.documentChanged = 0
                  return True
              except:
--- 896,900 ----
                  f.close()
                  self.filename = path
!                 self.documentChanged = False
                  return True
              except:
***************
*** 939,943 ****
          
          self.updatePanel(self.rsrc)
-         #self.updateStack(self.rsrc)
  
          # KEA 2002-03-24
--- 946,949 ----
***************
*** 951,955 ****
          self.rebindEventsForDragging()
  
!         self.documentChanged = 0
          self.fileHistory.AddFileToHistory(self.filename)
  
--- 957,961 ----
          self.rebindEventsForDragging()
  
!         self.documentChanged = False
          self.fileHistory.AddFileToHistory(self.filename)
  
***************
*** 1052,1056 ****
                      self.offset = (0, 0)
                      self.showSizingHandles(name)
!                     self.documentChanged = 1
  
                      c = self.components[name]
--- 1058,1062 ----
                      self.offset = (0, 0)
                      self.showSizingHandles(name)
!                     self.documentChanged = True
  
                      c = self.components[name]
***************
*** 1069,1073 ****
                  self.hideSizingHandles()
                  del self.components[aWidget.name]
!                 self.documentChanged = 1
  
      def on_componentAdd_command(self, event):
--- 1075,1079 ----
                  self.hideSizingHandles()
                  del self.components[aWidget.name]
!                 self.documentChanged = True
  
      def on_componentAdd_command(self, event):
***************
*** 1153,1159 ****
          self.propertyEditorWindow.visible = not self.propertyEditorWindow.visible
  
-     def updateStack(self, rsrc):
-         pass
- 
      def updatePanel(self, rsrc):
          # KEA 2002-03-24
--- 1159,1162 ----
***************
*** 1220,1231 ****
                  self.panel.Disconnect(-1, -1, wx.wxEVT_ERASE_BACKGROUND)
                  self.panel._bitmap = None
-         # KEA 2001-12-26
-         # can the icon for the titlebar be updated dynamically?
-         self.documentChanged = True
  
-         # KEA link up events for new dragging code
-         wx.EVT_LEFT_DOWN(self.panel, self.on_mouseDown)
-         wx.EVT_LEFT_UP(self.panel, self.on_mouseUp)
-         wx.EVT_MOTION(self.panel, self.on_mouseDrag)
          self.movingComponent = False
          self.resizingHandleTarget = None
--- 1223,1227 ----
***************
*** 1257,1261 ****
          if dlg.accepted():
              self.rsrc.application.name = dlg.components.fldName.text
-             #self.updateStack(self.rsrc)
              self.documentChanged = True
          dlg.destroy()
--- 1253,1256 ----
***************
*** 1307,1310 ****
--- 1302,1306 ----
                  background.icon = None
              self.updatePanel(self.rsrc)
+             self.documentChanged = True
          dlg.destroy()
  
***************
*** 1323,1326 ****
--- 1319,1323 ----
              background.size = eval(dlg.components.fldSize.text)
              self.updatePanel(self.rsrc)
+             self.documentChanged = True
          dlg.destroy()
          
***************
*** 1338,1342 ****
              else:
                  self.rsrc.application.backgrounds[0].menubar = menuDialog.menuResourceFromList(dlg.menuList)
!             self.documentChanged = 1
          dlg.destroy()
  
--- 1335,1339 ----
              else:
                  self.rsrc.application.backgrounds[0].menubar = menuDialog.menuResourceFromList(dlg.menuList)
!             self.documentChanged = True
          dlg.destroy()
  
***************
*** 1359,1363 ****
              else:
                  self.rsrc.application.backgrounds[0].strings = stringDialog.stringResourceFromList(dlg.stringList)
!             self.documentChanged = 1
          dlg.destroy()
  
--- 1356,1360 ----
              else:
                  self.rsrc.application.backgrounds[0].strings = stringDialog.stringResourceFromList(dlg.stringList)
!             self.documentChanged = True
          dlg.destroy()
  
***************
*** 1505,1509 ****
                  self.hideSizingHandles()
                  del self.components[aWidget.name]
!                 self.documentChanged = 1
  
      def on_menuEditCopy_select(self, event):
--- 1502,1506 ----
                  self.hideSizingHandles()
                  del self.components[aWidget.name]
!                 self.documentChanged = True
  
      def on_menuEditCopy_select(self, event):
***************
*** 1551,1555 ****
              self.offset = (0, 0)
              self.showSizingHandles(name)
!             self.documentChanged = 1
  
  
--- 1548,1552 ----
              self.offset = (0, 0)
              self.showSizingHandles(name)
!             self.documentChanged = True