gcompris r3519 - branches/gcomprixogoo/src/gcompris

[bcoudoin svn gnome org]

Author: bcoudoin
Date: Sun Aug 31 17:26:57 2008
New Revision: 3519
URL: http://svn.gnome.org/viewvc/gcompris?rev=3519&view=rev

Log:
cleanup, removed the moving bar (up down) code.


Modified:
   branches/gcomprixogoo/src/gcompris/bar.c

Modified: branches/gcomprixogoo/src/gcompris/bar.c
==============================================================================
--- branches/gcomprixogoo/src/gcompris/bar.c	(original)
+++ branches/gcomprixogoo/src/gcompris/bar.c	Sun Aug 31 17:26:57 2008
@@ -32,7 +32,6 @@
 
 #define BAR_GAP		10	/* Value used to fill space above and under icons in the bar */
 #define NUMBER_OF_ITEMS 5	/* Max Number of buttons in the bar                              */
-#define HIDE_BAR_TIMOUT 3000    /* The time before we hide the bar in ms */
 
 static void	 update_exit_button();
 static gboolean  on_enter_notify (GooCanvasItem *item,
@@ -49,10 +48,6 @@
 				gchar *data);
 static void	 bar_reset_sound_id (void);
 static void	 setup_item_signals (GooCanvasItem *item, gchar* name);
-//static gboolean	 _bar_down(void *ignore);
-//static void	 _bar_up(void);
-//static void	 _force_bar_down(void);
-//static void	 _force_bar_up(char *data);
 static gint	 bar_play_sound (gchar *sound);
 static void	 play_level_voice(int level);
 
@@ -71,11 +66,7 @@
 static GooCanvasItem *rootitem = NULL;
 
 static gint sound_play_id = 0;
-//static gint bar_down_id = 0;
 static gboolean _hidden;     /* Dialog boxes request a bar hide */
-static gboolean _barup;      /* The state of the bar */
-static gboolean _click_mode; /* Need to click on the bar to
-				bring it up or just enter it */
 
 /* Default position for the bar */
 static int _default_x;
@@ -267,9 +258,6 @@
 		NULL);
 
   _hidden = FALSE;
-  _click_mode = TRUE;
-  _barup = TRUE;
-  //  _force_bar_down();
 }
 
 
@@ -441,87 +429,6 @@
 		 "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
 }
 
-#if 0
-static gboolean
-_bar_down(void *ignore)
-{
-  if(_barup == FALSE)
-    return TRUE;
-
-  _barup = FALSE;
-
-  bar_down_id = 0;
-  goo_canvas_item_animate(rootitem,
-			  0,
-			  BOARDHEIGHT - BARHEIGHT/2,
-			  1,
-			  0,
-			  TRUE,
-			  1000,
-			  80,
-			  GOO_CANVAS_ANIMATE_FREEZE);
-
-  return(FALSE);
-}
-
-static void
-_force_bar_down(void)
-{
-  if(_barup == FALSE)
-    return;
-
-  _barup = FALSE;
-
-  if(bar_down_id)
-    g_source_remove (bar_down_id);
-
-  bar_down_id=0;
-
-  /* Hide it faster than normal */
-  goo_canvas_item_animate(rootitem,
-			  0,
-			  BOARDHEIGHT - BARHEIGHT/2,
-			  1,
-			  0,
-			  TRUE,
-			  100,
-			  10,
-			  GOO_CANVAS_ANIMATE_FREEZE);
-}
-
-static void _force_bar_up(char *data)
-{
-  bar_reset_sound_id();
-  sound_play_id = g_timeout_add (1000, (GtkFunction) bar_play_sound, data);
-  _bar_up();
-
-  if(bar_down_id)
-    g_source_remove (bar_down_id);
-
-  bar_down_id=0;
-}
-
-static void
-_bar_up(void)
-{
-  if(_barup == TRUE)
-    return;
-
-  _barup = TRUE;
-
-  goo_canvas_item_raise(rootitem, NULL);
-  goo_canvas_item_animate(rootitem,
-			  0,
-			  BOARDHEIGHT - BARHEIGHT,
-			  1,
-			  0,
-			  TRUE,
-			  700,
-			  80,
-			  GOO_CANVAS_ANIMATE_FREEZE);
-}
-#endif
-
 /* Hide all icons in the control bar
  * or restore the icons to the previous value
  */
@@ -537,7 +444,6 @@
     {
       g_object_set(rootitem,
 		   "visibility", GOO_CANVAS_ITEM_INVISIBLE, NULL);
-      //      _force_bar_down();
     }
   else
     {
@@ -612,13 +518,11 @@
 		 GdkEventCrossing *event,
 		 char *data)
 {
-  if(_hidden) // || _click_mode)
+  if(_hidden)
     return FALSE;
 
   sound_play_id = g_timeout_add (1000, (GtkFunction) bar_play_sound, data);
 
-  //  _force_bar_up(data);
-
   return FALSE;
 }
 
@@ -630,9 +534,6 @@
 {
   bar_reset_sound_id();
 
-  //  if(!bar_down_id)
-  //    bar_down_id = g_timeout_add (HIDE_BAR_TIMOUT, (GtkFunction) _bar_down, NULL);
-
   return FALSE;
 }
 
@@ -672,9 +573,6 @@
   if(_hidden)
     return(FALSE);
 
-  //  if(!_barup)
-  //    _force_bar_up(data);
-
   bar_reset_sound_id();
   gc_sound_play_ogg ("sounds/bleep.wav", NULL);
 
@@ -751,7 +649,6 @@
     }
   else if(!strcmp((char *)data, "bar"))
     {
-      //      _force_bar_up(data);
     }
 
   return TRUE;