What's up with commenting out the accelerators? It look like you forgot to add a comment explaining why it's commented out -- or forgot to just delete it after doing some testing.

It also has the unfortunate side-effect of removing the accelerators on mac.

John


On Apr 3, 2007, at 11:10 AM, [email protected] wrote:

Revision
13779
Author
heikki
Date
2007-04-03 11:10:49 -0700 (Tue, 03 Apr 2007)
Log Message

Use more wx builtin IDs. This will buy us icons, accelerators etc. in some cases.
Modified Paths

trunk/chandler/parcels/osaf/framework/attributeEditors/ DragAndDropTextCtrl.py
trunk/chandler/parcels/osaf/views/main/menus.py
Diff

Modified: trunk/chandler/parcels/osaf/framework/attributeEditors/ DragAndDropTextCtrl.py (13778 => 13779)

--- trunk/chandler/parcels/osaf/framework/attributeEditors/ DragAndDropTextCtrl.py 2007-04-03 18:07:12 UTC (rev 13778) +++ trunk/chandler/parcels/osaf/framework/attributeEditors/ DragAndDropTextCtrl.py 2007-04-03 18:10:49 UTC (rev 13779)
@@ -82,15 +82,15 @@
         # @@@ In the future, it might be nice to base this menu
         # on CPIA mechanisms, but we don't need that for now.
         menu = wx.Menu()
-        menu.Append(wx.ID_UNDO, messages.UNDO)
-        menu.Append(wx.ID_REDO, messages.REDO)
+ menu.Append(wx.ID_UNDO)#, messages.UNDO) # wx fills the message automatically
+        menu.Append(wx.ID_REDO)#, messages.REDO)
         menu.AppendSeparator()
-        menu.Append(wx.ID_CUT, messages.CUT)
-        menu.Append(wx.ID_COPY, messages.COPY)
-        menu.Append(wx.ID_PASTE, messages.PASTE)
-        menu.Append(wx.ID_CLEAR, messages.CLEAR)
+        menu.Append(wx.ID_CUT)#, messages.CUT)
+        menu.Append(wx.ID_COPY)#, messages.COPY)
+        menu.Append(wx.ID_PASTE)#, messages.PASTE)
+ menu.Append(wx.ID_CLEAR, messages.CLEAR) # have to use ours for mnemonic
         menu.AppendSeparator()
-        menu.Append(wx.ID_SELECTALL, messages.SELECT_ALL)
+        menu.Append(wx.ID_SELECTALL)#, messages.SELECT_ALL)

         if '__WXGTK__' in wx.PlatformInfo:
             # (see note below re: GTK)
Modified: trunk/chandler/parcels/osaf/views/main/menus.py (13778 => 13779)

--- trunk/chandler/parcels/osaf/views/main/menus.py 2007-04-03 18:07:12 UTC (rev 13778) +++ trunk/chandler/parcels/osaf/views/main/menus.py 2007-04-03 18:10:49 UTC (rev 13779)
@@ -213,7 +213,8 @@
                         menuItemKind = 'Separator'),
                     MenuItem.template('PrintPreviewItem',
                         event = globalBlocks.PrintPreview,
-                        title = _(u'Print Pre&view')),
+                        title = _(u'Print Pre&view'),
+                        wxId = wx.ID_PREVIEW),
                     MenuItem.template('PageSetupItem',
                         event = globalBlocks.PageSetup,
                         title = _(u'Page Set&up...'),
@@ -229,14 +230,15 @@
                     MenuItem.template('CommitView',
                         event = globalBlocks.CommitView,
                         title = _(u'&Save changes'),
-                        accel = _(u'Ctrl+S')),
+ #accel = _(u'Ctrl+S'), wx fills this and below entries automatically
+                        wxId = wx.ID_SAVE),
                     ])

     if wx.Platform != '__WXMAC__':
fileMenu.attrs['childBlocks'].append(MenuItem.template ('QuitItem', event=globalBlocks.Quit, title = _ (u'&Quit'), - accel = _ (u'Ctrl+Q'), + #accel = _ (u'Ctrl+Q'), helpString = _(u'Quit Chandler'), wxId = wx.ID_EXIT))

@@ -263,17 +265,17 @@
                     MenuItem.template('CutItem',
                         event = globalBlocks.Cut,
                         title = messages.CUT,
-                        accel = _(u'Ctrl+X'),
+                        #accel = _(u'Ctrl+X'),
                         wxId = wx.ID_CUT),
                     MenuItem.template('CopyItem',
                         event = globalBlocks.Copy,
                         title = messages.COPY,
-                        accel = _(u'Ctrl+C'),
+                        #accel = _(u'Ctrl+C'),
                         wxId = wx.ID_COPY),
                     MenuItem.template('PasteItem',
                         event = globalBlocks.Paste,
                         title = messages.PASTE,
-                        accel = _(u'Ctrl+V'),
+                        #accel = _(u'Ctrl+V'),
                         wxId = wx.ID_PASTE),
                     MenuItem.template('SelectAllItem',
                         event = globalBlocks.SelectAll,
@@ -288,19 +290,21 @@
                         title = _(u'Remo&ve'),
                         accel = platform_delete,
helpString = _(u'Remove the current selection from the current collection'),
-                        wxId = wx.ID_DELETE),
+                        wxId = wx.ID_REMOVE),
                     MenuItem.template('DeleteItem',
                         event = main.Delete,
                         title = _(u'&Delete'),
                         accel = platform_command_delete,
- helpString = _(u'Move the current selection to the trash')), + helpString = _(u'Move the current selection to the trash'),
+                        wxId = wx.ID_DELETE),
                     MenuItem.template('EditSeparator3',
                         menuItemKind = 'Separator'),
                     MenuItem.template('SearchItem',
                         event = main.Search,
                         title = _(u'&Find'),
-                        accel = _(u'Ctrl+F'),
- helpString = _(u'Search using the Quick Entry field')),
+                        #accel = _(u'Ctrl+F'),
+ helpString = _(u'Search using the Quick Entry field'),
+                        wxId = wx.ID_FIND),
                     ]), # Menu EditMenu
             Menu.template('ViewMenu',
                 title = _(u'&View'),

_______________________________________________
Commits mailing list
[email protected]
http://lists.osafoundation.org/mailman/listinfo/commits

_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _

Open Source Applications Foundation "chandler-dev" mailing list
http://lists.osafoundation.org/mailman/listinfo/chandler-dev

Reply via email to