[cairo-commit] roadster/data layers.xml, 1.28, 1.29 roadster.glade,
1.33, 1.34
Ian McIntosh
commit at pdx.freedesktop.org
Mon Oct 10 00:07:38 PDT 2005
- Previous message: [cairo-commit] roadster ChangeLog,1.87,1.88
- Next message: [cairo-commit] roadster/src db.c, 1.33, 1.34 import_tiger.c, 1.22,
1.23 main.h, 1.6, 1.7 mainwindow.c, 1.49, 1.50 map.c, 1.52,
1.53 map.h, 1.26, 1.27 map_draw_gdk.c, 1.26, 1.27 map_math.c,
1.1, 1.2 map_style.c, 1.6, 1.7 map_tilemanager.c, 1.1,
1.2 searchwindow.c, 1.26, 1.27 tooltipwindow.c, 1.1,
1.2 util.c, 1.15, 1.16 util.h, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv9358/data
Modified Files:
layers.xml roadster.glade
Log Message:
* data/layers.xml:
* src/map.c: Adjusting of zoom scales and styles.
* src/dc.c: Properly insert LOD3 table.
* src/import_tiger.c: Rivers only exist on LOD0.
* src/main.h: Add constant for middle mouse button.
* src/mainwindow.c: Make zoomscale widget instant. Middle mouse button drags map regardless of tool. Improvement of some web map URLs.
* src/util.c: Add zoomscale utility functions.
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- layers.xml 6 Oct 2005 00:00:53 -0000 1.28
+++ layers.xml 10 Oct 2005 07:07:36 -0000 1.29
@@ -4,243 +4,254 @@
]>
<mapstyle>
+<!-- <scale> -->
+<!-- <property name="font-size" value="12"> -->
+<!-- <property name="foreground-color" value="#FFFFFFFF"> -->
+<!-- <property name="background-color" value="#000000FF"> -->
+<!-- </scale> -->
-<layers>
-#
-# Labels
-#
-
-<layer draw-type="locations">
-<!-- <property zoom-level="1-5" name="size" value="large" /> -->
-</layer>
-
-<layer draw-type="location-labels">
- <property zoom-level="5-10" name="font-size" value="10" />
- <property zoom-level="5-10" name="color" value="#000000ff" />
-</layer>
-
-<layer data-source="railroads" draw-type="line-labels">
- <property zoom-level="5-7" name="font-size" value="10" />
- <property zoom-level="8" name="font-size" value="10" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="17" />
- <property zoom-level="6-10" name="color" value="#000000ff" />
- <property zoom-level="6-10" name="halo-size" value="1" />
- <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
-</layer>
-
-<layer data-source="minor-roads" draw-type="line-labels">
- <property zoom-level="8" name="font-size" value="9" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="20" />
- <property zoom-level="8-10" name="color" value="#000000ff" />
-</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="8" name="font-size" value="11" />
- <property zoom-level="9" name="font-size" value="12" />
- <property zoom-level="10" name="font-size" value="22" />
- <property zoom-level="6-10" name="color" value="#303030FF" />
- <property zoom-level="6-10" name="halo-size" value="1" />
- <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
-</layer>
-
-<layer data-source="lakes" draw-type="polygon-labels">
- <property zoom-level="5" name="font-size" value="10" />
- <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="12" />
- <property zoom-level="10" name="font-size" value="18" />
- <property zoom-level="6-10" name="color" value="#303030FF" />
- <property zoom-level="6-10" name="halo-size" value="1" />
- <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
-</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="9" name="font-size" value="14" />
- <property zoom-level="10" name="font-size" value="24" />
- <property zoom-level="6-10" name="color" value="#303030FF" />
- <property zoom-level="6-10" name="halo-size" value="1" />
- <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
-</layer>
-
-<layer data-source="major-roads" draw-type="line-labels">
- <property zoom-level="6" name="font-size" value="8" />
- <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="16" />
- <property zoom-level="10" name="font-size" value="20" />
- <property zoom-level="6-10" name="bold" value="yes" />
- <property zoom-level="6-10" name="color" value="#000000ff" />
-</layer>
-
-<layer data-source="minor-highways" draw-type="line-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="12" />
- <property zoom-level="9" name="font-size" value="14" />
- <property zoom-level="10" name="font-size" value="20" />
- <property zoom-level="6-10" name="bold" value="yes" />
- <property zoom-level="6-10" name="color" value="#000000ff" />
-</layer>
-
-#
-# Lines
-#
-<layer data-source="minor-highways" draw-type="lines">
- <!-- center line in minor highways -->
- <property zoom-level="6" name="line-width" value="1" />
- <property zoom-level="7" name="line-width" value="1" />
- <property zoom-level="8" name="line-width" value="1" />
- <property zoom-level="9" name="line-width" value="1" />
- <property zoom-level="10" name="line-width" value="1" />
- <property zoom-level="6-10" name="color" value="#ad8e21ff" />
-</layer>
-<layer data-source="minor-highways" draw-type="lines">
- <!-- inner color line in minor highways -->
- <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="5" name="line-width" value="3" />
-
- <property zoom-level="6" name="line-width" value="5" />
- <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" />
- <property zoom-level="10" name="line-width" value="25" />
- <property zoom-level="3-10" name="color" value="#f7df4aff" />
-</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="5" name="line-width" value="5" />
- <property zoom-level="6" name="line-width" value="7" />
- <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" />
- <property zoom-level="10" name="line-width" value="27" />
- <property zoom-level="3-10" name="color" value="#ad8e21ff" />
-</layer>
-
-<layer data-source="major-roads" draw-type="lines">
- <!-- major road top -->
- <property zoom-level="5" name="line-width" value="1" />
- <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" />
-</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="10" name="line-width" value="8" />
- <property zoom-level="6-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="#d0d0d0FF" />
-
- <property zoom-level="8" name="line-width" value="5" />
- <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="9" name="line-width" value="7" />
- <property zoom-level="10" name="line-width" value="10"/>
- <property zoom-level="7-10" name="color" value="#c0c0c0ff" />
-</layer>
-
-<layer data-source="major-roads" draw-type="lines">
- <!-- major roads bottom -->
- <property zoom-level="5" name="line-width" value="3" />
- <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="3-10" name="color" value="#c0c0c0ff" />
-</layer>
-
-<layer data-source="minor-roads" draw-type="lines">
- <!-- minor roads bottom -->
- <property zoom-level="8" name="line-width" value="7" />
- <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="#A59E84ff" />
-</layer>
-
-<layer data-source="railroads" draw-type="lines">
- <!-- railroad dashed inner line -->
- <property zoom-level="6-10" name="line-width" value="2" />
- <property zoom-level="6-10" name="dash-pattern" value="3 4 3" />
- <property zoom-level="6-10" name="line-cap" value="square" />
- <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
-</layer>
-<layer data-source="railroads" draw-type="lines">
- <!-- railroad solid inner line -->
- <property zoom-level="6-10" name="line-width" value="1" />
- <property zoom-level="6-10" name="color" value="#F7EBDEFF" />
-</layer>
-<layer data-source="railroads" draw-type="lines">
- <!-- railroad solid outer line -->
- <property zoom-level="6-10" name="line-width" value="3" />
- <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
-</layer>
-
-<layer data-source="rivers" draw-type="lines">
- <property zoom-level="1-6" name="line-width" value="1" />
- <property zoom-level="7" name="line-width" value="2" />
- <property zoom-level="8" name="line-width" value="2" />
- <property zoom-level="9" name="line-width" value="2" />
- <property zoom-level="10" name="line-width" value="2" />
- <property zoom-level="1-10" name="color" value="#B5C6D6FF" />
-</layer>
-
-<layer data-source="lakes" draw-type="polygons">
- <property zoom-level="1-10" name="color" value="#B5C6D6FF" />
-</layer>
-
-<layer data-source="parks" draw-type="polygons">
- <property zoom-level="1-10" name="fill-image" value="park-pattern" />
- <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" />
-</layer>
-
-<layer data-source="misc-areas" draw-type="polygons">
- <property zoom-level="1-10" name="color" value="#C0C0C0ff" />
-</layer>
-
-<!-- <layer data-source="urban-areas" draw-type="polygons"> -->
-<!-- <property zoom-level="6-10" name="color" value="#FF0000ff" /> -->
-<!-- </layer> -->
-
-<layer draw-type="fill">
-<!-- <property zoom-level="1-10" name="fill-image" value="ground-pattern" /> -->
- <property zoom-level="1-10" name="color" value="#F3EDDEFF" />
-</layer>
-
-</layers>
+ <layers>
+ # Labels
+ <layer draw-type="locations">
+ <!-- <property zoom-level="1-5" name="size" value="large" /> -->
+ </layer>
+
+ <layer draw-type="location-labels">
+ <property zoom-level="5-10" name="font-size" value="10" />
+ <property zoom-level="5-10" name="color" value="#000000ff" />
+ </layer>
+
+ <layer data-source="railroads" draw-type="line-labels">
+ <property zoom-level="5-7" name="font-size" value="10" />
+ <property zoom-level="8" name="font-size" value="10" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="17" />
+ <property zoom-level="6-10" name="color" value="#000000ff" />
+ <property zoom-level="6-10" name="halo-size" value="1" />
+ <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
+ </layer>
+ <layer data-source="minor-roads" draw-type="line-labels">
+ <property zoom-level="8" name="font-size" value="9" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="20" />
+ <property zoom-level="8-10" name="color" value="#000000ff" />
+ </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="8" name="font-size" value="11" />
+ <property zoom-level="9" name="font-size" value="12" />
+ <property zoom-level="10" name="font-size" value="22" />
+ <property zoom-level="6-10" name="color" value="#304030FF" />
+ <property zoom-level="6-10" name="halo-size" value="1" />
+ <property zoom-level="6-10" name="halo-color" value="#FFFFFFB5" />
+ </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="7" name="font-size" value="9" />
+ <property zoom-level="8" name="font-size" value="10" />
+ <property zoom-level="9" name="font-size" value="11" />
+ <property zoom-level="10" name="font-size" value="17" />
+ <property zoom-level="6-10" name="color" value="#303030FF" />
+ <property zoom-level="6-10" name="halo-size" value="1" />
+ <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
+ </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="9" name="font-size" value="14" />
+ <property zoom-level="10" name="font-size" value="24" />
+ <property zoom-level="6-10" name="color" value="#303030FF" />
+ <property zoom-level="6-10" name="halo-size" value="1" />
+ <property zoom-level="6-10" name="halo-color" value="#FFFFFFFF" />
+ </layer>
+
+ <layer data-source="major-roads" draw-type="line-labels">
+ <property zoom-level="6" name="font-size" value="8" />
+ <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="16" />
+ <property zoom-level="10" name="font-size" value="20" />
+ <property zoom-level="6-10" name="bold" value="yes" />
+ <property zoom-level="6-10" name="color" value="#000000ff" />
+ </layer>
+
+ <layer data-source="minor-highways" draw-type="line-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="12" />
+ <property zoom-level="9" name="font-size" value="14" />
+ <property zoom-level="10" name="font-size" value="20" />
+ <property zoom-level="6-10" name="bold" value="yes" />
+ <property zoom-level="6-10" name="color" value="#000000ff" />
+ </layer>
+
+ #
+ # Lines
+ #
+ <layer data-source="minor-highways" draw-type="lines">
+ <!-- center line in minor highways -->
+ <property zoom-level="6" name="line-width" value="1" />
+ <property zoom-level="7" name="line-width" value="1" />
+ <property zoom-level="8" name="line-width" value="1" />
+ <property zoom-level="9" name="line-width" value="1" />
+ <property zoom-level="10" name="line-width" value="1" />
+ <property zoom-level="6-10" name="color" value="#ad8e21ff" />
+ <property zoom-level="6-10" name="line-cap" value="square" />
+ </layer>
+ <layer data-source="minor-highways" draw-type="lines">
+ <!-- inner color line in minor highways -->
+ <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="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="7" name="line-width" value="7" />
+ <property zoom-level="8" name="line-width" value="10" />
+ <property zoom-level="9" name="line-width" value="13" />
+ <property zoom-level="10" name="line-width" value="25" />
+ <property zoom-level="3-10" name="color" value="#f7df4aff" />
+ </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="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="7" name="line-width" value="9" />
+ <property zoom-level="8" name="line-width" value="12" />
+ <property zoom-level="9" name="line-width" value="15" />
+ <property zoom-level="10" name="line-width" value="27" />
+ <property zoom-level="6-10" name="color" value="#ad8e21ff" />
+ </layer>
+
+ <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-cap" value="square" />
+ <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" />
+ </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="10" name="line-width" value="8" />
+ <property zoom-level="6-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="line-cap" value="square" />
+
+ <property zoom-level="8" name="line-width" value="1" />
+ <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="9" name="line-width" value="7" />
+ <property zoom-level="10" name="line-width" value="10"/>
+ <property zoom-level="7-10" name="color" value="#c0c0c0ff" />
+ </layer>
+
+ <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="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" />
+ </layer>
+
+ <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-cap" value="square" />
+ <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" />
+ </layer>
+
+ <layer data-source="railroads" draw-type="lines">
+ <!-- railroad dashed inner line -->
+ <property zoom-level="6-10" name="line-width" value="2" />
+ <property zoom-level="6-10" name="dash-pattern" value="3 4 3" />
+ <property zoom-level="6-10" name="line-cap" value="square" />
+ <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
+ </layer>
+ <layer data-source="railroads" draw-type="lines">
+ <!-- railroad solid inner line -->
+ <property zoom-level="6-10" name="line-width" value="1" />
+ <property zoom-level="6-10" name="color" value="#F7EBDEFF" />
+ <property zoom-level="6-10" name="line-cap" value="square" />
+ </layer>
+ <layer data-source="railroads" draw-type="lines">
+ <!-- railroad solid outer line -->
+ <property zoom-level="6-10" name="line-width" value="3" />
+ <property zoom-level="6-10" name="color" value="#9C9A9CFF" />
+ </layer>
+
+ <layer data-source="rivers" draw-type="lines">
+ <property zoom-level="1-6" name="line-width" value="1" />
+ <property zoom-level="1-6" name="color" value="#E5E6FFFF" />
+ <property zoom-level="7" name="line-width" value="2" />
+ <property zoom-level="8" name="line-width" value="2" />
+ <property zoom-level="9" name="line-width" value="2" />
+ <property zoom-level="10" name="line-width" value="2" />
+ <property zoom-level="7-10" name="color" value="#B5C6D6FF" />
+ </layer>
+
+ <layer data-source="lakes" draw-type="polygons">
+ <property zoom-level="1-10" name="color" value="#B5C6D6FF" />
+ </layer>
+
+ <layer data-source="parks" draw-type="polygons">
+ <property zoom-level="1-10" name="fill-image" value="park-pattern" />
+ <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" />
+ </layer>
+
+ <layer data-source="misc-areas" draw-type="polygons">
+ <property zoom-level="1-10" name="color" value="#C0C0C0ff" />
+ </layer>
+
+ <!-- <layer data-source="urban-areas" draw-type="polygons"> -->
+ <!-- <property zoom-level="6-10" name="color" value="#FF0000ff" /> -->
+ <!-- </layer> -->
+
+ <layer draw-type="fill">
+ <!-- <property zoom-level="1-10" name="fill-image" value="ground-pattern" /> -->
+ <property zoom-level="1-10" name="color" value="#F3EDDEFF" />
+ </layer>
+
+ </layers>
+
</mapstyle>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- roadster.glade 6 Oct 2005 00:00:53 -0000 1.33
+++ roadster.glade 10 Oct 2005 07:07:36 -0000 1.34
@@ -1095,8 +1095,8 @@
</widget>
<widget class="GtkWindow" id="mainwindow">
- <property name="width_request">600</property>
- <property name="height_request">300</property>
+ <property name="width_request">700</property>
+ <property name="height_request">400</property>
<property name="visible">True</property>
<property name="title" translatable="yes">Roadster Preview Release</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
@@ -1902,14 +1902,14 @@
<child>
<widget class="GtkHScale" id="zoomscale">
- <property name="width_request">140</property>
+ <property name="width_request">130</property>
<property name="visible">True</property>
- <property name="draw_value">True</property>
+ <property name="draw_value">False</property>
<property name="value_pos">GTK_POS_RIGHT</property>
<property name="digits">0</property>
<property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
- <property name="adjustment">4 1 42 1 1 1</property>
+ <property name="adjustment">30 1 41 0 0 0</property>
<signal name="value_changed" handler="mainwindow_on_zoomscale_value_changed" last_modification_time="Fri, 04 Mar 2005 04:21:33 GMT"/>
</widget>
<packing>
- Previous message: [cairo-commit] roadster ChangeLog,1.87,1.88
- Next message: [cairo-commit] roadster/src db.c, 1.33, 1.34 import_tiger.c, 1.22,
1.23 main.h, 1.6, 1.7 mainwindow.c, 1.49, 1.50 map.c, 1.52,
1.53 map.h, 1.26, 1.27 map_draw_gdk.c, 1.26, 1.27 map_math.c,
1.1, 1.2 map_style.c, 1.6, 1.7 map_tilemanager.c, 1.1,
1.2 searchwindow.c, 1.26, 1.27 tooltipwindow.c, 1.1,
1.2 util.c, 1.15, 1.16 util.h, 1.15, 1.16
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list