prepend label " " before the ETable

2004-06-14  Radek Doulik  <rodo@ximian.com>

	* gal-view-instance-save-as-dialog.glade: prepend label " " before
	the ETable

	* gal-view-instance-save-as-dialog.c
	(gal_view_instance_save_as_dialog_set_instance): select first row
	(gal_view_instance_save_as_dialog_init): show the etable

svn path=/trunk/; revision=26338

2 files changed, 57 insertions, 14 deletions

diff --git a/widgets/menus/gal-view-instance-save-as-dialog.c b/widgets/menus/gal-view-instance-save-as-dialog.c
index 2c99e389d3..ce76087553 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.c
+++ b/widgets/menus/gal-view-instance-save-as-dialog.c
@@ -57,9 +57,17 @@ gal_view_instance_save_as_dialog_set_instance(GalViewInstanceSaveAsDialog *dialo
 {
 	dialog->instance = instance;
 	if (dialog->model) {
+		GtkWidget *table;
 		g_object_set(dialog->model,
 			     "collection", instance ? instance->collection : NULL,
 			     NULL);
+		table = glade_xml_get_widget(dialog->gui, "custom-replace");
+		if (table) {
+			ETable *etable;
+			etable = e_table_scrolled_get_table (E_TABLE_SCROLLED (table));
+			e_selection_model_select_single_row (e_table_get_selection_model (etable), 0);
+			e_selection_model_change_cursor (e_table_get_selection_model (etable), 0, 0);
+		}
 	}
 }
 
@@ -183,7 +191,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 {
 	GladeXML *gui;
 	GtkWidget *widget;
-	GtkWidget *etable;
+	GtkWidget *table;
 
 	dialog->instance = NULL;
 
@@ -208,12 +216,12 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 	gvisad_connect_signal(dialog, "radiobutton-create",  "toggled", G_CALLBACK(gvisad_radio_toggled));
 
 	dialog->model = NULL;
-	etable = glade_xml_get_widget(dialog->gui, "custom-replace");
-	if (etable) {
-		dialog->model = g_object_get_data(G_OBJECT (etable), "GalViewInstanceSaveAsDialog::model");
-		g_object_set(dialog->model,
-			     "collection", dialog->instance ? dialog->instance->collection : NULL,
-			     NULL);
+	table = glade_xml_get_widget(dialog->gui, "custom-replace");
+	if (table) {
+		dialog->model = g_object_get_data(G_OBJECT (table), "GalViewInstanceSaveAsDialog::model");
+
+		gal_view_instance_save_as_dialog_set_instance (dialog, dialog->instance);
+		gtk_widget_show_all (table);
 	}
 	
 	gvisad_setup_radio_buttons (dialog);
@@ -224,7 +232,7 @@ gal_view_instance_save_as_dialog_init (GalViewInstanceSaveAsDialog *dialog)
 
 /* For use from libglade. */
 /* ETable creation */
-#define SPEC "<ETableSpecification no-header=\"true\" cursor-mode=\"line\" draw-grid=\"false\" selection-mode=\"single\" gettext-domain=\"" E_I18N_DOMAIN "\">" \
+#define SPEC "<ETableSpecification no-headers=\"true\" cursor-mode=\"line\" draw-grid=\"false\" selection-mode=\"single\" gettext-domain=\"" E_I18N_DOMAIN "\">" \
 	     "<ETableColumn model_col= \"0\" _title=\"Name\" expansion=\"1.0\" minimum_width=\"18\" resizable=\"true\" cell=\"string\" compare=\"string\"/>" \
              "<ETableState> <column source=\"0\"/> <grouping> </grouping> </ETableState>" \
 	     "</ETableSpecification>"
@@ -236,9 +244,10 @@ gal_view_instance_save_as_dialog_create_etable(char *name, char *string1, char *
 {
 	GtkWidget *table;
 	ETableModel *model;
-	model = gal_define_views_model_new();
+	model = gal_define_views_model_new ();
 	table = e_table_scrolled_new(model, NULL, SPEC, NULL);
 	g_object_set_data(G_OBJECT (table), "GalViewInstanceSaveAsDialog::model", model);
+
 	return table;
 }
 
diff --git a/widgets/menus/gal-view-instance-save-as-dialog.glade b/widgets/menus/gal-view-instance-save-as-dialog.glade
index da0c5be531..54776827a0 100644
--- a/widgets/menus/gal-view-instance-save-as-dialog.glade
+++ b/widgets/menus/gal-view-instance-save-as-dialog.glade
@@ -199,12 +199,46 @@
 	  </child>
 
 	  <child>
-	    <widget class="Custom" id="custom-replace">
+	    <widget class="GtkHBox" id="hbox2">
 	      <property name="visible">True</property>
-	      <property name="creation_function">gal_view_instance_save_as_dialog_create_etable</property>
-	      <property name="int1">0</property>
-	      <property name="int2">0</property>
-	      <property name="last_modification_time">Fri, 01 Feb 2002 20:18:32 GMT</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">6</property>
+
+	      <child>
+		<widget class="GtkLabel" id="label10">
+		  <property name="visible">True</property>
+		  <property name="label" translatable="yes">    </property>
+		  <property name="use_underline">False</property>
+		  <property name="use_markup">False</property>
+		  <property name="justify">GTK_JUSTIFY_LEFT</property>
+		  <property name="wrap">False</property>
+		  <property name="selectable">False</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xpad">0</property>
+		  <property name="ypad">0</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">False</property>
+		  <property name="fill">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="Custom" id="custom-replace">
+		  <property name="visible">True</property>
+		  <property name="creation_function">gal_view_instance_save_as_dialog_create_etable</property>
+		  <property name="int1">0</property>
+		  <property name="int2">0</property>
+		  <property name="last_modification_time">Fri, 01 Feb 2002 20:18:32 GMT</property>
+		</widget>
+		<packing>
+		  <property name="padding">0</property>
+		  <property name="expand">True</property>
+		  <property name="fill">True</property>
+		</packing>
+	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>