[cairo-commit] roadster/data layers.xml, 1.30, 1.31 roadster.glade, 1.35, 1.36

Ian McIntosh commit at pdx.freedesktop.org
Tue Oct 11 20:04:07 PDT 2005 

Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Log Message:
	* src/test_poly.c: Add checkbox to hide original line.
	* src/import_tiger.c: Fix cleanup code (remove memory leak?)
	* src/util.c: Add util_g_free_with_param, a generic g_free-like callback that takes an (unused) user-data param.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- layers.xml	11 Oct 2005 23:28:45 -0000	1.30
+++ layers.xml	12 Oct 2005 03:04:05 -0000	1.31
@@ -110,7 +110,7 @@
         	<property zoom-level="1" name="line-width" value="1" />
         	<property zoom-level="2" name="line-width" value="1" />
         	<property zoom-level="3" name="line-width" value="1" />
-        	<property zoom-level="4" name="line-width" value="2" />
+        	<property zoom-level="4" name="line-width" value="1" />
         	<property zoom-level="5" name="line-width" value="2" />
             <property zoom-level="1-5" name="line-cap" value="square" />
         
@@ -123,10 +123,7 @@
         </layer>
         <layer data-source="minor-highways" draw-type="lines">
             <!-- outer color line in minor highways -->
-        	<property zoom-level="1" name="line-width" value="2" />
-        	<property zoom-level="2" name="line-width" value="2" />
-        	<property zoom-level="3" name="line-width" value="3" />
-        	<property zoom-level="4" name="line-width" value="4" />
+        	<property zoom-level="4" name="line-width" value="3" />
         	<property zoom-level="5" name="line-width" value="4" />
         	<property zoom-level="1-5" name="color" value="#DdAe31ff" />
         	
@@ -142,12 +139,14 @@
             <!-- major road top -->
             <property zoom-level="4-5" name="line-width" value="1" />
             <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="3-10" name="color" value="#FFF384FF" />
+            <property zoom-level="6-10" name="color" value="#FFF384FF" />
         </layer>
         <layer data-source="minor-highway-ramps" draw-type="lines">
             <!-- minor highway ramp top -->
@@ -178,8 +177,9 @@
         
         <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="#d5d5b0ff" />
+<!--             <property zoom-level="4-5" name="line-width" value="3" />    -->
+<!--             <property zoom-level="4-5" name="color" value="#e5e5c0ff" /> -->
+
         	<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" />

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- roadster.glade	11 Oct 2005 23:28:45 -0000	1.35
+++ roadster.glade	12 Oct 2005 03:04:05 -0000	1.36
@@ -5772,22 +5772,55 @@
       </child>
 
       <child>
-	<widget class="GtkLabel" id="test_polylabel">
+	<widget class="GtkHBox" id="hbox104">
 	  <property name="visible">True</property>
-	  <property name="label" translatable="yes">label92389</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</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>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">0</property>
+
+	  <child>
+	    <widget class="GtkLabel" id="test_polylabel">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">label92389</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</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">True</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkCheckButton" id="test_polyhidecheck">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="label" translatable="yes">Hide Line</property>
+	      <property name="use_underline">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+	      <property name="active">False</property>
+	      <property name="inconsistent">False</property>
+	      <property name="draw_indicator">True</property>
+	      <signal name="toggled" handler="test_poly_on_hidecheck_toggled" last_modification_time="Wed, 12 Oct 2005 02:30:32 GMT"/>
+	    </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>

More information about the cairo-commit mailing list