r3140 - software/ui/src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-06-29 18:02:44 +0000 (Fri, 29 Jun 2007)
New Revision: 3140

Modified:
   software/ui/src/Makefile.am
   software/ui/src/common.h
   software/ui/src/games.cpp
   software/ui/src/pkgbrowser.h
   software/ui/src/ui.fld
Log:
Added support for screenshots



Modified: software/ui/src/Makefile.am
===================================================================
--- software/ui/src/Makefile.am	2007-06-29 16:54:18 UTC (rev 3139)
+++ software/ui/src/Makefile.am	2007-06-29 18:02:44 UTC (rev 3140)
@@ -9,7 +9,7 @@
 	ui.cpp \
 	pkgbrowser.cpp \
 	games.cpp
-games_LDFLAGS = $(LIBEPT_LIBS) `fltk-config --ldflags`
+games_LDFLAGS = $(LIBEPT_LIBS) `fltk-config --ldflags --use-images`
 
 manpage_SOURCES = manpage.cpp
 manpage_LDADD = $(LIBEPT_LIBS)
@@ -17,6 +17,6 @@
 ui.h ui.cpp: ui.fld
 	fluid -c -o ui.cpp -h ui.h ui.fld
 
-INCLUDES = -I.. $(LIBEPT_CFLAGS) `fltk-config --cxxflags` -Wall -Werror -ggdb
+INCLUDES = -I.. $(LIBEPT_CFLAGS) `fltk-config --cxxflags --use-images` -Wall -Werror -ggdb
 
 EXTRA_DIST = GamesOptions.h Environment.h Engine.h ui.h pkgbrowser.h

Modified: software/ui/src/common.h
===================================================================
--- software/ui/src/common.h	2007-06-29 16:54:18 UTC (rev 3139)
+++ software/ui/src/common.h	2007-06-29 18:02:44 UTC (rev 3140)
@@ -30,7 +30,7 @@
 #endif
 
 #ifndef DATADIR
-#define DATADIR "."
+#define DATADIR "./data"
 #endif
 
 #include <stdlib.h>

Modified: software/ui/src/games.cpp
===================================================================
--- software/ui/src/games.cpp	2007-06-29 16:54:18 UTC (rev 3139)
+++ software/ui/src/games.cpp	2007-06-29 18:02:44 UTC (rev 3140)
@@ -45,6 +45,9 @@
 #include <locale.h>
 #endif
 
+#include <FL/Fl.H>
+#include <FL/Fl_PNG_Image.H>
+
 namespace std {
 
 template<typename TAG, typename _Traits>
@@ -315,6 +318,8 @@
 		mainui.ToBeInstalledButton->callback((Fl_Callback*)CallBackToBeInstalledButton, &mainui);
 		mainui.ToBeInstalledButton->when(FL_WHEN_CHANGED);
 
+		mainui.Screenshot(new Fl_PNG_Image(DATADIR "/_default.png"));
+
 		UpdateUILists(mainui);
 
 		window->show(argc, (char**)argv);

Modified: software/ui/src/pkgbrowser.h
===================================================================
--- software/ui/src/pkgbrowser.h	2007-06-29 16:54:18 UTC (rev 3139)
+++ software/ui/src/pkgbrowser.h	2007-06-29 18:02:44 UTC (rev 3140)
@@ -56,7 +56,7 @@
     //
     int which_col_near_mouse() {
         int X,Y,W,H;
-        Fl_Browser::bbox(X,Y,W,H);		// area inside browser's box()
+        Fl_Browser::bbox(X,Y,W,H); // area inside browser's box()
         // EVENT NOT INSIDE BROWSER AREA? (eg. on a scrollbar)
         if ( ! Fl::event_inside(X,Y,W,H) ) {
             return(-1);
@@ -67,8 +67,8 @@
             colx += _widths[t];
             int diff = mousex - colx;
             // MOUSE 'NEAR' A COLUMN?
-	    //     Return column #
-	    //
+            //     Return column #
+            //
             if ( diff >= -4 && diff <= 4 ) {
                 return(t);
             }
@@ -79,8 +79,8 @@
 protected:
     // MANAGE EVENTS TO HANDLE COLUMN RESIZING
     int handle(int e) {
-	// Not showing column separators? Use default Fl_Browser::handle() logic
-	if ( ! showcolsep() ) return(Fl_Browser::handle(e));
+    // Not showing column separators? Use default Fl_Browser::handle() logic
+    if ( ! showcolsep() ) return(Fl_Browser::handle(e));
         // Handle column resizing
         int ret = 0;
         switch ( e ) {

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2007-06-29 16:54:18 UTC (rev 3139)
+++ software/ui/src/ui.fld	2007-06-29 18:02:44 UTC (rev 3140)
@@ -13,10 +13,29 @@
 
 class GamesUI {open
 } {
+  Function {GamesUI()} {open
+  } {}
+  Function {~GamesUI()} {open
+  } {
+    code {if (ScreenshotWidget->image() == NULL) {
+    Fl_Image *i=ScreenshotWidget->image();
+    ScreenshotWidget->image(NULL);
+    delete i;
+  }} {selected
+    }
+  }
+  Function {Screenshot(Fl_Image *img)} {open return_type void
+  } {
+    code {if (ScreenshotWidget->image() == NULL) {
+    Fl_Image *i=ScreenshotWidget->image();
+    delete i;
+  }
+  ScreenshotWidget->image(img);} {}
+  }
   Function {CreateMainWindow()} {open
   } {
-    Fl_Window {} {open selected
-      xywh {287 191 710 430} type Double resizable visible
+    Fl_Window {} {open
+      xywh {550 506 710 430} type Double resizable visible
     } {
       Fl_Group {} {open
         xywh {5 15 375 119} box UP_FRAME
@@ -67,8 +86,8 @@
       Fl_Group {} {open
         xywh {385 15 325 415}
       } {
-        Fl_Box {} {
-          xywh {385 16 320 239} box UP_FRAME align 1
+        Fl_Button ScreenshotWidget {
+          xywh {385 15 320 240} box NO_BOX
         }
         Fl_Text_Display PackageText {
           xywh {385 260 320 165} resizable