[cairo-commit] roadster/data layers.xml, 1.22, 1.23 roadster.glade, 1.22, 1.23 search-result-type-city.svg, NONE, 1.1 search-result-type-road.svg, NONE, 1.1

Ian McIntosh commit at pdx.freedesktop.org
Fri Sep 23 22:25:27 PDT 2005


Committed by: ian

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

Modified Files:
	layers.xml roadster.glade 
Added Files:
	search-result-type-city.svg search-result-type-road.svg 
Log Message:
2005-09-24  Ian McIntosh  <ian_mcintosh at linuxadvocate.org>

	* data/roadster.glade: New "Go" menu with web maps.  General GUI cleanup.
	* src/glyph.c: Complete rework.  Removes direct usage of librsvg.  Now uses only gdkpixbuf loaders (including the librsvg one!)
	* src/locationeditwindow.c: 
	* src/mainwindow.c: Use GLADE_LINK_WIDGET.  Add "web maps" menu options.  Add glyph reload debug menu option.  Possibly fix 'failure to stop scrolling' bug.
	* src/map.c: Beginning of support for "enhancing" map objects at run-time (adding points, smoothing sharp edges).
	* src/map.h: Fix a few 'double' which should be 'gdouble'
	* src/search_city.c: New search type matches city names.
	* src/search_road.c: Removed common code.  No longer do wildcard "search*" matching.  No longer display house #s in results.
	* src/search_location.c: Removed common code.
	* src/search.c: Moved common search code here.
	* src/searchwindow.c: Add icon.  Lots of small "look & feel" updates.
	* src/util.c: Add new word-in-sentence matching for treeview searches.  Add some treeview utility functions.  Add util_str_replace_many() for replacing eg "{LAT}" with a number for web map URLs.
	* src/welcomewindow.c: Update currently unused TIGER Data Web URL.
	* src/db.c: Playing with soundex() matching for roads and city names.
	* configure.ac: Bumped version.  Hey why not.



Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- layers.xml	14 Sep 2005 20:06:53 -0000	1.22
+++ layers.xml	24 Sep 2005 05:25:24 -0000	1.23
@@ -113,31 +113,6 @@
 	<property zoom-level="1-5" name="color" value="#ad8e21ff" />
 </layer>
 
-<layer data-source="railroads" draw-type="lines">
-    <!-- railroad dashed inner line -->
-	<property zoom-level="1-5" name="color" value="#858585FF" />
-    <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">
-    <!-- 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">
-    <!-- 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">
     <!-- major road top -->
@@ -252,38 +227,60 @@
     <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 data-source="railroads" draw-type="lines">
+    <!-- railroad dashed inner line -->
+    <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" />
+	<property zoom-level="1-5" name="color" value="#858585FF" />
+</layer>
+<layer data-source="railroads" draw-type="lines">
+    <!-- railroad solid inner line -->
+	<property zoom-level="1-2" name="line-width" value="1" />
+	<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">
+    <!-- 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="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" />
-	<property zoom-level="4" name="line-width" value="6" />
-	<property zoom-level="5" name="line-width" value="7" />
+	<property zoom-level="1" name="line-width" value="2" />
+	<property zoom-level="2" name="line-width" value="3" />
+	<property zoom-level="3" name="line-width" value="4" />
+	<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="#9cb2ceFF" />
 </layer>
 
 #
 # Polygons
 #
-
 <layer data-source="lakes" draw-type="polygons">
 	<property zoom-level="1-5" name="color" value="#9cb2ceFF" />
 </layer>
+<layer data-source="lakes" draw-type="lines">
+     # gives a fuzzy border to lakes in non-AA render mode
+	<property zoom-level="1-5" name="line-width" value="3" />
+	<property zoom-level="1-5" name="color" value="#C0C8D5FF" />
+</layer>
 
 <layer data-source="parks" draw-type="polygons">
 	<property zoom-level="1-5" name="color" value="#afcf94ff" />
 </layer>
 
 <layer data-source="misc-areas" draw-type="polygons">
-	<property zoom-level="1-5" name="color" value="#AAAAAAff" />
+	<property zoom-level="1-5" name="color" value="#B0B0B0ff" />
 </layer>
 
 <!-- <layer data-source="urban-areas" draw-type="polygons">           -->

Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- roadster.glade	14 Sep 2005 20:06:53 -0000	1.22
+++ roadster.glade	24 Sep 2005 05:25:24 -0000	1.23
@@ -454,7 +454,7 @@
       <signal name="activate" handler="mainwindow_on_addpointmenuitem_activate" last_modification_time="Wed, 26 Jan 2005 23:43:39 GMT"/>
 
       <child internal-child="image">
-	<widget class="GtkImage" id="image9510">
+	<widget class="GtkImage" id="image9782">
 	  <property name="visible">True</property>
 	  <property name="stock">gtk-new</property>
 	  <property name="icon_size">1</property>
@@ -653,7 +653,7 @@
   <property name="decorated">True</property>
   <property name="skip_taskbar_hint">False</property>
[...2074 lines suppressed...]
+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+  <property name="focus_on_map">True</property>
+
+  <child>
+    <widget class="GtkScrolledWindow" id="scrolledwindow9246">
+      <property name="visible">True</property>
+      <property name="can_focus">True</property>
+      <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+      <property name="vscrollbar_policy">GTK_POLICY_NEVER</property>
+      <property name="shadow_type">GTK_SHADOW_IN</property>
+      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
+
+      <child>
+	<placeholder/>
+      </child>
+    </widget>
+  </child>
+</widget>
+
 </glade-interface>

--- NEW FILE: search-result-type-city.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   width="20.000000mm"
   height="20.000000mm"
   id="svg1"
   sodipodi:version="0.32"
   inkscape:version="0.40"
   inkscape:export-filename="/home/yella/files/projects/roadster/data/casino.png"
   inkscape:export-xdpi="30.480000"
   inkscape:export-ydpi="30.480000"
   sodipodi:docbase="/home/yella/files/projects/roadster/data"
   sodipodi:docname="search-result-type-city.svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs
     id="defs3">
    <linearGradient
       id="linearGradient1747">
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop1748" />
      <stop
         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop1749" />
    </linearGradient>
    <linearGradient
       id="linearGradient1708">
      <stop
         style="stop-color:#f67777;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop1709" />
      <stop
         style="stop-color:#ffdd4d;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop1710" />
    </linearGradient>
    <radialGradient
       inkscape:collect="always"
       xlink:href="#linearGradient1747"
       id="radialGradient1750"
       gradientTransform="scale(1.073087,0.931891)"
       cx="32.266712"
       cy="38.793564"
       fx="32.215897"
       fy="38.837528"
       r="3.9124954"
       gradientUnits="userSpaceOnUse" />
    <linearGradient
       inkscape:collect="always"
       xlink:href="#linearGradient1708"
       id="linearGradient1979"
       gradientTransform="scale(1.001914,0.998090)"
       x1="35.262753"
       y1="52.510044"
       x2="35.001606"
       y2="11.841617"
       gradientUnits="userSpaceOnUse" />
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0000000"
     inkscape:pageshadow="2"
     inkscape:zoom="5.9975363"
     inkscape:cx="27.033829"
     inkscape:cy="34.001444"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:grid-bbox="true"
     inkscape:grid-points="false"
     gridspacingx="0.50000000mm"
     gridspacingy="0.50000000mm"
     gridtolerance="0.50000000mm"
     gridempspacing="5"
     showborder="true"
     inkscape:window-width="518"
     inkscape:window-height="565"
     inkscape:window-x="536"
     inkscape:window-y="453" />
  <metadata
     id="metadata4">
    <rdf:RDF
       id="RDF5">
      <cc:Work
         rdf:about=""
         id="Work6">
        <dc:format
           id="format7">image/svg+xml</dc:format>
        <dc:type
           id="type9"
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <image
     xlink:href="/home/yella/Desktop/complprac.jpg"
     sodipodi:absref="/home/yella/Desktop/complprac.jpg"
     width="136.13753"
     height="82.587585"
     id="image1798"
     x="136.41733"
     y="36.113201" />
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1">
    <path
       sodipodi:type="arc"
       style="fill:url(#linearGradient1979);fill-opacity:1.0;stroke:none;stroke-width:2.3750000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
       id="path1969"
       sodipodi:cx="35.591885"
       sodipodi:cy="35.409073"
       sodipodi:rx="35.322250"
       sodipodi:ry="35.187431"
       d="M 70.914135 35.409073 A 35.322250 35.187431 0 1 1  0.26963425,35.409073 A 35.322250 35.187431 0 1 1  70.914135 35.409073 z"
       transform="matrix(0.872919,0.000000,0.000000,0.872919,4.344530,6.588379)" />
    <path
       style="fill:#5b5a5a;fill-opacity:1.0000000;stroke:none;stroke-width:2.3750000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;"
       d="M 18.723373,12.359560 C 17.784463,12.718142 16.527703,13.592951 15.727626,14.254623 L 15.718750,14.500000 L 15.625000,22.968750 L 13.687500,22.937500 L 13.781250,30.500000 L 11.093750,30.593750 L 11.250000,56.156250 C 16.895145,63.344148 25.572809,68.062499 35.437500,68.062500 C 46.750883,68.062500 56.572892,61.900474 61.937500,52.843750 L 61.968750,39.843750 L 60.062500,37.875000 L 56.625000,23.968750 L 53.187500,37.625000 L 51.062500,39.718750 L 51.031250,45.031250 L 44.906250,44.968750 L 44.781250,19.750000 L 39.781250,19.812500 L 39.843750,15.968750 L 34.656250,15.812500 L 34.687500,19.968750 L 30.562500,20.000000 L 30.593750,54.500000 L 23.625000,54.437500 L 23.656250,30.750000 L 21.281250,30.687500 L 21.312500,23.000000 L 19.062500,23.031250 L 18.968750,14.437500 L 18.723373,12.359560 z "
       id="path1842"
       sodipodi:nodetypes="ccccccccccccccccccccccccccccccc" />
    <path
       sodipodi:type="arc"
       style="fill:none;fill-opacity:1.0000000;stroke:#000000;stroke-width:2.3750000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
       id="path1971"
       sodipodi:cx="35.591885"
       sodipodi:cy="35.409073"
       sodipodi:rx="35.322250"
       sodipodi:ry="35.187431"
       d="M 70.914135 35.409073 A 35.322250 35.187431 0 1 1  0.26963425,35.409073 A 35.322250 35.187431 0 1 1  70.914135 35.409073 z"
       transform="matrix(0.872919,0.000000,0.000000,0.872919,3.307939,6.593883)" />
  </g>
</svg>

--- NEW FILE: search-result-type-road.svg ---
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
"http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
   width="20.000000mm"
   height="20.000000mm"
   id="svg1"
   sodipodi:version="0.32"
   inkscape:version="0.40"
   inkscape:export-filename="/home/yella/files/projects/roadster/data/casino.png"
   inkscape:export-xdpi="30.480000"
   inkscape:export-ydpi="30.480000"
   sodipodi:docbase="/home/yella/files/projects/roadster/data"
   sodipodi:docname="search-result-type-road.svg"
   xmlns="http://www.w3.org/2000/svg"
   xmlns:cc="http://web.resource.org/cc/"
   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:dc="http://purl.org/dc/elements/1.1/"
   xmlns:xlink="http://www.w3.org/1999/xlink">
  <defs
     id="defs3">
    <linearGradient
       id="linearGradient1747">
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop1748" />
      <stop
         style="stop-color:#a3a3a3;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop1749" />
    </linearGradient>
    <linearGradient
       id="linearGradient1708">
      <stop
         style="stop-color:#ffffff;stop-opacity:1.0000000;"
         offset="0.0000000"
         id="stop1709" />
      <stop
         style="stop-color:#4da926;stop-opacity:1.0000000;"
         offset="1.0000000"
         id="stop1710" />
    </linearGradient>
  </defs>
  <sodipodi:namedview
     id="base"
     pagecolor="#ffffff"
     bordercolor="#666666"
     borderopacity="1.0"
     inkscape:pageopacity="0.0000000"
     inkscape:pageshadow="2"
     inkscape:zoom="3.8104332"
     inkscape:cx="29.444196"
     inkscape:cy="9.1676075"
     inkscape:current-layer="layer1"
     showgrid="true"
     inkscape:grid-bbox="true"
     inkscape:grid-points="false"
     gridspacingx="0.50000000mm"
     gridspacingy="0.50000000mm"
     gridtolerance="0.50000000mm"
     gridempspacing="5"
     showborder="true"
     inkscape:window-width="553"
     inkscape:window-height="565"
     inkscape:window-x="564"
     inkscape:window-y="25" />
  <metadata
     id="metadata4">
    <rdf:RDF
       id="RDF5">
      <cc:Work
         rdf:about=""
         id="Work6">
        <dc:format
           id="format7">image/svg+xml</dc:format>
        <dc:type
           id="type9"
           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
      </cc:Work>
    </rdf:RDF>
  </metadata>
  <g
     inkscape:label="Layer 1"
     inkscape:groupmode="layer"
     id="layer1">
    <path
       sodipodi:type="arc"
       style="fill:#bebebe;fill-opacity:1.0000000;stroke:#000000;stroke-width:2.3750000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
       id="path1842"
       sodipodi:cx="35.591885"
       sodipodi:cy="35.409073"
       sodipodi:rx="35.322250"
       sodipodi:ry="35.187431"
       d="M 70.914135 35.409073 A 35.322250 35.187431 0 1 1  0.26963425,35.409073 A 35.322250 35.187431 0 1 1  70.914135 35.409073 z"
       transform="matrix(0.872919,0.000000,0.000000,0.872919,4.523054,4.386425)" />
    <path
       style="fill:#000000;fill-opacity:1.0000000;stroke:#000000;stroke-width:3.0322678;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
       d="M 35.594264,5.0594416 C 30.993989,5.0594416 26.669344,6.1701020 22.747024,7.9720148 L 16.323403,58.527703 C 21.617899,62.792218 28.260438,65.470002 35.594264,65.470001 C 44.124494,65.470001 51.834643,61.995917 57.418615,56.413094 L 51.154587,9.4083526 C 46.572930,6.7195541 41.293080,5.0594416 35.594264,5.0594416 z "
       id="path1837"
       sodipodi:nodetypes="ccccccc" />
    <path
       style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.1500000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
       d="M 34.082720,3.8075477 L 38.908560,3.8075477 L 40.645672,26.325074 L 32.421135,26.325074 L 34.082720,3.8075477 z "
       id="path1833"
       sodipodi:nodetypes="ccccc" />
    <path
       style="fill:#ffffff;fill-opacity:1.0000000;stroke:none;stroke-width:1.1500000;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000"
       d="M 31.763234,43.011352 L 40.940887,43.011352 L 44.244481,64.383022 C 37.669541,65.744224 35.282920,65.744224 28.603272,64.383022 L 31.763234,43.011352 z "
       id="path1834"
       sodipodi:nodetypes="ccccc" />
  </g>
</svg>



More information about the cairo-commit mailing list