[cairo-commit] roadster/data layers.xml, 1.32, 1.33 roadster.glade, 1.38, 1.39

[Ian McIntosh]

Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Log Message:
	* roadster.spec: Added RPM .spec file contributed by Ofer Achler.
	* src/search_coordinate.c: Added file to allow pasting/typing text containing lat and lon coordinates into search box.  (Currently not implemented!)
	* src/search.c: Init and use search_coordinate stuff.
	* src/mainwindow.c: Disable hittesting related to tooltip for preview release.  Make GPS checkboxes insensitive when 'show position on map' is 
off.
	* src/db.c: Add db_city_get_name(id)
	* src/map_draw_cairo.c: Add miter limit.
	* src/mapinfowindow.c: Improve a lot.  May not make it into the preview release though.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- layers.xml	18 Oct 2005 03:05:25 -0000	1.32
+++ layers.xml	20 Oct 2005 06:56:22 -0000	1.33
@@ -109,7 +109,7 @@
         	<property zoom-level="5" name="line-width" value="2" />
             <property zoom-level="1-5" name="line-cap" value="square" />
         
-        	<property zoom-level="6" name="line-width" value="5" />
+        	<property zoom-level="6" name="line-width" value="6" />
         	<property zoom-level="7" name="line-width" value="7" />
         	<property zoom-level="8" name="line-width" value="10" />
         	<property zoom-level="9" name="line-width" value="13" />
@@ -122,7 +122,7 @@
         	<property zoom-level="5" name="line-width" value="4" />
         	<property zoom-level="1-5" name="color" value="#DdAe31ff" />
         	
-            <property zoom-level="6" name="line-width" value="7" />
+            <property zoom-level="6" name="line-width" value="8" />
         	<property zoom-level="7" name="line-width" value="9" />
         	<property zoom-level="8" name="line-width" value="12" />
         	<property zoom-level="9" name="line-width" value="15" />
@@ -132,16 +132,14 @@
         
         <layer data-source="major-roads" draw-type="lines">
             <!-- major road top -->
-            <property zoom-level="4-5" name="line-width" value="1" />
+            <property zoom-level="4-5" name="line-width" value="2" />
             <property zoom-level="4-5" name="line-cap" value="square" />
-            <property zoom-level="4-5" name="color" value="#EFE384FF" />
-
             <property zoom-level="6" name="line-width" value="4" />
             <property zoom-level="7" name="line-width" value="6" />
             <property zoom-level="8" name="line-width" value="8" />
             <property zoom-level="9" name="line-width" value="14" />
             <property zoom-level="10" name="line-width" value="24" />
-            <property zoom-level="6-10" name="color" value="#FFF384FF" />
+            <property zoom-level="4-10" name="color" value="#FFF384FF" />
         </layer>
         <layer data-source="minor-highway-ramps" draw-type="lines">
             <!-- minor highway ramp top -->
@@ -172,15 +170,13 @@
         
         <layer data-source="major-roads" draw-type="lines">
             <!-- major roads bottom -->
-<!--             <property zoom-level="4-5" name="line-width" value="3" />    -->
-<!--             <property zoom-level="4-5" name="color" value="#e5e5c0ff" /> -->
-
+            <property zoom-level="4-5" name="line-width" value="4" />
         	<property zoom-level="6" name="line-width" value="6" />
         	<property zoom-level="7" name="line-width" value="8" />
         	<property zoom-level="8" name="line-width" value="10" />
         	<property zoom-level="9" name="line-width" value="16" />
         	<property zoom-level="10" name="line-width" value="26" />
-            <property zoom-level="6-10" name="color" value="#c0c0c0ff" />
+            <property zoom-level="4-10" name="color" value="#c0c0c0ff" />
         </layer>
         
         <layer data-source="minor-roads" draw-type="lines">

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- roadster.glade	18 Oct 2005 06:40:19 -0000	1.38
+++ roadster.glade	20 Oct 2005 06:56:22 -0000	1.39
@@ -1474,7 +1474,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10356">
+			<widget class="GtkImage" id="image10366">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1507,7 +1507,7 @@
 		      <property name="use_underline">True</property>
 
[...1005 lines suppressed...]
+	  <property name="fill">True</property>
+	  <property name="pack_type">GTK_PACK_END</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkHSeparator" id="hseparator14">
+	  <property name="visible">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>
+    </widget>
   </child>
 </widget>