Changeset 2683

Timestamp:

01/15/2007 01:27:41 PM (2 years ago)

Author:

paul

Message:

Applied recent bugfixes to dabo-stable, wrote up ChangeLog? entries, and
bumped the version number. Please test your apps against dabo-stable, and
speak up if you find anything amiss.

Files:

• branches/stable/ChangeLog (modified) (1 diff)
• branches/stable/dabo/__version__.py (modified) (1 diff)
• branches/stable/dabo/db/dbFirebird.py (modified) (1 diff)
• branches/stable/dabo/lib/datanav/Form.py (modified) (5 diffs)
• branches/stable/dabo/lib/datanav/Page.py (modified) (1 diff)
• branches/stable/dabo/ui/dDataControlMixinBase.py (modified) (1 diff)
• branches/stable/dabo/ui/dialogs/about.py (modified) (1 diff)
• branches/stable/dabo/ui/dialogs/htmlAbout.py (modified) (4 diffs)
• branches/stable/dabo/ui/uiwx/dControlItemMixin.py (modified) (2 diffs)
• branches/stable/dabo/ui/uiwx/dMenuItem.py (modified) (2 diffs)
• branches/stable/dabo/ui/uiwx/dToggleButton.py (modified) (1 diff)
• branches/stable/dabo/ui/uiwx/dTreeView.py (modified) (1 diff)
• branches/stable/dabo/ui/uiwx/uiApp.py (modified) (1 diff)

branches/stable/ChangeLog

@@ -1 +1 @@
-See the Subversion log for all the details.
+
+===============================================================================
+Dabo 0.7.2 (2007-01-15) (Revision 2683):
+
+Additions, all minor, backported to stable only to keep compatibility with the 
+stable versions of daboide and/or dabodemo:
++ Enhanced the getImagePath() function to work better with Windows pathing.
++ Refactored dPanel into a common mixin class.
++ Added getBaseNodeClass() function to dTreeView.
+
+Bug Fixes:
++ Fixed the stable branch to work with wxPython 2.7 and 2.8, which was a fairly
+  large backport of relevant changes from the development trunk.
++ Fixed incremental search in dGrid, which was broken by earlier unicode fixes.
++ dBizobj.onSaveNew() user hook never being called. Fixed.
++ Fixed but in dUserSettingProvider if setting/retrieving nested settings.
++ dForm not updating field values after a save(), which is sometimes needed.
+  Fixed.
++ Fixed dForm to explicitly cancel bizobj changes if the user answers "no" to
+  the "do you wish to save?" message. Otherwise, the application would never
+  finish.
++ Fixed dGrid and dImage's attProperties.
++ Fixed bug in dGrid.HeaderHeight resulting in a traceback if you tried to set
+  it in initProperties() or as a kwarg to the constructor.
++ Fixed dabo.ui.busyInfo() to actually show the specified text instead of just
+  an ugly grey box on Gtk.
++ Fixed a bug in dbFirebird that was caused by initializing more than once.
++ Fixed a problem with the date textbox in the datanav select page adding 1
+  to each month, resulting in an incorrect select statement.
++ Fixed some minor wording and behavior problems with the Quick Report option
+  in AppWizard apps, thanks to Ted Roche.
++ Fixed htmlAbout to not return the html tags to the clipboard.
++ Fixed dToggleButton to always flush its data, not just on LostFocus.
+
-
-===============================================================================

branches/stable/dabo/__version__.py

@@ -2 +2 @@
-# Everything else is boilerplate copied also to other dabo repositories.
-package_name = "dabo"
-1
+2
-
-

branches/stable/dabo/db/dbFirebird.py

@@ -12 +12 @@
-        self.fieldPat = re.compile("([A-Za-z_][A-Za-z0-9-_]+)\.([A-Za-z_][A-Za-z0-9-_]+)")
-        import kinterbasdb
-
+
+
-        self.dbapi = kinterbasdb
-

branches/stable/dabo/lib/datanav/Form.py

@@ -385 +385 @@
-
-    def onQuickReport(self, evt):
+        # May not have records if called via toolbar button
+        if not self.enableQuickReport():
+            dabo.ui.exclaim(_("Sorry, there are no records to report on."), title=_("No Records"))
+            return
-        if self.preview:
-            # Just previewing 
@@ -399 +403 @@
-
-            def addControls(self):
-Group
+List
-                        Caption="Mode",
-                        Orientation="Row", 
@@ -407 +411 @@
-                        SaveRestoreValue=True)
-                self.Sizer.append1x(self.radMode)
-
-
+
+
+
-                        Caption="Report On",
-                        Orientation="Row", 
@@ -417 +422 @@
-                        SaveRestoreValue=True)
-                self.Sizer.append1x(self.radRecords)
+                self.Sizer.appendSpacer(12)
-
-                self.addObject(dabo.ui.dButton, RegID="btnAdvanced", Caption="Advanced")
-
+, halign="center"
-                self.btnAdvanced.bindEvent(dEvents.Hit, self.onAdvanced)
-
@@ -427 +433 @@
-                        "'yes', you'll be able to modify the file and it will be used "
-                        "as the Quick Report from now on (it will no longer be auto-"
-OK
-
+Yes
+, cancelButton=False
-                    self.saveNamedReportForm = True
-

branches/stable/dabo/lib/datanav/Page.py

@@ -286 +286 @@
-                    if isinstance(ctrl, dabo.ui.dDateTextBox):
-                        dtTuple = ctrl.getDateTuple()
-+1
+
-                                padl(dtTuple[2], 2, "0") )
-                    else:

branches/stable/dabo/ui/dDataControlMixinBase.py

@@ -155 +155 @@
-            oldVal = self._oldVal
-        except AttributeError:
+            oldVal = None
+        if isinstance(self, (dabo.ui.dToggleButton,)):
+            # These classes change their value before the GotFocus event
+            # can store the oldval, so always flush 'em.
-            oldVal = None
-        if curVal is None or curVal != oldVal:

branches/stable/dabo/ui/dialogs/about.py

@@ -66 +66 @@
-
-        ds = []
-
+
+
+
+
+
-        ds.append({"name": "Python Version:", "value": "%s on %s" 
-                % (sys.version.split()[0], sys.platform)})

branches/stable/dabo/ui/dialogs/htmlAbout.py

@@ -50 +50 @@
-
-        ds = []
-
+
+
+
+
+
-        ds.append({"name": "Python Version:", "value": "%s on %s"
-                % (sys.version.split()[0], sys.platform)})
@@ -70 +74 @@
-
-
-
+, useHTML=True
-        """Return app information as a string."""
-        ds = self.getInfoDataSet()
@@ -77 +81 @@
-            lines.append("%s %s" % (r["name"], r["value"]))
-
-"<br>\n"
+{True: "<br>\n", False: "\n"}[useHTML]
-
-        return eol.join(lines)
@@ -92 +96 @@
-    def onCopyInfo(self, evt):
-        """Copy the system information to the Clipboard"""
-htmlBox.Source
+getInfoString(useHTML=False)
-
-

branches/stable/dabo/ui/uiwx/dControlItemMixin.py

@@ +1 @@
+import wx
+import dabo
+import dabo.dEvents as dEvents
-from dDataControlMixin import dDataControlMixin
-from dabo.dLocalize import _
-import wx
-import dabo
-from dabo.ui import makeDynamicProperty
-
@@ -17 +18 @@
-
-        
+    def _initEvents(self):
+        super(dControlItemMixin, self)._initEvents()
+        self.bindEvent(dEvents.Hit, self.__flush)
+    
+    
+    def __flush(self, evt):
+        self.flushValue()
+    
+    
-    def appendItem(self, txt, select=False):
-        """ Adds a new item to the end of the list """

branches/stable/dabo/ui/uiwx/dMenuItem.py

@@ -15 +15 @@
-        preClass = wx.MenuItem
-        self.Parent = parent
+        
+        ## see comments in _setCaption for explanation of below:
+        text = kwargs.get("text", "")
+        if not text:
+            text = "dMenuItem"
+        kwargs["text"] = text
+        
-        pm.dPemMixin.__init__(self, preClass, parent, properties, *args, **kwargs)
-
@@ -48 +55 @@
-        if self._constructed():
-            ## Win32 seems to need to clear the caption first, or funkiness
-
-
+
+
+
+
+
-            self.SetText(val)
-        else:

branches/stable/dabo/ui/uiwx/dToggleButton.py

@@ -33 +33 @@
-        dim.dImageMixin.__init__(self)
-        dcm.dDataControlMixin.__init__(self, preClass, parent, properties, *args, **kwargs)
-        
-        self.Bind(wx.EVT_BUTTON, self.__onButton)
-    
-    
-    def __onButton(self, evt):
+        self.flushValue()
-        self.raiseEvent(dEvents.Hit, evt)
-

branches/stable/dabo/ui/uiwx/dTreeView.py

@@ -272 +272 @@
-        self.nodes = []
-        
+        style = self._extractKey((properties, kwargs), "style", 0)
-        # Default to showing buttons
-        val = self._extractKey((properties, kwargs), "ShowButtons", True)
+        if val:
+            style = style | wx.TR_HAS_BUTTONS
-        kwargs["ShowButtons"] = val
-        # Default to showing lines
-        val = self._extractKey((properties, kwargs), "ShowLines", True)
-        kwargs["ShowLines"] = val
+        if not val:
+            style = style | wx.TR_NO_LINES
-        # Default to showing root node
-        val = self._extractKey((properties, kwargs), "ShowRootNode", True)
-        kwargs["ShowRootNode"] = val
+        if not val:
+            style = style | wx.TR_HIDE_ROOT
-        # Default to showing root node lines
-        val = self._extractKey((properties, kwargs), "ShowRootNodeLines", True)
-        kwargs["ShowRootNodeLines"] = val
+        if val:
+            style = style | wx.TR_LINES_AT_ROOT
-
-        preClass = wx.PreTreeCtrl
-
+style=style,
-                *args, **kwargs)
-        

branches/stable/dabo/ui/uiwx/uiApp.py

@@ -267 +267 @@
-            # Now we can work with the rest
-            orphans = [frm for frm in frms
-
+
+
-            for orphan in orphans:
-                orphan.close()