[gnue] r8510 - in trunk/gnue-forms/src: . GFObjects uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2006-06-22 14:14:39 -0500 (Thu, 22 Jun 2006)
New Revision: 8510

Modified:
   trunk/gnue-forms/src/GFInstance.py
   trunk/gnue-forms/src/GFObjects/commanders.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
Log:
Fixed GCMenu/GCToolbar to GFMenu/GFToolbar, merge actions from default form
into main form.

issue79 in-progress


Modified: trunk/gnue-forms/src/GFInstance.py
===================================================================
--- trunk/gnue-forms/src/GFInstance.py  2006-06-22 18:35:43 UTC (rev 8509)
+++ trunk/gnue-forms/src/GFInstance.py  2006-06-22 19:14:39 UTC (rev 8510)
@@ -304,7 +304,7 @@
     # Load standard menu and merge it into main form
     assert gDebug (4, "Loading standard menu and toolbar")
 
-    main_menu = main_form.findChildNamed ('__main__', 'GCMenu')
+    main_menu = main_form.findChildNamed ('__main__', 'GFMenu')
     # FIXME: for now, only merge standard menu if there is a menu defined in
     # the form. Do all of this unconditionally after menu handling is finished.
     if main_menu:
@@ -313,7 +313,7 @@
         default_form = loadFile (filehandle, self, initialize=0, url=filename)
         filehandle.close ()
 
-        menu = default_form.findChildNamed ('__main__', 'GCMenu')
+        menu = default_form.findChildNamed ('__main__', 'GFMenu')
         menu.merge (main_menu)
         main_menu.assign (menu, True)
         main_menu.name = '__main__'
@@ -324,6 +324,10 @@
         main_menu._children.remove (help_menu)
         main_menu._children.append (help_menu)
 
+        # Merge all actions into the main form
+        for action in default_form.findChildrenOfType('GCAction'):
+            main_form._actions[action.name] = action
+
     # Initialize all the forms loaded into memory
     assert gDebug (4, "Initializing form objects")
 

Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 18:35:43 UTC 
(rev 8509)
+++ trunk/gnue-forms/src/GFObjects/commanders.py        2006-06-22 19:14:39 UTC 
(rev 8510)
@@ -257,7 +257,7 @@
     # Constructor
     # -------------------------------------------------------------------------
 
-    def __init__(self, parent = None, object_type = "GCMenu"):
+    def __init__(self, parent = None, object_type = "GFMenu"):
         """
         Create a GFMenu instance.
         """
@@ -277,7 +277,7 @@
     # Constructor
     # -------------------------------------------------------------------------
 
-    def __init__(self, parent = None, object_type = "GCMenuItem"):
+    def __init__(self, parent = None, object_type = "GFMenuItem"):
         """
         Create a GFMenuItem instance.
         """
@@ -304,7 +304,7 @@
     # Constructor
     # -------------------------------------------------------------------------
 
-    def __init__(self, parent = None, object_type = "GCToolbar"):
+    def __init__(self, parent = None, object_type = "GFToolbar"):
         """
         Create a GFToolbar instance.
         """
@@ -324,7 +324,7 @@
     # Constructor
     # -------------------------------------------------------------------------
 
-    def __init__(self, parent = None, object_type = "GCToolButton"):
+    def __init__(self, parent = None, object_type = "GFToolButton"):
         """
         Create a GFToolButton instance.
         """

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-06-22 18:35:43 UTC 
(rev 8509)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menu.py 2006-06-22 19:14:39 UTC 
(rev 8510)
@@ -68,6 +68,6 @@
 
 configuration = {
   'baseClass': UIMenu,
-  'provides' : 'GCMenu',
+  'provides' : 'GFMenu',
   'container': 1,
 }

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2006-06-22 
18:35:43 UTC (rev 8509)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2006-06-22 
19:14:39 UTC (rev 8510)
@@ -118,6 +118,6 @@
 
 configuration = {
   'baseClass': UIMenuItem,
-  'provides' : 'GCMenuItem',
+  'provides' : 'GFMenuItem',
   'container': False
 }