Changeset 572
- Timestamp:
- 13/11/2008 01:08:26 (2 months ago)
- Files:
-
- packages/main/pythoncard/tags/venus/debian/changelog (modified) (1 diff)
- packages/main/pythoncard/tags/venus/tools/resourceEditor/layoutEditor.py (modified) (9 diffs)
- packages/main/pythoncard/tags/venus/tools/resourceEditor/modules/multiresourceOutput.py (modified) (2 diffs)
- packages/main/pythoncard/trunk/debian/changelog (modified) (1 diff)
- packages/main/pythoncard/trunk/tools/resourceEditor/layoutEditor.py (modified) (9 diffs)
- packages/main/pythoncard/trunk/tools/resourceEditor/modules/multiresourceOutput.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
packages/main/pythoncard/tags/venus/debian/changelog
r571 r572 1 pythoncard (1.1.2.venus-5) stable; urgency=low 2 3 * Updated layoutEditor. 4 5 -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it> Thu, 13 Nov 2008 01:03:07 +0100 6 1 7 pythoncard (1.1.2.venus-4) stable; urgency=low 2 8 packages/main/pythoncard/tags/venus/tools/resourceEditor/layoutEditor.py
r564 r572 158 158 self.alignToGrid = self.menuBar.getChecked('menuOptionsAlignToGrid') 159 159 self.showGridLines = self.menuBar.getChecked('menuOptionsShowGridLines') 160 161 self.showLayoutSizers = self.menuBar.getChecked('menuOptionsShowLayoutWithSizers') 162 self.fixedLocations = [] 160 163 161 164 path = os.path.join(self.application.applicationDirectory, 'templates', \ … … 240 243 startTime = time.time() 241 244 desc = multiresourceOutput.resourceAttributes(self) 242 #agtrint "converted ", len(desc), time.time()-startTime243 245 if len(self.undoList) > 0 and desc == self.undoList[-1]: 244 246 #agtrint "same" 245 247 pass 246 248 else: 247 ## print "saved to list\n", desc248 249 self.undoList.append(desc) 249 250 self.redoList = [] … … 252 253 #rint len(self.undoList), len(self.redoList), len(self.undoList[0]), len(self.undoList[-1]) 253 254 255 if self.showLayoutSizers: 256 self.rsrc = resource.Resource(eval(desc, globals())) 257 if self.editingDialog: 258 bg = self.rsrc 259 else: 260 bg = self.rsrc.application.backgrounds[0] 261 if hasattr(bg, 'sizers') and not self._sizerTree: 262 model.layoutEachSizer(self, bg.sizers, None, None) 263 else: 264 self.panel.SetSizer(None) 265 self._sizerTree = None 266 254 267 255 268 def on_menuEditUndo_select(self, event): 256 #rint 'start undo', len(self.undoList), len(self.redoList)257 269 if len(self.undoList) == 1: 258 270 msg = "Nothing to undo." … … 262 274 startTime = time.time() 263 275 desc = multiresourceOutput.resourceAttributes(self) 264 #agtrint "converted ", len(desc), time.time()-startTime265 276 self.redoList.append(desc) 266 277 self.menuBar.setEnabled('menuEditRedo', True) … … 268 279 if desc == self.undoList[-1]: 269 280 del self.undoList[-1] 270 #rint "same (i.e. OK?)", len(self.undoList)271 281 if len(self.undoList) == 0: return 272 282 else: 273 283 print "different !!!!!!!!!!!!1" 274 284 275 #agtrint "undoing", len(self.undoList)276 285 self.resetAndClearWidgets() 277 286 desc = self.undoList[-1] 278 ## del self.undoList[-1]279 #rint "undoing back to\n", len(desc), len(self.undoList)280 287 self.rsrc = resource.Resource(eval(desc, globals())) 281 288 self.useNewResource() 282 289 if len(self.undoList) <= 1: 283 290 self.menuBar.setEnabled('menuEditUndo', False) 284 #rint len(self.undoList), len(self.redoList)285 291 286 292 def on_menuEditRedo_select(self, event): 287 #rint 'start redo', len(self.undoList), len(self.redoList)288 293 if len(self.redoList) == 0: 289 294 msg = "Nothing to redo." … … 293 298 startTime = time.time() 294 299 desc = multiresourceOutput.resourceAttributes(self) 295 #agtrint "converted ", len(desc), time.time()-startTime296 ###### self.undoList.append(desc)297 300 self.menuBar.setEnabled('menuEditUndo', True) 298 301 299 #### if desc == self.redoList[-1]:300 #### #agtrint "same"301 #### del self.redoList[-1]302 #### if len(self.redoList) == 0: return303 304 #agtrint "redoing", len(self.redoList)305 302 self.resetAndClearWidgets() 306 303 desc = self.redoList[-1] 307 304 self.undoList.append(desc) 308 305 del self.redoList[-1] 309 #agtrint desc310 306 self.rsrc = resource.Resource(eval(desc, globals())) 311 307 self.useNewResource() 312 308 if len(self.redoList) == 0: 313 309 self.menuBar.setEnabled('menuEditRedo', False) 314 #rint len(self.undoList), len(self.redoList)315 310 316 311 def isSizingHandle(self, name): … … 840 835 self.dc.DrawRectanglePointSize((self.marqueeBase[0], self.marqueeBase[1]), 841 836 (self.marqueeSize[0], self.marqueeSize[1])) 837 842 838 # use the global mouse position and the initial offset and start 843 839 # to figure out where to draw a rect in global coordinates … … 996 992 self.startName = None 997 993 return 998 #print "selct anything within", self.startGlobalPosition, self.marqueeSize999 994 res = self.controlInRect(self.startGlobalPosition, self.marqueeSize) 1000 995 self.marquee = False 1001 #print "we found", res1002 996 if res == []: return 1003 997 … … 2081 2075 self.panel.Refresh() 2082 2076 2077 def on_menuOptionsShowLayoutWithSizers_select(self, event): 2078 self.showLayoutSizers = self.menuBar.getChecked('menuOptionsShowLayoutWithSizers') 2079 if self.showLayoutSizers: 2080 self.fixedLocations = [ ("_", self.position, self.size) ] 2081 for cmp in self.components.iterkeys(): 2082 name = self.components[cmp].name 2083 if name in self.sizingHandleNames: continue 2084 self.fixedLocations.append( (name, self.components[cmp].position, self.components[cmp].size) ) 2085 self.noteDocumentChanged(True, "switch to layoutsizer") 2086 else: 2087 for x in self.fixedLocations: 2088 if x[0] == "_": 2089 self.position = x[1] 2090 self.size = x[2] 2091 else: 2092 self.components[x[0]].position = x[1] 2093 self.components[x[0]].size = x[2] 2094 self.noteDocumentChanged(True, "switch from layoutsizer") 2095 self.updatePanel(self.rsrc) 2096 2083 2097 def getCommandLineArgs(self): 2084 2098 args = ' ' packages/main/pythoncard/tags/venus/tools/resourceEditor/modules/multiresourceOutput.py
r564 r572 32 32 dFont = repr(comp.wUpdate.font) 33 33 dTextBgC = comp.fldname.backgroundColor.Get() 34 34 35 pos = aWidget.position 36 siz = aWidget.size 37 for x in background.fixedLocations: 38 if x[0] == aWidget.name: 39 pos = x[1] 40 siz = x[2] 41 break 42 35 43 # make sure these primary attributes show up 36 44 # at the beginning of the listing … … 45 53 46 54 dStr += " 'name':'%s', \n" % aWidget.name 47 dStr += " 'position':%s, \n" % str(aWidget.position) 55 dStr += " 'position':%s, \n" % str(pos) 56 ## dStr += " 'position':%s, \n" % str(aWidget.position) 48 57 49 58 # try and determine default sizes 50 width, height = aWidget.size 59 ## width, height = aWidget.size 60 width, height = siz 51 61 if aWidget.__class__.__name__ in imgWidgets: 52 62 width, height = aWidget._size packages/main/pythoncard/trunk/debian/changelog
r571 r572 1 pythoncard (1.1.2-4) unstable; urgency=low 2 3 * updated layoutEditor. 4 5 -- Unixmedia S.r.l. (Medianix Devel) <devel@unixmedia.it> Thu, 13 Nov 2008 01:02:18 +0100 6 1 7 pythoncard (1.1.2-3.1) unstable; urgency=low 2 8 packages/main/pythoncard/trunk/tools/resourceEditor/layoutEditor.py
r564 r572 158 158 self.alignToGrid = self.menuBar.getChecked('menuOptionsAlignToGrid') 159 159 self.showGridLines = self.menuBar.getChecked('menuOptionsShowGridLines') 160 161 self.showLayoutSizers = self.menuBar.getChecked('menuOptionsShowLayoutWithSizers') 162 self.fixedLocations = [] 160 163 161 164 path = os.path.join(self.application.applicationDirectory, 'templates', \ … … 240 243 startTime = time.time() 241 244 desc = multiresourceOutput.resourceAttributes(self) 242 #agtrint "converted ", len(desc), time.time()-startTime243 245 if len(self.undoList) > 0 and desc == self.undoList[-1]: 244 246 #agtrint "same" 245 247 pass 246 248 else: 247 ## print "saved to list\n", desc248 249 self.undoList.append(desc) 249 250 self.redoList = [] … … 252 253 #rint len(self.undoList), len(self.redoList), len(self.undoList[0]), len(self.undoList[-1]) 253 254 255 if self.showLayoutSizers: 256 self.rsrc = resource.Resource(eval(desc, globals())) 257 if self.editingDialog: 258 bg = self.rsrc 259 else: 260 bg = self.rsrc.application.backgrounds[0] 261 if hasattr(bg, 'sizers') and not self._sizerTree: 262 model.layoutEachSizer(self, bg.sizers, None, None) 263 else: 264 self.panel.SetSizer(None) 265 self._sizerTree = None 266 254 267 255 268 def on_menuEditUndo_select(self, event): 256 #rint 'start undo', len(self.undoList), len(self.redoList)257 269 if len(self.undoList) == 1: 258 270 msg = "Nothing to undo." … … 262 274 startTime = time.time() 263 275 desc = multiresourceOutput.resourceAttributes(self) 264 #agtrint "converted ", len(desc), time.time()-startTime265 276 self.redoList.append(desc) 266 277 self.menuBar.setEnabled('menuEditRedo', True) … … 268 279 if desc == self.undoList[-1]: 269 280 del self.undoList[-1] 270 #rint "same (i.e. OK?)", len(self.undoList)271 281 if len(self.undoList) == 0: return 272 282 else: 273 283 print "different !!!!!!!!!!!!1" 274 284 275 #agtrint "undoing", len(self.undoList)276 285 self.resetAndClearWidgets() 277 286 desc = self.undoList[-1] 278 ## del self.undoList[-1]279 #rint "undoing back to\n", len(desc), len(self.undoList)280 287 self.rsrc = resource.Resource(eval(desc, globals())) 281 288 self.useNewResource() 282 289 if len(self.undoList) <= 1: 283 290 self.menuBar.setEnabled('menuEditUndo', False) 284 #rint len(self.undoList), len(self.redoList)285 291 286 292 def on_menuEditRedo_select(self, event): 287 #rint 'start redo', len(self.undoList), len(self.redoList)288 293 if len(self.redoList) == 0: 289 294 msg = "Nothing to redo." … … 293 298 startTime = time.time() 294 299 desc = multiresourceOutput.resourceAttributes(self) 295 #agtrint "converted ", len(desc), time.time()-startTime296 ###### self.undoList.append(desc)297 300 self.menuBar.setEnabled('menuEditUndo', True) 298 301 299 #### if desc == self.redoList[-1]:300 #### #agtrint "same"301 #### del self.redoList[-1]302 #### if len(self.redoList) == 0: return303 304 #agtrint "redoing", len(self.redoList)305 302 self.resetAndClearWidgets() 306 303 desc = self.redoList[-1] 307 304 self.undoList.append(desc) 308 305 del self.redoList[-1] 309 #agtrint desc310 306 self.rsrc = resource.Resource(eval(desc, globals())) 311 307 self.useNewResource() 312 308 if len(self.redoList) == 0: 313 309 self.menuBar.setEnabled('menuEditRedo', False) 314 #rint len(self.undoList), len(self.redoList)315 310 316 311 def isSizingHandle(self, name): … … 840 835 self.dc.DrawRectanglePointSize((self.marqueeBase[0], self.marqueeBase[1]), 841 836 (self.marqueeSize[0], self.marqueeSize[1])) 837 842 838 # use the global mouse position and the initial offset and start 843 839 # to figure out where to draw a rect in global coordinates … … 996 992 self.startName = None 997 993 return 998 #print "selct anything within", self.startGlobalPosition, self.marqueeSize999 994 res = self.controlInRect(self.startGlobalPosition, self.marqueeSize) 1000 995 self.marquee = False 1001 #print "we found", res1002 996 if res == []: return 1003 997 … … 2081 2075 self.panel.Refresh() 2082 2076 2077 def on_menuOptionsShowLayoutWithSizers_select(self, event): 2078 self.showLayoutSizers = self.menuBar.getChecked('menuOptionsShowLayoutWithSizers') 2079 if self.showLayoutSizers: 2080 self.fixedLocations = [ ("_", self.position, self.size) ] 2081 for cmp in self.components.iterkeys(): 2082 name = self.components[cmp].name 2083 if name in self.sizingHandleNames: continue 2084 self.fixedLocations.append( (name, self.components[cmp].position, self.components[cmp].size) ) 2085 self.noteDocumentChanged(True, "switch to layoutsizer") 2086 else: 2087 for x in self.fixedLocations: 2088 if x[0] == "_": 2089 self.position = x[1] 2090 self.size = x[2] 2091 else: 2092 self.components[x[0]].position = x[1] 2093 self.components[x[0]].size = x[2] 2094 self.noteDocumentChanged(True, "switch from layoutsizer") 2095 self.updatePanel(self.rsrc) 2096 2083 2097 def getCommandLineArgs(self): 2084 2098 args = ' ' packages/main/pythoncard/trunk/tools/resourceEditor/modules/multiresourceOutput.py
r564 r572 32 32 dFont = repr(comp.wUpdate.font) 33 33 dTextBgC = comp.fldname.backgroundColor.Get() 34 34 35 pos = aWidget.position 36 siz = aWidget.size 37 for x in background.fixedLocations: 38 if x[0] == aWidget.name: 39 pos = x[1] 40 siz = x[2] 41 break 42 35 43 # make sure these primary attributes show up 36 44 # at the beginning of the listing … … 45 53 46 54 dStr += " 'name':'%s', \n" % aWidget.name 47 dStr += " 'position':%s, \n" % str(aWidget.position) 55 dStr += " 'position':%s, \n" % str(pos) 56 ## dStr += " 'position':%s, \n" % str(aWidget.position) 48 57 49 58 # try and determine default sizes 50 width, height = aWidget.size 59 ## width, height = aWidget.size 60 width, height = siz 51 61 if aWidget.__class__.__name__ in imgWidgets: 52 62 width, height = aWidget._size
