Changeset 639

Timestamp:

08/09/10 17:00:04 (9 years ago)

Author:

beliar

Message:

Patch by Beliar

• Enabled of Hud is now a property that gets/sets the enabled status of the hud and its children using real_widget. This makes it possible to really disable the widgets instead of making them do nothing.

File:

• trunk/game/scripts/gui/hud.py (modified) (13 diffs)

trunk/game/scripts/gui/hud.py

@@ -18 +18 @@
 from fife.extensions import pychan
 from fife.extensions.pychan.tools import callbackWithArguments as cbwa
-from fife.fife import MouseEvent
 
 from scripts.gui.filebrowser import FileBrowser
@@ -43 +42 @@
                quitGame: called when the user clicks on Quit
            @return: None"""
-        self.enabled = False
         pychan.init(controller.engine, debug = True)
 
@@ -79 +77 @@
         self.initializeEvents()
         self.initializeQuitDialog()
-
+    
+    def _getEnabled(self):
+        """"Returns whether the gui widget is enabled or not"""
+        return self.hud.real_widget.isEnabled()
+    
+    def _setEnabled(self, enabled):
+        """"Sets whether the gui widget is enabled or not"""
+        self.hud.real_widget.setEnabled(enabled)
+        childs = self.hud.getNamedChildren()
+        for child_list in childs.itervalues():
+            for child in child_list:
+                child.real_widget.setEnabled(enabled)
+    
+    enabled = property(_getEnabled, _setEnabled)
+        
     def initializeHud(self):
         """Initialize and show the main HUD
@@ -118 +130 @@
         
     def mouseMoved(self, event):
+        """Called when the mouse was moved on the bottom panel"""
         self.controller.updateMouse(event.getX(), 
-                                    self.engine.getSettings().getScreenHeight() - \
-                                    (self.bottom_panel.height - event.getY()))
+                                    self.engine.getSettings().getScreenHeight()\
+                                    - (self.bottom_panel.height - event.getY()))
         
 
@@ -163 +176 @@
             'toggleInventoryButton': self.toggleInventoryButton,
         }
-        self.inventory_storage = self.model.game_state.player_character.inventory
+        self.inventory_storage = \
+            self.model.game_state.player_character.inventory
         if self.inventory == None:
             self.inventory = inventorygui.InventoryGUI(self.controller,
@@ -204 +218 @@
         """Displays the main in-game menu.
            @return: None"""
-        if not self.enabled:
-            return
         self.stopActions()
         if (self.menu_displayed == False):
@@ -260 +272 @@
         """ Called when the user wants to save the game.
             @return: None"""
-        if not self.enabled:
-            return
         self.stopActions()
         save_browser = FileBrowser(self.engine,
@@ -272 +282 @@
 
     def stopActions(self):
-        """This method stops/resets actions that are currently performed like dragging an item.
-        This is done to be able to savely perform other actions that might interfere with current running ones."""
+        """This method stops/resets actions that are currently performed 
+        like dragging an item.
+        This is done to be able to savely perform other actions that might 
+        interfere with current running ones."""
         #Reset dragging - move item back to its old container
         if data_drag.dragging:
@@ -285 +297 @@
         """Called when user request to start a new game.
            @return: None"""
-        if not self.enabled:
-            return
         self.stopActions()
         print 'new game'
@@ -293 +303 @@
         """ Called when the user wants to load a game.
             @return: None"""
-        if not self.enabled:
-            return
         self.stopActions()
         load_browser = FileBrowser(self.engine,
@@ -336 +344 @@
         """Called when user requests to quit game.
            @return: None"""
-        if not self.enabled:
-            return
         self.stopActions()
         self.quit_window.show()
@@ -353 +359 @@
         """Displays the inventory screen
            @return: None"""
-        if not self.enabled:
-            return
         if self.inventory == None:
             self.initializeInventory()
@@ -427 +431 @@
     def readyAction(self, ready_button):
         """ Called when the user selects a ready button from the HUD """
-        if not self.enabled:
-            return
         text = "Used the item from %s" % ready_button        
         self.addAction(text)