Changeset 2888

Timestamp:

03/07/07 09:35:34 (1 year ago)

Author:

uwe_grauer

Message:

merged changes from trunk into my branch

Files:

• branches/uwe/dabo/biz/dBizobj.py (modified) (5 diffs)
• branches/uwe/dabo/dColors.py (modified) (7 diffs)
• branches/uwe/dabo/dObject.py (modified) (5 diffs)
• branches/uwe/dabo/lib/DesignerXmlConverter.py (modified) (1 diff)
• branches/uwe/dabo/ui/dialogs/htmlAbout.py (modified) (1 diff)
• branches/uwe/dabo/ui/uiwx/__init__.py (modified) (4 diffs)
• branches/uwe/dabo/ui/uiwx/dImage.py (modified) (5 diffs)
• branches/uwe/dabo/ui/uiwx/dImageMixin.py (modified) (1 diff)
• branches/uwe/dabo/ui/uiwx/dListBox.py (modified) (1 diff)
• branches/uwe/dabo/ui/uiwx/dListControl.py (modified) (3 diffs)
• branches/uwe/dabo/ui/uiwx/dPanel.py (modified) (3 diffs)
• branches/uwe/dabo/ui/uiwx/dSplitter.py (modified) (6 diffs)
• branches/uwe/dabo/ui/uiwx/dTreeView.py (modified) (3 diffs)
• branches/uwe/dabo/ui/uiwx/uiApp.py (modified) (1 diff)
• branches/uwe/tests (copied) (copied from trunk/tests)
• branches/uwe/tests/ModuleInitTemplate.py (copied) (copied from trunk/tests/ModuleInitTemplate.py)
• branches/uwe/tests/TestCaseTemplate.py (copied) (copied from trunk/tests/TestCaseTemplate.py)
• branches/uwe/tests/unitTests (copied) (copied from trunk/tests/unitTests)
• branches/uwe/tests/unitTests/Test_dColors.py (copied) (copied from trunk/tests/unitTests/Test_dColors.py)
• branches/uwe/tests/unitTests/Test_dObject.py (copied) (copied from trunk/tests/unitTests/Test_dObject.py)
• branches/uwe/tests/unitTests/biz (copied) (copied from trunk/tests/unitTests/biz)
• branches/uwe/tests/unitTests/biz/__init__.py (copied) (copied from trunk/tests/unitTests/biz/__init__.py)
• branches/uwe/tests/unitTests/db (copied) (copied from trunk/tests/unitTests/db)
• branches/uwe/tests/unitTests/db/__init__.py (copied) (copied from trunk/tests/unitTests/db/__init__.py)
• branches/uwe/tests/unitTests/lib (copied) (copied from trunk/tests/unitTests/lib)
• branches/uwe/tests/unitTests/lib/__init__.py (copied) (copied from trunk/tests/unitTests/lib/__init__.py)
• branches/uwe/tests/unitTests/masterTestSuite.py (copied) (copied from trunk/tests/unitTests/masterTestSuite.py)
• branches/uwe/tests/unitTests/ui (copied) (copied from trunk/tests/unitTests/ui)
• branches/uwe/tests/unitTests/ui/UIwx (copied) (copied from trunk/tests/unitTests/ui/UIwx)
• branches/uwe/tests/unitTests/ui/UIwx/__init__.py (copied) (copied from trunk/tests/unitTests/ui/UIwx/__init__.py)
• branches/uwe/tests/unitTests/ui/__init__.py (copied) (copied from trunk/tests/unitTests/ui/__init__.py)

branches/uwe/dabo/biz/dBizobj.py

@@ -393 +393 @@
-
-        self.afterCancel()
+        
+    
+    def deleteAllChildren(self, startTransaction=False):
+        """Delete all children associated with the current record without
+        deleting the current record in this bizobj.
+        """
+        cursor = self._CurrentCursor
+        errMsg = self.beforeDeleteAllChildren()
+        if errMsg:
+            raise dException.BusinessRuleViolation, errMsg
+
+        if startTransaction:
+            cursor.beginTransaction()
+
+        try:
+            for child in self.__children:
+                child.deleteAll(startTransaction=False)
+            if startTransaction:
+                cursor.commitTransaction()
+            self.afterDeleteAllChildren()
+
+        except dException.DBQueryException, e:
+            if startTransaction:
+                cursor.rollbackTransaction()
+            raise dException.DBQueryException, e
+        except StandardError, e:
+            if startTransaction:
+                cursor.rollbackTransaction()
+            raise StandardError, e
-
-
@@ -444 +473 @@
-            if startTransaction:
-                cursor.rollbackTransaction()
-
-
+
-        except StandardError, e:
-
+
+
-            raise StandardError, e
-
@@ -1291 +1320 @@
-    def prepareWhere(self, clause):
-        return self._CurrentCursor.prepareWhere(clause)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -1299 +1340 @@
-    def beforeNew(self): return ""
-    def beforeDelete(self): return ""
+    def beforeDeleteAllChildren(self): return ""
-    def beforeFirst(self): return ""
-    def beforePrior(self): return ""
@@ -1313 +1355 @@
-    def afterNew(self): pass
-    def afterDelete(self): pass
+    def afterDeleteAllChildren(self): return ""
-    def afterFirst(self): pass
-    def afterPrior(self): pass

branches/uwe/dabo/dColors.py

@@ -1 @@
-
+
+
+
+
+
+
+
+
+
+
-
-colorDict = {"aliceblue" : (240, 248, 255), 
@@ -156 +165 @@
-
-def hexToDec(hx):
+    if not isinstance(hx, types.StringTypes):
+        raise TypeError, "Input must be a string"
-    # Define a dict of char-value pairs
-    hex = {"0": 0, "1": 1, "2": 2, "3": 3, "4": 4, "5": 5, "6": 6, "7": 7, "8": 8, 
@@ -164 +175 @@
-    pos = 1
-    for c in rev:
+        if hex.get(c) == None:
+            raise InvalidCharError, "%s is an invalid hex character" % (c, )
-        ret += (hex[c] * pos)
-        pos = pos * 16
@@ -171 +184 @@
-def tupleToHex(t, includeHash=True):
-    """Convert a color tuple into an HTML hex format."""
+    if not len(t) == 3:
+        raise LengthError, "Color tuple needs to contain 3 elements"
+    for rgb in t:
+        if not isinstance(rgb, types.IntType):
+            raise IntegerTypeError, "Tuple elements should be all integers."
+        if not 0 <= rgb <= 255:
+            raise RgbValueError, "Rgb Value must be in the range 0-255"
-    rx, gx, bx = hex(t[0]), hex(t[1]), hex(t[2])
-    # Each is in the format '0x00'.
@@ -176 +196 @@
-    g = gx[2:].upper()
-    b= bx[2:].upper()
+    if len(r) == 1: r = '0' + r
+    if len(g) == 1: g = '0' + g
+    if len(b) == 1: b = '0' + b
-    ret = ""
-    if includeHash:
@@ -186 +209 @@
-    # Strip the pound sign, if any
-    hx = hx.replace("#", "")
+    hx = hx.lstrip('0')
+    if len(hx) < 6: hx = '0'*(6-len(hx)) + hx
-    red = hexToDec(hx[:2])
-    green = hexToDec(hx[2:4])
@@ -217 +242 @@
-        grps = mtch.groups()
-        ret = (int(grps[0]), int(grps[1]), int(grps[2]))
+        for val in ret:
+            if not 0 <= val <= 255:
+                raise KeyError, "Color tuple integer must range from 0-255"
-    else:
-        raise KeyError, "Color '%s' is not defined." % color

branches/uwe/dabo/dObject.py

@@ -221 +221 @@
-
-    def _setBasePrefKey(self, val):
+        if not isinstance(val, types.StringTypes):
+            raise TypeError, 'BasePrefKey must be a string.'
-        self._basePrefKey = val
-        pm = self.PreferenceManager
@@ -229 +231 @@
-
-    def _getClass(self):
-
-
-
-
+
-
-
@@ -267 +266 @@
-            return "?"
-    
-
-
+
+
+
+
+
+
-        
-        
@@ -293 +296 @@
-
-    def _setPreferenceManager(self, val):
+        if not isinstance(val, dPref):
+            raise TypeError, 'PreferenceManager must be a dPref object'
-        self._preferenceManager = val
-
-
-    def _getSuperClass(self):
-        if self.BaseClass == self.Class:
-            # The superclass is lower down than Dabo, and useless to the user.
-            return None
-        else:
-            return self.__class__.__base__
-    
-
@@ -335 +332 @@
-            _("Reference to the Preference Management object  (dPref)"))
-    
-    SuperClass = property(_getSuperClass, None, None, 
-            _("The super class of the object. Read-only.  (class)"))
-
-
-if __name__ == "__main__":

branches/uwe/dabo/lib/DesignerXmlConverter.py

@@ -267 +267 @@
-                isBorderSizer = clsname == "LayoutBorderSizer"
-                ornt = ""
+                prnt = ""
-                if not isGridSizer:
-propString = "Orientation='%s'" % self._extractKey(atts, "Orientation", "H")
-prnt = "
-if isBorderSizer:
-prnt = "currParent, "
-propString = "'%s', Caption=\"%s\"" % (self._extractKey(atts, "Orientation", "H"), 
-   self._extractKey(atts, "Caption", "")
+if isBorderSizer:
+       prnt = "currParent, 
+       propString = "'%s', Caption=\"%s\"" % (self._extractKey(atts, "Orientation", "H"), 
+           self._extractKey(atts, "Caption", ""))
+else:
+propString = "Orientation='%s'" % self._extractKey(atts, "Orientation", "H"
-                if self.CreateDesignerControls:
-                    superName = clsname

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

@@ -100 +100 @@
-    def onCopyInfo(self, evt):
-        """Copy the system information to the Clipboard"""
-
+
+
+
-
-

branches/uwe/dabo/ui/uiwx/__init__.py

@@ -593 +593 @@
-
-
-"Please enter a string:"
+_("Please enter a string:")
-    """Simple dialog for returning a small bit of text from the user."""
-    dlg = wx.TextEntryDialog(_getActiveForm(), message, caption, defaultValue)
@@ -605 +605 @@
-
-
-"Enter an integer value:", caption="Dabo",  
+_("Enter an integer value:"), caption="Dabo", 
-    """Simple dialog for returning an integer value from the user."""
-    class IntDialog(dabo.ui.dOkCancelDialog):
@@ -626 +626 @@
-    dlg.Destroy()
-    return val
+    
+
+# The next two methods prompt the user to select from a list. The first allows
+# a single selection, while the second allows for multiple selections.
+def getChoice(choices, message=None, caption=None, defaultPos=None):
+    """Simple dialog for presenting the user with a list of choices from which
+    they can select one item.
+    """
+    return _getChoiceDialog(choices, message, caption, defaultPos, False)
+
+
+def getChoices(choices, message=None, caption=None, defaultPos=None):
+    """Simple dialog for presenting the user with a list of choices from which
+    they can select one or more items. Returns a tuple containing the selections.
+    """
+    return _getChoiceDialog(choices, message, caption, defaultPos, True)
+
+
+def _getChoiceDialog(choices, message, caption, defaultPos, mult):
+    if message is None:
+        message = _("Please make your selection:")
+    if caption is None:
+        caption = "Dabo"
+    if defaultPos is None:
+        defaultPos = 0
+    if mult is None:
+        mult = False
+    class ChoiceDialog(dabo.ui.dOkCancelDialog):
+        def addControls(self):
+            self.Caption = caption
+            lbl = dabo.ui.dLabel(self, Caption=message)
+            self.lst = dabo.ui.dListBox(self, Choices=choices, 
+                    PositionValue=defaultPos, MultipleSelect=mult, 
+                    OnMouseLeftDoubleClick=self.onOK)
+            sz = self.Sizer
+            sz.appendSpacer(25)
+            sz.append(lbl, halign="center")
+            sz.appendSpacer(5)
+            sz.append(self.lst, 4, halign="center")
+            if mult:
+                hsz = dabo.ui.dSizer("h")
+                btnAll = dabo.ui.dButton(self, Caption=_("Select All"),
+                        OnHit=self.selectAll)
+                btnNone = dabo.ui.dButton(self, Caption=_("Unselect All"),
+                        OnHit=self.unselectAll)
+                hsz.append(btnAll)
+                hsz.appendSpacer(8)
+                hsz.append(btnNone)
+                sz.appendSpacer(16)
+                sz.append(hsz, halign="center", border=20)
+                sz.appendSpacer(8)
+                sz.append(dabo.ui.dLine(self), "x", border=44,
+                        borderSides=("left", "right"))
+            sz.appendSpacer(24)
+        
+        def selectAll(self, evt):
+            self.lst.selectAll()
+        
+        def unselectAll(self, evt):
+            self.lst.invertSelections()
+            
+            
+    dlg = ChoiceDialog(_getActiveForm())
+    dlg.show()
+    if dlg.Accepted:
+        val = dlg.lst.StringValue
+    else:
+        val = None
+    dlg.release()
+    return val          
-
-
@@ -781 +851 @@
-
-
-"Choose a folder"
+_("Choose a folder")
-    """Displays the folder selection dialog for the platform.
-    Returns the path to the selected folder, or None if no selection

branches/uwe/dabo/ui/uiwx/dImage.py

@@ -102 +102 @@
-            # No image to display
-            self.Bitmap = wx.EmptyBitmap(1, 1)
+            self.Freeze()
-            self.SetBitmap(self.Bitmap)
+            self.Thaw()
-            return
-
@@ -159 +161 @@
-        self._bitmapWidth = self.Bitmap.GetWidth()
-        
+        self.Freeze()
-        try:
-            self.SetBitmap(self.Bitmap)
-        except TypeError, e: pass
+        self.Thaw()
-        self._inShowPic = True
-        self.SetSize((origW, origH))
@@ -289 +293 @@
-        def afterInit(self):
-            self.Caption = "dImage Demonstration"
+            self.mainPanel = mp = dabo.ui.dPanel(self)
+            self.Sizer.append1x(mp)
+            sz = dabo.ui.dSizer("v")
+            mp.Sizer = sz
-            # Create a panel with horiz. and vert.  sliders
-self
-self
+mp
+mp
-                Value=100, OnHit=self.onSlider)
-self
+mp
-                Value=100, OnHit=self.onSlider)
-            
@@ -301 +309 @@
-            hsz.appendSpacer(10)
-            hsz.append(self.VSlider, 0, "x")
-elf.Sizer
-elf.Sizer.DefaultBorderLeft = self.Sizer
-elf.Sizer
-elf.Sizer
-elf.Sizer
-elf.Sizer
-elf.Sizer
+z
+z.DefaultBorderLeft = sz
+z
+z
+z
+z
+z
-
-            # Create the image control
@@ -314 +322 @@
-            hsz = dabo.ui.dSizer("H")
-            hsz.DefaultSpacing = 10
-self
+mp
-                    Picture="rotateCW", OnHit=self.rotateCW)
-self
+mp
-                    Picture="rotateCCW", OnHit=self.rotateCCW)
-            hsz.append(self.btnRotateCW)
-            hsz.append(self.btnRotateCCW)           
-self
+mp
-                    Choices=["Proportional", "Stretch", "Clip"],
-                    DataSource = "self.Form.img",
-                    DataField = "ScaleMode")
-            self.ddScale.PositionValue = 0
-self
+mp
-                    OnHit=self.onLoadImage)
-self
+mp
-            hsz.append(self.ddScale, 0, "x")
-            hsz.append(btn, 0, "x")
-            hsz.append(btnOK, 0, "x")
-elf.Sizer
-elf.Sizer
+z
+z
-            
-            # Set the idle update flage

branches/uwe/dabo/ui/uiwx/dImageMixin.py

@@ -91 +91 @@
-            else:
-                bmp = dabo.ui.strToBmp(val, self._imgScale, self._imgWd, self._imgHt)
+            self.Freeze()
-            self.SetBitmap(bmp)
+            self.Thaw()
-        else:
-            self._properties["Picture"] = val

branches/uwe/dabo/ui/uiwx/dListBox.py

@@ -28 +28 @@
-        for elem in self.GetSelections():
-            self.SetSelection(elem, False)
+    
+    
+    def selectAll(self):
+        if self.MultipleSelect:
+            for ii in xrange(self.Count):
+                self.SetSelection(ii)
+    
+    
+    def unselectAll(self):
+        self.clearSelections()
-
-        
+    def invertSelections(self):
+        """Switch all the items from False to True, and vice-versa."""
+        for ii in xrange(self.Count):
+            if self.IsSelected(ii):
+                self.Deselect(ii)
+            else:
+                self.SetSelection(ii)
+        
+    
-    def _getMultipleSelect(self):
-        return self._hasWindowStyleFlag(wx.LB_EXTENDED)

branches/uwe/dabo/ui/uiwx/dListControl.py

@@ -62 +62 @@
-    
-    
+    def removeColumn(self, pos=None):
+        """Removes the specified column, or the last column if
+        no column number is passed.
+        """
+        if pos is None:
+            pos = self.GetColumnCount() -1
+        self.DeleteColumn(pos)
+    
+    
-    def setColumns(self, colList):
-        """ Accepts a list/tuple of column headings, removes any
@@ -346 +355 @@
-            
-
-
+umn
-        return self.GetColumnCount()
+
+    def _setColumnCount(self, val):
+        if self._constructed():
+            cc = self.GetColumnCount()
+            if val < cc:
+                # Remove rightmost columns
+                while val < self.GetColumnCount():
+                    self.removeColumn()
+            elif val > cc:
+                while val > self.GetColumnCount():
+                    self.addColumn(_("Column %s") % self.GetColumnCount())              
+        else:
+            self._properties["ColumnCount"] = val
-        
-        
@@ -452 +474 @@
-
-
-Count, None, None, 
-(read-only).  (int)") 
+umnCount, _setColumnCount, None,
+ (int)")
-
-    Count = property(_getRowCount, None, None, 

branches/uwe/dabo/ui/uiwx/dPanel.py

@@ -13 +13 @@
-    def __init__(self, preClass, parent, properties=None, attProperties=None, 
-            *args, **kwargs):
+        self._minSizerWidth = 10
+        self._minSizerHeight = 10
-        self._buffered = None
-        buff = self._extractKey(attProperties, "Buffered", None)
@@ -34 +36 @@
-            # Set the panel's minimum size back to zero. This is sometimes
-            # necessary when the items in the panel have reduced in size.
-0, 0
+self.MinSizerWidth, self.MinSizerHeight
-        self.Layout()
-        for child in self.Children:
@@ -96 +98 @@
-        
-
+    def _getMinSizerHeight(self):
+        return self._minSizerHeight
+
+    def _setMinSizerHeight(self, val):
+        if self._constructed():
+            self._minSizerHeight = val
+        else:
+            self._properties["MinSizerHeight"] = val
+
+
+    def _getMinSizerWidth(self):
+        return self._minSizerWidth
+
+    def _setMinSizerWidth(self, val):
+        if self._constructed():
+            self._minSizerWidth = val
+        else:
+            self._properties["MinSizerWidth"] = val
+
+
-    Buffered = property(_getBuffered, _setBuffered, None,
-            _("Does this panel use double-buffering to create smooth redrawing?  (bool)"))
-
+    MinSizerHeight = property(_getMinSizerHeight, _setMinSizerHeight, None,
+            _("Minimum height for the panel. Default=10px  (int)"))
+    
+    MinSizerWidth = property(_getMinSizerWidth, _setMinSizerWidth, None,
+            _("Minimum width for the panel. Default=10px  (int)"))
+    
+    
-
-

branches/uwe/dabo/ui/uiwx/dSplitter.py

@@ -68 +68 @@
-        self.Sizer.append(win, 1, "expand")
-        self.splitter = win
-L
+l
-        
-    
@@ -107 +107 @@
-    def __init__(self, parent, properties=None, attProperties=None, *args, **kwargs):
-        self._baseClass = dSplitter
-
+LIVE_UPDATE | wx.SP_
-        style = self._extractKey((kwargs, properties, attProperties), "style", baseStyle)
-        self._createPanes = self._extractKey(attProperties, "createPanes", None)
@@ -128 +128 @@
-            
-        # Default to vertical split
-"v"
+self._extractKey((kwargs, properties, attProperties), "Orientation", "v")
-        self._sashPos = 100
-        self._p1 = self._p2 = None
@@ -188 +188 @@
-        self.Initialize(pnl)
-    
+    
+    def layout(self):
+        self.Panel1.layout()
+        self.Panel2.layout()
+        
-    
-    def _onSashDClick(self, evt):
@@ -226 +231 @@
-        else:
-            self.SplitVertically(self.Panel1, self.Panel2, pos)
-L
+l
-    
-    
@@ -234 +239 @@
-            self._getSashPosition()
-            self.Unsplit(win)
-L
+l
-            
-    

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

@@ -451 +451 @@
-        """
-        self.lockDisplay()
-
+
+
+
-        self.collapseAll()
-        for nd, exp in ndExp:
@@ -460 +462 @@
-    def getRootNode(self):
-        return self._rootNode
-
+
-
-    def setRootNode(self, txt):
@@ -1257 +1259 @@
-
-
-    
-    app = dabo.dApp()
-    app.MainFormClass = TreeViewTestForm

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

@@ -312 +312 @@
-                orphan.close()
-            # Now close the main form. It will close any of its children.
-
+
+
+
-        else:
-            while frms: