r3266 - software/ui/src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-06 21:52:03 +0000 (Fri, 06 Jul 2007)
New Revision: 3266

Modified:
   software/ui/src/games.cpp
   software/ui/src/ui.fld
Log:
Make help window behave properly



Modified: software/ui/src/games.cpp
===================================================================
--- software/ui/src/games.cpp	2007-07-06 21:37:31 UTC (rev 3265)
+++ software/ui/src/games.cpp	2007-07-06 21:52:03 UTC (rev 3266)
@@ -362,7 +362,7 @@
 
 		GamesUI mainui;
 		mainui.engine = &engine;
-		Fl_Double_Window *window = mainui.CreateMainWindow();
+		Fl_Double_Window *window = mainui.CreateWindows();
 		mainui.TypeSelection->callback((Fl_Callback*)CallBackTypeSelection, &mainui);
 		mainui.TypeSelection->when(FL_WHEN_CHANGED);
 		mainui.InterfaceSelection->callback((Fl_Callback*)CallBackInterfaceSelection, &mainui);

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2007-07-06 21:37:31 UTC (rev 3265)
+++ software/ui/src/ui.fld	2007-07-06 21:52:03 UTC (rev 3266)
@@ -65,7 +65,7 @@
   }
   Function {CreateMainWindow()} {open
   } {
-    Fl_Window {} {open
+    Fl_Window Window {open
       xywh {530 113 710 525} type Single resizable
       class MainWindow visible
     } {
@@ -111,12 +111,7 @@
           }
         }
         Fl_Button {} {
-          callback {static Fl_Double_Window *help = NULL;
-if (!help)
-{
-	help = CreateHelpWindow();
-}
-help->show();}
+          callback {HelpWindow->show();}
           image {../data/icons/KRIcon32.png} xywh {340 20 35 35} box NO_BOX
         }
       }
@@ -136,22 +131,28 @@
         class PackageView
       }
     }
-    code {w->size_range(710, 500);} {}
+    code {Window->size_range(710, 500);} {}
   }
   decl {Engine *engine;} {public
   }
-  Function {CreateHelpWindow()} {open private
+  Function {CreateHelpWindow()} {open
   } {
-    Fl_Window {} {open selected
-      xywh {668 461 520 430} type Double visible
+    Fl_Window HelpWindow {open
+      xywh {727 534 520 430} type Double visible
     } {
-      Fl_Help_View {} {
+      Fl_Help_View AboutView {
         xywh {5 75 510 350}
       }
       Fl_Button {} {
         image {../data/icons/KidsRating.png} xywh {400 5 90 90} box NO_BOX deactivate
       }
     }
-    code {w->clear_visible_focus();} {}
+    code {HelpWindow->clear_visible_focus();} {}
   }
+  Function {CreateWindows()} {open selected return_type {MainWindow *}
+  } {
+    code {CreateMainWindow();
+CreateHelpWindow();
+return Window;} {}
+  }
 }