gcompris r3379 - in branches/gcomprixogoo: . src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Tue Apr 15 22:26:35 2008
New Revision: 3379
URL: http://svn.gnome.org/viewvc/gcompris?rev=3379&view=rev

Log:
	Removed screensize configuration as we are screen independant
	now.


Modified:
   branches/gcomprixogoo/ChangeLog
   branches/gcomprixogoo/src/gcompris/config.c
   branches/gcomprixogoo/src/gcompris/properties.c
   branches/gcomprixogoo/src/gcompris/properties.h

Modified: branches/gcomprixogoo/src/gcompris/config.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/config.c	(original)
+++ branches/gcomprixogoo/src/gcompris/config.c	Tue Apr 15 22:26:35 2008
@@ -31,7 +31,6 @@
 static GooCanvasItem	*item_locale_text	= NULL;
 static GooCanvasItem	*item_locale_flag	= NULL;
 static GooCanvasItem	*item_bad_flag		= NULL;
-static GooCanvasItem	*item_screen_text	= NULL;
 static GooCanvasItem	*item_timer_text	= NULL;
 static GooCanvasItem	*item_skin_text		= NULL;
 static GooCanvasItem	*item_filter_text	= NULL;
@@ -131,12 +130,6 @@
   N_("Fast timer")
 };
 
-static gchar *screenname[] = {
-  "640x480",
-  N_("800x600 (Default for GCompris)"),
-  "1024x768",
-};
-
 static gchar *filtername[] = {
   N_("<i>Use Gcompris administration module\nto filter boards</i>")
 };
@@ -267,21 +260,6 @@
 		       "fill-color-rgba", gc_skin_color_content,
 		       NULL);
 
-  // Screen size
-  y_start += Y_GAP;
-
-  display_previous_next(x_start, y_start, "screen_previous", "screen_next");
-
-  item_screen_text = goo_canvas_text_new (rootitem,
-					  gettext(screenname[properties->screensize]),
-					  (gdouble) x_text_start,
-					  (gdouble) y_start,
-					  -1,
-					  GTK_ANCHOR_WEST,
-					  "font", gc_skin_font_subtitle,
-					  "fill-color-rgba", gc_skin_color_content,
-					  NULL);
-
   // Music
   y_start += Y_GAP;
 
@@ -792,24 +770,6 @@
 
       set_locale_flag(current_locale);
     }
-  else if(!strcmp((char *)data, "screen_previous"))
-    {
-      if(properties->screensize>0)
-	properties->screensize--;
-
-      g_object_set (G_OBJECT(item_screen_text),
-		    "text", gettext(screenname[properties->screensize]),
-		    NULL);
-    }
-  else if(!strcmp((char *)data, "screen_next"))
-    {
-      if(properties->screensize<MAX_SCREEN_VALUE)
-	properties->screensize++;
-
-      g_object_set (G_OBJECT(item_screen_text),
-		    "text", gettext(screenname[properties->screensize]),
-		    NULL);
-    }
   else if(!strcmp((char *)data, "timer_previous"))
     {
       if(properties->timer>0)

Modified: branches/gcomprixogoo/src/gcompris/properties.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/properties.c	(original)
+++ branches/gcomprixogoo/src/gcompris/properties.c	Tue Apr 15 22:26:35 2008
@@ -146,7 +146,6 @@
   tmp = (GcomprisProperties *) malloc (sizeof (GcomprisProperties));
   tmp->music		 = 1;
   tmp->fx		 = 1;
-  tmp->screensize	 = 1;
   tmp->fullscreen	 = 0;
   tmp->timer		 = 1;
   tmp->skin		 = g_strdup("babytoy");
@@ -384,9 +383,6 @@
 	} else if(!strcmp(value.v_identifier, "fx")) {
 	  if(!scan_get_int(scanner, &props->fx))
 	    g_warning("Config file parsing error on token %s", token);
-	} else if(!strcmp(value.v_identifier, "screensize")) {
-	  if(!scan_get_int(scanner, &props->screensize))
-	    g_warning("Config file parsing error on token %s", token);
 	} else if(!strcmp(value.v_identifier, "fullscreen")) {
 	  if(!scan_get_int(scanner, &props->fullscreen))
 	    g_warning("Config file parsing error on token %s", token);
@@ -554,7 +550,6 @@
 
   fprintf(filefd, "%s=%d\n", "music",			props->music);
   fprintf(filefd, "%s=%d\n", "fx",			props->fx);
-  fprintf(filefd, "%s=%d\n", "screensize",		props->screensize);
   fprintf(filefd, "%s=%d\n", "fullscreen",		props->fullscreen);
   fprintf(filefd, "%s=%d\n", "timer",			props->timer);
 

Modified: branches/gcomprixogoo/src/gcompris/properties.h
==============================================================================
--- branches/gcomprixogoo/src/gcompris/properties.h	(original)
+++ branches/gcomprixogoo/src/gcompris/properties.h	Tue Apr 15 22:26:35 2008
@@ -31,7 +31,6 @@
   gint		music;
   gint		fx;
   gint		fullscreen;
-  gint		screensize;
   gint		defaultcursor;
   gint		timer;
   gint		filter_style;