daboide Commit
Revision 251
Date: 2005-11-27 21:11:03 -0800 (Sun, 27 Nov 2005)
Author: paul

Changed:
U   trunk/ReportDesigner.py

Log:
Made some fixes in ReportDesigner... unfortunately due to some Dabo changes
The ReportDesigner has been crashing since Dabo revision 1528. 


Diff:
Modified: trunk/ReportDesigner.py
===================================================================
--- trunk/ReportDesigner.py     2005-11-25 16:28:09 UTC (rev 250)
+++ trunk/ReportDesigner.py     2005-11-28 05:11:03 UTC (rev 251)
@@ -101,11 +101,12 @@
                def _setSelectedForm(self, val):
                        oldSel = self.SelectedForm
                        self._selectedForm = val
-                       if oldSel is not None and oldSel != val:
-                               if val is None:
-                                       self.PropSheet.select([])
-                               else:
-                                       
self.PropSheet.select(val._rd.SelectedObjects)
+                       if self.PropSheet is not None:
+                               if oldSel is not None and oldSel != val:
+                                       if val is None:
+                                               self.PropSheet.select([])
+                                       else:
+                                               
self.PropSheet.select(val._rd.SelectedObjects)
 
                PropSheet = property(_getPropSheet, _setPropSheet)
                SelectedForm = property(_getSelectedForm, _setSelectedForm)
@@ -774,14 +775,10 @@
 
 
        def _getCaption(self):
-               try:
-                       c = self._caption
-               except:
-                       c = self._caption = ""
-               return c
+               return self.Parent.Caption
 
        def _setCaption(self, val):
-               self._caption = val
+               self.Parent.Caption = val
 
        Caption = property(_getCaption, _setCaption)
 
@@ -804,6 +801,7 @@
                self.BackColor = (255,255,255)
                self.Top = 100
 
+
        def afterInit(self):
                self._rd = self.Form.getCurrentEditor()
                self._rw = self._rd._rw
@@ -818,6 +816,7 @@
 
                self.availableProps = ["height", "name", "designerLock"]
 
+
        def initEvents(self):
                self.bindEvent(dEvents.MouseLeftClick, self.onLeftClick)
 
@@ -979,11 +978,16 @@
 
 
        def _getCaption(self):
-               return self.bandLabel.Caption
+               try:
+                       v = self._caption
+               except AttributeError:
+                       v = ""
+               return v
 
        def _setCaption(self, val):
-               self.bandLabel.Caption = val
+               self._caption = val
 
+
        def _getProps(self):
                return self._props
 
@@ -1366,6 +1370,7 @@
                                self._rulers["%s-left" % band] = 
self.getRuler("v")
                                self._rulers["%s-right" % band] = 
self.getRuler("v")
                                b = Band(self, Caption=band)
+                               print b.Caption
                                b.Props = self.ReportForm[band]
                                b._rw = self._rw
                                self._bands.append(b)
@@ -1574,9 +1579,9 @@
        """
        def initProperties(self):
                self._captionBase = self.Caption = "Dabo Report Designer"
-               self.Sizer = None
                
        def afterInit(self):
+               self.Sizer = None
                self.addObject(dabo.ui.dPageFrame, Name="pgf")
                self.pgf.appendPage(ReportDesigner, caption="Visual Editor")
                self.pgf.appendPage(XmlEditor, caption="XML Editor")
@@ -1661,7 +1666,7 @@
                        # open in a new editor
                        o = ReportDesignerForm(self.Parent)
                        o.Size = self.Size
-                       o.Position = self.Position + (20,20)
+                       o.Position = (self.Left + 20, self.Top + 20)
                o.getCurrentEditor().newFile()
                o.Show()
 
@@ -1676,7 +1681,7 @@
                                # open in a new editor
                                o = ReportDesignerForm(self.Parent)
                                o.Size = self.Size
-                               o.Position = self.Position + (20,20)
+                               o.Position = (self.Left + 20, self.Top + 20)
                        o.getCurrentEditor().newFile()
                        o.Show()
                        o.getCurrentEditor().openFile(fileName)
@@ -1812,10 +1817,9 @@
 class XmlEditor(dabo.ui.dEditBox): pass
 
 class PreviewWindow(dabo.ui.dImage):
-       def initEvents(self):
-               self.bindEvent(dEvents.PageEnter, self.onPageEnter)
        def onPageEnter(self, evt):
                self.render()
+
        def render(self):
                # Eventually, a platform-independent pdf viewer window will 
hopefully be
                # available. Until that time, just display the report in the 
available




_______________________________________________
Post Messages to: [email protected]
Subscription Maintenance: http://leafe.com/mailman/listinfo/dabo-dev

Reply via email to