[cairo-commit] roadster ChangeLog,1.11,1.12 roadster.glade,1.3,1.4
Ian McIntosh
commit at pdx.freedesktop.org
Tue Feb 22 09:33:16 PST 2005
- Previous message: [cairo-commit] roadster/src Makefile.am, 1.2, 1.3 databasewindow.c,
1.1.1.1, 1.2 datasetwindow.c, 1.1.1.1, 1.2 db.c, 1.4,
1.5 geometryset.c, 1.3, 1.4 gotowindow.c, 1.1.1.1,
1.2 gpsclient.c, 1.1.1.1, 1.2 import.c, 1.3,
1.4 import_tiger.c, 1.4, 1.5 importwindow.c, 1.2,
1.3 locationset.c, 1.2, 1.3 mainwindow.c, 1.3, 1.4 map.c, 1.4,
1.5 scenemanager.c, 1.2, 1.3 search.c, 1.1.1.1,
1.2 search_location.c, 1.2, 1.3 search_road.c, 1.4,
1.5 searchwindow.c, 1.2, 1.3 util.c, 1.1.1.1,
1.2 welcomewindow.c, 1.1.1.1, 1.2
- Next message: [cairo-commit] roadster/include import.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Committed by: ian
Update of /cvs/cairo/roadster
In directory gabe:/tmp/cvs-serv1064
Modified Files:
ChangeLog roadster.glade
Log Message:
* import_tiger.c: Added extracting of polygon labels.
* map.c: Added polygon label drawing.
Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/roadster/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog 22 Feb 2005 17:12:23 -0000 1.11
+++ ChangeLog 22 Feb 2005 17:33:14 -0000 1.12
@@ -1,3 +1,8 @@
+2005-02-22 Ian McIntosh <ian_mcintosh at linuxadvocate.org>
+
+ * import_tiger.c: Added extracting of polygon labels.
+ * map.c: Added polygon label drawing.
+
2005-02-22 Carl Worth <cworth at cworth.org>
* configure.in:
Index: roadster.glade
===================================================================
RCS file: /cvs/cairo/roadster/roadster.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- roadster.glade 22 Feb 2005 04:47:24 -0000 1.3
+++ roadster.glade 22 Feb 2005 17:33:14 -0000 1.4
@@ -53,7 +53,7 @@
<signal name="activate" handler="on_import_maps_activate" last_modification_time="Tue, 25 Jan 2005 19:06:57 GMT"/>
<child internal-child="image">
- <widget class="GtkImage" id="image9516">
+ <widget class="GtkImage" id="image9524">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -74,7 +74,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image9517">
+ <widget class="GtkImage" id="image9525">
<property name="visible">True</property>
<property name="stock">gtk-open</property>
<property name="icon_size">1</property>
@@ -213,7 +213,7 @@
<accelerator key="g" modifiers="GDK_CONTROL_MASK" signal="activate"/>
<child internal-child="image">
- <widget class="GtkImage" id="image9518">
+ <widget class="GtkImage" id="image9526">
<property name="visible">True</property>
<property name="stock">gtk-jump-to</property>
<property name="icon_size">1</property>
@@ -252,6 +252,44 @@
</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>
+ <signal name="activate" handler="on_bookmarksmenuitem_activate" last_modification_time="Tue, 22 Feb 2005 05:43:22 GMT"/>
+
+ <child>
+ <widget class="GtkMenu" id="bookmarksmenuitem_menu">
+
+ <child>
+ <widget class="GtkMenuItem" id="bookmark_this_location1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Bookmark This Location...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_bookmark_this_location1_activate" last_modification_time="Tue, 22 Feb 2005 06:37:55 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkMenuItem" id="manage_bookmarks1">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Manage Bookmarks...</property>
+ <property name="use_underline">True</property>
+ <signal name="activate" handler="on_manage_bookmarks1_activate" last_modification_time="Tue, 22 Feb 2005 06:37:55 GMT"/>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkSeparatorMenuItem" id="separator7">
+ <property name="visible">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ </child>
+
+ <child>
<widget class="GtkMenuItem" id="helpmenu">
<property name="visible">True</property>
<property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
@@ -1880,7 +1918,6 @@
<child>
<widget class="GtkVBox" id="vbox8787">
- <property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">8</property>
@@ -1958,60 +1995,60 @@
<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>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="hbox7">
+ <widget class="GtkHBox" id="hbox18">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox18">
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">4</property>
-
- <child>
- <widget class="GtkLabel" id="label34">
- <property name="visible">True</property>
- <property name="label" translatable="yes">L_atitude:</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="mnemonic_widget">latitudeentry</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">L_atitude:</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="mnemonic_widget">latitudeentry</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkEntry" id="latitudeentry">
- <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">13</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">True</property>
- <property name="width_chars">9</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkEntry" id="latitudeentry">
+ <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">13</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">9</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2019,72 +2056,72 @@
<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="GtkHBox" id="hbox19">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">4</property>
<child>
- <widget class="GtkHBox" id="hbox19">
+ <widget class="GtkLabel" id="label35">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">4</property>
-
- <child>
- <widget class="GtkLabel" id="label35">
- <property name="visible">True</property>
- <property name="label" translatable="yes">L_ongitude:</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="mnemonic_widget">longitudeentry</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">L_ongitude:</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="mnemonic_widget">longitudeentry</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
- <child>
- <widget class="GtkEntry" id="longitudeentry">
- <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">13</property>
- <property name="text" translatable="yes"></property>
- <property name="has_frame">True</property>
- <property name="invisible_char" translatable="yes">*</property>
- <property name="activates_default">True</property>
- <property name="width_chars">9</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
+ <child>
+ <widget class="GtkEntry" id="longitudeentry">
+ <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">13</property>
+ <property name="text" translatable="yes"></property>
+ <property name="has_frame">True</property>
+ <property name="invisible_char" translatable="yes">*</property>
+ <property name="activates_default">True</property>
+ <property name="width_chars">9</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</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="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
- Previous message: [cairo-commit] roadster/src Makefile.am, 1.2, 1.3 databasewindow.c,
1.1.1.1, 1.2 datasetwindow.c, 1.1.1.1, 1.2 db.c, 1.4,
1.5 geometryset.c, 1.3, 1.4 gotowindow.c, 1.1.1.1,
1.2 gpsclient.c, 1.1.1.1, 1.2 import.c, 1.3,
1.4 import_tiger.c, 1.4, 1.5 importwindow.c, 1.2,
1.3 locationset.c, 1.2, 1.3 mainwindow.c, 1.3, 1.4 map.c, 1.4,
1.5 scenemanager.c, 1.2, 1.3 search.c, 1.1.1.1,
1.2 search_location.c, 1.2, 1.3 search_road.c, 1.4,
1.5 searchwindow.c, 1.2, 1.3 util.c, 1.1.1.1,
1.2 welcomewindow.c, 1.1.1.1, 1.2
- Next message: [cairo-commit] roadster/include import.h,1.2,1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the cairo-commit
mailing list