[cairo-commit] roadster/data layers.xml, 1.21, 1.22 roadster.glade,
1.21, 1.22
Ian McIntosh
commit at pdx.freedesktop.org
Wed Sep 14 13:06:56 PDT 2005
- Previous message: [cairo-commit] roadster ChangeLog,1.72,1.73
- Next message: [cairo-commit]
roadster/src Makefile.am, 1.17, 1.18 animator.c, 1.5,
1.6 db.c, 1.25, 1.26 db.h, 1.10, 1.11 gotowindow.c, 1.9,
1.10 gpsclient.c, 1.10, 1.11 gpsclient.h, 1.3, 1.4 gui.c, 1.10,
1.11 gui.h, 1.2, 1.3 import_tiger.c, 1.19, 1.20 importwindow.c,
1.8, 1.9 layers.c, 1.16, NONE layers.h, 1.8,
NONE locationeditwindow.c, NONE, 1.1 locationeditwindow.h,
NONE, 1.1 locationset.c, 1.11, 1.12 main.c, 1.22, 1.23 main.h,
1.2, 1.3 mainwindow.c, 1.39, 1.40 map.c, 1.43, 1.44 map.h,
1.20, 1.21 map_draw_cairo.c, 1.21, 1.22 map_draw_gdk.c, 1.17,
1.18 map_style.c, NONE, 1.1 map_style.h, NONE, 1.1 prefs.c,
1.3, NONE prefs.h, 1.1, NONE road.c, 1.5, 1.6 scenemanager.c,
1.13, 1.14 search.c, 1.5, 1.6 search_road.c, 1.21,
1.22 searchwindow.c, 1.19, 1.20 util.c, 1.9, 1.10 util.h, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv9354/data
Modified Files:
layers.xml roadster.glade
Log Message:
* src/*.c: Removed many unneeded #includes. Removed NUM_ELEMS in favor of existing glib G_N_ELEMENTS.
* src/*window.c: Use GLADE_LINK_WIDGET to connect widget to Glade XML element.
* src/gpsclient.c: Work to make GPSD support optional at compile time.
* src/mainwindow.c: Fixed bug: mouse cursor returning to default pointer while scrolling.
* src/searchwindow.c: Change map zoomlevel when going to search results. Some code refactoring.
* src/gotowindow.c: Removed dead code.
* src/map_style.c: Added to replace layers.c. Add support for arbitrary dash patterns.
* src/map_draw_gdk.c: Support new arbitrary dash patterns.
* src/ma_draw_cairo.c: More work to restore Cairo drawing.
* src/prefs.c:
* src/prefs.h:
* src/layers.c:
* src/layers.h: Removed.
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- layers.xml 6 Sep 2005 02:44:19 -0000 1.21
+++ layers.xml 14 Sep 2005 20:06:53 -0000 1.22
@@ -1,10 +1,16 @@
<?xml version="1.0" standalone="no"?>
<!DOCTYPE roadster-layers SYSTEM "http://xxx/roadster-1.0.dtd">
-<layers>
+<mapstyle>
-# Labels
+<constants>
+ <constant name="shadow-color" value="#C0C0FF80" />
+</constants>
+<layers>
+#
+# Labels
+#
<layer data-source="railroads" draw-type="line-labels">
<property zoom-level="1-2" name="font-size" value="10" />
<property zoom-level="3" name="font-size" value="10" />
@@ -75,24 +81,9 @@
<property zoom-level="1-5" name="color" value="#000000ff" />
</layer>
+#
# Lines
-
-<!-- double stripe down the center of highways -->
-<!-- <layer data-source="minor-highways" draw-type="lines"> -->
-<!-- <property zoom-level="2" name="line-width" value="1" /> -->
-<!-- <property zoom-level="3" name="line-width" value="3" /> -->
-<!-- <property zoom-level="4" name="line-width" value="3" /> -->
-<!-- <property zoom-level="5" name="line-width" value="15" /> -->
-<!-- <property zoom-level="2-5" name="color" value="#f7df4aff" /> -->
-<!-- </layer> -->
-<!-- <layer data-source="minor-highways" draw-type="lines"> -->
-<!-- <property zoom-level="2" name="line-width" value="7" /> -->
-<!-- <property zoom-level="3" name="line-width" value="9" /> -->
-<!-- <property zoom-level="4" name="line-width" value="9" /> -->
-<!-- <property zoom-level="5" name="line-width" value="21" /> -->
-<!-- <property zoom-level="2-5" name="color" value="#FFFFFFFF" /> -->
-<!-- </layer> -->
-
+#
<layer data-source="minor-highways" draw-type="lines">
<!-- center line in minor highways -->
<property zoom-level="1" name="line-width" value="1" />
@@ -102,14 +93,6 @@
<property zoom-level="5" name="line-width" value="1" />
<property zoom-level="1-5" name="color" value="#ad8e21ff" />
</layer>
-<layer data-source="minor-highway-ramps" draw-type="lines">
- <property zoom-level="1" name="line-width" value="1" />
- <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="5" />
- <property zoom-level="5" name="line-width" value="8" />
- <property zoom-level="1-5" name="color" value="#f7df4aff" />
-</layer>
<layer data-source="minor-highways" draw-type="lines">
<!-- inner color line in minor highways -->
<property zoom-level="1" name="line-width" value="5" />
@@ -119,14 +102,7 @@
<property zoom-level="5" name="line-width" value="25" />
<property zoom-level="1-5" name="color" value="#f7df4aff" />
</layer>
-<layer data-source="minor-highway-ramps" draw-type="lines">
- <property zoom-level="1" name="line-width" value="3" />
- <property zoom-level="2" name="line-width" value="4" />
- <property zoom-level="3" name="line-width" value="5" />
- <property zoom-level="4" name="line-width" value="7" />
- <property zoom-level="5" name="line-width" value="10"/>
- <property zoom-level="1-5" name="color" value="#ad8e21ff" />
-</layer>
+
<layer data-source="minor-highways" draw-type="lines">
<!-- outer color line in minor highways -->
<property zoom-level="1" name="line-width" value="7" />
@@ -138,48 +114,60 @@
</layer>
<layer data-source="railroads" draw-type="lines">
- <!-- dashed inner line -->
- <property zoom-level="1-5" name="line-width" value="3" />
+ <!-- railroad dashed inner line -->
<property zoom-level="1-5" name="color" value="#858585FF" />
- <property zoom-level="1-5" name="dash-style" value="1" />
+ <property zoom-level="1-2" name="line-width" value="2" />
+ <property zoom-level="1-2" name="dash-pattern" value="5 5" />
+
+ <property zoom-level="3" name="line-width" value="6" />
+ <property zoom-level="3" name="dash-pattern" value="4 20" />
+
+ <property zoom-level="4-5" name="line-width" value="3" />
+ <property zoom-level="4-5" name="dash-pattern" value="4 20" />
+ <property zoom-level="1-5" name="line-cap" value="square" />
</layer>
<layer data-source="railroads" draw-type="lines">
- <!-- solid inner line -->
+ <!-- railroad solid inner line -->
<property zoom-level="1-2" name="line-width" value="2" />
<property zoom-level="3-5" name="line-width" value="3" />
<property zoom-level="1-5" name="color" value="#CCCCCCFF" />
</layer>
<layer data-source="railroads" draw-type="lines">
- <!-- solid outer line -->
+ <!-- railroad solid outer line -->
<property zoom-level="1-2" name="line-width" value="4" />
<property zoom-level="3-5" name="line-width" value="5" />
<property zoom-level="1-5" name="color" value="#858585FF" />
</layer>
<layer data-source="major-roads" draw-type="lines">
-<!-- dashed center lines -->
- <property zoom-level="5" name="line-width" value="1" />
- <property zoom-level="5" name="dash-style" value="1" />
- <property zoom-level="5" name="line-cap" value="square" />
- <property zoom-level="5" name="color" value="#EDDDDDff" />
-</layer>
-<layer data-source="minor-roads" draw-type="lines">
-<!-- dashed center lines -->
- <property zoom-level="5" name="line-width" value="1" />
- <property zoom-level="5" name="dash-style" value="1" />
- <property zoom-level="5" name="line-cap" value="square" />
- <property zoom-level="5" name="color" value="#CDCDCDff" />
-</layer>
-
-<layer data-source="major-roads" draw-type="lines">
+ <!-- major road top -->
<property zoom-level="1" name="line-width" value="6" />
<property zoom-level="2" name="line-width" value="8" />
<property zoom-level="3" name="line-width" value="10" />
<property zoom-level="4" name="line-width" value="15" />
<property zoom-level="5" name="line-width" value="20" />
- <property zoom-level="1-5" name="color" value="#FFFB94ff" />
+ <property zoom-level="1-5" name="color" value="#FFFB73FF" />
</layer>
+<layer data-source="minor-highway-ramps" draw-type="lines">
+ <!-- minor highway ramp top -->
+ <property zoom-level="1" name="line-width" value="1" />
+ <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="5" />
+ <property zoom-level="5" name="line-width" value="8" />
+ <property zoom-level="2-5" name="color" value="#fffbffff" />
+</layer>
+
+<layer data-source="minor-roads" draw-type="lines">
+ <!-- minor roads dashed center lines -->
+ <property zoom-level="4-5" name="line-width" value="1" />
+ <property zoom-level="4-5" name="dash-pattern" value="5 10" />
+ <property zoom-level="4-5" name="line-cap" value="square" />
+ <property zoom-level="4-5" name="color" value="#CDCDCDff" />
+</layer>
+
<layer data-source="minor-roads" draw-type="lines">
+ <!-- minor roads top -->
<property zoom-level="1" name="line-width" value="1" />
<property zoom-level="1" name="color" value="#c0c0c0ff" />
<property zoom-level="1" name="line-cap" value="square" />
@@ -191,17 +179,28 @@
<property zoom-level="5" name="line-width" value="24" />
<property zoom-level="2-5" name="color" value="#fffbffff" />
</layer>
+<layer data-source="minor-highway-ramps" draw-type="lines">
+ <!-- minor highway ramps top -->
+ <property zoom-level="1" name="line-width" value="3" />
+ <property zoom-level="2" name="line-width" value="4" />
+ <property zoom-level="3" name="line-width" value="5" />
+ <property zoom-level="4" name="line-width" value="7" />
+ <property zoom-level="5" name="line-width" value="10"/>
+ <property zoom-level="2-5" name="color" value="#c0c0c0ff" />
+</layer>
<layer data-source="major-roads" draw-type="lines">
+ <!-- major roads bottom -->
<property zoom-level="1" name="line-width" value="8" />
<property zoom-level="2" name="line-width" value="10" />
<property zoom-level="3" name="line-width" value="12" />
<property zoom-level="4" name="line-width" value="17" />
<property zoom-level="5" name="line-width" value="22" />
- <property zoom-level="1-5" name="color" value="#b0b0b0ff" />
+ <property zoom-level="1-5" name="color" value="#c0c0c0ff" />
</layer>
<layer data-source="minor-roads" draw-type="lines">
+ <!-- minor roads bottom -->
<property zoom-level="1" name="line-width" value="2" />
<property zoom-level="1" name="color" value="#E0E0E0ff" />
<property zoom-level="1" name="line-cap" value="square" />
@@ -211,10 +210,58 @@
<property zoom-level="3" name="line-width" value="9" />
<property zoom-level="4" name="line-width" value="14" />
<property zoom-level="5" name="line-width" value="26" />
- <property zoom-level="2-5" name="color" value="#B0B0B0ff" />
+ <property zoom-level="2-5" name="color" value="#c0c0c0ff" />
+</layer>
+
+<layer data-source="minor-highways" draw-type="lines">
+ <!-- minor highways shadow -->
+ <property zoom-level="3" name="line-width" value="12" />
+ <property zoom-level="4" name="line-width" value="15" />
+ <property zoom-level="5" name="line-width" value="27" />
+ <property zoom-level="3-5" name="color" value="shadow-color" />
+ <property zoom-level="3-5" name="line-cap" value="round" />
+ <property zoom-level="3" name="pixel-offset-x" value="2" />
+ <property zoom-level="3" name="pixel-offset-y" value="2" />
+ <property zoom-level="4-5" name="pixel-offset-x" value="3" />
+ <property zoom-level="4-5" name="pixel-offset-y" value="3" />
+</layer>
+
+<layer data-source="major-roads" draw-type="lines">
+ <!-- major roads shadow -->
+ <property zoom-level="3" name="line-width" value="12" />
+ <property zoom-level="4" name="line-width" value="17" />
+ <property zoom-level="5" name="line-width" value="22" />
+ <property zoom-level="3-5" name="color" value="shadow-color" />
+ <property zoom-level="3-5" name="line-cap" value="round" />
+ <property zoom-level="3" name="pixel-offset-x" value="2" />
+ <property zoom-level="3" name="pixel-offset-y" value="2" />
+ <property zoom-level="4-5" name="pixel-offset-x" value="3" />
+ <property zoom-level="4-5" name="pixel-offset-y" value="3" />
+</layer>
+
+<layer data-source="minor-roads" draw-type="lines">
+ <!-- minor roads shadow -->
+ <property zoom-level="3" name="line-width" value="9" />
+ <property zoom-level="4" name="line-width" value="14" />
+ <property zoom-level="5" name="line-width" value="26" />
+ <property zoom-level="3" name="pixel-offset-x" value="2" />
+ <property zoom-level="3" name="pixel-offset-y" value="2" />
+ <property zoom-level="4-5" name="pixel-offset-x" value="3" />
+ <property zoom-level="4-5" name="pixel-offset-y" value="3" />
+ <property zoom-level="3-5" name="color" value="shadow-color" />
+ <property zoom-level="3-5" name="line-cap" value="round" />
</layer>
<layer data-source="rivers" draw-type="lines">
+ <!-- rivers only layer -->
+ <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="3-5" name="color" value="#8ca2beFF" />
+</layer>
+
+<layer data-source="rivers" draw-type="lines">
+ <!-- rivers only layer -->
<property zoom-level="1" name="line-width" value="3" />
<property zoom-level="2" name="line-width" value="4" />
<property zoom-level="3" name="line-width" value="5" />
@@ -223,7 +270,9 @@
<property zoom-level="1-5" name="color" value="#9cb2ceFF" />
</layer>
+#
# Polygons
+#
<layer data-source="lakes" draw-type="polygons">
<property zoom-level="1-5" name="color" value="#9cb2ceFF" />
@@ -237,4 +286,14 @@
<property zoom-level="1-5" name="color" value="#AAAAAAff" />
</layer>
+<!-- <layer data-source="urban-areas" draw-type="polygons"> -->
+<!-- <property zoom-level="1-5" name="color" value="#FF0000ff" /> -->
+<!-- </layer> -->
+
+<layer draw-type="fill">
+ <property zoom-level="1-5" name="color" value="#ECE6E6ff" />
+</layer>
+
</layers>
+
+</mapstyle>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- roadster.glade 6 Sep 2005 02:44:19 -0000 1.21
+++ roadster.glade 14 Sep 2005 20:06:53 -0000 1.22
@@ -643,410 +643,506 @@
</child>
</widget>
-<widget class="GtkWindow" id="_____locationeditwindow">
- <property name="title" translatable="yes">Add Point</property>
+<widget class="GtkWindow" id="locationeditwindow">
+ <property name="title" translatable="yes">(name set in code)</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
- <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
[...1839 lines suppressed...]
+ <widget class="GtkHButtonBox" id="hbuttonbox17">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkButton" id="button35">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
<property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
@@ -4071,7 +4515,7 @@
</child>
<child>
- <widget class="GtkButton" id="button33">
+ <widget class="GtkButton" id="button36">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
- Previous message: [cairo-commit] roadster ChangeLog,1.72,1.73
- Next message: [cairo-commit]
roadster/src Makefile.am, 1.17, 1.18 animator.c, 1.5,
1.6 db.c, 1.25, 1.26 db.h, 1.10, 1.11 gotowindow.c, 1.9,
1.10 gpsclient.c, 1.10, 1.11 gpsclient.h, 1.3, 1.4 gui.c, 1.10,
1.11 gui.h, 1.2, 1.3 import_tiger.c, 1.19, 1.20 importwindow.c,
1.8, 1.9 layers.c, 1.16, NONE layers.h, 1.8,
NONE locationeditwindow.c, NONE, 1.1 locationeditwindow.h,
NONE, 1.1 locationset.c, 1.11, 1.12 main.c, 1.22, 1.23 main.h,
1.2, 1.3 mainwindow.c, 1.39, 1.40 map.c, 1.43, 1.44 map.h,
1.20, 1.21 map_draw_cairo.c, 1.21, 1.22 map_draw_gdk.c, 1.17,
1.18 map_style.c, NONE, 1.1 map_style.h, NONE, 1.1 prefs.c,
1.3, NONE prefs.h, 1.1, NONE road.c, 1.5, 1.6 scenemanager.c,
1.13, 1.14 search.c, 1.5, 1.6 search_road.c, 1.21,
1.22 searchwindow.c, 1.19, 1.20 util.c, 1.9, 1.10 util.h, 1.9, 1.10
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list