From a338dac3c7e4926602e40090e11ddb45e7dde0e0 Mon Sep 17 00:00:00 2001
From: Brian Caine <brian@mephistopheles.(none)>
Date: Sun, 25 Nov 2007 15:11:24 -0500
Subject: [PATCH] Well, I've started to do Justin's parts.

Yep, I've got the text rendering correctly.

But I don't know if transparency will work in general, but meh, I've got
something done.
---
 TODO                   | 14 ++++++--------
 game_client.py         | 19 +++++++++++++++++++
 pack_out/run.xml       | 17 +++++++++++++----
 pygame_gui/DerGUI.py   | 34 +++++++++++++++++++---------------
 pygame_gui/widgets.xml |  4 ++--
 5 files changed, 59 insertions(+), 29 deletions(-)

diff --git a/TODO b/TODO
index ef988c3..5abe83c 100644
--- a/TODO
+++ b/TODO
@@ -8,17 +8,15 @@ be done.
 
 Justin's TODO List:
 
-1. Play with the GUI. The test_suite.py file is the current version of 
-the gui. you may need to update your zipfiles with ./update_zip.sh, from 
-within the pygame_gui/ directory. As you can see, we're having a 
-transparency problem we didn't have before, so you can compare with 
-temp.py and DerCrapGUI.py.
-2. Get the text to draw properly.
+1. [DONE, by canine]
+2. [DONE, by canine]
 3. Add a function to the GUISystem class that allows you to add an 
    image. It'll be a surface containing the new image. Also, add an 
    image widget.
+4. Add some option for a gui theme to specify font size, name and color.
+5. Add a listbox widget.
 
 Brian's TODO List:
 
-1. Work on the GUI.
-2. Add support for gui nesting.
+1. Work on the new version.
+2. Get 3d stuff to work.
diff --git a/game_client.py b/game_client.py
index a3a2136..b0894d0 100644
--- a/game_client.py
+++ b/game_client.py
@@ -355,6 +355,7 @@ class Engine:
 
         glLoadIdentity()
         if self.change:
+            self.lamina_screen.clear()
             self.gui_system.draw(self.lamina_screen.surf)
             self.lamina_screen.refresh()
         self.lamina_screen.display()
@@ -490,10 +491,26 @@ class Engine:
 
     def showMenu(self, menu_name):
 
+        found = 0
+
         for file, contents in self.files.iteritems():
             for name, menu in contents['menu_instances'].iteritems():
                 if contents['menu_instances'].has_key(menu_name):
                     contents['menu_instances'][menu_name].show()
+                    found = 1
+
+        new_menu = None
+
+        if not found:
+            for file in self.files:
+                contents = self.files[file]
+                for name in contents['menu_defs']:
+                    menu = contents['menu_defs'][name]
+                    if name == menu_name:
+                        new_menu = Menu(name, contents['menu_defs'][name]['elements'], self)
+                        new_menu.show()
+
+                        self.files[file]['menu_instances'][name] = new_menu
 
         return
 
@@ -511,6 +528,8 @@ class Engine:
         self.hideAllMenus()
         self.showMenu(menu_name)
 
+        self.change = 1
+
         return
 
     def addFile(self, filename, parent=''):
diff --git a/pack_out/run.xml b/pack_out/run.xml
index 73b2ec3..9cbb65e 100644
--- a/pack_out/run.xml
+++ b/pack_out/run.xml
@@ -48,7 +48,7 @@
                 width="20"
                 height="10"
                 parent="background_image"
-		target="the_engine.setMenu('main_menu')"
+		target="self.engine.setMenu('main_menu')"
                 text="Back to main menu...">
         </button>
         <label name="title"
@@ -69,15 +69,24 @@
                parent="background_image"
                text="Project Lead: Joe Lopatta">
         </label>
-        <label name="modeling"
+        <label name="modeling#1"
                x="35"
                y="20"
                width="25"
                height="7"
                target=""
                parent="background_image"
-               text="Modeling Lead: Joe Lopatta Modeling: Calvin Strumsky">
+               text="Modeling Lead: Joe Lopatta">
         </label>
+	<label name="modeling#2"
+	       x="35"
+               y="22"
+               width="25"
+               height="7"
+               target=""
+               parent="background_image"
+	       text="Modeling: Calvin Strumsky">
+	</label>
         <label name="imaging"
                x="35"
                y="27"
@@ -368,7 +377,7 @@
 		width="20"
 		height="10"
 		parent="background_image"
-		target="the_engine.setMenu('main_menu')"
+		target="self.engine.setMenu('main_menu')"
 		text="Return to Main Menu">d
 	</button>
 	<button name="join_button"
diff --git a/pygame_gui/DerGUI.py b/pygame_gui/DerGUI.py
index c4b2804..d8b9b5e 100644
--- a/pygame_gui/DerGUI.py
+++ b/pygame_gui/DerGUI.py
@@ -21,7 +21,7 @@ import time
 import array
 
 FONT_NAME = 'serif'
-FONT_SIZE = 30
+FONT_SIZE = 20
 FONT_COLOR = (255, 255, 255)
 
 BLINK_DELAY = 3.0
@@ -90,7 +90,7 @@ class GUISystem:
 
                     widget = {}
 
-                    widget['parameters'] = {}
+                    widget['parameters'] = {'direct': 0}
                     widget['parts'] = {}
                     widget['behaviors'] = {}
 
@@ -121,10 +121,12 @@ class GUISystem:
                           for sub_sub_node in sub_node.childNodes:
 
                             if sub_sub_node.nodeName == 'type':
-                              widget['parts'][part_name]['type'] = sub_sub_node.childNodes[0].nodeValue.encode()
-                              if widget['parts'][part_name]['type'] == 'text':
-                                widget['parts'][part_name]['prerender'] = ''
-                                widget['parts'][part_name]['old_text'] = ''
+                                widget['parts'][part_name]['type'] = sub_sub_node.childNodes[0].nodeValue.encode()
+                                if widget['parts'][part_name]['type'].find(':direct') != -1:
+                                    widget['parameters']['direct'] = 1
+                                if widget['parts'][part_name]['type'] == 'text':
+                                  widget['parts'][part_name]['prerender'] = ''
+                                  widget['parts'][part_name]['old_text'] = ''
 
                             if sub_sub_node.nodeName == 'source':
                               widget['parts'][part_name]['source'] = sub_sub_node.childNodes[0].nodeValue.encode()
@@ -213,7 +215,7 @@ class GUISystem:
 
                 widget_rect = widget.getRect()
                 if widget_rect.collidepoint(new_event['data']['pos']):
-                    if new_event['type'] != 'MOUSEMOTION':
+                    if new_event['type'] != 'MOUSEMOTION' and widget.is_visible():
                         self.focus = widget
                         self.focus.event(new_event)
                         count += 1
@@ -398,6 +400,10 @@ class Widget:
 
         return
 
+    def is_visible(self):
+
+        return self.params['parameters']['visible']
+
     def connect(self, event, function, params={}):
 
         self.callbacks[event] = {'function': function, 'params': params}
@@ -468,7 +474,7 @@ class Widget:
 
         zindex_list.sort()
 
-        self.surf.fill(pygame.color.Color('0x00000000'))
+        #self.surf.fill(pygame.color.Color('0x00000000'))
 
         for zindex in zindex_list:
             for part in self.params['parts']:
@@ -478,7 +484,7 @@ class Widget:
                 # here be dragons
                 if cur_part['type'].find('text') != -1:
                     try:
-                        exec(''.join(['if self.params["parts"][part]["old_text"] != self.params["parameters"][self.params["parts"][part]["source"]]:\n    ', part, ' = self.the_gui_system.the_font.render(self.params["parameters"][self.params["parts"][part]["source"]], False, FONT_COLOR).convert_alpha(self.surf)\n    the_source = ', part, '\n    self.params["parts"][part]["prerender"] = ', part, '\n    self.params["parts"][part]["old_text"] = self.params["parameters"][self.params["parts"][part]["source"]]\nelse:\n    the_source = self.params["parts"][part]["prerender"]\n', part, ' = the_source']))
+                        exec(''.join(['if self.params["parts"][part]["old_text"] != self.params["parameters"][self.params["parts"][part]["source"]]:\n    ', part, ' = self.the_gui_system.the_font.render(self.params["parameters"][self.params["parts"][part]["source"]], True, FONT_COLOR).convert_alpha(self.surf)\n    the_source = ', part, '\n    self.params["parts"][part]["prerender"] = ', part, '\n    self.params["parts"][part]["old_text"] = self.params["parameters"][self.params["parts"][part]["source"]]\nelse:\n    the_source = self.params["parts"][part]["prerender"]\n', part, ' = the_source']))
                     except:
                         assert 0
 
@@ -503,17 +509,15 @@ class Widget:
                     if cur_part['type'] == 'text:direct':
                         position = [position[0] + self.params['parameters']['x'],
                                     position[1] + self.params['parameters']['y']]
-                        the_source.convert()
-                        the_source.set_colorkey((0, 0, 0))
                         dest_surface.blit(the_source, position)
 
                     if cur_part['type'] == 'widget':
                         pass # implement
 
-        self.surf.convert_alpha(dest_surface)
-
-#        print "Debug, bitsize", self.surf.get_bytesize(), "flags", self.surf.get_flags()
-        dest_surface.blit(self.surf, (self.params['parameters']['x'], self.params['parameters']['y']))
+        if self.params['parameters'].has_key('direct') and self.params['parameters']['direct']:
+            pass
+        else:
+            dest_surface.blit(self.surf, (self.params['parameters']['x'], self.params['parameters']['y']))
         return
 
 # end
diff --git a/pygame_gui/widgets.xml b/pygame_gui/widgets.xml
index 8ab0b7b..f707490 100644
--- a/pygame_gui/widgets.xml
+++ b/pygame_gui/widgets.xml
@@ -146,11 +146,11 @@
 
     <parameter name="width" default="kill" type="int" />
     <parameter name="height" default="kill" type="int" />
-    <parameter name="text:direct" default="" />
+    <parameter name="text" default="" />
 
     <part>
       <name>label_text</name>
-      <type>text</type>
+      <type>text:direct</type>
       <source>text</source>
 
       <position>0, 0</position>
-- 
2.11.4.GIT