[cairo-commit] roadster/data layers.xml, 1.25, 1.26 roadster.glade, 1.27, 1.28 search-result-type-road.svg, 1.1, 1.2

Ian McIntosh commit at pdx.freedesktop.org
Thu Sep 29 22:09:52 PDT 2005


Committed by: ian

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

Modified Files:
	layers.xml roadster.glade search-result-type-road.svg 
Log Message:
	* src/map_style.c: Removed "constants"-- found out that XML already has this feature!
	* src/glyph.c: Don't load the same image twice.  Allow loading at image's native resolution.
	* src/map_draw_gdk.c: Can now fill polygons with a tiled image.  Beginning support for moving POI to the layers.XML file.
	* src/util.c: Add code for GtkEntry "hints".  These are messages shown when there is nothing in the entry.  May be used for search box.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- layers.xml	25 Sep 2005 21:16:20 -0000	1.25
+++ layers.xml	30 Sep 2005 05:09:50 -0000	1.26
@@ -1,16 +1,24 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE roadster-layers SYSTEM "http://xxx/roadster-1.0.dtd">
+<!DOCTYPE roadster-layers SYSTEM "http://xxx/roadster-1.0.dtd" [
+    <!ENTITY example  "value">
+]>
 
 <mapstyle>
 
-<constants>
-    <constant name="shadow-color" value="#C0C0FF80" />
-</constants>
-
 <layers>
 #
 # Labels
 #
+
+<layer draw-type="locations">
+<!--     <property zoom-level="1-5" name="size" value="large" /> -->
+</layer>
+
+<layer draw-type="location-labels">
+	<property zoom-level="1-5" name="font-size" value="10" />
+	<property zoom-level="1-5" name="color" value="#000000ff" />
+</layer>
+
 <layer data-source="railroads" draw-type="line-labels">
 	<property zoom-level="1-2" name="font-size" value="10" />
 	<property zoom-level="3" name="font-size" value="10" />
@@ -113,7 +121,6 @@
 	<property zoom-level="1-5" name="color" value="#ad8e21ff" />
 </layer>
 
-
 <layer data-source="major-roads" draw-type="lines">
     <!-- major road top -->
 	<property zoom-level="1" name="line-width" value="6" />
@@ -121,7 +128,7 @@
 	<property zoom-level="3" name="line-width" value="10" />
 	<property zoom-level="4" name="line-width" value="15" />
 	<property zoom-level="5" name="line-width" value="20" />
-	<property zoom-level="1-5" name="color" value="#FFFB73FF" />
+	<property zoom-level="1-5" name="color" value="#FFF384FF" />
 </layer>
 <layer data-source="minor-highway-ramps" draw-type="lines">
     <!-- minor highway ramp top -->
@@ -134,25 +141,17 @@
 </layer>
 
 <layer data-source="minor-roads" draw-type="lines">
-    <!-- minor roads dashed center lines -->
-	<property zoom-level="4-5" name="line-width" value="1" />
-	<property zoom-level="4-5" name="dash-pattern" value="5 10" />
-	<property zoom-level="4-5" name="line-cap" value="square" />
-	<property zoom-level="4-5" name="color" value="#CDCDCDff" />
-</layer>
-
-<layer data-source="minor-roads" draw-type="lines">
     <!-- minor roads top -->
     <property zoom-level="1" name="line-width" value="1" />
-    <property zoom-level="1" name="color" value="#c0c0c0ff" />
+    <property zoom-level="1" name="color" value="#BDB294FF" />
     <property zoom-level="1" name="line-cap" value="square" />
 
     <property zoom-level="2" name="line-width" value="2" />
     <property zoom-level="2" name="line-cap" value="square" />
-	<property zoom-level="3" name="line-width" value="7" />
+	<property zoom-level="3" name="line-width" value="8" />
 	<property zoom-level="4" name="line-width" value="12" />
 	<property zoom-level="5" name="line-width" value="24" />
-	<property zoom-level="2-5" name="color" value="#fffbffff" />
+	<property zoom-level="2-5" name="color" value="#FFFFFFFF" />
 </layer>
 <layer data-source="minor-highway-ramps" draw-type="lines">
     <!-- minor highway ramps top -->
@@ -177,113 +176,54 @@
 <layer data-source="minor-roads" draw-type="lines">
     <!-- minor roads bottom -->
     <property zoom-level="1" name="line-width" value="2" />
-    <property zoom-level="1" name="color" value="#E0E0E0ff" />
     <property zoom-level="1" name="line-cap" value="square" />
 
     <property zoom-level="2" name="line-width" value="4" />
     <property zoom-level="2" name="line-cap" value="square" />
-	<property zoom-level="3" name="line-width" value="9" />
+	<property zoom-level="3" name="line-width" value="10" />
 	<property zoom-level="4" name="line-width" value="14" />
 	<property zoom-level="5" name="line-width" value="26" />
-	<property zoom-level="2-5" name="color" value="#c0c0c0ff" />
-</layer>
-
-<layer data-source="minor-highways" draw-type="lines">
-    <!-- minor highways shadow -->
-	<property zoom-level="3" name="line-width" value="12" />
-	<property zoom-level="4" name="line-width" value="15" />
-	<property zoom-level="5" name="line-width" value="27" />
-    <property zoom-level="3-5" name="color" value="shadow-color" />
-    <property zoom-level="3-5" name="line-cap" value="round" />
-    <property zoom-level="3" name="pixel-offset-x" value="2" />
-    <property zoom-level="3" name="pixel-offset-y" value="2" />
-    <property zoom-level="4-5" name="pixel-offset-x" value="3" />
-    <property zoom-level="4-5" name="pixel-offset-y" value="3" />
-</layer>
-
-<layer data-source="major-roads" draw-type="lines">
-    <!-- major roads shadow -->
-    <property zoom-level="3" name="line-width" value="12" />
-    <property zoom-level="4" name="line-width" value="17" />
-    <property zoom-level="5" name="line-width" value="22" />
-    <property zoom-level="3-5" name="color" value="shadow-color" />
-    <property zoom-level="3-5" name="line-cap" value="round" />
-    <property zoom-level="3" name="pixel-offset-x" value="2" />
-    <property zoom-level="3" name="pixel-offset-y" value="2" />
-    <property zoom-level="4-5" name="pixel-offset-x" value="3" />
-    <property zoom-level="4-5" name="pixel-offset-y" value="3" />
-</layer>
-
-<layer data-source="minor-roads" draw-type="lines">
-    <!-- minor roads shadow -->
-    <property zoom-level="3" name="line-width" value="9" />
-    <property zoom-level="4" name="line-width" value="14" />
-    <property zoom-level="5" name="line-width" value="26" />
-    <property zoom-level="3" name="pixel-offset-x" value="2" />
-    <property zoom-level="3" name="pixel-offset-y" value="2" />
-    <property zoom-level="4-5" name="pixel-offset-x" value="3" />
-    <property zoom-level="4-5" name="pixel-offset-y" value="3" />
-    <property zoom-level="3-5" name="color" value="shadow-color" />
-    <property zoom-level="3-5" name="line-cap" value="round" />
+	<property zoom-level="2-5" name="color" value="#A59E84ff" />
 </layer>
 
 <layer data-source="railroads" draw-type="lines">
     <!-- railroad dashed inner line -->
-    <property zoom-level="1-2" name="line-width" value="2" />
-	<property zoom-level="1-2" name="dash-pattern" value="8 8" />
-
-    <property zoom-level="3" name="line-width" value="6" />
-	<property zoom-level="3" name="dash-pattern" value="4 20" />
-
-    <property zoom-level="4-5" name="line-width" value="3" />
-    <property zoom-level="4-5" name="dash-pattern" value="4 20" />
-	<property zoom-level="1-5" name="line-cap" value="square" />
-	<property zoom-level="1-5" name="color" value="#B5B5B5FF" />
+    <property zoom-level="1-5" name="line-width" value="2" />
+    <property zoom-level="1-5" name="dash-pattern" value="3 4 3" />
+    <property zoom-level="1-5" name="line-cap" value="square" />
+    <property zoom-level="1-5" name="color" value="#9C9A9CFF" />
 </layer>
 <layer data-source="railroads" draw-type="lines">
     <!-- railroad solid inner line -->
-	<property zoom-level="1-2" name="line-width" value="1" />
-	<property zoom-level="3-5" name="line-width" value="3" />
-	<property zoom-level="1-5" name="color" value="#FCFCFCFF" />
+	<property zoom-level="1-5" name="line-width" value="1" />
+	<property zoom-level="1-5" name="color" value="#F7EBDEFF" />
 </layer>
 <layer data-source="railroads" draw-type="lines">
     <!-- railroad solid outer line -->
-	<property zoom-level="1-2" name="line-width" value="4" />
-	<property zoom-level="3-5" name="line-width" value="5" />
-	<property zoom-level="1-5" name="color" value="#A5A5A5FF" />
+	<property zoom-level="1-5" name="line-width" value="3" />
+	<property zoom-level="1-5" name="color" value="#9C9A9CFF" />
 </layer>
 
 <layer data-source="rivers" draw-type="lines">
-	<property zoom-level="1" name="line-width" value="2" />
-	<property zoom-level="2" name="line-width" value="3" />
-	<property zoom-level="3" name="line-width" value="4" />
-	<property zoom-level="4" name="line-width" value="5" />
-	<property zoom-level="5" name="line-width" value="8" />
-	<property zoom-level="1-5" name="color" value="#9cb2ceFF" />
+	<property zoom-level="1" name="line-width" value="1" />
+	<property zoom-level="2" name="line-width" value="2" />
+	<property zoom-level="3" name="line-width" value="2" />
+	<property zoom-level="4" name="line-width" value="2" />
+	<property zoom-level="5" name="line-width" value="2" />
+	<property zoom-level="1-5" name="color" value="#B5C6D6FF" />
 </layer>
 
 <layer data-source="lakes" draw-type="polygons">
-	<property zoom-level="1-5" name="color" value="#9cb2ceFF" />
-</layer>
-
-<layer data-source="rivers" draw-type="lines">
-     # gives a fuzzy border to lakes in non-AA render mode
-     <property zoom-level="1" name="line-width" value="4" />
-     <property zoom-level="2" name="line-width" value="5" />
-     <property zoom-level="3" name="line-width" value="6" />
-     <property zoom-level="4" name="line-width" value="7" />
-     <property zoom-level="5" name="line-width" value="10" />
-	<property zoom-level="1-5" name="color" value="#C0C8D5FF" />
-</layer>
-
-<layer data-source="lakes" draw-type="lines">
-     # gives a fuzzy border to lakes in non-AA render mode
-	<property zoom-level="1-5" name="line-width" value="3" />
-	<property zoom-level="1-5" name="color" value="#C0C8D5FF" />
+	<property zoom-level="1-5" name="color" value="#B5C6D6FF" />
 </layer>
 
 <layer data-source="parks" draw-type="polygons">
-	<property zoom-level="1-5" name="color" value="#afcf94ff" />
+	<property zoom-level="1-5" name="fill-image" value="park-pattern" />
+	<property zoom-level="1-5" name="color" value="#DEDBADff" />
+</layer>
+<layer data-source="parks" draw-type="lines">
+	<property zoom-level="1-5" name="line-width" value="2" />
+	<property zoom-level="1-5" name="color" value="#BEBB8Dff" />
 </layer>
 
 <layer data-source="misc-areas" draw-type="polygons">
@@ -295,7 +235,7 @@
 <!-- </layer>                                                         -->
 
 <layer draw-type="fill">
-    <property zoom-level="1-5" name="color" value="#ECE6E6ff" />
+    <property zoom-level="1-5" name="color" value="#F3EDDEFF" />
 </layer>
 
 </layers>

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- roadster.glade	26 Sep 2005 13:57:13 -0000	1.27
+++ roadster.glade	30 Sep 2005 05:09:50 -0000	1.28
@@ -1314,7 +1314,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10241">
+			<widget class="GtkImage" id="image10265">
 			  <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="image10242">
+			<widget class="GtkImage" id="image10266">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-save-as</property>
 			  <property name="icon_size">1</property>
@@ -1374,7 +1374,7 @@
 		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10243">
+			<widget class="GtkImage" id="image10267">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -1424,7 +1424,6 @@
 
 		  <child>
 		    <widget class="GtkCheckMenuItem" id="statusbarmenuitem">
-		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">Status_bar</property>
 		      <property name="use_underline">True</property>
 		      <property name="active">True</property>
@@ -1462,13 +1461,11 @@
 
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator12">
-		      <property name="visible">True</property>
 		    </widget>
 		  </child>
 
 		  <child>
 		    <widget class="GtkMenuItem" id="map_style">
-		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_Map Style</property>
 		      <property name="use_underline">True</property>
 
@@ -1480,7 +1477,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Auto</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">True</property>
+			      <property name="active">False</property>
 			    </widget>
 			  </child>
 
@@ -1499,7 +1496,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Night Colors</property>
 			      <property name="use_underline">True</property>
-			      <property name="active">False</property>
+			      <property name="active">True</property>
 			      <property name="group">auto1</property>
 			    </widget>
 			  </child>
@@ -1548,7 +1545,7 @@
 		      <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10244">
+			<widget class="GtkImage" id="image10268">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -1571,7 +1568,7 @@
 		      <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10245">
+			<widget class="GtkImage" id="image10269">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-media-forward</property>
 			  <property name="icon_size">1</property>
@@ -1596,7 +1593,7 @@
 		      <property name="label" translatable="yes">_Next Search Result</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="searchwindow_on_nextresultbutton_clicked" last_modification_time="Thu, 22 Sep 2005 21:16:04 GMT"/>
-		      <accelerator key="N" modifiers="GDK_CONTROL_MASK" signal="activate"/>
+		      <accelerator key="Down" modifiers="GDK_MOD1_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 
@@ -1606,7 +1603,7 @@
 		      <property name="label" translatable="yes">_Previous Search Result</property>
 		      <property name="use_underline">True</property>
 		      <signal name="activate" handler="searchwindow_on_previousresultbutton_clicked" last_modification_time="Thu, 22 Sep 2005 21:30:26 GMT"/>
-		      <accelerator key="N" modifiers="GDK_CONTROL_MASK | GDK_SHIFT_MASK" signal="activate"/>
+		      <accelerator key="Up" modifiers="GDK_MOD1_MASK" signal="activate"/>
 		    </widget>
 		  </child>
 		</widget>
@@ -1625,14 +1622,13 @@
 
 		  <child>
 		    <widget class="GtkImageMenuItem" id="send_and_receive_places1">
-		      <property name="visible">True</property>
 		      <property name="sensitive">False</property>
 		      <property name="label" translatable="yes">_Send / Receive</property>
 		      <property name="use_underline">True</property>
 		      <accelerator key="F9" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10246">
+			<widget class="GtkImage" id="image10270">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1647,7 +1643,6 @@
 
 		  <child>
 		    <widget class="GtkSeparatorMenuItem" id="separator18">
-		      <property name="visible">True</property>
 		    </widget>
 		  </child>
 
@@ -1681,7 +1676,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="image10247">
+			<widget class="GtkImage" id="image10271">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -1733,7 +1728,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="image10248">
+			<widget class="GtkImage" id="image10272">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1761,7 +1756,7 @@
 		      <accelerator key="F5" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10249">
+			<widget class="GtkImage" id="image10273">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1783,7 +1778,7 @@
 		      <accelerator key="F6" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10250">
+			<widget class="GtkImage" id="image10274">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1811,7 +1806,7 @@
 		      <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10251">
+			<widget class="GtkImage" id="image10275">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-jump-to</property>
 			  <property name="icon_size">1</property>
@@ -1905,22 +1900,14 @@
 	      <signal name="clicked" handler="searchwindow_on_findbutton_clicked" last_modification_time="Mon, 07 Feb 2005 09:47:42 GMT"/>
 
 	      <child>
-		<widget class="GtkLabel" id="label92349">
+		<widget class="GtkImage" id="image10254">
 		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">_Find</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="stock">gtk-find</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>
-		  <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>
@@ -1933,8 +1920,7 @@
 	  </child>
 
 	  <child>
-	    <widget class="GtkEntry" id="entry5">
-	      <property name="sensitive">False</property>
+	    <widget class="GtkEntry" id="searchlocationentry">
 	      <property name="can_focus">True</property>
 	      <property name="editable">True</property>
 	      <property name="visibility">True</property>
@@ -1943,7 +1929,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
-	      <property name="width_chars">12</property>
+	      <property name="width_chars">18</property>
 	    </widget>
 	    <packing>
 	      <property name="padding">0</property>
@@ -1955,7 +1941,6 @@
 
 	  <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>
@@ -1980,11 +1965,24 @@
 	  </child>
 
 	  <child>
+	    <widget class="GtkComboBoxEntry" id="searchcomboboxentry">
+	      <property name="add_tearoffs">False</property>
+	      <property name="has_frame">True</property>
+	      <property name="focus_on_click">True</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">0</property>
+	      <property name="expand">True</property>
+	      <property name="fill">True</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>
 	      <property name="can_focus">True</property>
-	      <property name="has_focus">True</property>
 	      <property name="editable">True</property>
 	      <property name="visibility">True</property>
 	      <property name="max_length">0</property>
@@ -1992,7 +1990,7 @@
 	      <property name="has_frame">True</property>
 	      <property name="invisible_char">*</property>
 	      <property name="activates_default">True</property>
-	      <property name="width_chars">17</property>
+	      <property name="width_chars">20</property>
 	      <signal name="changed" handler="searchwindow_on_searchentry_changed" last_modification_time="Sun, 25 Sep 2005 01:23:34 GMT"/>
 	    </widget>
 	    <packing>
@@ -2116,6 +2114,78 @@
 	      <property name="fill">False</property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkSeparatorToolItem" id="separatortoolitem12">
+	      <property name="visible">True</property>
+	      <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="padding">0</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkRadioButton" id="radiobutton15">
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NONE</property>
+	      <property name="focus_on_click">False</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">False</property>
+
+	      <child>
+		<widget class="GtkImage" id="image10252">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-about</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>
+	    <widget class="GtkRadioButton" id="radiobutton16">
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NONE</property>
+	      <property name="focus_on_click">False</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">False</property>
+	      <property name="group">radiobutton15</property>
+
+	      <child>
+		<widget class="GtkImage" id="image10253">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-sort-ascending</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>
@@ -2134,7 +2204,7 @@
 	    <widget class="GtkHPaned" id="hpaned1">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="position">1000</property>
+	      <property name="position">500</property>
 
 	      <child>
 		<widget class="GtkVBox" id="mainwindowmaparea">
@@ -2500,7 +2570,7 @@
 		      <child>
 			<widget class="GtkLabel" id="sideboxnotebookfindlabel">
 			  <property name="visible">True</property>
-			  <property name="label" translatable="yes">&lt;small&gt;_2.Search&lt;/small&gt;</property>
+			  <property name="label" translatable="yes">&lt;small&gt;_2.Results&lt;/small&gt;</property>
 			  <property name="use_underline">True</property>
 			  <property name="use_markup">True</property>
 			  <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2575,7 +2645,6 @@
 
       <child>
 	<widget class="GtkVBox" id="statusbar">
-	  <property name="visible">True</property>
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">0</property>
 

Index: search-result-type-road.svg
===================================================================
RCS file: /cvs/cairo/roadster/data/search-result-type-road.svg,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- search-result-type-road.svg	24 Sep 2005 05:25:24 -0000	1.1
+++ search-result-type-road.svg	30 Sep 2005 05:09:50 -0000	1.2
@@ -53,7 +53,7 @@
      inkscape:pageopacity="0.0000000"
      inkscape:pageshadow="2"
      inkscape:zoom="3.8104332"
-     inkscape:cx="29.444196"
+     inkscape:cx="29.444197"
      inkscape:cy="9.1676075"
      inkscape:current-layer="layer1"
      showgrid="true"
@@ -98,18 +98,18 @@
        d="M 70.914135 35.409073 A 35.322250 35.187431 0 1 1  0.26963425,35.409073 A 35.322250 35.187431 0 1 1  70.914135 35.409073 z"
        transform="matrix(0.872919,0.000000,0.000000,0.872919,4.523054,4.386425)" />
     <path
-       style="fill:#000000;fill-opacity:1.0000000;stroke:#000000;stroke-width:3.0322678;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
+       style="fill:#4d4d4d;fill-opacity:1.0000000;stroke:#000000;stroke-width:3.0322678;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
        d="M 35.594264,5.0594416 C 30.993989,5.0594416 26.669344,6.1701020 22.747024,7.9720148 L 16.323403,58.527703 C 21.617899,62.792218 28.260438,65.470002 35.594264,65.470001 C 44.124494,65.470001 51.834643,61.995917 57.418615,56.413094 L 51.154587,9.4083526 C 46.572930,6.7195541 41.293080,5.0594416 35.594264,5.0594416 z "
        id="path1837"
        sodipodi:nodetypes="ccccccc" />
     <path
        style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.1500000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       d="M 34.082720,3.8075477 L 38.908560,3.8075477 L 40.645672,26.325074 L 32.421135,26.325074 L 34.082720,3.8075477 z "
+       d="M 34.185079,7.0866147 L 39.010919,7.0866147 L 40.748031,28.346457 L 32.523494,28.346457 L 34.185079,7.0866147 z "
        id="path1833"
        sodipodi:nodetypes="ccccc" />
     <path
        style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.1500000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
-       d="M 31.763234,43.011352 L 40.940887,43.011352 L 44.244481,64.383022 C 37.669541,65.744224 35.282920,65.744224 28.603272,64.383022 L 31.763234,43.011352 z "
+       d="M 31.810092,41.386956 L 40.987745,41.386956 L 44.291339,62.758626 C 37.716399,64.119828 35.329778,64.119828 28.650130,62.758626 L 31.810092,41.386956 z "
        id="path1834"
        sodipodi:nodetypes="ccccc" />
   </g>



More information about the cairo-commit mailing list