Added gal-view-collection.c, gal-view-etable.c, gal-view-factory-etable.c,

2000-12-06  Christopher James Lahey  <clahey@helixcode.com>

	* Makefile.am: Added gal-view-collection.c, gal-view-etable.c,
	gal-view-factory-etable.c, gal-view-factory.c,
	gal-view-collection.h, gal-view-etable.h,
	gal-view-factory-etable.h, and gal-view-factory.h.

	* gal-define-views-dialog.c, gal-define-views-dialog.h: Rewrote
	this to take a GalViewCollection.  This now passes its collection
	to the new view dialog but still doesn't get its list of views
	from the collection.

	* gal-define-views-model.c: Changed this to use the gal_view_get_title
	function instead of the "title" gtk argument.

	* gal-define-views.glade, gal-define-views.glade.h: Changed this
	dialog to be a bit cleaner.

	* gal-view-collection.c, gal-view-collection.h: A collection of
	views and view factories.

	* gal-view-etable.c, gal-view-etable.h: An implementation of the
	view class.  This stores an ETableSpecification and the current
	ETableState.

	* gal-view-factory-etable.c, gal-view-factory-etable.h: An
	implementation of the view factory class.  This stores an
	ETableSpecification and creates GalViewEtables when requested.

	* gal-view-factory.c, gal-view-factory.h: A new virtual class.
	Its primary job is to return new GalViews.

	* gal-view-new-dialog.c, gal-view-new-dialog.h: Added a collection
	argument to the new function here so that it can get a list of
	factories to choose from.

	* gal-view-new-dialog.glade, gal-view-new-dialog.glade.h: Added a
	CList for the list of factories to choose from.

	* gal-view.c, gal-view.h: Changed this to be a virtual class.

svn path=/trunk/; revision=6811

1 files changed, 76 insertions, 2 deletions

diff --git a/widgets/menus/gal-view-new-dialog.glade b/widgets/menus/gal-view-new-dialog.glade
index aba8dc6b0f..02d9866d49 100644
--- a/widgets/menus/gal-view-new-dialog.glade
+++ b/widgets/menus/gal-view-new-dialog.glade
@@ -81,7 +81,7 @@
     <widget>
       <class>GtkTable</class>
       <name>table-top</name>
-      <rows>2</rows>
+      <rows>4</rows>
       <columns>1</columns>
       <homogeneous>False</homogeneous>
       <row_spacing>6</row_spacing>
@@ -95,13 +95,14 @@
       <widget>
 	<class>GtkLabel</class>
 	<name>label1</name>
-	<label>_Name of new view:</label>
+	<label>Name of new view:</label>
 	<justify>GTK_JUSTIFY_CENTER</justify>
 	<wrap>False</wrap>
 	<xalign>0</xalign>
 	<yalign>0.5</yalign>
 	<xpad>0</xpad>
 	<ypad>0</ypad>
+	<focus_target>entry-name</focus_target>
 	<child>
 	  <left_attach>0</left_attach>
 	  <right_attach>1</right_attach>
@@ -141,6 +142,79 @@
 	  <yfill>True</yfill>
 	</child>
       </widget>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>label2</name>
+	<label>Type of view:</label>
+	<justify>GTK_JUSTIFY_CENTER</justify>
+	<wrap>False</wrap>
+	<xalign>0</xalign>
+	<yalign>0.5</yalign>
+	<xpad>0</xpad>
+	<ypad>0</ypad>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>2</top_attach>
+	  <bottom_attach>3</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>False</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>False</yfill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkScrolledWindow</class>
+	<name>scrolledwindow1</name>
+	<hscrollbar_policy>GTK_POLICY_AUTOMATIC</hscrollbar_policy>
+	<vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy>
+	<hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy>
+	<vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy>
+	<child>
+	  <left_attach>0</left_attach>
+	  <right_attach>1</right_attach>
+	  <top_attach>3</top_attach>
+	  <bottom_attach>4</bottom_attach>
+	  <xpad>0</xpad>
+	  <ypad>0</ypad>
+	  <xexpand>False</xexpand>
+	  <yexpand>True</yexpand>
+	  <xshrink>False</xshrink>
+	  <yshrink>False</yshrink>
+	  <xfill>True</xfill>
+	  <yfill>True</yfill>
+	</child>
+
+	<widget>
+	  <class>GtkCList</class>
+	  <name>clist-type-list</name>
+	  <can_focus>True</can_focus>
+	  <columns>1</columns>
+	  <column_widths>80</column_widths>
+	  <selection_mode>GTK_SELECTION_SINGLE</selection_mode>
+	  <show_titles>False</show_titles>
+	  <shadow_type>GTK_SHADOW_IN</shadow_type>
+
+	  <widget>
+	    <class>GtkLabel</class>
+	    <child_name>CList:title</child_name>
+	    <name>label5</name>
+	    <label>label5</label>
+	    <justify>GTK_JUSTIFY_CENTER</justify>
+	    <wrap>False</wrap>
+	    <xalign>0.5</xalign>
+	    <yalign>0.5</yalign>
+	    <xpad>0</xpad>
+	    <ypad>0</ypad>
+	  </widget>
+	</widget>
+      </widget>
     </widget>
   </widget>
 </widget>