[openvrml-commit] openvrml/src/openvrml-player openvrml-player.glade, 1.4, 1.5 player.cpp, 1.9, 1.10

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv2912/src/openvrml-player

Modified Files:
	openvrml-player.glade player.cpp 
Log Message:
Use Glade XML to manage the OpenvrmlPlayerFileChooserDialog.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/player.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** player.cpp	9 Feb 2007 05:20:28 -0000	1.9
--- player.cpp	9 Feb 2007 08:24:41 -0000	1.10
***************
*** 32,35 ****
--- 32,36 ----
  # include <libgnomeui/libgnomeui.h>
  # include <glade/glade.h>
+ # include <glade/glade-build.h>
  
  # include "filechooserdialog.h"
***************
*** 42,46 ****
  
  extern "C" {
-     void openvrml_player_watch_child(GPid pid, gint status, gpointer data);
      gboolean openvrml_player_request_data_available(GIOChannel * source,
                                                      GIOCondition condition,
--- 43,46 ----
***************
*** 56,62 ****
                                        void * stream);
      void openvrml_player_on_about_activated(GtkWindow * window);
!     void openvrml_player_on_file_open_activated(GtkWindow * window);
      void openvrml_player_on_locationentry_activated(GtkEntry * entry);
      void openvrml_player_quit();
  }
  
--- 56,72 ----
                                        void * stream);
      void openvrml_player_on_about_activated(GtkWindow * window);
!     void openvrml_player_on_file_open_activated(
!         OpenvrmlPlayerFileChooserDialog * dialog);
      void openvrml_player_on_locationentry_activated(GtkEntry * entry);
      void openvrml_player_quit();
+ 
+     G_GNUC_INTERNAL void openvrml_player_watch_child(GPid pid,
+                                                      gint status,
+                                                      gpointer data);
+     G_GNUC_INTERNAL
+     GtkWidget *
+     openvrml_player_build_file_chooser_dialog(GladeXML * xml,
+                                               GType widget_type,
+                                               GladeWidgetInfo * info);
  }
  
***************
*** 149,155 ****
--- 159,177 ----
                             GNOME_PARAM_NONE);
  
+     glade_init();
+     glade_register_widget(OPENVRML_PLAYER_TYPE_FILE_CHOOSER_DIALOG,
+                           openvrml_player_build_file_chooser_dialog,
+                           0,
+                           0);
+ 
      GladeXML * const xml = xml_new(*program);
      glade_xml_signal_autoconnect(xml);
  
+     GtkWidget * const app_window = glade_xml_get_widget(xml, "window");
+     GtkWidget * const file_chooser_dialog =
+         glade_xml_get_widget(xml, "filechooserdialog");
+     gtk_window_set_transient_for(GTK_WINDOW(file_chooser_dialog),
+                                  GTK_WINDOW(app_window));
+ 
      //
      // The OPENVRML_XEMBED environment variable overrides the default
***************
*** 757,773 ****
  }
  
! void openvrml_player_on_file_open_activated(GtkWindow * const parent)
  {
!     static GtkWidget * file_chooser_dialog = 0;
! 
!     if (!file_chooser_dialog) {
!         file_chooser_dialog =
!             openvrml_player_file_chooser_dialog_new(parent);
!     }
! 
!     const gint response = gtk_dialog_run(GTK_DIALOG(file_chooser_dialog));
      if (response == GTK_RESPONSE_ACCEPT) {
          gchar * uri = 0;
!         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(file_chooser_dialog));
          g_return_if_fail(uri);
          scope_guard uri_guard = make_guard(g_free, uri);
--- 779,790 ----
  }
  
! void
! openvrml_player_on_file_open_activated(
!     OpenvrmlPlayerFileChooserDialog * const dialog)
  {
!     const gint response = gtk_dialog_run(GTK_DIALOG(dialog));
      if (response == GTK_RESPONSE_ACCEPT) {
          gchar * uri = 0;
!         uri = gtk_file_chooser_get_uri(GTK_FILE_CHOOSER(dialog));
          g_return_if_fail(uri);
          scope_guard uri_guard = make_guard(g_free, uri);
***************
*** 776,780 ****
      }
  
!     gtk_widget_hide(file_chooser_dialog);
  }
  
--- 793,797 ----
      }
  
!     gtk_widget_hide(GTK_WIDGET(dialog));
  }
  
***************
*** 820,823 ****
--- 837,849 ----
  }
  
+ GtkWidget *
+ openvrml_player_build_file_chooser_dialog(GladeXML * /* xml */,
+                                           GType /* widget_type */,
+                                           GladeWidgetInfo * /* info */)
+ {
+     GtkWidget * widget = openvrml_player_file_chooser_dialog_new(0);
+     return widget;
+ }
+ 
  namespace {
  

Index: openvrml-player.glade
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/openvrml-player/openvrml-player.glade,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** openvrml-player.glade	8 Feb 2007 05:53:37 -0000	1.4
--- openvrml-player.glade	9 Feb 2007 08:24:41 -0000	1.5
***************
*** 26,30 ****
                          <property name="use_underline">True</property>
                          <property name="use_stock">True</property>
!                         <signal name="activate" handler="openvrml_player_on_file_open_activated" object="window"/>
                        </widget>
                      </child>
--- 26,30 ----
                          <property name="use_underline">True</property>
                          <property name="use_stock">True</property>
!                         <signal name="activate" handler="openvrml_player_on_file_open_activated" object="filechooserdialog"/>
                        </widget>
                      </child>
***************
*** 107,109 ****
--- 107,111 ----
      </child>
    </widget>
+   <widget class="OpenvrmlPlayerFileChooserDialog" id="filechooserdialog">
+   </widget>
  </glade-interface>