Changeset 5661 for code/branches/resource2/data/gui/layouts

Timestamp:

Aug 19, 2009, 12:19:11 AM (15 years ago)

Author:

rgrieder

Message:

Cleaned out the lua script files for the GUI.
Also replaced "require" function to support resources.
Fixed a problem with the return value of doFile, includeFile and require being discarded because the tolua binding is for a C++ function returning void.

File:

• code/branches/resource2/data/gui/layouts/MainMenu.layout (moved) (moved from code/branches/resource2/data/gui/layouts/MainMenu_2.layout) (6 diffs)

code/branches/resource2/data/gui/layouts/MainMenu.layout

@@ -12 +12 @@
             <Property Name="Text" Value="Standalone"/>
             <Property Name="Disabled" Value="true"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_standalone_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_standalone_clicked"/>
         </Window>
         
@@ -20 +20 @@
             <Property Name="UnifiedSize" Value="{{0.35,0},{0.33,0}}" />
             <Property Name="Tooltip" Value="Available Levels." />
-            <Event Name="ItemSelectionChanged" Function="mainmenu_2.listbox_level_selectionchanged" />
+            <Event Name="ItemSelectionChanged" Function="MainMenu.listbox_level_selectionchanged" />
         </Window>
         
@@ -27 +27 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Dedicated"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_dedicated_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_dedicated_clicked"/>
         </Window>
         
@@ -34 +34 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Server"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_server_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_server_clicked"/>
         </Window>
         
@@ -41 +41 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Client"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_client_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_client_clicked"/>
         </Window>
         
@@ -48 +48 @@
             <Property Name="UnifiedSize" Value="{{0.15,0},{0.05,0}}"/>
             <Property Name="Text" Value="Quit"/>
-            <Event Name="Clicked" Function="mainmenu_2.button_quit_clicked"/>
+            <Event Name="Clicked" Function="MainMenu.button_quit_clicked"/>
         </Window>
     </Window>