[cairo-commit] roadster/data layers.xml, 1.2, 1.3 roadster.glade,
1.8, 1.9
Ian McIntosh
commit at pdx.freedesktop.org
Thu Mar 3 18:27:31 PST 2005
- Previous message: [cairo-commit] roadster ChangeLog,1.33,1.34
- Next message: [cairo-commit] roadster/src map_draw_cairo.c, NONE,
1.1 map_draw_cairo.h, NONE, 1.1 map_draw_gdk.c, NONE,
1.1 map_draw_gdk.h, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster/data
In directory gabe:/tmp/cvs-serv29799/data
Modified Files:
layers.xml roadster.glade
Log Message:
* map.c: Removed drawing code, added two rendering backends.
* map_draw_cairo.c:
* map_draw_gdk.c: Added.
* glyph.c: Made libsvg optional.
* gotowindow.c: Removed lots of unused code.
* main.c: Initialize threading (currently disabled).
* search_road.c: Don't pass RoadID to search results window.
Index: layers.xml
===================================================================
RCS file: /cvs/cairo/roadster/data/layers.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- layers.xml 3 Mar 2005 08:28:32 -0000 1.2
+++ layers.xml 4 Mar 2005 02:27:29 -0000 1.3
@@ -9,15 +9,15 @@
<property name="width" level="7" value="5.0" />
<property name="width" level="8" value="12.0" />
<property name="width" level="9" value="18.0" />
- <property name="width" level="10" value="36.0" />
- <property name="color" value="#a99f9dff" />
+ <property name="width" level="10" value="35.0" />
+ <property name="color" value="#898f8dff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
<sublayer>
- <property name="width" level="7" value="3.5" />
- <property name="width" level="8" value="10.0" />
- <property name="width" level="9" value="16.0" />
+ <property name="width" level="7" value="4.0" />
+ <property name="width" level="8" value="9.0" />
+ <property name="width" level="9" value="15.0" />
<property name="width" level="10" value="32.0" />
<property name="color" value="#fffbffff" />
<property name="join-style" value="miter" />
@@ -33,10 +33,10 @@
<layer name="major-roads">
<sublayer>
- <property name="width" level="7" value="12.0" />
- <property name="width" level="8" value="17.0" />
+ <property name="width" level="7" value="13.0" />
+ <property name="width" level="8" value="18.0" />
<property name="width" level="9" value="24.0" />
- <property name="width" level="10" value="36.0" />
+ <property name="width" level="10" value="35.0" />
<property name="color" value="#ada28cff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
@@ -47,10 +47,10 @@
<property name="width" level="5" value="3.3" />
<property name="width" level="6" value="6.0" />
<property name="width" level="7" value="10.0" />
- <property name="width" level="8" value="14.5" />
- <property name="width" level="9" value="22.0" />
- <property name="width" level="10" value="32.5" />
- <property name="color" value="#fffb73ff" />
+ <property name="width" level="8" value="15.0" />
+ <property name="width" level="9" value="21.0" />
+ <property name="width" level="10" value="32.0" />
+ <property name="color" value="#FFfb73ff" />
<property name="join-style" value="miter" />
<property name="cap-style" value="round" />
</sublayer>
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/data/roadster.glade,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- roadster.glade 3 Mar 2005 08:28:32 -0000 1.8
+++ roadster.glade 4 Mar 2005 02:27:29 -0000 1.9
@@ -219,57 +219,20 @@
<child>
<widget class="GtkMenuItem" id="datasetmenuitem">
+ <property name="sensitive">False</property>
<property name="label" translatable="yes">_Data Set Dialog</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="mainwindow_on_datasetmenuitem_activate" last_modification_time="Thu, 27 Jan 2005 21:22:36 GMT"/>
<accelerator key="d" modifiers="GDK_CONTROL_MASK" signal="activate"/>
</widget>
</child>
<child>
<widget class="GtkMenuItem" id="importmenuitem">
- <property name="label" translatable="yes">_Import Dialog</property>
- <property name="use_underline">True</property>
- <signal name="activate" handler="on_importmenuitem_activate" last_modification_time="Wed, 26 Jan 2005 23:30:39 GMT"/>
- </widget>
- </child>
- </widget>
- </child>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="bookmarksmenuitem">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Bookmarks</property>
- <property name="use_underline">True</property>
-
- <child>
- <widget class="GtkMenu" id="bookmarksmenuitem_menu">
-
- <child>
- <widget class="GtkMenuItem" id="bookmark_this_location1">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="label" translatable="yes">Bookmark This Location...</property>
- <property name="use_underline">True</property>
- </widget>
- </child>
-
- <child>
- <widget class="GtkMenuItem" id="manage_bookmarks1">
- <property name="visible">True</property>
<property name="sensitive">False</property>
- <property name="label" translatable="yes">Manage Bookmarks...</property>
+ <property name="label" translatable="yes">_Import Dialog</property>
<property name="use_underline">True</property>
</widget>
</child>
-
- <child>
- <widget class="GtkSeparatorMenuItem" id="separator7">
- <property name="visible">True</property>
- </widget>
- </child>
</widget>
</child>
</widget>
@@ -475,7 +438,7 @@
<property name="is_important">False</property>
<child>
- <widget class="GtkEntry" id="addressstreetentry">
+ <widget class="GtkEntry" id="searchentry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
@@ -486,7 +449,7 @@
<property name="has_frame">True</property>
<property name="invisible_char" translatable="yes">*</property>
<property name="activates_default">True</property>
- <property name="width_chars">23</property>
+ <property name="width_chars">21</property>
</widget>
</child>
</widget>
@@ -504,7 +467,7 @@
<property name="is_important">False</property>
<child>
- <widget class="GtkButton" id="searchfindbutton">
+ <widget class="GtkButton" id="searchbutton">
<property name="visible">True</property>
<property name="can_default">True</property>
<property name="has_default">True</property>
@@ -593,7 +556,7 @@
<property name="digits">0</property>
<property name="update_policy">GTK_UPDATE_DISCONTINUOUS</property>
<property name="inverted">False</property>
- <property name="adjustment">7 1 11 1 1 1</property>
+ <property name="adjustment">8 1 11 1 1 1</property>
<signal name="value_changed" handler="on_zoomscale_value_changed" last_modification_time="Sat, 28 Aug 2004 16:55:50 GMT"/>
</widget>
</child>
@@ -700,7 +663,7 @@
<child>
<widget class="GtkHBox" id="mainwindowsidebox">
- <property name="width_request">230</property>
+ <property name="width_request">220</property>
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">0</property>
@@ -732,7 +695,7 @@
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
<child>
- <widget class="GtkTreeView" id="addressresultstreeview">
+ <widget class="GtkTreeView" id="searchresultstreeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
@@ -761,13 +724,27 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Plot results</property>
- <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92260">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">_Plot Results</span></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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -823,7 +800,7 @@
<child>
<widget class="GtkLabel" id="label23396">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="small">_Go to</span></property>
+ <property name="label" translatable="yes"><span size="small">Go to</span></property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1058,13 +1035,27 @@
<widget class="GtkCheckButton" id="checkbutton33">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">_Show position on map</property>
- <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92256">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">_Show position on map</span></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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1102,13 +1093,27 @@
<widget class="GtkCheckButton" id="checkbutton34">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Keep position _centered</property>
- <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92257">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">Keep position _centered</span></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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1121,13 +1126,27 @@
<widget class="GtkCheckButton" id="checkbutton35">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Show GPS _trail</property>
- <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92258">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">Show GPS _trail</span></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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1141,13 +1160,27 @@
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes">Stick to roads</property>
- <property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
<property name="inconsistent">False</property>
<property name="draw_indicator">True</property>
+
+ <child>
+ <widget class="GtkLabel" id="label92259">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">Stick to Roads</span></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>
+ </widget>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1174,7 +1207,7 @@
<child>
<widget class="GtkLabel" id="label92240">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>GPS Options</b></property>
+ <property name="label" translatable="yes"><span size="small"><b>GPS Options</b></span></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1277,7 +1310,7 @@
<child>
<widget class="GtkLabel" id="label23394">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Points of Interest</b></property>
+ <property name="label" translatable="yes"><span size="small"><b>Points of Interest</b></span></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1345,7 +1378,7 @@
<child>
<widget class="GtkLabel" id="label23395">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Map Layers</b></property>
+ <property name="label" translatable="yes"><span size="small"><b>Map Layers</b></span></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1377,7 +1410,7 @@
<child>
<widget class="GtkLabel" id="sideboxnotebookdrawlabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span size="small">_3. Points</span></property>
+ <property name="label" translatable="yes"><span size="small">_3. POI</span></property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1393,6 +1426,45 @@
<property name="type">tab</property>
</packing>
</child>
+
+ <child>
+ <widget class="GtkLabel" id="label92262">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Coming Soon?</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>
+ </widget>
+ <packing>
+ <property name="tab_expand">False</property>
+ <property name="tab_fill">True</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label92261">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span size="small">_4. Draw</span></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.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="type">tab</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -1877,7 +1949,7 @@
</widget>
<widget class="GtkWindow" id="gotowindow">
- <property name="border_width">4</property>
+ <property name="border_width">8</property>
<property name="title" translatable="yes">Go To</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
@@ -1887,7 +1959,7 @@
<property name="decorated">True</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">False</property>
- <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<child>
@@ -1897,93 +1969,6 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkVBox" id="vbox8787">
- <property name="homogeneous">False</property>
- <property name="spacing">8</property>
-
- <child>
- <widget class="GtkHBox" id="hbox29">
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkLabel" id="label23333">
- <property name="visible">True</property>
- <property name="label" translatable="yes">_Sets: </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>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkComboBox" id="combobox3">
- <property name="visible">True</property>
- <property name="items" translatable="yes">
-Two</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
- <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_AUTOMATIC</property>
- <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
-
- <child>
- <widget class="GtkTreeView" id="knownlocationtreeview">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="has_focus">True</property>
- <property name="headers_visible">True</property>
- <property name="rules_hint">False</property>
- <property name="reorderable">False</property>
- <property name="enable_search">True</property>
- <signal name="row_activated" handler="gotowindow_on_knownlocationtreeview_row_activated" last_modification_time="Sat, 15 Jan 2005 07:17:01 GMT"/>
- </widget>
- </child>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</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="GtkHBox" id="hbox7">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -2127,7 +2112,7 @@
<child>
<widget class="GtkButton" id="button10">
<property name="visible">True</property>
- <property name="label">gtk-close</property>
+ <property name="label">gtk-cancel</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">False</property>
- Previous message: [cairo-commit] roadster ChangeLog,1.33,1.34
- Next message: [cairo-commit] roadster/src map_draw_cairo.c, NONE,
1.1 map_draw_cairo.h, NONE, 1.1 map_draw_gdk.c, NONE,
1.1 map_draw_gdk.h, NONE, 1.1
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list