gthumb r2345 - in trunk: . data/glade src

[mjc svn gnome org]

Author: mjc
Date: Thu Jul 10 12:14:14 2008
New Revision: 2345
URL: http://svn.gnome.org/viewvc/gthumb?rev=2345&view=rev

Log:
2008-07-10  Michael J. Chudobiak  <mjc svn gnome org>

        Patch by Geoffrey Antos <dynamotwain aim com>:

        * src/gs-fade.c: removed
        * src/gs-fade.h: removed

        * src/Makefile.am:
        * src/gth-fullscreen.c: (gth_fullscreen_finalize),
        (slideshow_timeout_cb), (viewer_image_loaded_cb), (fade_faded_cb),
        (gth_fullscreen_init):
        Removed old slideshow fading code that doesn't support Xinerama.

        * src/gth-fullscreen.c: (load_current_image),
        (real_load_current_image):
        Removed gs-fade.c-specific load_current_image
        Renamed real_load_current_image to load_current_image



Removed:
   trunk/src/gs-fade.c
   trunk/src/gs-fade.h
Modified:
   trunk/ChangeLog
   trunk/data/glade/gthumb_preferences.glade
   trunk/src/Makefile.am
   trunk/src/dlg-preferences.c
   trunk/src/gth-fullscreen.c

Modified: trunk/data/glade/gthumb_preferences.glade
==============================================================================
--- trunk/data/glade/gthumb_preferences.glade	(original)
+++ trunk/data/glade/gthumb_preferences.glade	Thu Jul 10 12:14:14 2008
@@ -2108,24 +2108,6 @@
 			    </packing>
 			  </child>
 
-			  <child>
-			    <widget class="GtkCheckButton" id="toggle_ss_fading">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="label" translatable="yes">Use a _fading effect when changing image</property>
-			      <property name="use_underline">True</property>
-			      <property name="relief">GTK_RELIEF_NORMAL</property>
-			      <property name="focus_on_click">True</property>
-			      <property name="active">False</property>
-			      <property name="inconsistent">False</property>
-			      <property name="draw_indicator">True</property>
-			    </widget>
-			    <packing>
-			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
-			    </packing>
-			  </child>
 			</widget>
 			<packing>
 			  <property name="padding">0</property>

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Thu Jul 10 12:14:14 2008
@@ -87,8 +87,6 @@
 	dlg-scripts.h				\
 	dlg-write-to-cd.c			\
 	dlg-write-to-cd.h			\
-	gs-fade.c				\
-	gs-fade.h				\
 	gth-application.c			\
 	gth-application.h			\
 	gth-batch-op.c				\

Modified: trunk/src/dlg-preferences.c
==============================================================================
--- trunk/src/dlg-preferences.c	(original)
+++ trunk/src/dlg-preferences.c	Thu Jul 10 12:14:14 2008
@@ -101,7 +101,6 @@
 	GtkWidget  *radio_ss_direction_random;
 	GtkWidget  *spin_ss_delay;
 	GtkWidget  *toggle_ss_wrap_around;
-	GtkWidget  *toggle_ss_fading;
 
 } DialogData;
 
@@ -140,7 +139,6 @@
 	/* Slideshow. */
 
 	eel_gconf_set_boolean (PREF_SLIDESHOW_WRAP_AROUND, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->toggle_ss_wrap_around)));
-	eel_gconf_set_boolean (PREF_SLIDESHOW_FADING, gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (data->toggle_ss_fading)));
 
 	eel_gconf_set_float (PREF_SLIDESHOW_DELAY, gtk_spin_button_get_value (GTK_SPIN_BUTTON (data->spin_ss_delay)));
 
@@ -435,7 +433,6 @@
         data->radio_ss_direction_random = glade_xml_get_widget (data->gui, "radio_ss_direction_random");
         data->spin_ss_delay = glade_xml_get_widget (data->gui, "spin_ss_delay");
         data->toggle_ss_wrap_around = glade_xml_get_widget (data->gui, "toggle_ss_wrap_around");
-        data->toggle_ss_fading = glade_xml_get_widget (data->gui, "toggle_ss_fading");
 
 	btn_close  = glade_xml_get_widget (data->gui, "p_close_button");
 	btn_help   = glade_xml_get_widget (data->gui, "p_help_button");
@@ -524,7 +521,6 @@
 	gtk_spin_button_set_value (GTK_SPIN_BUTTON (data->spin_ss_delay),
 				   eel_gconf_get_float (PREF_SLIDESHOW_DELAY, 4.0));
 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_ss_wrap_around), eel_gconf_get_boolean (PREF_SLIDESHOW_WRAP_AROUND, FALSE));
-	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (data->toggle_ss_fading), eel_gconf_get_boolean (PREF_SLIDESHOW_FADING, TRUE));
 
 	/* Set the signals handlers. */
 

Modified: trunk/src/gth-fullscreen.c
==============================================================================
--- trunk/src/gth-fullscreen.c	(original)
+++ trunk/src/gth-fullscreen.c	Thu Jul 10 12:14:14 2008
@@ -48,7 +48,6 @@
 #include "main.h"
 #include "preferences.h"
 #include "totem-scrsaver.h"
-#include "gs-fade.h"
 
 #include "icons/pixbufs.h"
 
@@ -88,8 +87,6 @@
 	GtkWidget       *toolbar_window;
 
 	TotemScrsaver   *screensaver;
-	GSFade          *fade;
-	gboolean         use_fade;
 
 	/* comment */
 
@@ -135,10 +132,6 @@
 
 		g_object_unref (priv->screensaver);
 
-		if (priv->fading_activated)
-			gs_fade_reset (priv->fade);
-		g_object_unref (priv->fade);
-
 		file_data_unref (priv->file);
 		file_data_list_free (priv->file_list);
 		file_data_unref (priv->requested);
@@ -178,7 +171,6 @@
 	}
 
 	if (!priv->slideshow_paused) {
-		priv->use_fade = TRUE;
 		load_next_image (fullscreen);
 	}
 
@@ -208,14 +200,6 @@
 {
 	GthFullscreenPrivateData *priv = fullscreen->priv;
 
-	if (priv->fading_activated) {
-		if (priv->use_fade) {
-			gs_fade_in (priv->fade);
-			return;
-		}
-		gs_fade_reset (priv->fade);
-	}
-
 	if (priv->slideshow)
 		continue_slideshow (fullscreen);
 }
@@ -250,29 +234,6 @@
 		image_viewer_load_from_image_loader (IMAGE_VIEWER (priv->viewer), loader);
 }
 
-
-static void real_load_current_image (GthFullscreen *fullscreen);
-
-
-static void
-fade_faded_cb (GSFade          *fade,
-	       GsFadeDirection  direction,
-	       GthFullscreen   *fullscreen)
-{
-	switch (direction) {
-	case GS_FADE_DIRECTION_OUT:
-		real_load_current_image (fullscreen);
-		break;
-
-	case GS_FADE_DIRECTION_IN:
-		if (fullscreen->priv->slideshow)
-			continue_slideshow (fullscreen);
-		fullscreen->priv->use_fade = FALSE;
-		break;
-	}
-}
-
-
 static void
 gth_fullscreen_init (GthFullscreen *fullscreen)
 {
@@ -294,12 +255,6 @@
 
 	priv->screensaver = totem_scrsaver_new ();
 
-	priv->fade = gs_fade_new ();
-	g_signal_connect (G_OBJECT (priv->fade),
-			  "faded",
-			  G_CALLBACK (fade_faded_cb),
-			  fullscreen);
-	priv->use_fade = FALSE;
 }
 
 
@@ -513,9 +468,8 @@
 	return TRUE;
 }
 
-
 static void
-real_load_current_image (GthFullscreen *fullscreen)
+load_current_image (GthFullscreen *fullscreen)
 {
 	GthFullscreenPrivateData *priv = fullscreen->priv;
 	gboolean from_pixbuf = TRUE;
@@ -547,23 +501,7 @@
 
 	if (from_pixbuf)
 		image_loaded (fullscreen);
-}
-
-
-static void
-load_current_image (GthFullscreen *fullscreen)
-{
-	GthFullscreenPrivateData *priv = fullscreen->priv;
-
-	if (priv->fading_activated) {
-		if (priv->use_fade) {
-			gs_fade_out (fullscreen->priv->fade);
-			return;
-		}
-		gs_fade_reset (fullscreen->priv->fade);
-	}
 
-	real_load_current_image (fullscreen);
 }