[cairo-commit] roadster/data layers.xml, 1.26, 1.27 roadster.glade,
1.31, 1.32
Ian McIntosh
commit at pdx.freedesktop.org
Tue Oct 4 23:09:38 PDT 2005
- Previous message: [cairo-commit] roadster ChangeLog,1.84,1.85
- Next message: [cairo-commit] roadster/src Makefile.am, 1.23, 1.24 db.c, 1.32,
1.33 db.h, 1.14, 1.15 import_tiger.c, 1.21, 1.22 main.c, 1.32,
1.33 main.h, 1.5, 1.6 mainwindow.c, 1.48, 1.49 map.c, 1.51,
1.52 map.h, 1.25, 1.26 map_draw_cairo.c, 1.27,
1.28 map_draw_cairo.h, 1.1, 1.2 map_draw_gdk.c, 1.25,
1.26 map_draw_gdk.h, 1.1, 1.2 map_style.c, 1.4, 1.5 map_tile.c,
1.2, NONE map_tile.h, 1.1, NONE map_tilemanager.c, NONE,
1.1 map_tilemanager.h, NONE, 1.1 road.c, 1.8,
1.9 scenemanager.c, 1.15, 1.16 scenemanager.h, 1.7,
1.8 search_road.c, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv21001/data
Modified Files:
layers.xml roadster.glade
Log Message:
* src/import_tiger.c:
* src/search_road.c:
* src/db.c: Add level of detail concept.
* src/mainwindow.c: Add zoomtool.
* src/map_draw_gdk.c:
* src/map_draw_cairo.c: Calculate bounding box on load instead of draw. Update to tile drawing.
* src/map.c: Begin splitting this file up more. Add lots more zoom levels.
* src/scenemanager.c: Remove empty module init.
* src/main.c: Don't need to init scenemanager module.
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- layers.xml 30 Sep 2005 05:09:50 -0000 1.26
+++ layers.xml 5 Oct 2005 06:09:36 -0000 1.27
@@ -15,78 +15,79 @@
</layer>
<layer draw-type="location-labels">
- <property zoom-level="1-5" name="font-size" value="10" />
- <property zoom-level="1-5" name="color" value="#000000ff" />
+ <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="1-2" name="font-size" value="10" />
- <property zoom-level="3" name="font-size" value="10" />
- <property zoom-level="4" name="font-size" value="12" />
- <property zoom-level="5" name="font-size" value="17" />
- <property zoom-level="1-5" name="color" value="#000000ff" />
- <property zoom-level="1-5" name="halo-size" value="1" />
- <property zoom-level="1-5" name="halo-color" value="#FFFFFFFF" />
+ <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="3" name="font-size" value="9" />
- <property zoom-level="4" name="font-size" value="11" />
- <property zoom-level="5" name="font-size" value="20" />
- <property zoom-level="3-5" name="color" value="#000000ff" />
+ <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="1" name="font-size" value="10" />
- <property zoom-level="2" name="font-size" value="10" />
- <property zoom-level="3" name="font-size" value="11" />
- <property zoom-level="4" name="font-size" value="12" />
- <property zoom-level="5" name="font-size" value="22" />
- <property zoom-level="1-5" name="color" value="#303030FF" />
- <property zoom-level="1-5" name="halo-size" value="1" />
- <property zoom-level="1-5" name="halo-color" value="#FFFFFFFF" />
+ <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="1" name="font-size" value="10" />
- <property zoom-level="2" name="font-size" value="10" />
- <property zoom-level="3" name="font-size" value="11" />
- <property zoom-level="4" name="font-size" value="12" />
- <property zoom-level="5" name="font-size" value="18" />
- <property zoom-level="1-5" name="color" value="#303030FF" />
- <property zoom-level="1-5" name="halo-size" value="1" />
- <property zoom-level="1-5" name="halo-color" value="#FFFFFFFF" />
+ <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="1" name="font-size" value="10" />
- <property zoom-level="2" name="font-size" value="12" />
- <property zoom-level="3" name="font-size" value="13" />
- <property zoom-level="4" name="font-size" value="14" />
- <property zoom-level="5" name="font-size" value="24" />
- <property zoom-level="1-5" name="color" value="#303030FF" />
- <property zoom-level="1-5" name="halo-size" value="1" />
- <property zoom-level="1-5" name="halo-color" value="#FFFFFFFF" />
+ <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="1" name="font-size" value="9" />
- <property zoom-level="2" name="font-size" value="10" />
- <property zoom-level="3" name="font-size" value="12" />
- <property zoom-level="4" name="font-size" value="16" />
- <property zoom-level="5" name="font-size" value="20" />
- <property zoom-level="1-5" name="bold" value="yes" />
- <property zoom-level="1-5" name="color" value="#000000ff" />
+ <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="1" name="font-size" value="10" />
- <property zoom-level="2" name="font-size" value="12" />
- <property zoom-level="3" name="font-size" value="12" />
- <property zoom-level="4" name="font-size" value="14" />
- <property zoom-level="5" name="font-size" value="20" />
- <property zoom-level="1-5" name="bold" value="yes" />
- <property zoom-level="1-5" name="color" value="#000000ff" />
+ <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>
#
@@ -94,148 +95,149 @@
#
<layer data-source="minor-highways" draw-type="lines">
<!-- center 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="1" />
- <property zoom-level="5" name="line-width" value="1" />
- <property zoom-level="1-5" name="color" value="#ad8e21ff" />
+ <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="5" />
- <property zoom-level="2" name="line-width" value="7" />
- <property zoom-level="3" name="line-width" value="10" />
- <property zoom-level="4" name="line-width" value="13" />
- <property zoom-level="5" name="line-width" value="25" />
- <property zoom-level="1-5" name="color" value="#f7df4aff" />
-</layer>
+ <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="7" />
- <property zoom-level="2" name="line-width" value="9" />
- <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="1-5" name="color" value="#ad8e21ff" />
+ <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="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="#FFF384FF" />
+ <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="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" />
+ <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="1" name="line-width" value="1" />
- <property zoom-level="1" name="color" value="#BDB294FF" />
- <property zoom-level="1" name="line-cap" value="square" />
+ <property zoom-level="7" name="line-width" value="1" />
+ <property zoom-level="7" name="color" value="#d0d0d0FF" />
- <property zoom-level="2" name="line-width" value="2" />
- <property zoom-level="2" name="line-cap" value="square" />
- <property zoom-level="3" name="line-width" value="8" />
- <property zoom-level="4" name="line-width" value="12" />
- <property zoom-level="5" name="line-width" value="24" />
- <property zoom-level="2-5" name="color" value="#FFFFFFFF" />
+ <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="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" />
+ <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="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="#c0c0c0ff" />
+ <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="1" name="line-width" value="2" />
- <property zoom-level="1" name="line-cap" value="square" />
-
- <property zoom-level="2" name="line-width" value="4" />
- <property zoom-level="2" name="line-cap" value="square" />
- <property zoom-level="3" name="line-width" value="10" />
- <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="#A59E84ff" />
+ <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="1-5" name="line-width" value="2" />
- <property zoom-level="1-5" name="dash-pattern" value="3 4 3" />
- <property zoom-level="1-5" name="line-cap" value="square" />
- <property zoom-level="1-5" name="color" value="#9C9A9CFF" />
+ <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="1-5" name="line-width" value="1" />
- <property zoom-level="1-5" name="color" value="#F7EBDEFF" />
+ <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="1-5" name="line-width" value="3" />
- <property zoom-level="1-5" name="color" value="#9C9A9CFF" />
+ <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" name="line-width" value="1" />
- <property zoom-level="2" name="line-width" value="2" />
- <property zoom-level="3" name="line-width" value="2" />
- <property zoom-level="4" name="line-width" value="2" />
- <property zoom-level="5" name="line-width" value="2" />
- <property zoom-level="1-5" name="color" value="#B5C6D6FF" />
+ <property zoom-level="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="6-10" name="color" value="#B5C6D6FF" />
</layer>
<layer data-source="lakes" draw-type="polygons">
- <property zoom-level="1-5" name="color" value="#B5C6D6FF" />
+ <property zoom-level="1-10" name="color" value="#B5C6D6FF" />
</layer>
<layer data-source="parks" draw-type="polygons">
- <property zoom-level="1-5" name="fill-image" value="park-pattern" />
- <property zoom-level="1-5" name="color" value="#DEDBADff" />
+ <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-5" name="line-width" value="2" />
- <property zoom-level="1-5" name="color" value="#BEBB8Dff" />
+ <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-5" name="color" value="#D0D0D0ff" />
+ <property zoom-level="6-10" name="color" value="#C0C0C0ff" />
</layer>
<!-- <layer data-source="urban-areas" draw-type="polygons"> -->
-<!-- <property zoom-level="1-5" name="color" value="#FF0000ff" /> -->
+<!-- <property zoom-level="6-10" name="color" value="#FF0000ff" /> -->
<!-- </layer> -->
<layer draw-type="fill">
- <property zoom-level="1-5" name="color" value="#F3EDDEFF" />
+ <property zoom-level="1-10" name="color" value="#F3EDDEFF" />
</layer>
</layers>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- roadster.glade 1 Oct 2005 19:09:05 -0000 1.31
+++ roadster.glade 5 Oct 2005 06:09:36 -0000 1.32
@@ -1665,6 +1665,7 @@
<widget class="GtkButton" id="backbutton">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="tooltip" translatable="yes">Go back one view</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="mainwindow_on_backbutton_clicked" last_modification_time="Sun, 20 Mar 2005 10:32:22 GMT"/>
@@ -1692,6 +1693,7 @@
<widget class="GtkButton" id="forwardbutton">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="tooltip" translatable="yes">Go forward one view</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="mainwindow_on_forwardbutton_clicked" last_modification_time="Sun, 20 Mar 2005 10:32:35 GMT"/>
@@ -1874,6 +1876,7 @@
<widget class="GtkButton" id="zoomoutbutton">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="tooltip" translatable="yes">Zoom out one level</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="mainwindow_on_zoomout_activate" last_modification_time="Fri, 04 Mar 2005 04:25:21 GMT"/>
@@ -1904,9 +1907,9 @@
<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_DELAYED</property>
+ <property name="update_policy">GTK_UPDATE_CONTINUOUS</property>
<property name="inverted">False</property>
- <property name="adjustment">1 1 6 1 1 1</property>
+ <property name="adjustment">4 1 42 1 1 1</property>
<signal name="value_changed" handler="mainwindow_on_zoomscale_value_changed" last_modification_time="Fri, 04 Mar 2005 04:21:33 GMT"/>
</widget>
<packing>
@@ -1919,6 +1922,7 @@
<child>
<widget class="GtkButton" id="zoominbutton">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Zoom in one level</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<signal name="clicked" handler="mainwindow_on_zoomin_activate" last_modification_time="Fri, 04 Mar 2005 04:25:10 GMT"/>
@@ -1944,6 +1948,7 @@
<child>
<widget class="GtkSeparatorToolItem" id="separatortoolitem12">
+ <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="draw">True</property>
<property name="visible_horizontal">True</property>
@@ -1957,8 +1962,9 @@
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton15">
- <property name="can_focus">True</property>
+ <widget class="GtkRadioButton" id="pointertoolradiobutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Pointer tool</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<property name="active">False</property>
@@ -1968,7 +1974,7 @@
<child>
<widget class="GtkImage" id="image10252">
<property name="visible">True</property>
- <property name="stock">gtk-about</property>
+ <property name="stock">gtk-index</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -1985,19 +1991,20 @@
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton16">
- <property name="can_focus">True</property>
+ <widget class="GtkRadioButton" id="zoomtoolradiobutton">
+ <property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Zoom tool</property>
<property name="relief">GTK_RELIEF_NONE</property>
<property name="focus_on_click">False</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">False</property>
- <property name="group">radiobutton15</property>
+ <property name="group">pointertoolradiobutton</property>
<child>
<widget class="GtkImage" id="image10253">
<property name="visible">True</property>
- <property name="stock">gtk-sort-ascending</property>
+ <property name="stock">gtk-zoom-fit</property>
<property name="icon_size">4</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
@@ -2337,7 +2344,7 @@
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
- <property name="xpad">4</property>
+ <property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">hpaned1</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -2530,7 +2537,7 @@
<property name="selectable">False</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
- <property name="xpad">4</property>
+ <property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">hpaned1</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
@@ -3158,7 +3165,7 @@
</child>
</widget>
-<widget class="GtkWindow" id="_____optionswindow">
+<widget class="GtkWindow" id="_____optionswindow__not_in_preview">
<property name="title" translatable="yes">Options</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
@@ -3402,7 +3409,7 @@
<widget class="GtkCheckButton" id="checkbutton12">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Automatically go to search result when there is only one</property>
+ <property name="label" translatable="yes">_Automatically go to top search result</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -3452,7 +3459,7 @@
<property name="update_policy">GTK_UPDATE_ALWAYS</property>
<property name="snap_to_ticks">False</property>
<property name="wrap">False</property>
- <property name="adjustment">50 10 1000 1 10 10</property>
+ <property name="adjustment">10 10 1000 1 10 10</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4741,7 +4748,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image9780">
+ <widget class="GtkImage" id="image10276">
<property name="visible">True</property>
<property name="stock">gtk-edit</property>
<property name="icon_size">1</property>
@@ -4767,7 +4774,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image9781">
+ <widget class="GtkImage" id="image10277">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -4790,7 +4797,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image9778">
+ <widget class="GtkImage" id="image10278">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -4810,7 +4817,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image9779">
+ <widget class="GtkImage" id="image10279">
<property name="visible">True</property>
<property name="stock">gtk-copy</property>
<property name="icon_size">1</property>
@@ -4855,4 +4862,711 @@
</child>
</widget>
+<widget class="GtkWindow" id="_____advancedsearchwindow">
+ <property name="title" translatable="yes">Advanced Search</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_NONE</property>
+ <property name="modal">False</property>
+ <property name="resizable">False</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox8911">
+ <property name="border_width">12</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkNotebook" id="notebook2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="show_tabs">True</property>
+ <property name="show_border">True</property>
+ <property name="tab_pos">GTK_POS_TOP</property>
+ <property name="scrollable">False</property>
+ <property name="enable_popup">False</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox8916">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92362">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Address</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox8923">
+ <property name="border_width">8</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkFrame" id="frame59">
+ <property name="visible">True</property>
+ <property name="label_xalign">0</property>
+ <property name="label_yalign">0.5</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment105">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">1</property>
+ <property name="yscale">1</property>
+ <property name="top_padding">4</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">12</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkTable" id="table17">
+ <property name="visible">True</property>
+ <property name="n_rows">6</property>
+ <property name="n_columns">2</property>
+ <property name="homogeneous">False</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">8</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92375">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with <b>all</b> of the words</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92376">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with the <b>exact phrase</b></property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92377">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">with <b>at least one</b> of the words</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry8</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92378">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>without</b> the words</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry9</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry8">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes">pizza dumplings sushi</property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">3</property>
+ <property name="bottom_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkEntry" id="entry9">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes">dominos</property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92382">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">created <b>by</b></property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry9</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkComboBox" id="combobox16">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Anyone
+Me
+-
+person1
+person2</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">5</property>
+ <property name="bottom_attach">6</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92383">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">of <b>type</b></property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">entry9</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="left_attach">0</property>
+ <property name="right_attach">1</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkComboBox" id="combobox15">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">Bars
+Coffee Shops
+Restaurants</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox100">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkEntry" id="entry6">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92386">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">in field</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">2</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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkComboBox" id="combobox17">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">any
+review</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox101">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkEntry" id="entry10">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="editable">True</property>
+ <property name="visibility">True</property>
+ <property name="max_length">0</property>
+ <property name="text" translatable="yes">great food</property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char">*</property>
+ <property name="activates_default">False</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92387">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">in field</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">2</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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkComboBox" id="combobox18">
+ <property name="visible">True</property>
+ <property name="items" translatable="yes">any
+review</property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92374">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>Find results</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <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="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkVBox" id="vbox8921">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92367">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Places</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHButtonBox" id="hbuttonbox19">
+ <property name="visible">True</property>
+ <property name="layout_style">GTK_BUTTONBOX_END</property>
+ <property name="spacing">8</property>
+
+ <child>
+ <widget class="GtkButton" id="button47">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="has_focus">True</property>
+ <property name="label">gtk-close</property>
+ <property name="use_stock">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="util_close_parent_window" last_modification_time="Wed, 21 Sep 2005 05:41:54 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="button48">
+ <property name="visible">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="can_focus">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+
+ <child>
+ <widget class="GtkAlignment" id="alignment106">
+ <property name="visible">True</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
+ <property name="top_padding">0</property>
+ <property name="bottom_padding">0</property>
+ <property name="left_padding">0</property>
+ <property name="right_padding">0</property>
+
+ <child>
+ <widget class="GtkHBox" id="hbox102">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">2</property>
+
+ <child>
+ <widget class="GtkImage" id="image10280">
+ <property name="visible">True</property>
+ <property name="stock">gtk-find</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92388">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">_Search</property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <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>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
</glade-interface>
- Previous message: [cairo-commit] roadster ChangeLog,1.84,1.85
- Next message: [cairo-commit] roadster/src Makefile.am, 1.23, 1.24 db.c, 1.32,
1.33 db.h, 1.14, 1.15 import_tiger.c, 1.21, 1.22 main.c, 1.32,
1.33 main.h, 1.5, 1.6 mainwindow.c, 1.48, 1.49 map.c, 1.51,
1.52 map.h, 1.25, 1.26 map_draw_cairo.c, 1.27,
1.28 map_draw_cairo.h, 1.1, 1.2 map_draw_gdk.c, 1.25,
1.26 map_draw_gdk.h, 1.1, 1.2 map_style.c, 1.4, 1.5 map_tile.c,
1.2, NONE map_tile.h, 1.1, NONE map_tilemanager.c, NONE,
1.1 map_tilemanager.h, NONE, 1.1 road.c, 1.8,
1.9 scenemanager.c, 1.15, 1.16 scenemanager.h, 1.7,
1.8 search_road.c, 1.28, 1.29
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list