[cairo-commit] roadster/data layers.xml, 1.29, 1.30 roadster.glade, 1.34, 1.35

Ian McIntosh commit at pdx.freedesktop.org
Tue Oct 11 16:28:47 PDT 2005


Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Log Message:
	* src/test_poly.c:
	* src/test_poly.h: Added to test polygon point reduction algorithm and others.
	* src/map_draw_gdk.c: Prepare for rectangle clipping.
	* src/map_math.c: Add Douglas-Peucker point simplification algorithm.  Add point distance from line function.  Add in/out/partial rect overlap function.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- layers.xml	10 Oct 2005 07:07:36 -0000	1.29
+++ layers.xml	11 Oct 2005 23:28:45 -0000	1.30
@@ -39,8 +39,8 @@
         </layer>
         
         <layer data-source="parks" draw-type="polygon-labels">
-        	<property zoom-level="6" name="font-size" value="10" />
-        	<property zoom-level="7" name="font-size" value="10" />
+<!--             <property zoom-level="6" name="font-size" value="10" /> -->
+            <property zoom-level="7" name="font-size" value="9" />
         	<property zoom-level="8" name="font-size" value="11" />
         	<property zoom-level="9" name="font-size" value="12" />
         	<property zoom-level="10" name="font-size" value="22" />
@@ -50,8 +50,8 @@
         </layer>
         
         <layer data-source="lakes" draw-type="polygon-labels">
-        	<property zoom-level="5" name="font-size" value="9" />
-        	<property zoom-level="6" name="font-size" value="9" />
+<!--             <property zoom-level="5" name="font-size" value="9" /> -->
+            <property zoom-level="6" name="font-size" value="9" />
         	<property zoom-level="7" name="font-size" value="9" />
         	<property zoom-level="8" name="font-size" value="10" />
         	<property zoom-level="9" name="font-size" value="11" />
@@ -62,9 +62,9 @@
         </layer>
         
         <layer data-source="misc-areas" draw-type="polygon-labels">
-        	<property zoom-level="6" name="font-size" value="10" />
-        	<property zoom-level="7" name="font-size" value="12" />
-        	<property zoom-level="8" name="font-size" value="13" />
+<!--             <property zoom-level="6" name="font-size" value="10" /> -->
+        	<property zoom-level="7" name="font-size" value="10" />
+        	<property zoom-level="8" name="font-size" value="11" />
         	<property zoom-level="9" name="font-size" value="14" />
         	<property zoom-level="10" name="font-size" value="24" />
         	<property zoom-level="6-10" name="color" value="#303030FF" />
@@ -151,26 +151,26 @@
         </layer>
         <layer data-source="minor-highway-ramps" draw-type="lines">
             <!-- minor highway ramp top -->
-        	<property zoom-level="8" name="line-width" value="3" />
-        	<property zoom-level="9" name="line-width" value="5" />
+        	<property zoom-level="8" name="line-width" value="1" />
+            <property zoom-level="9" name="line-width" value="5" />
         	<property zoom-level="10" name="line-width" value="8" />
-        	<property zoom-level="6-10" name="color" value="#fffbffff" />
+        	<property zoom-level="8-10" name="color" value="#fffbffff" />
         </layer>
         
         <layer data-source="minor-roads" draw-type="lines">
             <!-- minor roads top -->
         	<property zoom-level="7" name="line-width" value="1" />
-            <property zoom-level="7" name="color" value="#CAC2A9ff" />
+            <property zoom-level="7" name="color" value="#D9D0B7ff" />
             <property zoom-level="7" name="line-cap" value="square" />
         	
-        	<property zoom-level="8" name="line-width" value="1" />
+        	<property zoom-level="8" name="line-width" value="2" />
         	<property zoom-level="9" name="line-width" value="10" />
         	<property zoom-level="10" name="line-width" value="18" />
         	<property zoom-level="8-10" name="color" value="#FFFFFFFF" />
         </layer>
         <layer data-source="minor-highway-ramps" draw-type="lines">
             <!-- minor highway ramps top -->
-        	<property zoom-level="8" name="line-width" value="5" />
+        	<property zoom-level="8" name="line-width" value="3" />
         	<property zoom-level="9" name="line-width" value="7" />
         	<property zoom-level="10" name="line-width" value="10"/>
         	<property zoom-level="7-10" name="color" value="#c0c0c0ff" />
@@ -190,11 +190,13 @@
         
         <layer data-source="minor-roads" draw-type="lines">
             <!-- minor roads bottom -->
-        	<property zoom-level="8" name="line-width" value="3" />
+        	<property zoom-level="8" name="line-width" value="4" />
         	<property zoom-level="8" name="line-cap" value="square" />
-        	<property zoom-level="9" name="line-width" value="12" />
+        	<property zoom-level="8" name="color" value="#D5CEB4ff" />
+        	
+            <property zoom-level="9" name="line-width" value="12" />
         	<property zoom-level="10" name="line-width" value="20" />
-        	<property zoom-level="8-10" name="color" value="#C5BEA4ff" />
+        	<property zoom-level="9-10" name="color" value="#C5BEA4ff" />
         </layer>
         
         <layer data-source="railroads" draw-type="lines">
@@ -227,7 +229,11 @@
         </layer>
         
         <layer data-source="lakes" draw-type="polygons">
-        	<property zoom-level="1-10" name="color" value="#B5C6D6FF" />
+        	<property zoom-level="1-10" name="color" value="#B6CCDEFF" />
+        </layer>
+        <layer data-source="lakes" draw-type="lines">
+        	<property zoom-level="1-10" name="line-width" value="2" />
+        	<property zoom-level="1-10" name="color" value="#9Db6bEFF" />
         </layer>
         
         <layer data-source="parks" draw-type="polygons">
@@ -235,8 +241,8 @@
         	<property zoom-level="1-10" name="color" value="#DEDBADff" />
         </layer>
         <layer data-source="parks" draw-type="lines">
-        	<property zoom-level="1-10" name="line-width" value="2" />
-        	<property zoom-level="1-10" name="color" value="#BEBB8Dff" />
+            <property zoom-level="1-10" name="line-width" value="2" />
+            <property zoom-level="1-10" name="color" value="#BEBB8Dff" />
         </layer>
         
         <layer data-source="misc-areas" draw-type="polygons">

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- roadster.glade	10 Oct 2005 07:07:36 -0000	1.34
+++ roadster.glade	11 Oct 2005 23:28:45 -0000	1.35
@@ -1139,7 +1139,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10265">
+			<widget class="GtkImage" id="image10292">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1172,7 +1172,7 @@
 		      <property name="use_underline">True</property>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10266">
+			<widget class="GtkImage" id="image10293">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-save-as</property>
 			  <property name="icon_size">1</property>
@@ -1199,7 +1199,7 @@
 		      <accelerator key="Q" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10267">
+			<widget class="GtkImage" id="image10294">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-quit</property>
 			  <property name="icon_size">1</property>
@@ -1302,7 +1302,7 @@
 			      <property name="visible">True</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>
 
@@ -1311,7 +1311,7 @@
 			      <property name="visible">True</property>
 			      <property name="label" translatable="yes">_Day 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>
@@ -1370,7 +1370,7 @@
 		      <accelerator key="Left" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10268">
+			<widget class="GtkImage" id="image10295">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-go-back</property>
 			  <property name="icon_size">1</property>
@@ -1393,7 +1393,7 @@
 		      <accelerator key="Right" modifiers="GDK_MOD1_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10269">
+			<widget class="GtkImage" id="image10296">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-media-forward</property>
 			  <property name="icon_size">1</property>
@@ -1453,7 +1453,7 @@
 		      <accelerator key="F9" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10270">
+			<widget class="GtkImage" id="image10297">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1501,7 +1501,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="image10271">
+			<widget class="GtkImage" id="image10298">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-about</property>
 			  <property name="icon_size">1</property>
@@ -1553,7 +1553,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="image10272">
+			<widget class="GtkImage" id="image10299">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-open</property>
 			  <property name="icon_size">1</property>
@@ -1581,7 +1581,7 @@
 		      <accelerator key="F5" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10273">
+			<widget class="GtkImage" id="image10300">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1603,7 +1603,7 @@
 		      <accelerator key="F6" modifiers="0" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10274">
+			<widget class="GtkImage" id="image10301">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-refresh</property>
 			  <property name="icon_size">1</property>
@@ -1623,6 +1623,15 @@
 		  </child>
 
 		  <child>
+		    <widget class="GtkMenuItem" id="polygon_test_window1">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">Polygon Test Window</property>
+		      <property name="use_underline">True</property>
+		      <signal name="activate" handler="test_poly_show" last_modification_time="Tue, 11 Oct 2005 21:37:38 GMT"/>
+		    </widget>
+		  </child>
+
+		  <child>
 		    <widget class="GtkImageMenuItem" id="gotomenuitem">
 		      <property name="visible">True</property>
 		      <property name="label" translatable="yes">_GoTo Dialog</property>
@@ -1631,7 +1640,7 @@
 		      <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 		      <child internal-child="image">
-			<widget class="GtkImage" id="image10275">
+			<widget class="GtkImage" id="image10302">
 			  <property name="visible">True</property>
 			  <property name="stock">gtk-jump-to</property>
 			  <property name="icon_size">1</property>
@@ -2055,151 +2064,127 @@
 		      <property name="shadow_type">GTK_SHADOW_IN</property>
 
 		      <child>
-			<widget class="GtkVBox" id="mainwindowcontentsbox">
+			<widget class="GtkVBox" id="vbox8924">
 			  <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>
+			    <widget class="GtkVPaned" id="vpaned1">
+			      <property name="visible">True</property>
+			      <property name="can_focus">True</property>
+			      <property name="position">100</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>
+				<widget class="GtkScrolledWindow" id="scrolledwindow9247">
+				  <property name="height_request">100</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="GtkButton" id="button44">
+				    <widget class="GtkTreeView" id="directionstreeview">
 				      <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>
+				      <property name="can_focus">True</property>
+				      <property name="headers_visible">True</property>
+				      <property name="rules_hint">True</property>
+				      <property name="reorderable">False</property>
+				      <property name="enable_search">False</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="expand">False</property>
-				  <property name="homogeneous">False</property>
+				  <property name="shrink">False</property>
+				  <property name="resize">False</property>
 				</packing>
 			      </child>
 
 			      <child>
-				<widget class="GtkToolItem" id="toolitem2">
+				<widget class="GtkVBox" id="mainwindowcontentsbox">
 				  <property name="visible">True</property>
-				  <property name="visible_horizontal">True</property>
-				  <property name="visible_vertical">True</property>
-				  <property name="is_important">False</property>
+				  <property name="homogeneous">False</property>
+				  <property name="spacing">0</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>
+				    <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="GtkLabel" id="label92353">
+					<widget class="GtkMenuToolButton" id="countrybutton">
 					  <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>
+					  <property name="label" translatable="yes">Country</property>
+					  <property name="use_underline">True</property>
+					  <property name="visible_horizontal">True</property>
+					  <property name="visible_vertical">True</property>
+					  <property name="is_important">False</property>
 					</widget>
+					<packing>
+					  <property name="expand">False</property>
+					  <property name="homogeneous">False</property>
+					</packing>
 				      </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="GtkMenuToolButton" id="statebutton">
+					  <property name="visible">True</property>
+					  <property name="label" translatable="yes">State</property>
+					  <property name="use_underline">True</property>
+					  <property name="visible_horizontal">True</property>
+					  <property name="visible_vertical">True</property>
+					  <property name="is_important">False</property>
+					</widget>
+					<packing>
+					  <property name="expand">False</property>
+					  <property name="homogeneous">False</property>
+					</packing>
+				      </child>
 
 				      <child>
-					<widget class="GtkLabel" id="label92352">
+					<widget class="GtkMenuToolButton" id="citybutton">
 					  <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>
+					  <property name="label" translatable="yes">City</property>
+					  <property name="use_underline">True</property>
+					  <property name="visible_horizontal">True</property>
+					  <property name="visible_vertical">True</property>
+					  <property name="is_important">False</property>
 					</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>
 				<packing>
-				  <property name="expand">False</property>
-				  <property name="homogeneous">False</property>
+				  <property name="shrink">True</property>
+				  <property name="resize">True</property>
 				</packing>
 			      </child>
 			    </widget>
 			    <packing>
 			      <property name="padding">0</property>
-			      <property name="expand">False</property>
-			      <property name="fill">False</property>
+			      <property name="expand">True</property>
+			      <property name="fill">True</property>
 			    </packing>
 			  </child>
-
-			  <child>
-			    <placeholder/>
-			  </child>
 			</widget>
 		      </child>
 		    </widget>
@@ -5569,4 +5554,249 @@
   </child>
 </widget>
 
+<widget class="GtkWindow" id="test_polywindow">
+  <property name="width_request">300</property>
+  <property name="height_request">300</property>
+  <property name="title" translatable="yes">Polygon Reduction Test</property>
+  <property name="type">GTK_WINDOW_TOPLEVEL</property>
+  <property name="window_position">GTK_WIN_POS_CENTER</property>
+  <property name="modal">False</property>
+  <property name="resizable">True</property>
+  <property name="destroy_with_parent">False</property>
+  <property name="decorated">True</property>
+  <property name="skip_taskbar_hint">False</property>
+  <property name="skip_pager_hint">False</property>
+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+
+  <child>
+    <widget class="GtkVBox" id="test_poly_contentbox">
+      <property name="border_width">4</property>
+      <property name="visible">True</property>
+      <property name="homogeneous">False</property>
+      <property name="spacing">0</property>
+
+      <child>
+	<widget class="GtkHBox" id="hbox103">
+	  <property name="visible">True</property>
+	  <property name="homogeneous">False</property>
+	  <property name="spacing">12</property>
+
+	  <child>
+	    <widget class="GtkVBox" id="vbox8926">
+	      <property name="visible">True</property>
+	      <property name="homogeneous">False</property>
+	      <property name="spacing">4</property>
+
+	      <child>
+		<widget class="GtkVBox" id="vbox8927">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label92390">
+		      <property name="visible">True</property>
+		      <property name="label" translatable="yes">&lt;b&gt;Reduction Tolerance&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</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="GtkHScale" id="test_poly_scale">
+		      <property name="visible">True</property>
+		      <property name="can_focus">True</property>
+		      <property name="draw_value">True</property>
+		      <property name="value_pos">GTK_POS_LEFT</property>
+		      <property name="digits">2</property>
+		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+		      <property name="inverted">False</property>
+		      <property name="adjustment">0.10000000149 0 1 0.00999999977648 0 0</property>
+		    </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="GtkVBox" id="vbox8928">
+		  <property name="visible">True</property>
+		  <property name="homogeneous">False</property>
+		  <property name="spacing">0</property>
+
+		  <child>
+		    <widget class="GtkLabel" id="label92391">
+		      <property name="label" translatable="yes">&lt;b&gt;Smoothing&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</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="GtkHScale" id="hscale2">
+		      <property name="can_focus">True</property>
+		      <property name="draw_value">True</property>
+		      <property name="value_pos">GTK_POS_LEFT</property>
+		      <property name="digits">2</property>
+		      <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
+		      <property name="inverted">False</property>
+		      <property name="adjustment">0.10000000149 0 1 0.00999999977648 0 0</property>
+		    </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">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>
+
+	  <child>
+	    <widget class="GtkVSeparator" id="vseparator7">
+	      <property name="visible">True</property>
+	    </widget>
+	    <packing>
+	      <property name="padding">4</property>
+	      <property name="expand">False</property>
+	      <property name="fill">True</property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="test_poly_clear_button">
+	      <property name="visible">True</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="image10281">
+		  <property name="visible">True</property>
+		  <property name="stock">gtk-clear</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">False</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <child>
+	<widget class="GtkFrame" id="frame60">
+	  <property name="border_width">2</property>
+	  <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>
+
+	  <child>
+	    <widget class="GtkDrawingArea" id="test_polydrawingarea">
+	      <property name="visible">True</property>
+	    </widget>
+	  </child>
+	</widget>
+	<packing>
+	  <property name="padding">0</property>
+	  <property name="expand">True</property>
+	  <property name="fill">True</property>
+	</packing>
+      </child>
+
+      <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">False</property>
+	  <property name="fill">False</property>
+	</packing>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>



More information about the cairo-commit mailing list