[cairo-commit] roadster/data layers.xml, 1.18, 1.19 roadster.glade,
1.19, 1.20
Ian McIntosh
commit at pdx.freedesktop.org
Mon Aug 29 08:23:16 EST 2005
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv9792/data
Modified Files:
layers.xml roadster.glade
Log Message:
data/roadster.glade: UI cleanup. Moved many items into a 'Debug' menu.
src/gpsclient.c: Update to newest gpsd lib.
src/db.c: Format coordinates using g_ascii_dtostr to avoid i18n.
src/mainwindow.c: Add GTK About dialog.
src/map.c: Back to GDK rendering as default (not fast enough without hardware
accel.). Use g_ascii_dtostr. Add hack to turn circular rivers into lakes.
src/map_draw_cairo.c: Update to Cairo 1.0. Add hack to round text rotation
angles down to better utilize font cache (which isn't in 1.0 yet).
src/pointstring.c:
src/point.c: Add debugging function.
src/search_road.c: Move function to util.c
src/searchwindow.c: Remove unused variables.
src/util.c: Added util_split_words_onto_two_lines(), currently unused.
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- layers.xml 26 May 2005 20:05:36 -0000 1.18
+++ layers.xml 28 Aug 2005 22:23:14 -0000 1.19
@@ -14,7 +14,7 @@
<property name="width" level="10" value="35.0" />
<property name="color" value="#a0a0a0ff" />
<property name="join-style" value="miter" />
- <property name="cap-style" value="round" />
+ <property name="cap-style" value="butt" />
</sublayer>
<sublayer>
<property name="width" level="6" value="1.0" />
@@ -24,7 +24,7 @@
<property name="width" level="10" value="33.0" />
<property name="color" value="#fffbffff" />
<property name="join-style" value="miter" />
- <property name="cap-style" value="round" />
+ <property name="cap-style" value="butt" />
</sublayer>
<label>
<property name="color" value="#FF000000" />
@@ -214,7 +214,7 @@
<label>
<property name="color" value="#00000000" />
<property name="font-size" level="7" value="11" />
- <property name="halo" level="7" value="4" />
+ <property name="halo" level="7" value="2" />
</label>
</layer>
@@ -227,44 +227,38 @@
</sublayer>
<sublayer>
<property name="width" level="3" value="1.0" />
- <property name="color" value="#94C29Cff" />
+ <property name="color" value="#afcf94ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
- <property name="color" value="#338833FF" />
- <property name="font-size" level="2" value="6" />
- <property name="font-size" level="5" value="6" />
- <property name="font-size" level="6" value="8" />
- <property name="font-size" level="7" value="10" />
- <property name="font-size" level="8" value="12" />
- <property name="font-size" level="10" value="14" />
- <property name="bold" value="yes" />
- <property name="halo" value="3" />
+ <property name="color" value="#222222FF" />
+ <property name="font-size" level="6" value="11" />
+ <property name="font-size" level="7" value="12" />
+ <property name="font-size" level="8" value="13" />
+ <property name="bold" value="no" />
+ <property name="halo" value="2" />
</label>
</layer>
<layer name="rivers">
<sublayer>
- <property name="width" level="4" value="1.0" />
- <property name="width" level="5" value="5.0" />
- <property name="width" level="6" value="5.0" />
+ <property name="width" level="6" value="3.0" />
<property name="width" level="7" value="5.0" />
<property name="width" level="8" value="5.0" />
<property name="width" level="9" value="8.0" />
<property name="width" level="10" value="10.0" />
- <property name="color" value="#777777FF" />
+ <property name="color" value="#999999FF" />
<property name="join-style" value="round" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
- <property name="width" level="5" value="3.0" />
- <property name="width" level="6" value="3.0" />
+ <property name="width" level="6" value="1.0" />
<property name="width" level="7" value="3.0" />
<property name="width" level="8" value="3.0" />
<property name="width" level="9" value="6.0" />
<property name="width" level="10" value="8.0" />
- <property name="color" value="#5AAEDEFF" />
+ <property name="color" value="#9cb2ceFF" />
<property name="join-style" value="round" />
<property name="cap-style" value="round" />
</sublayer>
@@ -272,7 +266,7 @@
<layer name="lakes">
<sublayer>
- <property name="color" value="#777777FF" />
+ <property name="color" value="#999999FF" />
<property name="width" level="1" value="1.0" />
<property name="width" level="3" value="2.0" />
<property name="join-style" value="miter" />
@@ -280,36 +274,34 @@
</sublayer>
<sublayer>
<property name="width" level="3" value="1.0" />
- <property name="color" value="#5AAEDEFF" />
+ <property name="color" value="#9cb2ceFF" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
- <property name="color" value="#5250F8FF" />
- <property name="font-size" level="2" value="5" />
- <property name="font-size" level="6" value="10" />
- <property name="font-size" level="8" value="12" />
- <property name="font-size" level="10" value="14" />
- <property name="bold" value="yes" />
- <property name="halo" value="3" />
+ <property name="color" value="#222222FF" />
+ <property name="font-size" level="6" value="11" />
+ <property name="font-size" level="7" value="12" />
+ <property name="font-size" level="8" value="13" />
+ <property name="bold" value="no" />
+ <property name="halo" value="2" />
</label>
</layer>
<layer name="misc-area">
<sublayer>
<property name="width" level="6" value="1.0" />
- <property name="color" value="#9b9b9bff" />
+ <property name="color" value="#AAAAAAff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="butt" />
</sublayer>
<label>
- <property name="color" value="#404040ff" />
- <property name="font-size" level="6" value="10" />
- <property name="font-size" level="7" value="10" />
- <property name="font-size" level="8" value="12" />
- <property name="font-size" level="10" value="14" />
- <property name="bold" value="yes" />
- <property name="halo" value="3" />
+ <property name="color" value="#222222FF" />
+ <property name="font-size" level="6" value="11" />
+ <property name="font-size" level="7" value="12" />
+ <property name="font-size" level="8" value="13" />
+ <property name="bold" value="no" />
+ <property name="halo" value="2" />
</label>
</layer>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- roadster.glade 23 Apr 2005 18:13:39 -0000 1.19
+++ roadster.glade 28 Aug 2005 22:23:14 -0000 1.20
@@ -4,7 +4,7 @@
<glade-interface>
<requires lib="gnome"/>
-<widget class="GtkWindow" id="datasetwindow">
+<widget class="GtkWindow" id="_____datasetwindow__not_needed">
<property name="border_width">4</property>
<property name="width_request">500</property>
<property name="height_request">300</property>
@@ -19,6 +19,7 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
[...977 lines suppressed...]
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -3601,6 +3744,10 @@
<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>
More information about the cairo-commit
mailing list