Changeset 3032

Timestamp:

04/04/07 22:23:30 (2 years ago)

Author:

paul

Message:

This completes the icon conversion for common areas of Dabo.

Files:

• trunk/dabo/lib/datanav2/Form.py (modified) (7 diffs)
• trunk/dabo/lib/datanav2/PageFrame.py (modified) (2 diffs)
• trunk/dabo/ui/uiwx/dBaseMenuBar.py (modified) (7 diffs)

trunk/dabo/lib/datanav2/Form.py

@@ -68 +68 @@
-        tb.SetToolBitmapSize((22,22))  ## need to abstract in dToolBar! 
-        if self.FormType != 'Edit':
-OnHit=self.onFirst, 
-
-OnHit=self.onPrior, 
-
-OnHit=self.onRequery, 
-
-OnHit=self.onNext, 
-
-OnHit=self.onLast, 
-
+
+OnHit=self.onFirst,    
+
+OnHit=self.onPrior,    
+
+OnHit=self.onRequery,  
+
+OnHit=self.onNext, 
+
+OnHit=self.onLast, 
-            tb.appendSeparator()
-
-        if self.FormType == 'Normal':
-OnHit=self.onNew, 
-
-OnHit=self.onDelete, 
-
+
+OnHit=self.onNew,  
+
+OnHit=self.onDelete, 
-            tb.appendSeparator()
-
-        if self.FormType != 'PickList':
-OnHit=self.onSave, 
-
-OnHit=self.onCancel, 
-
+
+OnHit=self.onSave, 
+
+OnHit=self.onCancel, 
-            tb.appendSeparator()
-
@@ -106 +106 @@
-
-        menu.append(_("Set Selection &Criteria")+"\tAlt+1", 
-checkMark"
+%s/actions/system-search.png" % iconPath
-                help=_("Set the selection criteria for the recordset."))
-
-        menu.append(_("&Browse Records")+"\tAlt+2", 
-browse"
+%s/actions/format-justify-fill.png" % iconPath
-                help=_("Browse the records in the current recordset."))
-
@@ -130 +130 @@
-                    help = ""
-                    
-
+
+
-            menu.appendSeparator()
-
-        if self.FormType != "Edit":
-
+
+
-                    help=_("Get a new recordset from the backend."), menutype="check")      
-    
-        if self.FormType != "PickList":
-
+
+
-                    help=_("Save any changes made to the records."))    
-
+
+
-                    help=_("Cancel any changes made to the records."))
-            menu.appendSeparator()
@@ -166 +170 @@
-        
-        if self.FormType == "Normal":
-
+
+
-                    help=_("Add a new record to the dataset."))
-
+
+
-                    help=_("Delete the current record from the dataset."))
-            menu.appendSeparator()
@@ -176 +182 @@
-
-        if self.FormType == "Normal":
-
+
+
-                    DynamicEnabled=self.enableQuickReport)
-
@@ -295 +302 @@
-        if sql is None:
-            sql = "-Nothing executed yet-"
-
+
+
-        eb = dlg.addObject(dabo.ui.dEditBox, ReadOnly=True, Value=sql, 
-                Size=(400, 400))
@@ -312 +320 @@
-        # May not have records if called via toolbar button
-        if not self.enableQuickReport():
-
+
+
-            return
-

trunk/dabo/lib/datanav2/PageFrame.py

@@ -9 +9 @@
-        self._pageStyleClass.__init__(self, parent, Name=Name, *args, **kwargs)
-        # Add the images for the various pages.
-
-
-
+
+
+
+
-        self.addImage("childview")
-
@@ -36 +37 @@
-
-    def addSelectPage(self, caption=_("Select")):
-checkMark
+select
-
-    def addBrowsePage(self, caption=_("Browse")):

trunk/dabo/ui/uiwx/dBaseMenuBar.py

@@ -17 +17 @@
-from dabo.dLocalize import _, n_
-
+iconPath = "themes/tango/16x16"
-
-class FileMenu(dMenu):
@@ -32 +33 @@
-        if self.Application.ShowCommandWindowMenu:
-            self.append(_("Command Win&dow") + "\tCtrl+D", OnHit=app.onCmdWin, 
+                    bmp="%s/apps/utilities-terminal.png" % iconPath,
-                    help=_("Open up a command window for debugging") )
-        
-        prmpt = _("Close Windo&w") + "\tCtrl+W"
- bmp="close",
+
-                help=_("Close the current window") )
-
@@ -41 +43 @@
-
-        prmpt = _("&Quit") + "\tCtrl+Q"
-#       if wx.Platform == '__WXWIN__':
-#           prmpt = _("E&xit") + "\tAlt+F4"
-        self.append(prmpt, id=wx.ID_EXIT, OnHit=app.onFileExit, 
-
+
+
-
-
@@ -54 +55 @@
-        self.Caption = _("&Edit")
-
-
+
+
-                help=_("Undo last action") )
-
-
+
+
-                help=_("Undo last undo") )
-
-        self.appendSeparator()
-
-
+
+
-                help=_("Cut selected text") )
-
-
+
+
-                help=_("Copy selected text") )
-
-
+
+
-                help=_("Paste text from clipboard") )
-
-
+
+
-                help=_("Select all text") )
-
@@ -79 +86 @@
-        # commented lines below this enable the plain Find dialog call.
-        self.append(_("&Find / Replace") + "\tCtrl+F", OnHit=app.onEditFind, 
-
+
+
-
-#       self.append(_("Find") + "\tShift+Ctrl+F", OnHit=app.onEditFindAlone, 
-find"
+%s/actions/edit-find.png" % iconPath
-
-        self.append(_("Find A&gain") + "\tCtrl+G", OnHit=app.onEditFindAgain, bmp="",
@@ -89 +97 @@
-        self.appendSeparator()
-
-
+
+
-                help=_("Set user preferences") )
+
-        # Put the prefs item in the App Menu on Mac
-        wx.App_SetMacPreferencesMenuItemId(itm.GetId())
@@ -120 +130 @@
-
-        itm = self.append(_("&About"), id=wx.ID_ABOUT, 
- bmp="apply",
+
-                help=_("About this application") )
-        # Put the about menu in the App Menu on Mac