r3263 - software/ui/src

[Miriam Ruiz]

Author: baby-guest
Date: 2007-07-06 21:11:38 +0000 (Fri, 06 Jul 2007)
New Revision: 3263

Modified:
   software/ui/src/games.cpp
   software/ui/src/ui.fld
Log:
replaced buttons with radio buttons



Modified: software/ui/src/games.cpp
===================================================================
--- software/ui/src/games.cpp	2007-07-06 20:57:17 UTC (rev 3262)
+++ software/ui/src/games.cpp	2007-07-06 21:11:38 UTC (rev 3263)
@@ -271,37 +271,48 @@
 
 static void CallBackSearchInput(Fl_Input* input, void *data)
 {
-	printf("CallBackSearchInput\n");
-	fflush(stdout);
+	printf("CallBackSearchInput\n"); fflush(stdout);
 	GamesUI& ui = *static_cast<GamesUI*>(data);
 	ui.engine->setKeywordFilter(input->value());
 	UpdateUILists(ui);
 }
 
-static void CallBackAlreadyInstalledButton(Fl_Check_Button*, void *data)
+static void CallBackAlreadyInstalled(Fl_Round_Button*, void *data)
 {
-	printf("CallBackInstalledButton\n");
-	fflush(stdout);
+	printf("CallBackInstalled\n"); fflush(stdout);
 	GamesUI& ui = *static_cast<GamesUI*>(data);
-	//ui.engine->setInstalledFilter(Engine::ANY);
+	ui.AlreadyInstalled->value(1); ui.AlreadyInstalled->redraw();
+	ui.ToBeInstalled->value(0); ui.ToBeInstalled->redraw();
+	ui.InstalledOrNot->value(0); ui.InstalledOrNot->redraw();
 	ui.engine->setInstalledFilter(Engine::INSTALLED);
 	UpdateUILists(ui);
 }
 
-static void CallBackToBeInstalledButton(Fl_Check_Button*, void *data)
+static void CallBackToBeInstalled(Fl_Round_Button*, void *data)
 {
-	printf("CallBackToBeInstalledButton\n");
-	fflush(stdout);
+	printf("CallBackToBeInstalled\n"); fflush(stdout);
 	GamesUI& ui = *static_cast<GamesUI*>(data);
-	//ui.engine->setInstalledFilter(Engine::ANY);
+	ui.AlreadyInstalled->value(0); ui.AlreadyInstalled->redraw();
+	ui.ToBeInstalled->value(1); ui.ToBeInstalled->redraw();
+	ui.InstalledOrNot->value(0); ui.InstalledOrNot->redraw();
 	ui.engine->setInstalledFilter(Engine::NOTINSTALLED);
 	UpdateUILists(ui);
 }
 
+static void CallBackInstalledOrNot(Fl_Round_Button*, void *data)
+{
+	printf("CallBackToBeInstalled\n"); fflush(stdout);
+	GamesUI& ui = *static_cast<GamesUI*>(data);
+	ui.AlreadyInstalled->value(0); ui.AlreadyInstalled->redraw();
+	ui.ToBeInstalled->value(0); ui.ToBeInstalled->redraw();
+	ui.InstalledOrNot->value(1); ui.InstalledOrNot->redraw();
+	ui.engine->setInstalledFilter(Engine::ANY);
+	UpdateUILists(ui);
+}
+
 static void OnResultsBrowserClick(Fl_Browser*, void *data)
 {
-	printf("OnResultsBrowserClick\n");
-	fflush(stdout);
+	printf("OnResultsBrowserClick\n"); fflush(stdout);
 //	GamesUI& ui = *static_cast<GamesUI*>(data);
 }
 
@@ -358,11 +369,18 @@
 		mainui.InterfaceSelection->when(FL_WHEN_CHANGED);
 		mainui.SearchInput->callback((Fl_Callback*)CallBackSearchInput, &mainui);
 		mainui.SearchInput->when(FL_WHEN_CHANGED);
-		mainui.AlreadyInstalledButton->callback((Fl_Callback*)CallBackAlreadyInstalledButton, &mainui);
-		mainui.AlreadyInstalledButton->when(FL_WHEN_CHANGED);
-		mainui.ToBeInstalledButton->callback((Fl_Callback*)CallBackToBeInstalledButton, &mainui);
-		mainui.ToBeInstalledButton->when(FL_WHEN_CHANGED);
+		mainui.AlreadyInstalled->callback((Fl_Callback*)CallBackAlreadyInstalled, &mainui);
+		mainui.AlreadyInstalled->when(FL_WHEN_CHANGED);
+		mainui.ToBeInstalled->callback((Fl_Callback*)CallBackToBeInstalled, &mainui);
+		mainui.ToBeInstalled->when(FL_WHEN_CHANGED);
+		mainui.InstalledOrNot->callback((Fl_Callback*)CallBackInstalledOrNot, &mainui);
+		mainui.InstalledOrNot->when(FL_WHEN_CHANGED);
 
+		mainui.AlreadyInstalled->value(0); mainui.AlreadyInstalled->redraw();
+		mainui.ToBeInstalled->value(0); mainui.ToBeInstalled->redraw();
+		mainui.InstalledOrNot->value(1); mainui.InstalledOrNot->redraw();
+		mainui.engine->setInstalledFilter(Engine::ANY);
+
 		mainui.Screenshot(new Fl_PNG_Image(FILE_NO_SCREENSHOT));
 
 		UpdateUILists(mainui);

Modified: software/ui/src/ui.fld
===================================================================
--- software/ui/src/ui.fld	2007-07-06 20:57:17 UTC (rev 3262)
+++ software/ui/src/ui.fld	2007-07-06 21:11:38 UTC (rev 3263)
@@ -61,26 +61,17 @@
   if (i != NULL) {
     delete i;
   }
-  ScreenshotWidget->redraw();} {selected
-    }
+  ScreenshotWidget->redraw();} {}
   }
   Function {CreateMainWindow()} {open
   } {
     Fl_Window {} {open
-      xywh {494 199 710 525} type Single resizable
+      xywh {528 161 710 525} type Single resizable
       class MainWindow visible
     } {
       Fl_Group InputGroup {open
         xywh {5 15 375 119} box UP_FRAME
       } {
-        Fl_Check_Button AlreadyInstalledButton {
-          label {Already installed}
-          xywh {19 20 25 36} down_box DOWN_BOX labelsize 12
-        }
-        Fl_Check_Button ToBeInstalledButton {
-          label {To be installed}
-          xywh {200 20 25 36} down_box DOWN_BOX labelsize 12
-        }
         Fl_Choice TypeSelection {
           label Type open
           xywh {70 60 120 25} down_box BORDER_BOX labelsize 12 when 1
@@ -103,6 +94,22 @@
           label Search
           xywh {65 95 300 25} labelsize 12
         }
+        Fl_Pack {} {open selected
+          xywh {10 25 360 30} labelsize 10
+        } {
+          Fl_Round_Button AlreadyInstalled {
+            label {Already installed}
+            xywh {25 30 70 15} down_box ROUND_DOWN_BOX labelsize 12
+          }
+          Fl_Round_Button ToBeInstalled {
+            label {To be installed}
+            xywh {155 30 70 15} down_box ROUND_DOWN_BOX labelsize 12
+          }
+          Fl_Round_Button InstalledOrNot {
+            label Both
+            xywh {285 30 70 15} down_box ROUND_DOWN_BOX value 1 labelsize 12
+          }
+        }
       }
       Fl_Button ScreenshotWidget {
         xywh {385 15 320 240} box FLAT_BOX color 32 selection_color 32