Changeset 3035

Timestamp:

04/05/2007 02:24:43 PM (2 years ago)

Author:

paul

Message:

Changed the old datanav to use the new icons. With this, I believe all the
dependencies to the old icons are gone, so after 0.8 is released I'll
remove the old icons.

Files:

• trunk/dabo/lib/datanav/Form.py (modified) (4 diffs)
• trunk/dabo/lib/datanav/PageFrame.py (modified) (2 diffs)
• trunk/dabo/lib/datanav2/PageFrame.py (modified) (1 diff)

trunk/dabo/lib/datanav/Form.py

@@ -142 +142 @@
-            # It's already been set up
-            return
-
-
-
+
+
+
+
+
+
+
+
+
+
-        if self.FormType != 'Edit':
-leftArrows", OnHit=self.onFirst
-
-leftArrow", OnHit=self.onPrior
-
-requery", OnHit=self.onRequery
-
-rightArrow", OnHit=self.onNext
-
-rightArrows", OnHit=self.onLast
-
+%s/actions/go-first.png" % iconPath
+OnHit=self.onFirst,    
+%s/actions/go-previous.png" % iconPath
+OnHit=self.onPrior,    
+%s/actions/view-refresh.png" % iconPath
+OnHit=self.onRequery,  
+%s/actions/go-next.png" % iconPath
+OnHit=self.onNext, 
+%s/actions/go-last.png" % iconPath
+OnHit=self.onLast, 
-            tb.appendSeparator()
-
-        if self.FormType == 'Normal':
-blank", OnHit=self.onNew
-
-delete", OnHit=self.onDelete
-
+%s/actions/document-new.png" % iconPath
+OnHit=self.onNew,  
+%s/actions/edit-delete.png" % iconPath
+OnHit=self.onDelete, 
-            tb.appendSeparator()
-
-        if self.FormType != 'PickList':
-save", OnHit=self.onSave
-
-revert", OnHit=self.onCancel
-
+%s/actions/document-save.png" % iconPath
+OnHit=self.onSave, 
+%s/actions/edit-undo.png" % iconPath
+OnHit=self.onCancel, 
-            tb.appendSeparator()
-
-        if self.FormType != "Edit":
-            self.appendToolBarButton("SQL", "zoomNormal", OnHit=self.onShowSQL, 
-                    tip=_("Show SQL"), help=_("Show the last executed SQL statement"))
-
-        if self.FormType == "Normal":
-print"
+%s/actions/document-print-preview.png" % iconPath
-                    OnHit=self.onQuickReport, tip=_("Quick Report"),
-                    help=_("Run a Quick Report on the current dataset"))
@@ -183 +186 @@
-
-    def getMenu(self):
+        iconPath = "themes/tango/16x16" 
-        menu = super(Form, self).getMenu()
-        menu.Caption = _("&Actions")
-
-        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."))
-
@@ -211 +215 @@
-                    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()
@@ -233 +241 @@
-
-            menu.append(_("Select &First Record")+"\t%s+UP" % altKey, 
-leftArrows"
+%s/actions/go-first.png" % iconPath
-                    help=_("Go to the first record in the set.")) 
-            menu.append(_("Select &Prior Record")+"\t%s+LEFT" % altKey, 
-bmp="leftArrow"
+ bmp="%s/actions/go-previous.png" % iconPath
-                    help=_("Go to the prior record in the set."))   
-            menu.append(_("Select Ne&xt Record")+"\t%s+RIGHT" % altKey, 
-rightArrow"
+%s/actions/go-next.png" % iconPath
-                    help=_("Go to the next record in the set."))
-            menu.append(_("Select &Last Record")+"\t%s+DOWN" % altKey, 
-rightArrows"
+%s/actions/go-last.png" % iconPath
-                    help=_("Go to the last record in the set."))
-            menu.appendSeparator()
-        
-        if self.FormType == "Normal":
-
+
+
-                    help=_("Add a new record to the dataset."))
-
+
+
-                    help=_("Delete the current record from the dataset."))
-            menu.appendSeparator()
-
-        if self.FormType != "Edit":
-, bmp="zoomNormal"
+
-
-        if self.FormType == "Normal":
-
+
+
-                    DynamicEnabled=self.enableQuickReport)
-

trunk/dabo/lib/datanav/PageFrame.py

@@ -15 +15 @@
-        self._pageStyleClass.__init__(self, parent, Name=Name, *args, **kwargs)
-        # Add the images for the various pages.
-self.addImage("checkMark")
-browse
-edit
-childview
+iconPath = "themes/tango/16x16"
+%s/actions/system-search.png" % iconPath, key="select
+%s/actions/format-justify-fill.png" % iconPath, key="browse
+%s/apps/accessories-text-editor.png" % iconPath, key="edit
-
-
@@ -57 +57 @@
-                for child in bizobj.getChildren():
-                    self.appendPage(self.ChildPageClass(self, child.DataSource), 
-, imgKey="childview"
+
-
-
-    def addSelectPage(self, title=_("Select")):
-checkMark
+select
-    
-    def addBrowsePage(self, title=_("Browse")):

trunk/dabo/lib/datanav2/PageFrame.py

@@ -13 +13 @@
-        self.addImage("%s/actions/format-justify-fill.png" % iconPath, key="browse")
-        self.addImage("%s/apps/accessories-text-editor.png" % iconPath, key="edit")
-        self.addImage("childview")
-
-        self.dsEditPages = {}