r3267 - in software/ui: data data/html src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-06 22:00:45 +0000 (Fri, 06 Jul 2007)
New Revision: 3267

Added:
   software/ui/data/html/
   software/ui/data/html/help.en.html
Modified:
   software/ui/src/common.h
   software/ui/src/games.cpp
   software/ui/src/ui.fld
Log:
about windows works properly now.
added english html about doc.



Added: software/ui/data/html/help.en.html
===================================================================
--- software/ui/data/html/help.en.html	                        (rev 0)
+++ software/ui/data/html/help.en.html	2007-07-06 22:00:45 UTC (rev 3267)
@@ -0,0 +1,18 @@
+<h1>This Program</h1><br />
+<br />&nbsp;<br />
+Copyright (C) 2007  Miriam Ruiz &lt;little_miry at yahoo.es&gt;<br />
+Copyright (C) 2007  Enrico Zini &lt;enrico at debian.org&gt;<br />
+<br />&nbsp;<br />
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+<br />&nbsp;<br />
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+<br />&nbsp;<br />
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

Modified: software/ui/src/common.h
===================================================================
--- software/ui/src/common.h	2007-07-06 21:52:03 UTC (rev 3266)
+++ software/ui/src/common.h	2007-07-06 22:00:45 UTC (rev 3267)
@@ -33,6 +33,10 @@
 #define DATADIR "./data"
 #endif
 
+#ifndef HTMLDIR
+#define HTMLDIR DATADIR "/html"
+#endif
+
 #ifndef FILE_NO_SCREENSHOT
 #define FILE_NO_SCREENSHOT DATADIR "/no_screenshot.png"
 #endif

Modified: software/ui/src/games.cpp
===================================================================
--- software/ui/src/games.cpp	2007-07-06 21:52:03 UTC (rev 3266)
+++ software/ui/src/games.cpp	2007-07-06 22:00:45 UTC (rev 3267)
@@ -382,6 +382,7 @@
 		mainui.engine->setInstalledFilter(Engine::ANY);
 
 		mainui.Screenshot(new Fl_PNG_Image(FILE_NO_SCREENSHOT));
+		mainui.AboutView->load(HTMLDIR "/help.en.html");
 
 		UpdateUILists(mainui);
 

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2007-07-06 21:52:03 UTC (rev 3266)
+++ software/ui/src/ui.fld	2007-07-06 22:00:45 UTC (rev 3267)
@@ -111,7 +111,7 @@
           }
         }
         Fl_Button {} {
-          callback {HelpWindow->show();}
+          callback {AboutWindow->show();}
           image {../data/icons/KRIcon32.png} xywh {340 20 35 35} box NO_BOX
         }
       }
@@ -135,9 +135,9 @@
   }
   decl {Engine *engine;} {public
   }
-  Function {CreateHelpWindow()} {open
+  Function {CreateAboutWindow()} {open
   } {
-    Fl_Window HelpWindow {open
+    Fl_Window AboutWindow {open selected
       xywh {727 534 520 430} type Double visible
     } {
       Fl_Help_View AboutView {
@@ -147,12 +147,12 @@
         image {../data/icons/KidsRating.png} xywh {400 5 90 90} box NO_BOX deactivate
       }
     }
-    code {HelpWindow->clear_visible_focus();} {}
+    code {AboutWindow->clear_visible_focus();} {}
   }
-  Function {CreateWindows()} {open selected return_type {MainWindow *}
+  Function {CreateWindows()} {open return_type {MainWindow *}
   } {
     code {CreateMainWindow();
-CreateHelpWindow();
+CreateAboutWindow();
 return Window;} {}
   }
 }