[cairo-commit] roadster/data roadster.glade,1.26,1.27

Ian McIntosh commit at pdx.freedesktop.org
Mon Sep 26 06:57:15 PDT 2005


Committed by: ian

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

Modified Files:
	roadster.glade 
Log Message:
	* data/help/roadster-help.xml:
	* data/help/legal.xml:
	* data/help/figures/window_layout.png: Added the basics of a help system.

	* src/db.c: Removed debug stuff.
	* src/glyph.c: Added glyph drawing (via gdk/pixbufs).
	* src/location.c: Added location attribute name inserting / retrieving.
	* src/locationset.c: Added 'icon' field.
	* src/main.c: Add some debug code to insert test POI data.
	* src/search.c: Removed knowledge of search result type icons.  Now each type can provide its own.
	* src/search_*.c: Provide an icon suggestion along with results.
	* src/map.c:
	* src/map_draw_gdk.c: Re-enable / fix POI drawing.
	* src/point.c:
	* src/pointstring.c:
	* src/locationset.c: Fixed area_size of chunk allocators.	


Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- roadster.glade	25 Sep 2005 21:16:20 -0000	1.26
+++ roadster.glade	26 Sep 2005 13:57:13 -0000	1.27
@@ -1314,7 +1314,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10221">
+			<widget class="GtkImage" id="image10241">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1347,7 +1347,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10222">
+			<widget class="GtkImage" id="image10242">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-save-as</property>
 			  <property name="icon_size">1</property>
@@ -1371,9 +1371,10 @@
 		      <property name="label" translatable="yes">_Quit</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="mainwindow_on_quitmenuitem_activate" last_modification_time="Sat, 12 Mar 2005 06:47:26 GMT"/>
+		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10223">
+			<widget class="GtkImage" id="image10243">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -1477,10 +1478,9 @@
 			  <child>
 			    <widget class="GtkRadioMenuItem" id="auto1">
 			      <property name="visible">True</property>
-			      <property name="sensitive">False</property>
 			      <property name="label" translatable="yes">_Auto</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
+			      <property name="active">True</property>
 			    </widget>
 			  </child>
 
@@ -1499,7 +1499,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Night Colors</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			      <property name="group">auto1</property>
 			    </widget>
 			  </child>
@@ -1548,7 +1548,7 @@
 		      <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10224">
+			<widget class="GtkImage" id="image10244">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -1571,7 +1571,7 @@
 		      <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10225">
+			<widget class="GtkImage" id="image10245">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-media-forward</property>
 			  <property name="icon_size">1</property>
@@ -1632,7 +1632,7 @@
 		      <accelerator key="F9" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10226">
+			<widget class="GtkImage" id="image10246">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1681,7 +1681,7 @@
 		      <signal name="activate" handler="mainwindow_on_aboutmenuitem_activate" last_modification_time="Sat, 12 Mar 2005 06:48:18 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10227">
+			<widget class="GtkImage" id="image10247">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -1733,7 +1733,7 @@
 		      <signal name="activate" handler="mainwindow_on_import_maps_activate" last_modification_time="Fri, 04 Mar 2005 04:28:20 GMT"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10228">
+			<widget class="GtkImage" id="image10248">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1761,7 +1761,7 @@
 		      <accelerator key="F5" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10229">
+			<widget class="GtkImage" id="image10249">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1783,7 +1783,7 @@
 		      <accelerator key="F6" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10230">
+			<widget class="GtkImage" id="image10250">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1811,7 +1811,7 @@
 		      <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10231">
+			<widget class="GtkImage" id="image10251">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-jump-to</property>
 			  <property name="icon_size">1</property>
@@ -1933,6 +1933,53 @@
 	  </child>
 
 	  <child>
+	    <widget class="GtkEntry" id="entry5">
+	      <property name="sensitive">False</property>
+	      <property name="can_focus">True</property>
+	      <property name="editable">True</property>
+	      <property name="visibility">True</property>
+	      <property name="max_length">0</property>
+	      <property name="text" translatable="yes"></property>
+	      <property name="has_frame">True</property>
+	      <property name="invisible_char">*</property>
+	      <property name="activates_default">True</property>
+	      <property name="width_chars">12</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	      <property name="pack_type">GTK_PACK_END</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="label92350">
+	      <property name="sensitive">False</property>
+	      <property name="label" translatable="yes">near</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">2</property>
+	      <property name="ypad">0</property>
+	      <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+	      <property name="width_chars">-1</property>
+	      <property name="single_line_mode">False</property>
+	      <property name="angle">0</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">False</property>
+	      <property name="pack_type">GTK_PACK_END</property>
+	    </packing>
+	  </child>
+
+	  <child>
 	    <widget class="GtkEntry" id="searchentry">
 	      <property name="visible">True</property>
 	      <property name="tooltip" translatable="yes">Search for Places, street addresses, cities, states, or countries</property>
@@ -2096,68 +2143,6 @@
 		  <property name="spacing">0</property>
 
 		  <child>
-		    <widget class="GtkHBox" id="hbox55">
-		      <property name="homogeneous">False</property>
-		      <property name="spacing">0</property>
-
-		      <child>
-			<widget class="GtkLabel" id="label92243">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;span font_desc=&quot;11&quot;&gt; United States   Massachusetts   Cambridge&lt;/span&gt;</property>
-			  <property name="use_underline">False</property>
-			  <property name="use_markup">True</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>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">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="label92244">
-			  <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>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</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">False</property>
-		      <property name="fill">True</property>
-		    </packing>
-		  </child>
-
-		  <child>
 		    <widget class="GtkFrame" id="frame21">
 		      <property name="border_width">1</property>
 		      <property name="width_request">300</property>
@@ -2167,12 +2152,149 @@
 		      <property name="shadow_type">GTK_SHADOW_IN</property>
 
 		      <child>
-			<widget class="GtkHBox" id="mainwindowcontentsbox">
+			<widget class="GtkVBox" id="mainwindowcontentsbox">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
 			  <property name="spacing">0</property>
 
 			  <child>
+			    <widget class="GtkToolbar" id="toolbar2">
+			      <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+			      <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
+			      <property name="tooltips">False</property>
+			      <property name="show_arrow">True</property>
+
+			      <child>
+				<widget class="GtkToolItem" id="toolitem1">
+				  <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="button44">
+				      <property name="visible">True</property>
+				      <property name="relief">GTK_RELIEF_NONE</property>
+				      <property name="focus_on_click">False</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label92351">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">&lt;b&gt;United States&lt;/b&gt;</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">True</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">8</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">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="toolitem2">
+				  <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="button45">
+				      <property name="visible">True</property>
+				      <property name="relief">GTK_RELIEF_NONE</property>
+				      <property name="focus_on_click">False</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label92353">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">&lt;b&gt;Massachusetts&lt;/b&gt;</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">True</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">8</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">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="toolitem3">
+				  <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="button46">
+				      <property name="visible">True</property>
+				      <property name="relief">GTK_RELIEF_NONE</property>
+				      <property name="focus_on_click">False</property>
+
+				      <child>
+					<widget class="GtkLabel" id="label92352">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">&lt;b&gt;Cambridge&lt;/b&gt;</property>
+					  <property name="use_underline">False</property>
+					  <property name="use_markup">True</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">8</property>
+					  <property name="ypad">0</property>
+					  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+					  <property name="width_chars">-1</property>
+					  <property name="single_line_mode">False</property>
+					  <property name="angle">0</property>
+					</widget>
+				      </child>
+				    </widget>
+				  </child>
+				</widget>
+				<packing>
+				  <property name="expand">False</property>
+				  <property name="homogeneous">False</property>
+				</packing>
+			      </child>
+			    </widget>
+			    <packing>
+			      <property name="padding">0</property>
+			      <property name="expand">False</property>
+			      <property name="fill">False</property>
+			    </packing>
+			  </child>
+
+			  <child>
 			    <placeholder/>
 			  </child>
 			</widget>
@@ -2220,48 +2342,25 @@
 			      <property name="spacing">0</property>
 
 			      <child>
-				<widget class="GtkFrame" id="locationsframe">
+				<widget class="GtkScrolledWindow" id="scrolled329032">
 				  <property name="visible">True</property>
-				  <property name="label_xalign">0</property>
-				  <property name="label_yalign">0</property>
-				  <property name="shadow_type">GTK_SHADOW_NONE</property>
+				  <property name="can_focus">True</property>
+				  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+				  <property name="shadow_type">GTK_SHADOW_IN</property>
+				  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
 
 				  <child>
-				    <widget class="GtkAlignment" id="alignment57">
+				    <widget class="GtkTreeView" id="locationsetstreeview">
 				      <property name="visible">True</property>
-				      <property name="xalign">0.5</property>
-				      <property name="yalign">0.5</property>
-				      <property name="xscale">1</property>
-				      <property name="yscale">1</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="GtkScrolledWindow" id="scrolled329032">
-					  <property name="visible">True</property>
-					  <property name="can_focus">True</property>
-					  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-					  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-					  <property name="shadow_type">GTK_SHADOW_IN</property>
-					  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-					  <child>
-					    <widget class="GtkTreeView" id="locationsetstreeview">
-					      <property name="visible">True</property>
-					      <property name="can_focus">True</property>
-					      <property name="headers_visible">False</property>
-					      <property name="rules_hint">True</property>
-					      <property name="reorderable">False</property>
-					      <property name="enable_search">True</property>
-					      <property name="fixed_height_mode">False</property>
-					      <property name="hover_selection">False</property>
-					      <property name="hover_expand">False</property>
-					    </widget>
-					  </child>
-					</widget>
-				      </child>
+				      <property name="can_focus">True</property>
+				      <property name="headers_visible">False</property>
+				      <property name="rules_hint">True</property>
+				      <property name="reorderable">False</property>
+				      <property name="enable_search">True</property>
+				      <property name="fixed_height_mode">False</property>
+				      <property name="hover_selection">False</property>
+				      <property name="hover_expand">False</property>
 				    </widget>
 				  </child>
 				</widget>
@@ -2356,59 +2455,6 @@
 		      </child>
 
 		      <child>
-			<widget class="GtkScrolledWindow" id="scrolledwindow9245">
-			  <property name="visible">True</property>
-			  <property name="can_focus">True</property>
-			  <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
-			  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-			  <property name="shadow_type">GTK_SHADOW_IN</property>
-			  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
-			  <child>
-			    <widget class="GtkTreeView" id="treeview1">
-			      <property name="visible">True</property>
-			      <property name="can_focus">True</property>
-			      <property name="headers_visible">False</property>
-			      <property name="rules_hint">True</property>
-			      <property name="reorderable">False</property>
-			      <property name="enable_search">True</property>
-			      <property name="fixed_height_mode">False</property>
-			      <property name="hover_selection">False</property>
-			      <property name="hover_expand">False</property>
-			    </widget>
-			  </child>
-			</widget>
-			<packing>
-			  <property name="tab_expand">False</property>
-			  <property name="tab_fill">True</property>
-			</packing>
-		      </child>
-
-		      <child>
-			<widget class="GtkLabel" id="label92348">
-			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;small&gt;_2.Tracks&lt;/small&gt;</property>
-			  <property name="use_underline">True</property>
-			  <property name="use_markup">True</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">4</property>
-			  <property name="ypad">0</property>
-			  <property name="mnemonic_widget">hpaned1</property>
-			  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-			  <property name="width_chars">-1</property>
-			  <property name="single_line_mode">False</property>
-			  <property name="angle">0</property>
-			</widget>
-			<packing>
-			  <property name="type">tab</property>
-			</packing>
-		      </child>
-
-		      <child>
 			<widget class="GtkVBox" id="vbox211">
 			  <property name="visible">True</property>
 			  <property name="homogeneous">False</property>
@@ -2454,7 +2500,7 @@
 		      <child>
 			<widget class="GtkLabel" id="sideboxnotebookfindlabel">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;small&gt;_3.Search&lt;/small&gt;</property>
+			  <property name="label" translatable="yes">&lt;small&gt;_2.Search&lt;/small&gt;</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2575,6 +2621,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="positionlabel">
 		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">(Lat: -yyy.yyyyyy Lon: -xxx.xxxxxx)</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>
@@ -2611,6 +2658,7 @@
 		  <child>
 		    <widget class="GtkLabel" id="zoomscalelabel">
 		      <property name="width_request">90</property>
+		      <property name="can_focus">True</property>
 		      <property name="label" translatable="yes">1:xxxxxxxx</property>
 		      <property name="use_underline">False</property>
 		      <property name="use_markup">False</property>



More information about the cairo-commit mailing list