Changeset 1590

Timestamp:

11/28/2005 06:56:33 AM (3 years ago)

Author:

ed

Message:

Added constants needed to distinguish the Find/Replace dialog fields from each other.

Added the method 'addConnectFile()' to dApp. This allows you to pass a path to a cnxml file, and it will read in the connection information and add it to its dbConnectionDefs.

Modified the dToolForm class to use wx.MiniFrame? instead of a modified wx.Frame. I don't notice any change in behavior, but I figured that since this wx class is designed for just this purpose, it made more sense to use it. I left the old dToolForm code commented in case we find any problems with this new class.

Overhauled the Find/Replace logic in uiApp. It now works as expected (at least on OS X!), and is ready to be used as an integral part of the next iteration of the Designer, which will feature code editing.

Files:

• trunk/dabo/dApp.py (modified) (2 diffs)
• trunk/dabo/dConstants.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dBaseMenuBar.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/dForm.py (modified) (1 diff)
• trunk/dabo/ui/uiwx/uiApp.py (modified) (13 diffs)

trunk/dabo/dApp.py

@@ -355 +355 @@
-                name = "%s@%s" % (ci.User, ci.Host)
-        self.dbConnectionDefs[name] = ci
+    
+
+    def addConnectFile(self, connFile):
+        """Accepts a cnxml file path, and reads in the connections
+        defined in it, adding them to self.dbConnectionDefs.
+        """
+        if os.path.exists(connFile):
+            connDefs = importConnections(connFile)
+            # For each connection definition, add an entry to 
+            # self.dbConnectionDefs that contains a key on the 
+            # name, and a value of a dConnectInfo object.
+            for k,v in connDefs.items():
+                ci = dabo.db.dConnectInfo()
+                ci.setConnInfo(v)
+                self.dbConnectionDefs[k] = ci
-    
-
@@ -376 +391 @@
-    def onEditFind(self, evt):
-        self.uiApp.onEditFind(evt)
+    def onEditFindAlone(self, evt):
+        self.uiApp.onEditFindAlone(evt)
-    def onEditFindAgain(self, evt):
-        self.uiApp.onEditFindAgain(evt)

trunk/dabo/dConstants.py

@@ -28 +28 @@
-DLG_OK = 0
-DLG_CANCEL = -1
+
+FIND_DIALOG_FINDTEXT = -210
+FIND_DIALOG_REPLACETEXT = -212

trunk/dabo/ui/uiwx/dBaseMenuBar.py

@@ -64 +64 @@
-        self.appendSeparator()
-
-
-
+
+
+
+
+
+
-
-        self.append(_("Find Again") + "\tCtrl+G", bindfunc=app.onEditFindAgain, bmp="",
-                help=_("Repeat the last search") )
+
+        self.append(_("&Find / Replace") + "\tCtrl+F", bindfunc=app.onEditFind, 
+                bmp="find", help=_("Find text in the active window") )
-
-        self.appendSeparator()

trunk/dabo/ui/uiwx/dForm.py

@@ -762 +762 @@
-
-
-
+
+
-    def __init__(self, parent=None, properties=None, *args, **kwargs):
-
-
-
+
+
+
+
-        kwargs["ShowStatusBar"] = False
-        kwargs["ShowToolBar"] = False
-
+
+
+
+
+
+
+
-#       kwargs[""] = 
-
+# 
-
-            

trunk/dabo/ui/uiwx/uiApp.py

@@ -6 +6 @@
-from dabo.dObject import dObject
-from dabo.dLocalize import _, n_
+import dabo.dConstants as kons
+
-
-class uiApp(wx.App, dObject):
@@ -16 +18 @@
-        self._noneDisp = _("<null>")
-        self._drawSizerOutlines = False
+        # Various attributes used by the FindReplace dialog
+        self._findString = ""
+        self._replaceString = ""
+        self._findReplaceFlags = wx.FR_DOWN
+        self.findReplaceData = None
+        self.findDialog = None
-        
-        
@@ -91 +99 @@
-        
-    def _onWxActivate(self, evt):
-
-
+
-        if bool(evt.GetActive()):
-            self.raiseEvent(dEvents.Activate, evt)
@@ -235 +242 @@
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-        if self.ActiveForm:
-            win = self.ActiveForm.ActiveControl
-            if win:
-                self.findWindow = win           # Save reference for use by self.OnFind()
-    
-                try:
-                    data = self.findReplaceData
@@ -247 +263 @@
-                    data = None
-                if data is None:
-
+
+
+
-                    self.findReplaceData = data
-
+
+
+
+
+
-                
-                # Map enter key to find button:
@@ -258 +280 @@
-                dlg.Bind(wx.EVT_FIND, self.OnFind)
-                dlg.Bind(wx.EVT_FIND_NEXT, self.OnFind)
+                dlg.Bind(wx.EVT_FIND_REPLACE, self.OnFindReplace)
+                dlg.Bind(wx.EVT_FIND_REPLACE_ALL, self.OnFindReplaceAll)
-                dlg.Bind(wx.EVT_FIND_CLOSE, self.OnFindClose)
-    
@@ -275 +299 @@
-        for kid in kids:
-            if isinstance(kid, wx.TextCtrl):
-
+
+
+
+
-            elif isinstance(kid, wx.CheckBox):
-                lbl = kid.GetLabel()
@@ -295 +322 @@
-    def onEditFindAgain(self, evt):
-        """Repeat the last search."""
+        if self.findReplaceData is None:
+            if self._findString:
+                data = wx.FindReplaceData(self._findReplaceFlags)
+                data.SetFindString(self._findString)
+                data.SetReplaceString(self._replaceString)
+                self.findReplaceData = data
-        try:
-            fd = self.findReplaceData
-            self.OnFind(fd)
-
+, e
-            self.onEditFind(None)
-            return
@@ -305 +338 @@
-    def OnFindClose(self, evt):
-        """ User clicked the close button, so hide the dialog."""
+        frd = self.findReplaceData
+        self._findString = frd.GetFindString()
+        self._replaceString = frd.GetReplaceString()
+        self._findReplaceFlags = frd.GetFlags()
-        self.findReplaceData = None
-        self.findDialog.Destroy()
+        self.findDialog = None
-        evt.Skip()
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        """ User clicked the 'find' button in the find dialog.
-        Run the search on the current control, if it is a text-based control.
@@ -317 +375 @@
-        flags = self.findReplaceData.GetFlags()
-        findString = self.findReplaceData.GetFindString()
+        replaceString = self.findReplaceData.GetReplaceString()
+        replaceString2 = self.findReplaceData.GetReplaceString()
-        downwardSearch = (flags & wx.FR_DOWN) == wx.FR_DOWN
-        wholeWord = (flags & wx.FR_WHOLEWORD) == wx.FR_WHOLEWORD
-        matchCase = (flags & wx.FR_MATCHCASE) == wx.FR_MATCHCASE
-
+        ret = None
-        win = self.findWindow
-        if win:
-            if isinstance(win, wx.stc.StyledTextCtrl):
-                # STC
+                if action == "Replace":
+                    # Make sure that there is something to replace
+                    selectPos = win.GetSelection()
+                    if selectPos[1] - selectPos[0] > 0: 
+                        # There is something selected to replace
+                        win.ReplaceSelection(replaceString)
+
+                selectPos = win.GetSelection()
-                if downwardSearch:
-win.GetSelection()
+selectPos
-                    finish = win.GetTextLength()
-                    pos = win.FindText(start, finish, findString, flags)
-                else:
-win.GetSelection()
+selectPos
-                    txt = win.GetText()[:start]
-                    txRev = utils.reverseText(txt)
@@ -341 +410 @@
-                    pos = len(txt) - posRev - len(fsRev)
-                if pos > -1:
+                    ret = True
-                    win.SetSelection(pos, pos+len(findString))
-
+
+
-            else:
-                try: 
@@ -352 +423 @@
-                    return
-
+                if action == "Replace":
+                    # If we have a selection, replace it.
+                    selectPos = win.GetSelection()
+                    if selectPos[1] - selectPos[0] > 0:
+                        win.ReplaceSelection(replaceString)
+
+                selectPos = win.GetSelection()
-                if downwardSearch:
-win.GetSelection()
+selectPos
-                    value = win.GetValue()[currentPos:]
-                else:
-win.GetSelection()
+selectPos
-                    value = win.GetValue()[:currentPos]
-                    value = utils.reverseText(value)
@@ -376 +454 @@
-                else:
-                    dabo.infoLog.write(_("Not found"))
-
-
+
+
-    def onShowSizerLines(self, evt):
-        """Toggles whether sizer lines are drawn. This is simply a tool