[gnue] r8444 - trunk/gnue-common/src/logic

[reinhard]

Author: reinhard
Date: 2006-04-20 08:39:50 -0500 (Thu, 20 Apr 2006)
New Revision: 8444

Modified:
   trunk/gnue-common/src/logic/GTrigger.py
Log:
Fixed separate global namespace for all dialogs.


Modified: trunk/gnue-common/src/logic/GTrigger.py
===================================================================
--- trunk/gnue-common/src/logic/GTrigger.py     2006-04-20 13:14:24 UTC (rev 
8443)
+++ trunk/gnue-common/src/logic/GTrigger.py     2006-04-20 13:39:50 UTC (rev 
8444)
@@ -26,6 +26,7 @@
 
 from gnue.common.apps import errors, GDebug
 from gnue.common.definitions.GObjects import GObj
+from gnue.common.definitions.GRootObj import GRootObj
 from gnue.common.definitions.GParserHelpers import GContent
 from gnue.common.formatting import GTypecast
 
@@ -91,7 +92,15 @@
 
         self._xml_content_as_cdata_ = gConfig('StoreTriggersAsCDATA')
 
-        self.__root = self.findParentOfType(None)
+        # Find the next GRootObj. This can be, for example, either a <form> or
+        # a <dialog> within a <form>. This most be done because every dialog
+        # has its own global trigger namespace and its own trigger dictionary.
+        parent = self.getParent()
+        while not isinstance(parent, GRootObj) \
+                and parent.getParent() is not None:
+            parent = parent.getParent()
+        self.__root = parent
+
         self.__function = None
 
         self._inits = [self.__initialize]