[cairo-commit] roadster/data roadster.glade,1.3,1.4

Ian McIntosh commit at pdx.freedesktop.org
Sun Feb 27 19:25:25 PST 2005


Committed by: ian

Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv17134/data

Modified Files:
	roadster.glade 
Log Message:
	* configure.ac: Added libsvg-cairo as dependency. (Not quite correct? Nate will fix it.:)
	* Makefile.am: Added glyph.c.
	* datasetwindow.c: Removed Import button.
	* db.c: Removed debugging comments.  City with the same name are no longer shared between states.
	* geometryset.c: Expired a bunch of old code.
	* gotowindow.c: Use mappoint_t instead of loose lat/lon variables.
	* gui.c: Changed an error message.
	* main.c: Move init/deinit code from main() to main_init() and main_deinit()
	* mainwindow.c: Some cleanup and early support for SVG icon loading.
	* map.c: Renamed some variables and functions.  Moved start location from arbitrary spot in MA, USA to (0,0)
	* pointstring.c: Clean up.
	* search_location.c: Use new map_* function names.
	* search_road.c: Use city, state, and zip if present.
	* searchwindow.c: Correctly use G_TYPE_DOUBLE to store coordinates.  Use mappoint_t instead of loose variables.


Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- roadster.glade	26 Feb 2005 09:37:36 -0000	1.3
+++ roadster.glade	28 Feb 2005 03:25:23 -0000	1.4
@@ -53,7 +53,7 @@
 			  <signal name="activate" handler="on_import_maps_activate" last_modification_time="Tue, 25 Jan 2005 19:06:57 GMT"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image9524">
+			    <widget class="GtkImage" id="image9537">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -74,7 +74,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image9525">
+			    <widget class="GtkImage" id="image9538">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -195,57 +195,44 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkMenuItem" id="windows1">
+			<widget class="GtkImageMenuItem" id="gotomenuitem">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">_Dialogs</property>
+			  <property name="tooltip" translatable="yes">Go to a new location</property>
+			  <property name="label" translatable="yes">_Go To Dialog</property>
 			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="mainwindow_on_gotomenuitem_activate" last_modification_time="Sat, 15 Jan 2005 07:28:38 GMT"/>
+			  <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
-			  <child>
-			    <widget class="GtkMenu" id="windows1_menu">
-
-			      <child>
-				<widget class="GtkImageMenuItem" id="gotomenuitem">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Go to a new location</property>
-				  <property name="label" translatable="yes">_Go To Dialog</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="mainwindow_on_gotomenuitem_activate" last_modification_time="Sat, 15 Jan 2005 07:28:38 GMT"/>
-				  <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-
-				  <child internal-child="image">
-				    <widget class="GtkImage" id="image9526">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-jump-to</property>
-				      <property name="icon_size">1</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="datasetmenuitem">
-				  <property name="label" translatable="yes">_Data Set Dialog</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="mainwindow_on_datasetmenuitem_activate" last_modification_time="Thu, 27 Jan 2005 21:22:36 GMT"/>
-				  <accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
-				</widget>
-			      </child>
-
-			      <child>
-				<widget class="GtkMenuItem" id="importmenuitem">
-				  <property name="label" translatable="yes">_Import Dialog</property>
-				  <property name="use_underline">True</property>
-				  <signal name="activate" handler="on_importmenuitem_activate" last_modification_time="Wed, 26 Jan 2005 23:30:39 GMT"/>
-				</widget>
-			      </child>
+			  <child internal-child="image">
+			    <widget class="GtkImage" id="image9539">
+			      <property name="visible">True</property>
+			      <property name="stock">gtk-jump-to</property>
+			      <property name="icon_size">1</property>
+			      <property name="xalign">0.5</property>
+			      <property name="yalign">0.5</property>
+			      <property name="xpad">0</property>
+			      <property name="ypad">0</property>
 			    </widget>
 			  </child>
 			</widget>
 		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="datasetmenuitem">
+			  <property name="label" translatable="yes">_Data Set Dialog</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="mainwindow_on_datasetmenuitem_activate" last_modification_time="Thu, 27 Jan 2005 21:22:36 GMT"/>
+			  <accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+			</widget>
+		      </child>
+
+		      <child>
+			<widget class="GtkMenuItem" id="importmenuitem">
+			  <property name="label" translatable="yes">_Import Dialog</property>
+			  <property name="use_underline">True</property>
+			  <signal name="activate" handler="on_importmenuitem_activate" last_modification_time="Wed, 26 Jan 2005 23:30:39 GMT"/>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -256,7 +243,6 @@
 		  <property name="visible">True</property>
 		  <property name="label" translatable="yes">Bookmarks</property>
 		  <property name="use_underline">True</property>
-		  <signal name="activate" handler="on_bookmarksmenuitem_activate" last_modification_time="Tue, 22 Feb 2005 05:43:22 GMT"/>
 
 		  <child>
 		    <widget class="GtkMenu" id="bookmarksmenuitem_menu">
@@ -387,6 +373,89 @@
 	      </child>
 
 	      <child>
+		<widget class="GtkToolItem" id="toolitem20">
+		  <property name="visible">True</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+
+		  <child>
+		    <widget class="GtkButton" id="button32">
+		      <property name="sensitive">False</property>
+		      <property name="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">False</property>
+		      <signal name="activate" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 05:50:47 GMT"/>
+		      <signal name="clicked" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 09:47:42 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="image9532">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-back</property>
+			  <property name="icon_size">2</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkToolItem" id="toolitem21">
+		  <property name="visible">True</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		  <property name="is_important">False</property>
+
+		  <child>
+		    <widget class="GtkButton" id="button33">
+		      <property name="sensitive">False</property>
+		      <property name="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">False</property>
+		      <signal name="activate" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 05:50:47 GMT"/>
+		      <signal name="clicked" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 09:47:42 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="image9531">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-go-forward</property>
+			  <property name="icon_size">2</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">False</property>
+		</packing>
+	      </child>
+
+	      <child>
+		<widget class="GtkSeparatorToolItem" id="separatortoolitem7">
+		  <property name="sensitive">False</property>
+		  <property name="draw">True</property>
+		  <property name="visible_horizontal">True</property>
+		  <property name="visible_vertical">True</property>
+		</widget>
+		<packing>
+		  <property name="expand">False</property>
+		  <property name="homogeneous">False</property>
+		</packing>
+	      </child>
+
+	      <child>
 		<widget class="GtkSeparatorToolItem" id="separatortoolitem5">
 		  <property name="width_request">8</property>
 		  <property name="visible">True</property>
@@ -420,7 +489,7 @@
 		      <property name="has_frame">True</property>
 		      <property name="invisible_char" translatable="yes">*</property>
 		      <property name="activates_default">True</property>
-		      <property name="width_chars">24</property>
+		      <property name="width_chars">28</property>
 		    </widget>
 		  </child>
 		</widget>
@@ -431,21 +500,6 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkSeparatorToolItem" id="separatortoolitem6">
-		  <property name="width_request">4</property>
-		  <property name="visible">True</property>
-		  <property name="sensitive">False</property>
-		  <property name="draw">False</property>
-		  <property name="visible_horizontal">True</property>
-		  <property name="visible_vertical">True</property>
-		</widget>
-		<packing>
-		  <property name="expand">False</property>
-		  <property name="homogeneous">False</property>
-		</packing>
-	      </child>
-
-	      <child>
 		<widget class="GtkToolItem" id="toolitem19">
 		  <property name="visible">True</property>
 		  <property name="visible_horizontal">True</property>
@@ -457,22 +511,12 @@
 		      <property name="visible">True</property>
 		      <property name="can_default">True</property>
 		      <property name="has_default">True</property>
+		      <property name="label" translatable="yes">_Find</property>
+		      <property name="use_underline">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">False</property>
 		      <signal name="activate" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 05:50:47 GMT"/>
 		      <signal name="clicked" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 09:47:42 GMT"/>
-
-		      <child>
-			<widget class="GtkImage" id="image9519">
-			  <property name="visible">True</property>
-			  <property name="stock">gtk-find</property>
-			  <property name="icon_size">4</property>
-			  <property name="xalign">0.5</property>
-			  <property name="yalign">0.5</property>
-			  <property name="xpad">0</property>
-			  <property name="ypad">0</property>
-			</widget>
-		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -497,23 +541,30 @@
 	      </child>
 
 	      <child>
-		<widget class="GtkToolItem" id="toolitem14">
+		<widget class="GtkToolItem" id="toolitem22">
 		  <property name="visible">True</property>
 		  <property name="visible_horizontal">True</property>
 		  <property name="visible_vertical">True</property>
 		  <property name="is_important">False</property>
 
 		  <child>
-		    <widget class="GtkToolButton" id="toolbutton1">
-		      <property name="border_width">2</property>
+		    <widget class="GtkButton" id="button34">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <property name="stock_id">gtk-remove</property>
-		      <property name="visible_horizontal">True</property>
-		      <property name="visible_vertical">True</property>
-		      <property name="is_important">False</property>
-		      <signal name="clicked" handler="on_zoomout_activate" last_modification_time="Sat, 18 Sep 2004 07:29:43 GMT"/>
+		      <property name="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">False</property>
+		      <signal name="clicked" handler="on_zoomout_activate" last_modification_time="Sun, 27 Feb 2005 16:23:02 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="image9533">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-zoom-out</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -538,7 +589,7 @@
 
 		      <child>
 			<widget class="GtkHScale" id="zoomscale">
-			  <property name="width_request">150</property>
+			  <property name="width_request">140</property>
 			  <property name="visible">True</property>
 			  <property name="draw_value">True</property>
 			  <property name="value_pos">GTK_POS_RIGHT</property>
@@ -566,16 +617,23 @@
 		  <property name="is_important">False</property>
 
 		  <child>
-		    <widget class="GtkToolButton" id="zoominbutton">
-		      <property name="border_width">2</property>
+		    <widget class="GtkButton" id="button35">
 		      <property name="visible">True</property>
-		      <property name="label" translatable="yes"></property>
-		      <property name="use_underline">True</property>
-		      <property name="stock_id">gtk-add</property>
-		      <property name="visible_horizontal">True</property>
-		      <property name="visible_vertical">True</property>
-		      <property name="is_important">False</property>
-		      <signal name="clicked" handler="on_zoomin_activate" last_modification_time="Sat, 18 Sep 2004 07:29:47 GMT"/>
+		      <property name="relief">GTK_RELIEF_NONE</property>
+		      <property name="focus_on_click">False</property>
+		      <signal name="clicked" handler="on_zoomin_activate" last_modification_time="Sun, 27 Feb 2005 16:23:50 GMT"/>
+
+		      <child>
+			<widget class="GtkImage" id="image9534">
+			  <property name="visible">True</property>
+			  <property name="stock">gtk-zoom-in</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+		      </child>
 		    </widget>
 		  </child>
 		</widget>
@@ -1608,7 +1666,6 @@
 
 			  <child>
 			    <widget class="GtkImage" id="image9476">
-			      <property name="visible">True</property>
 			      <property name="stock">gtk-harddisk</property>
 			      <property name="icon_size">1</property>
 			      <property name="xalign">0.5</property>
@@ -1751,77 +1808,6 @@
 		  <signal name="clicked" handler="datasetwindow_on_datasetdeletebutton_clicked" last_modification_time="Thu, 27 Jan 2005 21:38:20 GMT"/>
 		</widget>
 	      </child>
-
-	      <child>
-		<widget class="GtkButton" id="datasetimportbutton">
-		  <property name="visible">True</property>
-		  <property name="can_default">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="relief">GTK_RELIEF_NORMAL</property>
-		  <property name="focus_on_click">True</property>
-		  <signal name="clicked" handler="datasetwindow_on_datasetimportbutton_clicked" last_modification_time="Thu, 27 Jan 2005 22:07:06 GMT"/>
-
-		  <child>
-		    <widget class="GtkAlignment" id="alignment1">
-		      <property name="visible">True</property>
-		      <property name="xalign">0.5</property>
-		      <property name="yalign">0.5</property>
-		      <property name="xscale">0</property>
-		      <property name="yscale">0</property>
-		      <property name="top_padding">0</property>
-		      <property name="bottom_padding">0</property>
-		      <property name="left_padding">0</property>
-		      <property name="right_padding">0</property>
-
-		      <child>
-			<widget class="GtkHBox" id="hbox2">
-			  <property name="visible">True</property>
-			  <property name="homogeneous">False</property>
-			  <property name="spacing">2</property>
-
-			  <child>
-			    <widget class="GtkImage" id="image1">
-			      <property name="visible">True</property>
-			      <property name="stock">gtk-open</property>
-			      <property name="icon_size">4</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="GtkLabel" id="label12">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">Import...</property>
-			      <property name="use_underline">True</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>
-			</widget>
-		      </child>
-		    </widget>
-		  </child>
-		</widget>
-	      </child>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -1895,7 +1881,6 @@
 
 <widget class="GtkWindow" id="gotowindow">
   <property name="border_width">4</property>
-  <property name="height_request">350</property>
   <property name="title" translatable="yes">Go To</property>
   <property name="type">GTK_WINDOW_TOPLEVEL</property>
   <property name="window_position">GTK_WIN_POS_CENTER</property>
@@ -3104,107 +3089,16 @@
 		      <property name="spacing">8</property>
 
 		      <child>
-			<widget class="GtkHBox" id="hbox50">
+			<widget class="GtkHBox" id="hbox60">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
-			  <property name="spacing">4</property>
-
-			  <child>
-			    <widget class="GtkLabel" id="label92234">
-			      <property name="visible">True</property>
-			      <property name="label" translatable="yes">_Type:</property>
-			      <property name="use_underline">True</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="GtkHBox" id="hbox34">
-			      <property name="visible">True</property>
-			      <property name="homogeneous">False</property>
-			      <property name="spacing">4</property>
-
-			      <child>
-				<widget class="GtkComboBox" id="combobox4">
-				  <property name="visible">True</property>
-				  <property name="items" translatable="yes">Bars
-Coffee Shops
-Gas Stations
-Libraries
-Restaurants</property>
-				</widget>
-				<packing>
-				  <property name="padding">0</property>
-				  <property name="expand">False</property>
-				  <property name="fill">True</property>
-				</packing>
-			      </child>
-
-			      <child>
-				<widget class="GtkButton" id="button29">
-				  <property name="visible">True</property>
-				  <property name="tooltip" translatable="yes">Add / Edit Sets</property>
-				  <property name="can_focus">True</property>
-				  <property name="relief">GTK_RELIEF_NORMAL</property>
-				  <property name="focus_on_click">True</property>
-
-				  <child>
-				    <widget class="GtkImage" id="image9448">
-				      <property name="visible">True</property>
-				      <property name="stock">gtk-properties</property>
-				      <property name="icon_size">4</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xpad">0</property>
-				      <property name="ypad">0</property>
-				    </widget>
-				  </child>
-				</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>
-			      <property name="expand">True</property>
-			      <property name="fill">True</property>
-			    </packing>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="padding">0</property>
-			  <property name="expand">True</property>
-			  <property name="fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkFrame" id="frame29">
-			  <property name="visible">True</property>
-			  <property name="label_xalign">0</property>
-			  <property name="label_yalign">0.5</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
+			  <property name="spacing">0</property>
 
 			  <child>
 			    <widget class="GtkTable" id="table11">
 			      <property name="border_width">4</property>
 			      <property name="visible">True</property>
-			      <property name="n_rows">3</property>
+			      <property name="n_rows">5</property>
 			      <property name="n_columns">2</property>
 			      <property name="homogeneous">False</property>
 			      <property name="row_spacing">8</property>
@@ -3227,8 +3121,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -3251,8 +3145,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -3275,8 +3169,8 @@
 				<packing>
 				  <property name="left_attach">0</property>
 				  <property name="right_attach">1</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options"></property>
 				</packing>
@@ -3297,8 +3191,8 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">0</property>
-				  <property name="bottom_attach">1</property>
+				  <property name="top_attach">1</property>
+				  <property name="bottom_attach">2</property>
 				  <property name="y_options"></property>
 				</packing>
 			      </child>
@@ -3351,8 +3245,8 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">1</property>
-				  <property name="bottom_attach">2</property>
+				  <property name="top_attach">2</property>
+				  <property name="bottom_attach">3</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options">fill</property>
 				</packing>
@@ -3406,13 +3300,152 @@
 				<packing>
 				  <property name="left_attach">1</property>
 				  <property name="right_attach">2</property>
-				  <property name="top_attach">2</property>
-				  <property name="bottom_attach">3</property>
+				  <property name="top_attach">3</property>
+				  <property name="bottom_attach">4</property>
 				  <property name="x_options">fill</property>
 				  <property name="y_options">fill</property>
 				</packing>
 			      </child>
+
+			      <child>
+				<widget class="GtkLabel" id="label92234">
+				  <property name="visible">True</property>
+				  <property name="label" translatable="yes">_Type:</property>
+				  <property name="use_underline">True</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="left_attach">0</property>
+				  <property name="right_attach">1</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options"></property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkComboBox" id="combobox4">
+				  <property name="visible">True</property>
+				  <property name="items" translatable="yes">Bars
+Coffee Shops
+Gas Stations
+Libraries
+Restaurants</property>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">0</property>
+				  <property name="bottom_attach">1</property>
+				  <property name="x_options">fill</property>
+				  <property name="y_options">fill</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<widget class="GtkHBox" id="hbox61">
+				  <property name="visible">True</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">0</property>
+
+				  <child>
+				    <placeholder/>
+				  </child>
+
+				  <child>
+				    <widget class="GtkButton" id="button31">
+				      <property name="visible">True</property>
+				      <property name="tooltip" translatable="yes">Add / Edit Sets</property>
+				      <property name="can_focus">True</property>
+				      <property name="relief">GTK_RELIEF_NORMAL</property>
+				      <property name="focus_on_click">True</property>
+
+				      <child>
+					<widget class="GtkImage" id="image9527">
+					  <property name="visible">True</property>
+					  <property name="stock">gtk-add</property>
+					  <property name="icon_size">4</property>
+					  <property name="xalign">0.5</property>
+					  <property name="yalign">0.5</property>
+					  <property name="xpad">0</property>
+					  <property name="ypad">0</property>
+					</widget>
+				      </child>
+				    </widget>
+				    <packing>
+				      <property name="padding">0</property>
+				      <property name="expand">False</property>
+				      <property name="fill">False</property>
+				    </packing>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="left_attach">1</property>
+				  <property name="right_attach">2</property>
+				  <property name="top_attach">4</property>
+				  <property name="bottom_attach">5</property>
+				  <property name="x_options">fill</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
+			  </child>
+
+			  <child>
+			    <widget class="GtkVBox" id="vbox8867">
+			      <property name="border_width">4</property>
+			      <property name="visible">True</property>
+			      <property name="homogeneous">False</property>
+			      <property name="spacing">0</property>
+
+			      <child>
+				<widget class="GtkButton" id="button29">
+				  <property name="visible">True</property>
+				  <property name="tooltip" translatable="yes">Add / Edit Sets</property>
+				  <property name="can_focus">True</property>
+				  <property name="relief">GTK_RELIEF_NORMAL</property>
+				  <property name="focus_on_click">True</property>
+
+				  <child>
+				    <widget class="GtkImage" id="image9448">
+				      <property name="visible">True</property>
+				      <property name="stock">gtk-properties</property>
+				      <property name="icon_size">4</property>
+				      <property name="xalign">0.5</property>
+				      <property name="yalign">0.5</property>
+				      <property name="xpad">0</property>
+				      <property name="ypad">0</property>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="padding">0</property>
+				  <property name="expand">False</property>
+				  <property name="fill">False</property>
+				</packing>
+			      </child>
+
+			      <child>
+				<placeholder/>
+			      </child>
 			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
+			    </packing>
 			  </child>
 			</widget>
 			<packing>




More information about the cairo-commit mailing list