Changeset 3208

Timestamp:

06/23/2007 06:32:54 AM (2 years ago)

Author:

ed

Message:

Added all the options from dGrid.buildFromDataSet() to dabo.ui.browse(). This will allow you to specify things like column order, captions for the columns, which fields to include, etc. By default, if you don't specify any of these, it works the way it always has. Thanks to Kelie (http://leafe.com/archives/showMsg/355365) for the idea to do this.

Files:

• trunk/dabo/ui/uiwx/__init__.py (modified) (64 diffs)

trunk/dabo/ui/uiwx/__init__.py

@@ -14 +14 @@
-_failedLibs = []
-# note: may need wx.animate as well
- 
+
-        "wx.lib.calendar", "wx.lib.masked", "wx.lib.buttons"):
-    try:
@@ -28 +28 @@
-    %s
-    """ % "\n\t".join(_failedLibs)
-
+
-    sys.exit(msg)
-del(_failedLibs)
@@ -52 +52 @@
-
-# Import dPemMixin first, and then manually put into dabo.ui module. This is
- 
+
-# is in dabo.ui.uiwx. Must also do the same with dControlMixin, as dDataControlMixinBase
-# descends from it.
@@ -189 +189 @@
-            wx.CallAfter(callback)
-    return ret
-
+
-
-def callAfter(fnc, *args, **kwargs):
-    """There are times when this functionality is needed when creating UI
- 
+
-    developers do not need to use wx code in their apps.
-    """
-    wx.CallAfter(fnc, *args, **kwargs)
-
+
-
-_callAfterIntervalReferences = {}
@@ -228 +228 @@
-        dabo.errorLog.write(_("setAfter() failed to set property '%s' to value '%s': %s.")
-                % (prop, val, e))
-
+
-
-def setAfterInterval(interval, obj, prop, val):
- 
+
-    of calling a function.
-    """
@@ -243 +243 @@
-
-def callEvery(interval, func, *args, **kwargs):
- 
+
-    at the specified interval. Interval is given in milliseconds. It will pass along
-    any additional arguments to the function when it is called.
@@ -257 +257 @@
-def yieldUI(*args, **kwargs):
-    """Yield to other apps/messages."""
-  
+
-
-
-def beep():
-    wx.Bell()
-
+
-
-def busyInfo(msg="Please wait...", *args, **kwargs):
-    """Display a message that the system is busy.
-
- 
+
-    object is explicitly unbound. For example:
-
@@ -290 +290 @@
-            dabo.errorLog.write("Incorrect event class (%s) passed to continueEvent. Error: %s"
-                    % (str(evt), str(e)))
-
-
+
+
-def discontinueEvent(evt):
-    try:
@@ -302 +302 @@
-            dabo.errorLog.write("Incorrect event class (%s) passed to continueEvent. Error: %s"
-                    % (str(evt), str(e)))
-
-
+
+
-def getEventData(wxEvt):
-    ed = {}
-    eventType = wxEvt.GetEventType()
-
+
-    if isinstance(wxEvt, (wx.KeyEvent, wx.MouseEvent, wx.TreeEvent,
-            wx.CommandEvent, wx.CloseEvent, wx.grid.GridEvent,
-            wx.grid.GridSizeEvent, wx.SplitterEvent) ):
-
+
-        if dabo.allNativeEventInfo:
-            # Cycle through all the attributes of the wx events, and evaluate them
@@ -319 +319 @@
-                upPems = [p for p in d if p[0].isupper()]
-                for pem in upPems:
- 
- 
- 
+
+
+
-                            "SetTimestamp", "StopPropagation"):
-                        continue
@@ -331 +331 @@
-            except:
-                pass
-
+
-    if isinstance(wxEvt, (wx.SplitterEvent,) ):
-        try:
@@ -362 +362 @@
-        else:
-            ed["prompt"] = menu.Caption
-
+
-
-    if isinstance(wxEvt, wx.CommandEvent):
@@ -388 +388 @@
-            if wx.Platform in ("__WXMAC__", "__WXGTK__"):
-                ed["keyChar"] = chr(wxEvt.GetKeyCode())
-  
+
-                ed["keyChar"] = chr(wxEvt.GetRawKeyCode())
-        except (ValueError, OverflowError):
@@ -394 +394 @@
-        if not ed["keyChar"]:
-            # See if it is one of the keypad keys
- 
- 
- 
+
+
+
-                    wx.WXK_NUMPAD8: "8", wx.WXK_NUMPAD9: "9", wx.WXK_NUMPAD_SPACE: " ",
- 
- 
- 
+
+
+
-                    wx.WXK_NUMPAD_DECIMAL: ".", wx.WXK_NUMPAD_DIVIDE: "/"}
-            ed["keyChar"] = numpadKeys.get(ed["keyCode"], None)
-
+
-    if isinstance(wxEvt, wx.ContextMenuEvent):
-        ed["mousePosition"] = wxEvt.GetPosition()
@@ -409 +409 @@
-    if isinstance(wxEvt, wx.CloseEvent):
-        ed["force"] = not wxEvt.CanVeto()
-
+
-    if isinstance(wxEvt, wx.TreeEvent):
-        tree = wxEvt.GetEventObject()
@@ -425 +425 @@
-        except:
-            pass
-
+
-    if isinstance(wxEvt, wx.SplitterEvent):
-        try:
@@ -436 +436 @@
-            except:
-                ed["windowRemoved"] = None
-
+
-    if hasattr(wxEvt, "GetId"):
-        ed["id"] = wxEvt.GetId()
@@ -446 +446 @@
-            ed["index"] = wxEvt.GetSelection()
-
-
+
-    if isinstance(wxEvt, wx.grid.GridEvent):
-        ed["row"] = wxEvt.GetRow()
@@ -459 +459 @@
-            ed["commandDown"] = wxEvt.CmdDown()
-        except: pass
-
+
-    if isinstance(wxEvt, wx.grid.GridSizeEvent):
-        #ed["rowOrCol"] = wxEvt.GetRowOrCol()
@@ -475 +475 @@
-            ed["commandDown"] = wxEvt.CmdDown()
-        except: pass
-
+
-    if isinstance(wxEvt, wx.calendar.CalendarEvent):
-        ed["date"] = wxEvt.PyGetDate()
@@ -486 +486 @@
-        ed["collapsed"] = not ed["expanded"]
-        ed["panel"] = wxEvt.GetEventObject().GetParent()
-
+
-    try:
-        if isinstance(wxEvt, wx.html.HtmlLinkEvent):
@@ -493 +493 @@
-        # wxPython 2.6 and earlier doesn't seem to have this event
-        pass
-
+
-    return ed
-
+
-
-def getMousePosition():
@@ -508 +508 @@
-    actwin = dabo.dAppRef.ActiveForm
-    return actwin.relativeCoordinates(wx.GetMousePosition())
-
+
-
-def getMouseObject():
-    """Returns a reference to the object below the mouse pointer
- 
- 
+
+
-    live application.
-    """
@@ -522 +522 @@
-    if isinstance(actwin, dabo.ui.dShell.dShell):
-        actwin.lockDisplay()
-    
+
-    else:
-        actwin = None
@@ -565 +565 @@
-
-
- 
+
-#### modal form for the calendar.
-# def popupCalendar(dt=None, x=None, y=None, pos="topleft"):
-#   """Pops up a calendar control at the specified x,y location, relative
- 
- 
+
+
-#   today. Returns the selected date, or None if the user presses Esc.
-#   """
@@ -577 +577 @@
-#           dCalendar(self, RegID="cal", Position=(0,0))
-#           self.Size = self.cal.Size
-          
+
-#       def onHit_cal(self, evt):
-#           self.Visible = False
-      
+
-#   pos = pos.lower().strip()
-#   if dt is None:
@@ -588 +588 @@
-#   else:
-#       x, y = wx.ClientToScreen(x, y)
-  
+
-#   calForm = popCal(None)
-#   calForm.cal.Date = dt
@@ -605 +605 @@
-#   return ret
-
-
+
-def _getActiveForm():
-    app = dabo.dAppRef
@@ -613 +613 @@
-
-
- 
+
-        defaultValue="", **kwargs):
-    """Simple dialog for returning a small bit of text from the user.
@@ -622 +622 @@
-    # Give the textbox a default value:
-    txt = dabo.ui.getString(defaultValue="initial string value")
-
+
-    # Password Entry (*'s instead of the actual text)
-    txt = dabo.ui.getString(PasswordEntry=True)
@@ -637 +637 @@
-            self.Sizer.append(hs, "expand")
-            dabo.ui.callAfter(self.strVal.setFocus)
-
+
-    if defaultValue:
-        kwargs["Value"] = defaultValue
@@ -650 +650 @@
-
-
- 
+
-        defaultValue=0, **kwargs):
-    """Simple dialog for returning an integer value from the user."""
@@ -664 +664 @@
-            self.Sizer.append(hs)
-            dabo.ui.callAfter(self.spnVal.setFocus)
-
+
-    if defaultValue:
-        kwargs["Value"] = defaultValue
@@ -675 +675 @@
-    dlg.Destroy()
-    return val
-
+
-
-# The next two methods prompt the user to select from a list. The first allows
@@ -706 +706 @@
-            self.Caption = caption
-            lbl = dabo.ui.dLabel(self, Caption=message)
- 
- 
+
+
-                    OnMouseLeftDoubleClick=self.onOK)
-            sz = self.Sizer
@@ -733 +733 @@
-                        borderSides=("left", "right"))
-            sz.appendSpacer(24)
-
+
-        def selectAll(self, evt):
-            self.lst.selectAll()
-
+
-        def unselectAll(self, evt):
-            self.lst.unselectAll()
-
+
-        def invertSelection(self, evt):
-            self.lst.invertSelections()
-
+
-    dlg = ChoiceDialog(_getActiveForm())
-    dlg.show()
@@ -750 +750 @@
-        val = None
-    dlg.release()
-         
+
-
-
@@ -775 +775 @@
-
-def getDate(dt=None):
- 
+
-    Defaults to the given date parameter, or today if no value
-    is passed.
@@ -793 +793 @@
-        month = result[2]
-        year = int(result[3])
- 
+
-                "July", "August", "September", "October", "November", "December"]
-        ret = datetime.date(year, monthNames.index(month)+1, day)
@@ -832 +832 @@
-    list = fEnum.GetFacenames()
-    list.sort()
-    
+
-
-
@@ -852 +852 @@
-    """Display the file selection dialog for the platform, and return selection(s).
-
- 
+
-    that case, the return value will be a sequence of unicode strings.
-
- 
+
-    made. Only file may be selected if multiple is False.
-
@@ -865 +865 @@
-    wc = _getWild(*args)
-    return _getPath(dFileDialog, wildcard=wc, **kwargs)[0]
-
+
-
-def getFileAndType(*args, **kwargs):
@@ -879 +879 @@
-        ret = (pth, args[idx])
-    return ret
-
+
-
-def getSaveAs(*args, **kwargs):
@@ -911 +911 @@
-    was made.
-    """
- 
+
-            wildcard=wildcard)[0]
-
@@ -929 +929 @@
-        arglist = []
-        tmplt = "%s Files (*.%s)|*.%s"
- 
+
-            "xml" : "XML",
-            "txt" : "Text",
@@ -935 +935 @@
-            "gif" : "GIF",
-            "png" : "PNG",
- 
+
-            "bmp" : "Bitmap" }
-
+
-        for a in args:
-            descrp = ext = ""
@@ -1013 +1013 @@
-
-def createMenuBar(srcFile, form=None, previewFunc=None):
- 
- 
+
+
-    a reference to the newly-created MenuBar. You can optionally
-    pass in a reference to the form to which this menu is
- 
- 
+
+
-    will call the associated form's close() method. If 'previewFunc'
- 
+
-    and executed on a live menu will instead be passed back as
-    a parameter to that function.
@@ -1039 +1039 @@
-            return
-        app = dabo.dAppRef
-  
+
-            if "Separator" in itm["name"]:
-                menu.appendSeparator()
@@ -1059 +1059 @@
-                help = itmatts["HelpText"]
-                menuItem = menu.append(cap, OnHit=binding, help=help,
-   
-
+
+
-    mnd = dabo.lib.xmltodict.xmltodict(srcFile)
-    mb = dabo.ui.dMenuBar()
@@ -1066 +1066 @@
-        addMenu(mb, mn, form, previewFunc)
-    return mb
-
-
-
+
+
+
+
-    """Given a data source, a form with a grid containing the data
- 
+
-    its getDataSet() method will be called to extract the data.
-
-    If parent is passed, the form isn't created, and the browsegrid
-    becomes a child of parent instead.
+
+    The columns will be taken from the first record of the dataset, with each
+    column header caption being set to the field name, unless   the optional
+    keyCaption parameter is passed. This parameter is a 1:1 dict containing
+    the data set keys as its keys, and the desired caption as the
+    corresponding value.
+
+    If the includeFields parameter is a sequence, the only columns added will
+    be the fieldnames included in the includeFields sequence. If the
+    includeFields   parameter is None, all fields will be added to the grid.
+
+    The columns will be in the order returned by ds.keys(), unless the
+    optional colOrder parameter is passed. Like the keyCaption property,
+    this is a 1:1 dict containing key:order.
-    """
-    if not isinstance(dataSource, (list, tuple)):
@@ -1096 +1111 @@
-
-    grd = dGrid(parent, AlternateRowColoring=True)
-
+
+
+
-
-    parent.Sizer.append(grd, 1, "x")
@@ -1123 +1140 @@
-    return fontMetric(txt=obj.Text, face=obj.FontFace, size=obj.FontSize,
-            bold=obj.FontBold, italic=obj.FontItalic)
-
+
-
-def fontMetric(txt=None, wind=None, face=None, size=None, bold=None,
-        italic=None):
-    """Calculate the width and height of the given text using the supplied
- 
+
-    from the specified window, or, if no window is specified, the currently
-    active form. If no form is active, the app's MainForm is used.
@@ -1173 +1190 @@
-    """Takes a screenshot of the specified and writes it to a file, converting
-    it to the requested image type. If no object is specified, the current
- 
+
-    will let you set things up as needed before the image is taken; if not specified,
-    the image is taken immediately.
@@ -1189 +1206 @@
-        # Nothing active!
-        stop(_("There is no active form to capture."), _("No Active Form"))
-     
+
-    bmp = obj.getCaptureBitmap()
-    knownTypes = ("png", "jpg", "bmp", "pcx")
@@ -1199 +1216 @@
-        else:
-            imgType = (imgType, )
- 
- 
+
+
-            "bmp":  wx.BITMAP_TYPE_BMP,
-            "pcx":  wx.BITMAP_TYPE_PCX}
@@ -1218 +1235 @@
-    img = wx.ImageFromBitmap(bmp)
-    img.SaveFile(pth, wxTypeDict[typ])
-
-
-
-
+
+
+
+
-
-
@@ -1231 +1248 @@
-def bitmapFromData(data):
-    return BitmapFromImage(imageFromData(data))
-
-
+
+
-def imageFromData(data):
-    stream = cStringIO.StringIO(data)
@@ -1241 +1258 @@
-# For applications that use the same image more than once,
-# this speeds up resolution of the requested image name.
- 
+
-def strToBmp(val, scale=None, width=None, height=None):
-    """This can be either a path, or the name of a built-in graphic.
-    If an adjusted size is desired, you can either pass a 'scale' value
- 
- 
-   
+
+
+
-    """
-    ret = None
@@ -1256 +1273 @@
-    else:
-        # Include all the pathing possibilities
- 
+
-                for pth in dabo.icons.__path__]
- 
+
-                for pth in dabo.__path__]
-        localpaths = [os.path.join(os.getcwd(), pth, val)
@@ -1278 +1295 @@
-    else:
-        _bmpCache[val] = ret
-
+
-    if ret is not None:
-        if scale is None and width is None and height is None:
@@ -1305 +1322 @@
-                    newWd = oldWd * (newHt / oldHt)
-            img.Rescale(newWd, newHt)
-    
+
-    return ret
-
-
+
+
-def pathToBmp(pth):
-    img = wx.NullImage
@@ -1319 +1336 @@
-    img.Rescale(wd, ht)
-    return img.ConvertToBitmap()
-
-
+
+
-def getCommonBitmap(name):
- 
+
-    This wraps the procedure for generating these bitmaps. If a name is
-    passed for which there is no icon, an image denoting a missing image
@@ -1336 +1353 @@
-
-def getImagePath(nm, url=False):
- 
+
-    current directory, returns the full path to the image. If 'url' is true, returns
-    the path in a 'file:///image.ext' format.
@@ -1368 +1385 @@
-            ret = "file://%s" % ret
-    return ret
-
+
-
-