[cairo-commit] roadster/data layers.xml, 1.3, 1.4 roadster.glade, 1.9, 1.10

Ian McIntosh commit at pdx.freedesktop.org
Fri Mar 4 01:27:29 PST 2005 

Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Log Message:
	* src/*.c: Use gtk/gtk.h instead of gnome.h where possible.
	* src/mainwindow.c: Added map dragging and scroll wheel zooming.  Made sure all callbacks start with mainwindow_
	* src/map.c: Allow draw flags to allow caller to specify which map elements get drawn.
	* src/map_draw_*: Respect draw flags.


Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- layers.xml	4 Mar 2005 02:27:29 -0000	1.3
+++ layers.xml	4 Mar 2005 09:27:26 -0000	1.4
@@ -7,16 +7,16 @@
 	<sublayer>
 		<property name="width" level="5" value="1.0" />
 		<property name="width" level="7" value="5.0" />
-		<property name="width" level="8" value="12.0" />
-		<property name="width" level="9" value="18.0" />
+		<property name="width" level="8" value="6.0" />
+		<property name="width" level="9" value="17.0" />
 		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#898f8dff" />
 		<property name="join-style" value="miter" />
 		<property name="cap-style" value="round" />
 	</sublayer>
 	<sublayer>
-		<property name="width" level="7" value="4.0" />
-		<property name="width" level="8" value="9.0" />
+		<property name="width" level="7" value="3.0" />
+		<property name="width" level="8" value="4.0" />
 		<property name="width" level="9" value="15.0" />
 		<property name="width" level="10" value="32.0" />
 		<property name="color" value="#fffbffff" />
@@ -27,14 +27,14 @@
 		<property name="color" value="#00000000" />
 		<property name="font-size" level="8" value="10" />
 		<property name="font-size" level="9" value="14" />
-		<property name="font-size" level="10" value="32" />
+		<property name="font-size" level="10" value="24" />
 	</label>
 </layer>
 
 <layer name="major-roads">
 	<sublayer>
-		<property name="width" level="7" value="13.0" />
-		<property name="width" level="8" value="18.0" />
+		<property name="width" level="7" value="8.0" />
+		<property name="width" level="8" value="10.0" />
 		<property name="width" level="9" value="24.0" />
 		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#ada28cff" />
@@ -46,8 +46,8 @@
 		<property name="width" level="4" value="2.5" />
 		<property name="width" level="5" value="3.3" />
 		<property name="width" level="6" value="6.0" />
-		<property name="width" level="7" value="10.0" />
-		<property name="width" level="8" value="15.0" />
+		<property name="width" level="7" value="6.0" />
+		<property name="width" level="8" value="8.0" />
 		<property name="width" level="9" value="21.0" />
 		<property name="width" level="10" value="32.0" />
 		<property name="color" value="#FFfb73ff" />
@@ -71,10 +71,10 @@
 		<property name="width" level="4" value="5.0" />
 		<property name="width" level="5" value="8.0" />
 		<property name="width" level="6" value="9.0" />
-		<property name="width" level="7" value="17.0" />
-		<property name="width" level="8" value="22.0" />
-		<property name="width" level="9" value="28.0" />
-		<property name="width" level="10" value="36.0" />
+		<property name="width" level="7" value="10.0" />
+		<property name="width" level="8" value="11.0" />
+		<property name="width" level="9" value="27.0" />
+		<property name="width" level="10" value="35.0" />
 		<property name="color" value="#ad8e21ff" />
 		<property name="join-style" value="miter" />
 		<property name="cap-style" value="round" />
@@ -84,8 +84,8 @@
 		<property name="width" level="4" value="3.1" />
 		<property name="width" level="5" value="6.5" />
 		<property name="width" level="6" value="7.0" />
-		<property name="width" level="7" value="15.0" />
-		<property name="width" level="8" value="19.5" />
+		<property name="width" level="7" value="8.0" />
+		<property name="width" level="8" value="9.0" />
 		<property name="width" level="9" value="25.0" />
 		<property name="width" level="10" value="33.0" />
 		<property name="color" value="#f7df4aff" />

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- roadster.glade	4 Mar 2005 02:27:29 -0000	1.9
+++ roadster.glade	4 Mar 2005 09:27:26 -0000	1.10
@@ -20,7 +20,7 @@
   <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
   <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
   <property name="enable_layout_config">True</property>
-  <signal name="delete_event" handler="on_application_delete_event" last_modification_time="Fri, 03 Sep 2004 10:32:59 GMT"/>
+  <signal name="delete_event" handler="mainwindow_on_application_delete_event" last_modification_time="Fri, 04 Mar 2005 04:21:54 GMT"/>
 
   <child internal-child="dock">
     <widget class="BonoboDock" id="bonobodock1">
@@ -50,10 +50,10 @@
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Import _Map Data...</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_import_maps_activate" last_modification_time="Tue, 25 Jan 2005 19:06:57 GMT"/>
+			  <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="image9542">
+			    <widget class="GtkImage" id="image9548">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -74,7 +74,7 @@
 			  <property name="use_underline">True</property>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image9543">
+			    <widget class="GtkImage" id="image9549">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-open</property>
 			      <property name="icon_size">1</property>
@@ -97,7 +97,7 @@
 			<widget class="GtkImageMenuItem" id="quit_menuitem">
 			  <property name="visible">True</property>
 			  <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
-			  <signal name="activate" handler="on_quitmenuitem_activate" last_modification_time="Wed, 15 Sep 2004 07:23:54 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_quitmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -119,7 +119,7 @@
 			  <property name="label" translatable="yes">_Toolbar</property>
 			  <property name="use_underline">True</property>
 			  <property name="active">True</property>
-			  <signal name="activate" handler="on_toolbarmenuitem_activate" last_modification_time="Fri, 03 Sep 2004 10:44:42 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_toolbarmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			  <accelerator key="t" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 			</widget>
 		      </child>
@@ -130,7 +130,7 @@
 			  <property name="label" translatable="yes">_Sidebar</property>
 			  <property name="use_underline">True</property>
 			  <property name="active">True</property>
-			  <signal name="activate" handler="on_sidebarmenuitem_activate" last_modification_time="Wed, 12 Jan 2005 17:44:05 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_sidebarmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			  <accelerator key="S" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 			</widget>
 		      </child>
@@ -141,7 +141,7 @@
 			  <property name="label" translatable="yes">Statusbar</property>
 			  <property name="use_underline">True</property>
 			  <property name="active">True</property>
-			  <signal name="activate" handler="on_statusbarmenuitem_activate" last_modification_time="Sun, 05 Sep 2004 08:47:43 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_statusbarmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			</widget>
 		      </child>
 
@@ -156,7 +156,7 @@
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Zoom _In</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_zoomin_activate" last_modification_time="Sat, 18 Sep 2004 07:23:22 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_zoomin_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			  <accelerator key="equal" modifiers="0" signal="activate"/>
 			</widget>
 		      </child>
@@ -166,7 +166,7 @@
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Zoom _Out</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_zoomout_activate" last_modification_time="Sat, 18 Sep 2004 07:23:42 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_zoomout_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			  <accelerator key="minus" modifiers="0" signal="activate"/>
 			</widget>
 		      </child>
@@ -183,7 +183,7 @@
 			  <property name="label" translatable="yes">Full Screen</property>
 			  <property name="use_underline">True</property>
 			  <property name="active">False</property>
-			  <signal name="activate" handler="on_fullscreenmenuitem_activate" last_modification_time="Thu, 09 Sep 2004 04:38:34 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_fullscreenmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:20:46 GMT"/>
 			  <accelerator key="F11" modifiers="0" signal="activate"/>
 			</widget>
 		      </child>
@@ -204,7 +204,7 @@
 			  <accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image9544">
+			    <widget class="GtkImage" id="image9550">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-jump-to</property>
 			      <property name="icon_size">1</property>
@@ -250,7 +250,7 @@
 			<widget class="GtkImageMenuItem" id="aboutmenuitem">
 			  <property name="visible">True</property>
 			  <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-			  <signal name="activate" handler="on_aboutmenuitem_activate" last_modification_time="Fri, 03 Sep 2004 09:21:47 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_aboutmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:26:27 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -272,11 +272,11 @@
 			  <property name="visible">True</property>
 			  <property name="label" translatable="yes">Reload Styles</property>
 			  <property name="use_underline">True</property>
-			  <signal name="activate" handler="on_reloadstylesmenuitem_activate" last_modification_time="Thu, 03 Mar 2005 07:25:08 GMT"/>
+			  <signal name="activate" handler="mainwindow_on_reloadstylesmenuitem_activate" last_modification_time="Fri, 04 Mar 2005 04:30:08 GMT"/>
 			  <accelerator key="F5" modifiers="0" signal="activate"/>
 
 			  <child internal-child="image">
-			    <widget class="GtkImage" id="image9545">
+			    <widget class="GtkImage" id="image9551">
 			      <property name="visible">True</property>
 			      <property name="stock">gtk-refresh</property>
 			      <property name="icon_size">1</property>
@@ -512,7 +512,7 @@
 		      <property name="visible">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">False</property>
-		      <signal name="clicked" handler="on_zoomout_activate" last_modification_time="Sun, 27 Feb 2005 16:23:02 GMT"/>
+		      <signal name="clicked" handler="mainwindow_on_zoomout_activate" last_modification_time="Fri, 04 Mar 2005 04:25:21 GMT"/>
 
 		      <child>
 			<widget class="GtkImage" id="image9533">
@@ -554,10 +554,10 @@
 			  <property name="draw_value">True</property>
 			  <property name="value_pos">GTK_POS_RIGHT</property>
 			  <property name="digits">0</property>
-			  <property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
+			  <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
 			  <property name="inverted">False</property>
 			  <property name="adjustment">8 1 11 1 1 1</property>
-			  <signal name="value_changed" handler="on_zoomscale_value_changed" last_modification_time="Sat, 28 Aug 2004 16:55:50 GMT"/>
+			  <signal name="value_changed" handler="mainwindow_on_zoomscale_value_changed" last_modification_time="Fri, 04 Mar 2005 04:21:33 GMT"/>
 			</widget>
 		      </child>
 		    </widget>
@@ -581,7 +581,7 @@
 		      <property name="visible">True</property>
 		      <property name="relief">GTK_RELIEF_NONE</property>
 		      <property name="focus_on_click">False</property>
-		      <signal name="clicked" handler="on_zoomin_activate" last_modification_time="Sun, 27 Feb 2005 16:23:50 GMT"/>
+		      <signal name="clicked" handler="mainwindow_on_zoomin_activate" last_modification_time="Fri, 04 Mar 2005 04:25:10 GMT"/>
 
 		      <child>
 			<widget class="GtkImage" id="image9534">
@@ -623,7 +623,7 @@
 		  <property name="visible_vertical">True</property>
 		  <property name="is_important">False</property>
 		  <property name="active">False</property>
-		  <signal name="clicked" handler="on_toolbutton_clicked" last_modification_time="Wed, 08 Sep 2004 20:25:04 GMT"/>
+		  <signal name="clicked" handler="mainwindow_on_toolbutton_clicked" last_modification_time="Fri, 04 Mar 2005 04:24:59 GMT"/>
 		</widget>
 		<packing>
 		  <property name="expand">False</property>
@@ -640,7 +640,7 @@
 		  <property name="is_important">False</property>
 		  <property name="active">False</property>
 		  <property name="group">pointertoolbutton</property>
-		  <signal name="clicked" handler="on_toolbutton_clicked" last_modification_time="Wed, 08 Sep 2004 20:25:04 GMT"/>
+		  <signal name="clicked" handler="mainwindow_on_toolbutton_clicked" last_modification_time="Fri, 04 Mar 2005 04:24:52 GMT"/>
 		</widget>
 		<packing>
 		  <property name="expand">False</property>

More information about the cairo-commit mailing list