[gnome-initial-setup] Remove the old gd-based assistant and use GtkStack

[Jasper St. Pierre <jstpierre src gnome org>]

commit b638eb2d32cf925663c52dca3b1c8bdd826f4a8f
Author: Jasper St. Pierre <jstpierre mecheye net>
Date:   Wed Apr 24 11:49:07 2013 -0400

    Remove the old gd-based assistant and use GtkStack

 configure.ac                            |    2 +-
 gnome-initial-setup/Makefile.am         |    1 -
 gnome-initial-setup/gis-assistant-gd.c  |  116 -------------------------------
 gnome-initial-setup/gis-assistant-gd.h  |   60 ----------------
 gnome-initial-setup/gis-assistant-gtk.c |   54 +++++++++-----
 gnome-initial-setup/gis-driver.c        |   17 +----
 6 files changed, 37 insertions(+), 213 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 00b3a19..54f862f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -92,7 +92,7 @@ PKG_CHECK_MODULES(ISOCODES, iso-codes)
 AC_DEFINE_UNQUOTED([ISO_CODES_PREFIX],["`$PKG_CONFIG --variable=prefix iso-codes`"],[ISO codes prefix])
 ISO_CODES=iso-codes
 
-LIBGD_INIT([stack notification static])
+LIBGD_INIT([notification static])
 
 GLIB_VERSION_DEFINES="-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_30 
'-DGLIB_VERSION_MAX_ALLOWED=G_ENCODE_VERSION(2,34)'"
 
diff --git a/gnome-initial-setup/Makefile.am b/gnome-initial-setup/Makefile.am
index a38ed54..7668859 100644
--- a/gnome-initial-setup/Makefile.am
+++ b/gnome-initial-setup/Makefile.am
@@ -17,7 +17,6 @@ gnome_initial_setup_SOURCES = \
        gis-center-container.c gis-center-container.h \
        gis-assistant.c gis-assistant.h gis-assistant-private.h \
        gis-assistant-gtk.c gis-assistant-gtk.h \
-       gis-assistant-gd.c gis-assistant-gd.h \
        gis-page.c gis-page.h \
        gis-driver.c gis-driver.h
 
diff --git a/gnome-initial-setup/gis-assistant-gtk.c b/gnome-initial-setup/gis-assistant-gtk.c
index aac3f99..33be664 100644
--- a/gnome-initial-setup/gis-assistant-gtk.c
+++ b/gnome-initial-setup/gis-assistant-gtk.c
@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * Copyright (C) 2012 Red Hat
+ * Copyright (C) 2013 Red Hat
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
@@ -36,36 +36,51 @@ G_DEFINE_TYPE (GisAssistantGtk, gis_assistant_gtk, GIS_TYPE_ASSISTANT)
 
 struct _GisAssistantGtkPrivate
 {
-  GtkWidget *notebook;
+  GtkWidget *stack;
 };
 
 static void
-current_page_changed (GtkNotebook  *notebook,
-                      GtkWidget    *new_page,
-                      gint          new_page_num,
-                      GisAssistant *assistant)
+current_page_changed (GObject    *gobject,
+                      GParamSpec *pspec,
+                      gpointer    user_data)
 {
+  GtkStack *stack = GTK_STACK (gobject);
+  GisAssistant *assistant = GIS_ASSISTANT (user_data);
+  GtkWidget *new_page = gtk_stack_get_visible_child (stack);
   _gis_assistant_current_page_changed (assistant, GIS_PAGE (new_page));
 }
 
 static void
 gis_assistant_gtk_switch_to (GisAssistant          *assistant,
-                             GisAssistantDirection  direction,
-                             GisPage               *page)
+                            GisAssistantDirection  direction,
+                            GisPage               *page)
 {
   GisAssistantGtkPrivate *priv = GIS_ASSISTANT_GTK (assistant)->priv;
-  gint page_num = gtk_notebook_page_num (GTK_NOTEBOOK (priv->notebook),
-                                         GTK_WIDGET (page));
-  gtk_notebook_set_current_page (GTK_NOTEBOOK (priv->notebook), page_num);
+  GtkStackTransitionType transition_type;
+
+  switch (direction) {
+  case GIS_ASSISTANT_NEXT:
+    transition_type = GTK_STACK_TRANSITION_TYPE_SLIDE_LEFT;
+    break;
+  case GIS_ASSISTANT_PREV:
+    transition_type = GTK_STACK_TRANSITION_TYPE_SLIDE_RIGHT;
+    break;
+  default:
+    g_assert_not_reached ();
+  }
+
+  gtk_stack_set_transition_type (GTK_STACK (priv->stack), transition_type);
+
+  gtk_stack_set_visible_child (GTK_STACK (priv->stack),
+                              GTK_WIDGET (page));
 }
 
 static void
 gis_assistant_gtk_add_page (GisAssistant *assistant,
-                            GisPage      *page)
+                           GisPage      *page)
 {
   GisAssistantGtkPrivate *priv = GIS_ASSISTANT_GTK (assistant)->priv;
-  gtk_notebook_append_page (GTK_NOTEBOOK (priv->notebook),
-                            GTK_WIDGET (page), NULL);
+  gtk_container_add (GTK_CONTAINER (priv->stack), GTK_WIDGET (page));
 }
 
 static void
@@ -78,13 +93,14 @@ gis_assistant_gtk_init (GisAssistantGtk *assistant_gtk)
   assistant_gtk->priv = priv;
 
   frame = _gis_assistant_get_frame (assistant);
-  priv->notebook = gtk_notebook_new ();
-  gtk_notebook_set_show_tabs (GTK_NOTEBOOK (priv->notebook), FALSE);
-  gtk_container_add (GTK_CONTAINER (frame), priv->notebook);
+  priv->stack = gtk_stack_new ();
+  gtk_stack_set_transition_type (GTK_STACK (priv->stack),
+                                GTK_STACK_TRANSITION_TYPE_CROSSFADE);
+  gtk_container_add (GTK_CONTAINER (frame), priv->stack);
 
-  gtk_widget_show (priv->notebook);
+  gtk_widget_show (priv->stack);
 
-  g_signal_connect (priv->notebook, "switch-page",
+  g_signal_connect (priv->stack, "notify::visible-child",
                     G_CALLBACK (current_page_changed), assistant);
 }
 
diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
index 450fb92..ee31c3b 100644
--- a/gnome-initial-setup/gis-driver.c
+++ b/gnome-initial-setup/gis-driver.c
@@ -28,7 +28,6 @@
 #include <stdlib.h>
 
 #include "gis-assistant-gtk.h"
-#include "gis-assistant-gd.h"
 
 #define GIS_TYPE_DRIVER_MODE (gis_driver_mode_get_type ())
 
@@ -170,20 +169,6 @@ gis_driver_get_mode (GisDriver *driver)
   return priv->mode;
 }
 
-static GType
-get_assistant_type (void)
-{
-  gboolean enable_animations;
-  g_object_get (gtk_settings_get_default (),
-                "gtk-enable-animations", &enable_animations,
-                NULL);
-
-  if (enable_animations && g_getenv ("GIS_DISABLE_GD") == NULL)
-    return GIS_TYPE_ASSISTANT_GD;
-  else
-    return GIS_TYPE_ASSISTANT_GTK;
-}
-
 static void
 gis_driver_get_property (GObject      *object,
                          guint         prop_id,
@@ -263,7 +248,7 @@ gis_driver_startup (GApplication *app)
                     G_CALLBACK (window_realize_cb),
                     (gpointer)app);
 
-  priv->assistant = g_object_new (get_assistant_type (), NULL);
+  priv->assistant = g_object_new (GIS_TYPE_ASSISTANT_GTK, NULL);
   gtk_container_add (GTK_CONTAINER (priv->main_window), GTK_WIDGET (priv->assistant));
 
   gtk_widget_show (GTK_WIDGET (priv->assistant));