#
AC_INIT(Makefile.am)
-AM_INIT_AUTOMAKE(maemo-mapper, 1.4.2)
+AM_INIT_AUTOMAKE(maemo-mapper, 1.4.3)
AC_PROG_CPP
AC_CONFIG_HEADERS(src/config.h)
icon_scalabledir=$datadir/icons/hicolor/scalable/hildon
# Help file install directory
-helpfile_engbdir=$datadir/osso-help/en_US
+helpfile_enusdir=$datadir/osso-help/en_US
+AC_SUBST(helpfile_enusdir)
+helpfile_engbdir=$datadir/osso-help/en_GB
+AC_SUBST(helpfile_engbdir)
# Hildon control panel plugin install directories
pluginlibdir=`$PKG_CONFIG hildon-control-panel --variable=plugindir`
AC_SUBST(icon_scalabledir)
AC_SUBST(pluginlibdir)
AC_SUBST(plugindesktopentrydir)
-AC_SUBST(helpfile_engbdir)
AC_DEFINE_UNQUOTED([LOCALEDIR], "${localedir}", [Runtime locale catalog files path])
AC_DEFINE_UNQUOTED([PIXMAPDIR], "${pixmapdir}", [Runtime pixmap files path])
Makefile \
src/Makefile \
data/Makefile \
+ data/help/Makefile \
po/Makefile.in \
po/Makefile
)
icon_40x40_DATA = icons/40x40/maemo-mapper.png
icon_scalable_DATA = icons/scalable/maemo-mapper.png
-helpfile_engb_DATA = help/en_US/maemomapper.xml
+EXTRA_DIST = $(serviceentry_DATA) $(desktopentry_DATA) $(icon_26x26_DATA) $(icon_40x40_DATA) $(icon_scalable_DATA)
-EXTRA_DIST = $(serviceentry_DATA) $(desktopentry_DATA) $(icon_26x26_DATA) $(icon_40x40_DATA) $(icon_scalable_DATA) $(helpfile_engb_DATA)
+SUBDIRS = help
--- /dev/null
+#
+# This file is part of maemo-mapper
+#
+# Copyright (C) 2006 John Costigan.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+
+helpfile_enus_DATA = en_US/maemomapper.xml
+helpfile_engb_DATA = en_GB/maemomapper.xml
+
+EXTRA_DIST = $(helpfile_engb_DATA) $(helpfile_engb_DATA)
+
+# Replace version in help files
+%.xml: %.xml.in
+ sed "s/__VERSION__/$(VERSION)/g" $< >$@
+
<display_text>Show Distance to Next Waypoint</display_text> - Show
the distance left to be traveled (along the current route) until
the next waypoint.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>Show Distance to End of Route</display_text> - Show
the end of the current route. The calculated distance includes
the distance between breaks in the route (i.e. between the end of
one route segment and the beginning of another route segment).
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>Reset</display_text> - Reset Maemo Mapper's tracking
<display_text>Save...</display_text> - Save the current track to a
GPX file on the file system.
</listitem>
+ <listitem>
+ <display_text>Insert Break</display_text> - Artificially insert a
+ break in your current track data. This simulates the loss and
+ re-acquisition of a GPS fix, and it can be used to track, for
+ example, refueling stops.
+ </listitem>
<listitem>
<display_text>Insert Mark</display_text> - Artificially insert a
- mark in your current track data. This can be used to track, for
- example, refueling stops. Note that Maemo Mapper automatically
- inserts marks when contact with a GPS receiver is established or
- lost.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
+ mark with a description in your current track data. This can be
+ used to mark important landmarks.
</listitem>
<listitem>
- <display_text>Show Distance from Last Mark</display_text> - Show
+ <display_text>Show Distance from Last Break</display_text> - Show
the distance traveled (along the current track) since the last
- mark.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
+ break.
</listitem>
<listitem>
<display_text>Show Distance from Beginning</display_text> - Show
beginning of the track. The calculated distance includes the
distance between breaks in the track (i.e. between when a GPS fix
is lost and later re-acquired).
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>Clear</display_text> - Clear the current track,
items:
</para>
<list>
+ <listitem>
+ <display_text>Zoom In</display_text> - Zoom in by one zoom level.
+ You can also use the <graphic
+ filename="2686KEY_zoom_in"/> button.
+ </listitem>
+ <listitem>
+ <display_text>Zoom Out</display_text> - Zoom out by one zoom
+ level. You can also use the <graphic
+ filename="2686KEY_zoom_out"/> button.
+ </listitem>
<listitem>
<display_text>Full Screen</display_text> - Toggle full-screen
mode. You can also use the <graphic
- filename="2686KEY_zoom_full_screen"/> button to toggle
- full-screen mode.
+ filename="2686KEY_full_screen"/> button to toggle
+ full-screen mode.
+ </listitem>
+ <listitem>
+ <display_text>Scale</display_text> - Toggle the display of the
+ scale.
</listitem>
<listitem>
<display_text>Route</display_text> - Toggle the display of routes.
</listitem>
<listitem>
<display_text>POIs</display_text> - Toggle the display of POIs.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>POI Categories...</display_text> - Define POI
with a GPS receiver. You must have a GPS receiver set up in order
to use this menu item. When on, Maemo Mapper will constantly
search for the GPS receiver.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>Show Information</display_text> - Toggle display of
additional information provided by the GPS receiver. This
information will appear in the main display as a panel on the
left.
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
<listitem>
<display_text>Details...</display_text> - Show even more
to your /etc/sudoers file (if you don't know what that means,
don't try it): <b>user ALL = NOPASSWD: /usr/sbin/hciconfig hci0
reset</b>
- This action can be assigned to the <graphic
- filename="2686KEY_esc"/> key.
</listitem>
</list>
<heading>Other</heading>
refid="help_maemomapper_settings" refdoc="Settings"/>.
</listitem>
<listitem>
- <display_text>Help</display_text> - Access this help file.
+ <display_text>Help...</display_text> - Access this help file.
+ </listitem>
+ <listitem>
+ <display_text>About...</display_text> - Display version and
+ copyright information.
</listitem>
<listitem>
<display_text>Close</display_text> - Close Maemo Mapper.
<display_text>Download Zoom Steps</display_text> ensures that you
see all maps at their native resolution.
</listitem>
+ <listitem>
+ <display_text>Double Pixels</display_text> - This forces Maemo
+ Mapper to avoid using the native resolution of any maps, instead
+ using pixel-doubling. This is useful if your repository's maps
+ contain small, hard-to-read text, and you want to double the size
+ of the images to make them more readable. This setting can also
+ affect the zoom levels that are downloaded when Auto-Download is
+ enabled.
+ </listitem>
+ <listitem>
+ <display_text>Next-able</display_text> - This oddly-named option
+ determines whether or not the "Select Next Repository" action
+ (which can be mapped to any of the hardware keys) will be able to
+ select this repository. When unset, the "Select Next Repository"
+ action will simply skip over this repository.
+ </listitem>
</list>
<para>
In addition to the per-repository controls, there are a few buttons
<listitem>
<display_text>New...</display_text> - Adds a new repository.
</listitem>
+ <listitem>
+ <display_text>Reset...</display_text> - Resets your repository
+ list to the factory default. This will remove all of your
+ repositories and replace them with the single default repository
+ that comes with Maemo Mapper.
+ </listitem>
<listitem>
<display_text>Download...</display_text> - Downloads information
about several preset repositories, and adds them to your
<para>
The <display_text>Settings</display_text> dialog (accessible from
the main menu) provides access to a plethora of configurable options
- that control how Maemo Mapper appears and runs. In addition to the
- <display_text>Colors...</display_text> button (which allows you to
- customize the colors that are used for drawing on-map objects), there
- are several tabs in the dialog, each of which tries to group sets of
- related options.
+ that control how Maemo Mapper appears and runs. In addition to the
+ tabs, which are described below, there are also two buttons at the
+ bottom of the diagram labeled <display_text>Hardware
+ Keys...</display_text> and <display_text>Colors...</display_text>.
+ </para>
+ <para>
+ The <display_text>Hardware Keys...</display_text> button brings up
+ another dialog box, which allows you to customize the actions that
+ each hardware key causes. For example, you can map the
+ <graphic filename="2686KEY_esc"/> button to cycle through map
+ repositories, giving you quick access to switching among them.
+ </para>
+ <para>
+ The <display_text>Colors...</display_text> button allows you to
+ customize the colors that are used for drawing on-map objects.
</para>
<heading>GPS</heading>
<para>
will only keep the screen on in full screen mode.
</listitem>
<listitem>
- <display_text>Escape Key</display_text> - The <graphic
- filename="2686KEY_esc"/> key can be programmed to perform any
- number of functions. All of these functions are available from
- the main menu, except for <display_text>Toggle Speed
- Limit</display_text>, which is available from the
- <display_text>Settings</display_text> dialog.
+ <display_text>Information Font Size</display_text> - Controls the
+ font size for all information that is popped up to the user in the
+ upper-right corner, including waypoint descriptions.
</listitem>
<listitem>
<display_text>Units</display_text> - Controls the units in which
<display_text>Location</display_text> - Controls the location on
the screen of the speed warning.
</listitem>
- <listitem>
- <display_text>Information Font Size</display_text> - Controls the
- font size for all information that is popped up to the user in the
- upper-right corner, including waypoint descriptions.
- </listitem>
</list>
<heading>POI</heading>
<para>
</listitem>
</list>
</topic>
+ <topic>
+ <topictitle>About Maemo Mapper</topictitle>
+ <context contextUID="help_maemomapper_about"/>
+ <para>
+ Current Version: __VERSION__
+ </para>
+ <para>
+ Maemo Mapper was created and developed by John Costigan (aka
+ <display_text>gnuite</display_text>).
+ </para>
+ <para>
+ Copyright © 2006-2007 John Costigan.
+ </para>
+ <para>
+ POI and GPS-Info code originally written by Cezary Jackiewicz.
+ </para>
+ <para>
+ Default map data provided by http://www.openstreetmap.org/ - other
+ map repositories are subject to their own licenses and may or may not
+ be suitable for use with Maemo Mapper. It may be illegal to use a
+ certain repository with Maemo Mapper or under certain conditions. This
+ includes the repositories downloadable directly in Maemo Mapper. If
+ you are not sure if you are legally allowed to use a particular
+ repository, you should delete it from your list of repositories. The
+ authors of Maemo Mapper cannot be held responsible for your use of a
+ particular repository.
+ </para>
+ <para>
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ </para>
+ <para>
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+ </para>
+ <para>
+ You should have received a copy of the GNU General Public License along
+ with this program; if not, write to the Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ </para>
+ </topic>
</folder>
</ossohelpsource>
+maemo-mapper (1.4.3) unstable; urgency=low
+
+ * Fixed bug that caused announcements to be late.
+ * Fixed bug with WMS repositories.
+ * Added native support for OpenStreetMap; made it the default repo.
+ * Added support for remapping all of the hardware keys. In doing so, I
+ removed the "Escape Key"-specific stuff in Misc. 2, and cleaned up that
+ tab a little bit (i.e. moved Info Font Size to Misc. [1]).
+ * Added Zoom In/Out buttons to the View menu.
+ * Added a scale.
+ * Added an About page with version information.
+ * Added a "Double Pixels" option for repositories; if enabled, maps will be
+ shown at a minimum of double the pixel size, for those who don't want to
+ squint.
+ * Added a "Next-able" option for repositories, which controls whether or not
+ the repository is selectable via the "Select Next Repository" shortcut.
+ * Changed "Track Mark" functionality back to old "Track Break" name.
+ * Added the ability to add waypoint-like "Marks" to the track. Marks are
+ like Track Breaks, except that you can give a description.
+ * Added some additional "first time running Maemo Mapper" help.
+ * Reorganized the track and route code.
+ * Modified timestamp to use GPS time if available.
+ * Changed old recursive-make-dir code to just use g_makdir_with_parents.
+ * Changed Repo Manager to support using ~ in the cache dir.
+
+ -- John Costigan <gnuite@gmail.com> Mon, 12 Mar 2007 02:19:00 -0400
+
maemo-mapper (1.4.2) unstable; urgency=low
* Updated the fi_FI locale and added msgid's for POI categories.
msgstr ""
"Project-Id-Version: maemo-mapper 1.2.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 16:40-0500\n"
+"POT-Creation-Date: 2007-03-12 01:23-0400\n"
"PO-Revision-Date: 2006-10-28 22:19-0400\n"
"Last-Translator: David Davidov <dave@del.bg>\n"
"Language-Team: John Costigan <gnuite@gmail.com>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/maemo-mapper.c:11990
+#: ../src/maemo-mapper.c:12323
msgid "# POIs"
msgstr ""
-#: ../src/maemo-mapper.c:11939
+#: ../src/maemo-mapper.c:6186
+#, fuzzy
+msgid "About..."
+msgstr "относно"
+
+#: ../src/maemo-mapper.c:12272
msgid "Add"
msgstr "Добави"
-#: ../src/maemo-mapper.c:11678
+#: ../src/maemo-mapper.c:12011
msgid "Add Category"
msgstr "Добави категория"
-#: ../src/maemo-mapper.c:12341
+#: ../src/maemo-mapper.c:12674
msgid "Add POI"
msgstr "Добави POI"
-#: ../src/maemo-mapper.c:6494 ../src/maemo-mapper.c:6523
+#: ../src/maemo-mapper.c:6318 ../src/maemo-mapper.c:6347
#, fuzzy
msgid "Add POI..."
msgstr "Добави POI..."
-#: ../src/maemo-mapper.c:6490 ../src/maemo-mapper.c:6545
+#: ../src/maemo-mapper.c:6314 ../src/maemo-mapper.c:6369
msgid "Add Route Point"
msgstr "Добави Route Point"
-#: ../src/maemo-mapper.c:12631
+#: ../src/maemo-mapper.c:12964
#, fuzzy
msgid "Add Waypoint"
msgstr "Добави Точки по пътя"
-#: ../src/maemo-mapper.c:6492 ../src/maemo-mapper.c:6547
+#: ../src/maemo-mapper.c:6316 ../src/maemo-mapper.c:6371
#, fuzzy
msgid "Add Waypoint..."
msgstr "Добави Точки по пътя..."
-#: ../src/maemo-mapper.c:5166
+#: ../src/maemo-mapper.c:4936
msgid "Advance Notice"
msgstr "Придвижване инфо"
-#: ../src/maemo-mapper.c:11202
+#: ../src/maemo-mapper.c:11486
msgid "Along Route - Radius (tiles):"
msgstr "Около маршрут - Радиус (блокчета):"
-#: ../src/maemo-mapper.c:2978
+#: ../src/maemo-mapper.c:2764
msgid "Altitude"
msgstr "Височина"
-#: ../src/maemo-mapper.c:4773
+#: ../src/maemo-mapper.c:4426
msgid "An error occurred while attempting to scan for bluetooth devices."
msgstr ""
-#: ../src/maemo-mapper.c:10596
+#: ../src/maemo-mapper.c:10888
msgid ""
"An error occurred while retrieving the repositories. The web service may be "
"temporarily down."
msgstr ""
-#: ../src/maemo-mapper.c:8477
+#: ../src/maemo-mapper.c:8475
msgid ""
"An error occurred while trying to reset the bluetooth radio.\n"
"\n"
"Променихте ли файла\n"
"/etc/sudoers?"
-#: ../src/maemo-mapper.c:5162
+#: ../src/maemo-mapper.c:4932
msgid "Announce"
msgstr "Анонси"
-#: ../src/maemo-mapper.c:11239
+#: ../src/maemo-mapper.c:11523
msgid "Area"
msgstr "Зона"
-#: ../src/maemo-mapper.c:5131 ../src/maemo-mapper.c:6310
+#: ../src/maemo-mapper.c:4901 ../src/maemo-mapper.c:6122
msgid "Auto-Center"
msgstr "Авто-Центр."
-#: ../src/maemo-mapper.c:10091
+#: ../src/maemo-mapper.c:10307
msgid "Auto-Center Mode: Lat/Lon"
msgstr "Авто-Центриране: Дълж/Шир"
-#: ../src/maemo-mapper.c:10076
+#: ../src/maemo-mapper.c:10292
msgid "Auto-Center Mode: Lead"
msgstr "Авто-Центриране: Изпреварващо"
-#: ../src/maemo-mapper.c:10105
+#: ../src/maemo-mapper.c:10321
msgid "Auto-Center Off"
msgstr "Авто-Центриране Изкл."
-#: ../src/maemo-mapper.c:6270
+#: ../src/maemo-mapper.c:6072
msgid "Auto-Download"
msgstr "Авто-Изтегляне"
-#: ../src/maemo-mapper.c:9572
+#: ../src/maemo-mapper.c:9680
msgid "Auto-Update"
msgstr "Авто-Обновяване"
-#: ../src/maemo-mapper.c:8052
+#: ../src/maemo-mapper.c:7969
#, fuzzy
msgid "Bottom-Left"
msgstr "Долу/Дясно"
-#: ../src/maemo-mapper.c:8051 ../src/maemo-mapper.c:11306
+#: ../src/maemo-mapper.c:7968 ../src/maemo-mapper.c:11590
msgid "Bottom-Right"
msgstr "Долу/Дясно"
-#: ../src/maemo-mapper.c:5349 ../src/maemo-mapper.c:10473
+#: ../src/maemo-mapper.c:3700
+msgid "Break already inserted."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5097 ../src/maemo-mapper.c:10695
msgid "Browse..."
msgstr "Избор..."
-#: ../src/maemo-mapper.c:3160
+#: ../src/maemo-mapper.c:2946
msgid "Bus stops, airports, train stations, etc."
msgstr ""
-#: ../src/maemo-mapper.c:3165
+#: ../src/maemo-mapper.c:2951
msgid "Business"
msgstr ""
-#: ../src/maemo-mapper.c:11193
+#: ../src/maemo-mapper.c:11477
msgid "By Area (see tab)"
msgstr "Зона (виж таб)"
-#: ../src/maemo-mapper.c:10463
+#: ../src/maemo-mapper.c:10685
msgid "Cache Dir."
msgstr "Кеш Директория"
-#: ../src/maemo-mapper.c:10409
+#: ../src/maemo-mapper.c:10626
msgid ""
"Cannot delete the last repository - there must be at lease one repository."
msgstr "Не мога да изтрия последното хранилище - трябва да остане поне едно."
-#: ../src/maemo-mapper.c:11473
+#: ../src/maemo-mapper.c:11795
msgid ""
"Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."
msgstr ""
"Не мога да разреша GPS докато не е посочен MAC адреса на приемника в "
"Настрийки."
-#: ../src/maemo-mapper.c:12191 ../src/maemo-mapper.c:12378
+#: ../src/maemo-mapper.c:12524 ../src/maemo-mapper.c:12711
msgid "Category"
msgstr "Категория"
-#: ../src/maemo-mapper.c:6239 ../src/maemo-mapper.c:6257
-#: ../src/maemo-mapper.c:11146
+#: ../src/maemo-mapper.c:6039 ../src/maemo-mapper.c:6059
+#: ../src/maemo-mapper.c:11430
msgid "Clear"
msgstr "Изчистване"
-#: ../src/maemo-mapper.c:6374
+#: ../src/maemo-mapper.c:6188
msgid "Close"
msgstr "Затваряне"
-#: ../src/maemo-mapper.c:4899
+#: ../src/maemo-mapper.c:4647
msgid "Colors"
msgstr "Цветове"
-#: ../src/maemo-mapper.c:5090
+#: ../src/maemo-mapper.c:4860
msgid "Colors..."
msgstr "Цветове..."
-#: ../src/maemo-mapper.c:10908 ../src/maemo-mapper.c:10995
+#: ../src/maemo-mapper.c:11192 ../src/maemo-mapper.c:11279
msgid "Confirm DELETION of"
msgstr "Потвърдете ИЗТРИВАНЕ на"
-#: ../src/maemo-mapper.c:10416
+#: ../src/maemo-mapper.c:10633
msgid "Confirm delete of repository"
msgstr "Потвърдете изтриване хранилище"
-#: ../src/maemo-mapper.c:13034
+#: ../src/maemo-mapper.c:13335
msgid "Confirm delete of waypoint"
msgstr "Потвърдете изтриване на точка по пътя"
-#: ../src/maemo-mapper.c:10914 ../src/maemo-mapper.c:11001
+#: ../src/maemo-mapper.c:11198 ../src/maemo-mapper.c:11285
msgid "Confirm download of"
msgstr "Потвърдете изтегляне на"
-#: ../src/maemo-mapper.c:6513
+#: ../src/maemo-mapper.c:4583
+msgid "Continue?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6337
#, fuzzy
msgid "Copy Description"
msgstr "Описание"
-#: ../src/maemo-mapper.c:6482 ../src/maemo-mapper.c:6511
+#: ../src/maemo-mapper.c:6306 ../src/maemo-mapper.c:6335
#, fuzzy
msgid "Copy Lat/Lon"
msgstr "Покажи Шир/Дълж"
-#: ../src/maemo-mapper.c:9709
+#: ../src/maemo-mapper.c:9817
msgid ""
"Could not generate directions. Make sure your source and destination are "
"valid."
msgstr ""
"Не мога да генерирам инструкции. Моля проверета адресите на крайните точки."
-#: ../src/maemo-mapper.c:12709
+#: ../src/maemo-mapper.c:13043
msgid ""
"Creating a \"waypoint\" with no description actually adds a break point. Is "
"that what you want?"
msgstr ""
-#: ../src/maemo-mapper.c:2389
+#: ../src/maemo-mapper.c:2239
msgid "DGPS"
msgstr ""
-#: ../src/maemo-mapper.c:4905
-msgid "Defaults"
-msgstr "Възстановяване"
-
-#: ../src/maemo-mapper.c:5277
+#: ../src/maemo-mapper.c:5035
msgid "Degrees Format"
msgstr ""
-#: ../src/maemo-mapper.c:11659 ../src/maemo-mapper.c:12316
+#: ../src/maemo-mapper.c:11992 ../src/maemo-mapper.c:12649
msgid "Delete"
msgstr "Изтриване"
-#: ../src/maemo-mapper.c:11183
+#: ../src/maemo-mapper.c:11467
msgid "Delete Maps"
msgstr "Изтриване Карти"
-#: ../src/maemo-mapper.c:12032
+#: ../src/maemo-mapper.c:12365
msgid "Delete POI?"
msgstr "Изтриване POI?"
-#: ../src/maemo-mapper.c:11580
+#: ../src/maemo-mapper.c:11913
msgid "Delete category?"
msgstr "Изтриване категория?"
-#: ../src/maemo-mapper.c:6520 ../src/maemo-mapper.c:10676
+#: ../src/maemo-mapper.c:6344 ../src/maemo-mapper.c:10981
msgid "Delete..."
msgstr "Изтриване..."
-#: ../src/maemo-mapper.c:4761 ../src/maemo-mapper.c:11697
-#: ../src/maemo-mapper.c:11985 ../src/maemo-mapper.c:12405
-#: ../src/maemo-mapper.c:12657
+#: ../src/maemo-mapper.c:4414 ../src/maemo-mapper.c:10069
+#: ../src/maemo-mapper.c:12030 ../src/maemo-mapper.c:12318
+#: ../src/maemo-mapper.c:12738 ../src/maemo-mapper.c:12989
msgid "Description"
msgstr "Описание"
-#: ../src/maemo-mapper.c:9600
+#: ../src/maemo-mapper.c:9708
msgid "Destination"
msgstr "Край"
-#: ../src/maemo-mapper.c:6359
+#: ../src/maemo-mapper.c:6171
msgid "Details..."
msgstr "Подробности..."
-#: ../src/maemo-mapper.c:3153
+#: ../src/maemo-mapper.c:2939
msgid "Dining"
msgstr ""
-#: ../src/maemo-mapper.c:3528 ../src/maemo-mapper.c:3588
-#: ../src/maemo-mapper.c:12598
+#: ../src/maemo-mapper.c:3314 ../src/maemo-mapper.c:3374
+#: ../src/maemo-mapper.c:12931
#, fuzzy
msgid "Distance"
msgstr "Покажи разстояние до"
-#: ../src/maemo-mapper.c:11170
+#: ../src/maemo-mapper.c:10752
+msgid "Double Pixels"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11454
msgid "Download Maps"
msgstr "Изтегляне Карти"
-#: ../src/maemo-mapper.c:9532
+#: ../src/maemo-mapper.c:9640
msgid "Download Route"
msgstr "Изтегляне Маршрут"
-#: ../src/maemo-mapper.c:6487 ../src/maemo-mapper.c:6518
-#: ../src/maemo-mapper.c:6542
+#: ../src/maemo-mapper.c:6311 ../src/maemo-mapper.c:6342
+#: ../src/maemo-mapper.c:6366
msgid "Download Route to..."
msgstr "Изтегляне на маршрут в..."
-#: ../src/maemo-mapper.c:10478
+#: ../src/maemo-mapper.c:10715
msgid "Download Zoom Steps"
msgstr "Изтегляне Мащаб Стъпки"
-#: ../src/maemo-mapper.c:6229 ../src/maemo-mapper.c:10657
+#: ../src/maemo-mapper.c:6029 ../src/maemo-mapper.c:10962
msgid "Download..."
msgstr "Изтегляне..."
-#: ../src/maemo-mapper.c:6960
+#: ../src/maemo-mapper.c:6827
msgid "Downloading maps"
msgstr "Изтегляне карти"
-#: ../src/maemo-mapper.c:11936
+#: ../src/maemo-mapper.c:12269
msgid "Edit"
msgstr "Редакт."
-#: ../src/maemo-mapper.c:12401
+#: ../src/maemo-mapper.c:12734
msgid "Edit Categories..."
msgstr "Редакт. категории..."
-#: ../src/maemo-mapper.c:11653
+#: ../src/maemo-mapper.c:11986
msgid "Edit Category"
msgstr "Редакт. категория"
-#: ../src/maemo-mapper.c:12310
+#: ../src/maemo-mapper.c:12643
msgid "Edit POI"
msgstr "Редакт. POI"
-#: ../src/maemo-mapper.c:3164
+#: ../src/maemo-mapper.c:2950
msgid "Elementary schools, college campuses, etc."
msgstr ""
-#: ../src/maemo-mapper.c:6351
+#: ../src/maemo-mapper.c:6163
msgid "Enable GPS"
msgstr "Използвай GPS"
-#: ../src/maemo-mapper.c:5178
+#: ../src/maemo-mapper.c:4948
msgid "Enable Voice Synthesis (requires flite)"
msgstr "Разреши гласов синтез (изисква flite)"
-#: ../src/maemo-mapper.c:11721 ../src/maemo-mapper.c:11973
+#: ../src/maemo-mapper.c:12054 ../src/maemo-mapper.c:12306
msgid "Enabled"
msgstr "Разреши"
-#: ../src/maemo-mapper.c:7212
+#: ../src/maemo-mapper.c:7064
msgid ""
"Error in download. Check internet connection and/or Map Repository URL "
"Format."
msgstr ""
-#: ../src/maemo-mapper.c:8229 ../src/maemo-mapper.c:9765
-#: ../src/maemo-mapper.c:9808 ../src/maemo-mapper.c:9883
+#: ../src/maemo-mapper.c:8227 ../src/maemo-mapper.c:9873
+#: ../src/maemo-mapper.c:9917 ../src/maemo-mapper.c:9991
msgid "Error parsing GPX file."
msgstr "Грешка при разчитане (parsing) GPX файл."
-#: ../src/maemo-mapper.c:1472
+#: ../src/maemo-mapper.c:1475
msgid "Error while writing to file"
msgstr "Грешка при запис във файл"
-#: ../src/maemo-mapper.c:9905 ../src/maemo-mapper.c:9960
+#: ../src/maemo-mapper.c:10013 ../src/maemo-mapper.c:10163
msgid "Error writing GPX file."
msgstr "Грешка при запис на GPX файл."
-#: ../src/maemo-mapper.c:5239
-msgid "Escape Key"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3311
+#: ../src/maemo-mapper.c:3097
msgid "Establishing GPS fix"
msgstr "Установяване GPS фикс"
-#: ../src/maemo-mapper.c:2393
+#: ../src/maemo-mapper.c:2243
msgid "Estimated"
msgstr ""
-#: ../src/maemo-mapper.c:4065
+#: ../src/maemo-mapper.c:3836
msgid "Failed to connect to GPS receiver. Retry?"
msgstr ""
-#: ../src/maemo-mapper.c:9697
+#: ../src/maemo-mapper.c:9805
msgid "Failed to connect to GPX Directions server"
msgstr "Неуспешно свързване с GPX сървър за инструкции"
-#: ../src/maemo-mapper.c:5667
+#: ../src/maemo-mapper.c:5478
msgid "Failed to initialize GConf. Quitting."
msgstr "Неуспешна инициализация на GConf. Прекъсвам."
-#: ../src/maemo-mapper.c:4280
+#: ../src/maemo-mapper.c:3980
msgid "Failed to initialize GConf. Settings were not saved."
msgstr "Неуспешна инициализация на GConf. Запазих настройките."
-#: ../src/maemo-mapper.c:7768 ../src/maemo-mapper.c:8217
+#: ../src/maemo-mapper.c:7625 ../src/maemo-mapper.c:8216
msgid "Failed to open file for reading"
msgstr "Неуспех при отваряне за четене"
-#: ../src/maemo-mapper.c:7425 ../src/maemo-mapper.c:7769
+#: ../src/maemo-mapper.c:7282 ../src/maemo-mapper.c:7626
msgid "Failed to open file for writing"
msgstr "Неуспех при отваряне за запис"
-#: ../src/maemo-mapper.c:3178
+#: ../src/maemo-mapper.c:2964
msgid "Failed to open or create database"
msgstr "Неуспешно отваряне/създаване на база данни"
-#: ../src/maemo-mapper.c:1473
+#: ../src/maemo-mapper.c:1476
msgid "File is incomplete."
msgstr "Незавършен файл."
-#: ../src/maemo-mapper.c:3023
+#: ../src/maemo-mapper.c:2809
msgid "Fix"
msgstr "Фикс"
-#: ../src/maemo-mapper.c:3032
+#: ../src/maemo-mapper.c:2818
msgid "Fix Quality"
msgstr "Фикс качество"
-#: ../src/maemo-mapper.c:2392
+#: ../src/maemo-mapper.c:2242
msgid "Float RTK"
msgstr ""
-#: ../src/maemo-mapper.c:3149
+#: ../src/maemo-mapper.c:2935
msgid "Fuel"
msgstr ""
-#: ../src/maemo-mapper.c:6283
+#: ../src/maemo-mapper.c:6089
msgid "Full Screen"
msgstr "Пълноекранно"
-#: ../src/maemo-mapper.c:5101 ../src/maemo-mapper.c:6347
+#: ../src/maemo-mapper.c:4665 ../src/maemo-mapper.c:4871
+#: ../src/maemo-mapper.c:6159
msgid "GPS"
msgstr ""
-#: ../src/maemo-mapper.c:2926
+#: ../src/maemo-mapper.c:2712
msgid "GPS Details"
msgstr "GPS подробности"
-#: ../src/maemo-mapper.c:2939
+#: ../src/maemo-mapper.c:2725
msgid "GPS Information"
msgstr "GPS Информация"
-#: ../src/maemo-mapper.c:6339 ../src/maemo-mapper.c:11253
+#: ../src/maemo-mapper.c:6151 ../src/maemo-mapper.c:11537
msgid "GPS Location"
msgstr "GPS позиция"
-#: ../src/maemo-mapper.c:4917
-msgid "GPS Mark"
-msgstr "GPS знак"
-
-#: ../src/maemo-mapper.c:3168
+#: ../src/maemo-mapper.c:2954
msgid "General landmarks."
msgstr ""
-#: ../src/maemo-mapper.c:3166
+#: ../src/maemo-mapper.c:2952
msgid "General places of business."
msgstr ""
-#: ../src/maemo-mapper.c:6333
+#: ../src/maemo-mapper.c:6145
msgid "Go to"
msgstr ""
-#: ../src/maemo-mapper.c:10121
+#: ../src/maemo-mapper.c:10337
#, fuzzy
msgid "Go to Lat/Lon"
msgstr "Покажи Шир/Дълж"
-#: ../src/maemo-mapper.c:6550
+#: ../src/maemo-mapper.c:6374
msgid "Go to Nearest"
msgstr ""
-#: ../src/maemo-mapper.c:6527
+#: ../src/maemo-mapper.c:6351
msgid "Go to Next"
msgstr ""
-#: ../src/maemo-mapper.c:2987
+#: ../src/maemo-mapper.c:4531
+msgid "Hardware Keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4857
+msgid "Hardware Keys..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2773
msgid "Heading"
msgstr "Посока"
-#: ../src/maemo-mapper.c:6372
-msgid "Help"
+#: ../src/maemo-mapper.c:6184
+#, fuzzy
+msgid "Help..."
msgstr "Помощ"
-#: ../src/maemo-mapper.c:3152
+#: ../src/maemo-mapper.c:2938
msgid "Houses, apartments, or other residences of import."
msgstr ""
-#: ../src/maemo-mapper.c:11965
+#: ../src/maemo-mapper.c:12298
msgid "ID"
msgstr ""
-#: ../src/maemo-mapper.c:3158
+#: ../src/maemo-mapper.c:2944
msgid "Indoor or Outdoor places to have fun."
msgstr ""
-#: ../src/maemo-mapper.c:5322
+#: ../src/maemo-mapper.c:5008
#, fuzzy
msgid "Information Font Size"
msgstr "GPS Информация"
-#: ../src/maemo-mapper.c:6251
+#: ../src/maemo-mapper.c:6051
+#, fuzzy
+msgid "Insert Break"
+msgstr "Вмъкване прекъсване"
+
+#: ../src/maemo-mapper.c:10044
#, fuzzy
msgid "Insert Mark"
msgstr "Вмъкване прекъсване"
-#: ../src/maemo-mapper.c:8035
-msgid "Insert Track Mark"
-msgstr ""
+#: ../src/maemo-mapper.c:6053
+#, fuzzy
+msgid "Insert Mark..."
+msgstr "Вмъкване прекъсване"
+
+#: ../src/maemo-mapper.c:7934
+#, fuzzy
+msgid "Insert Track Break"
+msgstr "Вмъкване прекъсване"
-#: ../src/maemo-mapper.c:11417
+#: ../src/maemo-mapper.c:11703
msgid "Invalid Bottom-Right Latitude"
msgstr "Невалидна ширина долу/дясно"
-#: ../src/maemo-mapper.c:11424
+#: ../src/maemo-mapper.c:11710
msgid "Invalid Bottom-Right Longitude"
msgstr "Невалидна дължина долу/дясно"
-#: ../src/maemo-mapper.c:10177
+#: ../src/maemo-mapper.c:10393
#, fuzzy
msgid "Invalid Latitude"
msgstr "Невалидна ширина"
-#: ../src/maemo-mapper.c:10184
+#: ../src/maemo-mapper.c:10400
#, fuzzy
msgid "Invalid Longitude"
msgstr "Невалидна дължина"
-#: ../src/maemo-mapper.c:8995 ../src/maemo-mapper.c:9006
+#: ../src/maemo-mapper.c:9121 ../src/maemo-mapper.c:9132
msgid "Invalid NMEA input from receiver!"
msgstr "Невалидни NMEA данни от приемника!"
-#: ../src/maemo-mapper.c:11403
+#: ../src/maemo-mapper.c:11689
msgid "Invalid Top-Left Latitude"
msgstr "Невалидна ширина горе/ляво"
-#: ../src/maemo-mapper.c:11410
+#: ../src/maemo-mapper.c:11696
msgid "Invalid Top-Left Longitude"
msgstr "Невалидна дължина горе/ляво"
-#: ../src/maemo-mapper.c:5230
+#: ../src/maemo-mapper.c:6455
+msgid ""
+"It looks like this is your first time running Maemo Mapper. Press OK to "
+"view the the help pages. Otherwise, press Cancel to continue."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5000
msgid "Keep Display On Only in Fullscreen Mode"
msgstr "Не спирай дисплей само в пълноекранен режим"
-#: ../src/maemo-mapper.c:11689 ../src/maemo-mapper.c:11980
-#: ../src/maemo-mapper.c:12186 ../src/maemo-mapper.c:12370
+#: ../src/maemo-mapper.c:12022 ../src/maemo-mapper.c:12313
+#: ../src/maemo-mapper.c:12519 ../src/maemo-mapper.c:12703
msgid "Label"
msgstr "Етикет"
-#: ../src/maemo-mapper.c:3167
+#: ../src/maemo-mapper.c:2953
msgid "Landmark"
msgstr ""
-#: ../src/maemo-mapper.c:12360 ../src/maemo-mapper.c:12641
+#: ../src/maemo-mapper.c:10054 ../src/maemo-mapper.c:12693
+#: ../src/maemo-mapper.c:12974
#, fuzzy
msgid "Lat, Lon"
msgstr "Шир, Дълж"
-#: ../src/maemo-mapper.c:6314
+#: ../src/maemo-mapper.c:6126
msgid "Lat/Lon"
msgstr "Шир/Дълж"
-#: ../src/maemo-mapper.c:6337
+#: ../src/maemo-mapper.c:6149
#, fuzzy
msgid "Lat/Lon..."
msgstr "Шир/Дълж..."
-#: ../src/maemo-mapper.c:2951 ../src/maemo-mapper.c:10131
-#: ../src/maemo-mapper.c:11243 ../src/maemo-mapper.c:12544
+#: ../src/maemo-mapper.c:2737 ../src/maemo-mapper.c:10347
+#: ../src/maemo-mapper.c:11527 ../src/maemo-mapper.c:12877
msgid "Latitude"
msgstr "Ширина"
-#: ../src/maemo-mapper.c:6320
+#: ../src/maemo-mapper.c:6132
msgid "Lead"
msgstr "Изпреварващо"
-#: ../src/maemo-mapper.c:5148
+#: ../src/maemo-mapper.c:4918
msgid "Lead Amount"
msgstr "Изпрев. дължина"
-#: ../src/maemo-mapper.c:5218
+#: ../src/maemo-mapper.c:4988
msgid "Line Width"
msgstr "Дебелина"
-#: ../src/maemo-mapper.c:2996
+#: ../src/maemo-mapper.c:2782
msgid "Local time"
msgstr "Местно време"
-#: ../src/maemo-mapper.c:5306 ../src/maemo-mapper.c:6474
-#: ../src/maemo-mapper.c:12181
+#: ../src/maemo-mapper.c:5068 ../src/maemo-mapper.c:6298
+#: ../src/maemo-mapper.c:12514
msgid "Location"
msgstr "Позиция"
-#: ../src/maemo-mapper.c:3161
+#: ../src/maemo-mapper.c:2947
msgid "Lodging"
msgstr ""
-#: ../src/maemo-mapper.c:2960 ../src/maemo-mapper.c:10143
-#: ../src/maemo-mapper.c:11247 ../src/maemo-mapper.c:12545
+#: ../src/maemo-mapper.c:2746 ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:11531 ../src/maemo-mapper.c:12878
msgid "Longitude"
msgstr "Дължина"
-#: ../src/maemo-mapper.c:4756 ../src/maemo-mapper.c:5105
+#: ../src/maemo-mapper.c:4409 ../src/maemo-mapper.c:4875
msgid "MAC"
msgstr ""
-#: ../src/maemo-mapper.c:10577
+#: ../src/maemo-mapper.c:10869
msgid ""
"Maemo Mapper will now download and add a list of possibly-duplicate "
"repositories from the internet. Continue?"
msgstr ""
-#: ../src/maemo-mapper.c:11135
+#: ../src/maemo-mapper.c:11419
msgid "Manage Maps"
msgstr "Управление Карти"
-#: ../src/maemo-mapper.c:6266
+#: ../src/maemo-mapper.c:6068
msgid "Manage Maps..."
msgstr "Управление Карти..."
-#: ../src/maemo-mapper.c:10646
+#: ../src/maemo-mapper.c:10945
msgid "Manage Repositories"
msgstr "Управление Хранилища"
-#: ../src/maemo-mapper.c:6268
+#: ../src/maemo-mapper.c:6070
msgid "Manage Repositories..."
msgstr "Управление Хранилища..."
-#: ../src/maemo-mapper.c:2394
+#: ../src/maemo-mapper.c:2244
msgid "Manual"
msgstr "Ръчно"
-#: ../src/maemo-mapper.c:6261
+#: ../src/maemo-mapper.c:6063
msgid "Maps"
msgstr "Карти"
-#: ../src/maemo-mapper.c:3929
-msgid "Mark already inserted."
-msgstr ""
-
-#: ../src/maemo-mapper.c:3041
+#: ../src/maemo-mapper.c:2827
msgid "Max speed"
msgstr "Макс. скорост"
-#: ../src/maemo-mapper.c:5214
+#: ../src/maemo-mapper.c:4984
msgid "Misc."
msgstr "Други"
-#: ../src/maemo-mapper.c:5254
+#: ../src/maemo-mapper.c:5020
msgid "Misc. 2"
msgstr "Други 2"
-#: ../src/maemo-mapper.c:3170
+#: ../src/maemo-mapper.c:2956
msgid "Miscellaneous category for everything else."
msgstr ""
-#: ../src/maemo-mapper.c:11372 ../src/maemo-mapper.c:11506
+#: ../src/maemo-mapper.c:11658 ../src/maemo-mapper.c:11828
#, fuzzy
msgid ""
"NOTE: You must set a Map URI in the current repository in order to download "
"Задайте URI на картов сървър в \"Управление на Хранилища\" за да изтегляте "
"карти."
-#: ../src/maemo-mapper.c:10369 ../src/maemo-mapper.c:10548
+#: ../src/maemo-mapper.c:10586 ../src/maemo-mapper.c:10805
msgid "Name"
msgstr "Име"
-#: ../src/maemo-mapper.c:6343
+#: ../src/maemo-mapper.c:6155
#, fuzzy
msgid "Nearest POI"
msgstr "Избор POI"
-#: ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:10576
msgid "New Name"
msgstr "Ново Име"
-#: ../src/maemo-mapper.c:10538
+#: ../src/maemo-mapper.c:10795
msgid "New Repository"
msgstr "Ново Хранилище"
-#: ../src/maemo-mapper.c:10679
+#: ../src/maemo-mapper.c:10984
msgid "New..."
msgstr "Ново ..."
-#: ../src/maemo-mapper.c:6341
+#: ../src/maemo-mapper.c:6153
#, fuzzy
msgid "Next Waypoint"
msgstr "Точки по пътя"
-#: ../src/maemo-mapper.c:5439
+#: ../src/maemo-mapper.c:10760
+msgid "Next-able"
+msgstr ""
+
+#: ../src/maemo-mapper.c:5188
+#, fuzzy
msgid ""
-"No GPS Receiver MAC Provided.\n"
-"GPS Disabled."
+"No GPS Receiver MAC provided.\n"
+"GPS will be disabled."
msgstr ""
"Липсва MAC на приемник.\n"
"Забранявам GPS."
-#: ../src/maemo-mapper.c:10283 ../src/maemo-mapper.c:12133
+#: ../src/maemo-mapper.c:10499 ../src/maemo-mapper.c:12466
msgid "No POIs found."
msgstr ""
-#: ../src/maemo-mapper.c:12926 ../src/maemo-mapper.c:12947
-#: ../src/maemo-mapper.c:12969 ../src/maemo-mapper.c:12990
-#: ../src/maemo-mapper.c:13011 ../src/maemo-mapper.c:13091
-msgid "No waypoints are visible."
-msgstr "Няма видими точки по пътя."
-
-#: ../src/maemo-mapper.c:12903
-#, fuzzy
-msgid "No waypoints found."
-msgstr "Няма видими точки по пътя."
-
-#: ../src/maemo-mapper.c:6326
+#: ../src/maemo-mapper.c:6138
msgid "None"
msgstr "Не"
-#: ../src/maemo-mapper.c:5121
+#: ../src/maemo-mapper.c:4891
#, fuzzy
msgid ""
"Note: You can enter a device path\n"
"Note: For manual rfcomm, enter a device path\n"
"(e.g. \"/dev/rfcomm0\")."
-#: ../src/maemo-mapper.c:6628
-msgid ""
-"Now you must set up at least one Map Repository. You can download a sample "
-"set from the internet by using the \"Download...\" button."
-msgstr ""
-
-#: ../src/maemo-mapper.c:6227 ../src/maemo-mapper.c:6247
+#: ../src/maemo-mapper.c:6027 ../src/maemo-mapper.c:6047
msgid "Open..."
msgstr "Отваряне..."
-#: ../src/maemo-mapper.c:9589
+#: ../src/maemo-mapper.c:6465
+msgid ""
+"OpenStreetMap.org provides public, free-to-use maps. You can also download "
+"a sample set of repositories from the internet by using the \"Download...\" "
+"button."
+msgstr ""
+
+#: ../src/maemo-mapper.c:9697
msgid "Origin"
msgstr "Начало"
-#: ../src/maemo-mapper.c:3169
+#: ../src/maemo-mapper.c:2955
msgid "Other"
msgstr ""
-#: ../src/maemo-mapper.c:11177
+#: ../src/maemo-mapper.c:11461
msgid "Overwrite"
msgstr "Подмяна стари"
-#: ../src/maemo-mapper.c:4975 ../src/maemo-mapper.c:5335
-#: ../src/maemo-mapper.c:6531
+#: ../src/maemo-mapper.c:4737 ../src/maemo-mapper.c:5083
+#: ../src/maemo-mapper.c:6355
msgid "POI"
msgstr ""
-#: ../src/maemo-mapper.c:11926
+#: ../src/maemo-mapper.c:12259
msgid "POI Categories"
msgstr "POI Категории"
-#: ../src/maemo-mapper.c:6305
+#: ../src/maemo-mapper.c:6117
msgid "POI Categories..."
msgstr "POI Категории..."
-#: ../src/maemo-mapper.c:5339
+#: ../src/maemo-mapper.c:5087
msgid "POI database"
msgstr "POI база данни"
-#: ../src/maemo-mapper.c:6301
+#: ../src/maemo-mapper.c:6113
msgid "POIs"
msgstr ""
-#: ../src/maemo-mapper.c:2390
+#: ../src/maemo-mapper.c:2240
msgid "PPS"
msgstr ""
+#: ../src/maemo-mapper.c:7919
+msgid "Pan East"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7916
+msgid "Pan North"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7918
+msgid "Pan South"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7917
+msgid "Pan West"
+msgstr ""
+
# This word refers to Pitch as in of a person's voice.
-#: ../src/maemo-mapper.c:5203
+#: ../src/maemo-mapper.c:4973
msgid "Pitch"
msgstr "Тон"
-#: ../src/maemo-mapper.c:3154
+#: ../src/maemo-mapper.c:2940
msgid "Places to eat or drink."
msgstr ""
-#: ../src/maemo-mapper.c:3156
+#: ../src/maemo-mapper.c:2942
msgid "Places to shop or acquire services."
msgstr ""
-#: ../src/maemo-mapper.c:3162
+#: ../src/maemo-mapper.c:2948
msgid "Places to stay temporarily or for the night."
msgstr ""
-#: ../src/maemo-mapper.c:4791
+#: ../src/maemo-mapper.c:10112
+#, fuzzy
+msgid "Please provide a description for the mark."
+msgstr "Моля посочете POI име."
+
+#: ../src/maemo-mapper.c:4444
msgid "Please select a bluetooth device from the list."
msgstr "Моля, изберете bluetooth устройство от списъка."
-#: ../src/maemo-mapper.c:12460
+#: ../src/maemo-mapper.c:12793
#, fuzzy
msgid "Please specify a category for the POI."
msgstr "Моля посочете POI име."
-#: ../src/maemo-mapper.c:12453
+#: ../src/maemo-mapper.c:12786
msgid "Please specify a name for the POI."
msgstr "Моля посочете POI име."
-#: ../src/maemo-mapper.c:11747
+#: ../src/maemo-mapper.c:12080
msgid "Please specify a name for the category."
msgstr "Моля посочете име за категорията."
-#: ../src/maemo-mapper.c:9659
+#: ../src/maemo-mapper.c:9767
#, fuzzy
msgid "Please specify a source URL."
msgstr "Моля посочете POI име."
-#: ../src/maemo-mapper.c:9671
+#: ../src/maemo-mapper.c:9779
msgid "Please specify a start location."
msgstr "Моля задайте стартова точка."
-#: ../src/maemo-mapper.c:9678
+#: ../src/maemo-mapper.c:9786
msgid "Please specify an end location."
msgstr "Моля задайте крайна точка."
-#: ../src/maemo-mapper.c:12507
+#: ../src/maemo-mapper.c:12840
msgid "Problem adding POI"
msgstr "Проблем при добавяне на POI"
-#: ../src/maemo-mapper.c:11784
+#: ../src/maemo-mapper.c:12117
msgid "Problem adding category"
msgstr "Проблем при добавяне категория"
-#: ../src/maemo-mapper.c:11595 ../src/maemo-mapper.c:12043
+#: ../src/maemo-mapper.c:11928 ../src/maemo-mapper.c:12376
msgid "Problem deleting POI"
msgstr "Проблем при изтриване на POI"
-#: ../src/maemo-mapper.c:11604
+#: ../src/maemo-mapper.c:11937
msgid "Problem deleting category"
msgstr "Проблем при изтриване категория"
-#: ../src/maemo-mapper.c:11825
+#: ../src/maemo-mapper.c:12158
msgid "Problem updating Category"
msgstr "Проблем при обновяване на Категория"
-#: ../src/maemo-mapper.c:12485
+#: ../src/maemo-mapper.c:12818
msgid "Problem updating POI"
msgstr "Проблем при обновяване на POI"
-#: ../src/maemo-mapper.c:11769
+#: ../src/maemo-mapper.c:12102
msgid "Problem updating category"
msgstr "Проблем при обновяване на категория"
-#: ../src/maemo-mapper.c:3110
+#: ../src/maemo-mapper.c:2896
msgid "Problem with POI database"
msgstr "Проблем с POI база данни"
-#: ../src/maemo-mapper.c:2391
+#: ../src/maemo-mapper.c:2241
msgid "Real Time Kinematic"
msgstr ""
-#: ../src/maemo-mapper.c:3858
+#: ../src/maemo-mapper.c:3627
msgid "Recalculating directions..."
msgstr ""
-#: ../src/maemo-mapper.c:3157
+#: ../src/maemo-mapper.c:2943
#, fuzzy
msgid "Recreation"
msgstr "Позиция"
-#: ../src/maemo-mapper.c:10673
+#: ../src/maemo-mapper.c:10978
msgid "Rename..."
msgstr "Преименуване..."
-#: ../src/maemo-mapper.c:6237
+#: ../src/maemo-mapper.c:10833
+msgid "Replace all repositories with the default repository?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6037
msgid "Reset"
msgstr "Рестарт"
-#: ../src/maemo-mapper.c:6362 ../src/maemo-mapper.c:8043
+#: ../src/maemo-mapper.c:6174 ../src/maemo-mapper.c:7943
msgid "Reset Bluetooth"
msgstr "Рестарт Bluetooth"
-#: ../src/maemo-mapper.c:3151
+#: ../src/maemo-mapper.c:4619
+msgid "Reset all colors to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4505
+msgid "Reset all hardware keys to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4537 ../src/maemo-mapper.c:4653
+#: ../src/maemo-mapper.c:10956
+#, fuzzy
+msgid "Reset..."
+msgstr "Рестарт"
+
+#: ../src/maemo-mapper.c:2937
msgid "Residence"
msgstr ""
-#: ../src/maemo-mapper.c:4954 ../src/maemo-mapper.c:6223
-#: ../src/maemo-mapper.c:6287
+#: ../src/maemo-mapper.c:4713 ../src/maemo-mapper.c:6023
+#: ../src/maemo-mapper.c:6099
msgid "Route"
msgstr "Маршрут"
-#: ../src/maemo-mapper.c:9757
+#: ../src/maemo-mapper.c:9865
msgid "Route Downloaded"
msgstr "Маршрут изтеглен"
-#: ../src/maemo-mapper.c:8226 ../src/maemo-mapper.c:9805
+#: ../src/maemo-mapper.c:8224 ../src/maemo-mapper.c:9914
msgid "Route Opened"
msgstr "Маршрут отворен"
-#: ../src/maemo-mapper.c:9957
+#: ../src/maemo-mapper.c:10160
msgid "Route Saved"
msgstr "Маршрут записан"
-#: ../src/maemo-mapper.c:10022
+#: ../src/maemo-mapper.c:10238
msgid "Routes are now hidden"
msgstr "Маршрутите скрити"
-#: ../src/maemo-mapper.c:10016
+#: ../src/maemo-mapper.c:10232
msgid "Routes are now shown"
msgstr "Маршрутите показани"
-#: ../src/maemo-mapper.c:2388
+#: ../src/maemo-mapper.c:2238
msgid "SPS"
msgstr ""
-#: ../src/maemo-mapper.c:3014
+#: ../src/maemo-mapper.c:2800
msgid "Sat in use"
msgstr "Ползва сат."
-#: ../src/maemo-mapper.c:3005
+#: ../src/maemo-mapper.c:2791
msgid "Sat in view"
msgstr "Виждими сат."
-#: ../src/maemo-mapper.c:2946
+#: ../src/maemo-mapper.c:2732
msgid "Satellites details"
msgstr "Информация Сателити"
-#: ../src/maemo-mapper.c:2871
+#: ../src/maemo-mapper.c:2660
msgid "Satellites in view"
msgstr "Видими сателити"
-#: ../src/maemo-mapper.c:6231 ../src/maemo-mapper.c:6249
+#: ../src/maemo-mapper.c:6031 ../src/maemo-mapper.c:6049
msgid "Save..."
msgstr "Записване..."
-#: ../src/maemo-mapper.c:5115
+#: ../src/maemo-mapper.c:6094
+msgid "Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4885
msgid "Scan..."
msgstr "Скан..."
-#: ../src/maemo-mapper.c:4767
+#: ../src/maemo-mapper.c:4420
msgid "Scanning for Bluetooth Devices"
msgstr ""
-#: ../src/maemo-mapper.c:3163
+#: ../src/maemo-mapper.c:2949
msgid "School"
msgstr ""
-#: ../src/maemo-mapper.c:3301
+#: ../src/maemo-mapper.c:3087
msgid "Searching for GPS receiver"
msgstr "Търси GPS приемник"
-#: ../src/maemo-mapper.c:4731
+#: ../src/maemo-mapper.c:4384
msgid "Select Bluetooth Device"
msgstr "Избор Bluetooth устрийство"
-#: ../src/maemo-mapper.c:8030
+#: ../src/maemo-mapper.c:7929
#, fuzzy
msgid "Select Next Repository"
msgstr "Следващо Хранилище"
-#: ../src/maemo-mapper.c:12153
+#: ../src/maemo-mapper.c:12486
msgid "Select POI"
msgstr "Избор POI"
-#: ../src/maemo-mapper.c:12218
+#: ../src/maemo-mapper.c:12551
msgid "Select one POI from the list."
msgstr "Избор на една POI от списъка."
-#: ../src/maemo-mapper.c:5135
+#: ../src/maemo-mapper.c:4905
msgid "Sensitivity"
msgstr "Чувствителност"
-#: ../src/maemo-mapper.c:6498
+#: ../src/maemo-mapper.c:6322
#, fuzzy
msgid "Set as GPS Location"
msgstr "Използвай GPS позиция"
-#: ../src/maemo-mapper.c:5080
+#: ../src/maemo-mapper.c:4847
#, fuzzy
msgid "Settings"
msgstr "Настройки..."
-#: ../src/maemo-mapper.c:6369
+#: ../src/maemo-mapper.c:6181
msgid "Settings..."
msgstr "Настройки..."
-#: ../src/maemo-mapper.c:11160
+#: ../src/maemo-mapper.c:11444
msgid "Setup"
msgstr "Настройка"
-#: ../src/maemo-mapper.c:3155
+#: ../src/maemo-mapper.c:2941
msgid "Shopping/Services"
msgstr ""
-#: ../src/maemo-mapper.c:6509
+#: ../src/maemo-mapper.c:6333
msgid "Show Description"
msgstr "Покажи Описание"
-#: ../src/maemo-mapper.c:6255 ../src/maemo-mapper.c:8039
+#: ../src/maemo-mapper.c:6057 ../src/maemo-mapper.c:7938
#, fuzzy
msgid "Show Distance from Beginning"
msgstr "Покажи разстояние до"
-#: ../src/maemo-mapper.c:6253 ../src/maemo-mapper.c:8037
+#: ../src/maemo-mapper.c:7936
+#, fuzzy
+msgid "Show Distance from Last Break"
+msgstr "Покажи разстояние до"
+
+#: ../src/maemo-mapper.c:6055
#, fuzzy
msgid "Show Distance from Last Mark"
msgstr "Покажи разстояние до"
-#: ../src/maemo-mapper.c:6485 ../src/maemo-mapper.c:6516
-#: ../src/maemo-mapper.c:6540
+#: ../src/maemo-mapper.c:6309 ../src/maemo-mapper.c:6340
+#: ../src/maemo-mapper.c:6364
msgid "Show Distance to"
msgstr "Покажи разстояние до"
-#: ../src/maemo-mapper.c:6235 ../src/maemo-mapper.c:8034
+#: ../src/maemo-mapper.c:6035 ../src/maemo-mapper.c:7933
#, fuzzy
msgid "Show Distance to End of Route"
msgstr "Покажи разстояние до"
-#: ../src/maemo-mapper.c:6233 ../src/maemo-mapper.c:8032
+#: ../src/maemo-mapper.c:6033 ../src/maemo-mapper.c:7931
#, fuzzy
msgid "Show Distance to Next Waypoint"
msgstr "Разстояние до точка по пътя"
-#: ../src/maemo-mapper.c:6355
+#: ../src/maemo-mapper.c:6167
msgid "Show Information"
msgstr "Покажи Информация"
-#: ../src/maemo-mapper.c:6480 ../src/maemo-mapper.c:6507
+#: ../src/maemo-mapper.c:6304 ../src/maemo-mapper.c:6331
msgid "Show Lat/Lon"
msgstr "Покажи Шир/Дълж"
-#: ../src/maemo-mapper.c:5354
+#: ../src/maemo-mapper.c:5102
msgid "Show POI below zoom"
msgstr "Показвай POI под мащаб"
-#: ../src/maemo-mapper.c:2395
+#: ../src/maemo-mapper.c:2245
msgid "Simulation"
msgstr "Симулация"
-#: ../src/maemo-mapper.c:9554
+#: ../src/maemo-mapper.c:9662
msgid "Source URL"
msgstr ""
-#: ../src/maemo-mapper.c:2969 ../src/maemo-mapper.c:5191
+#: ../src/maemo-mapper.c:2755 ../src/maemo-mapper.c:4961
msgid "Speed"
msgstr "Скорост"
-#: ../src/maemo-mapper.c:5296
+#: ../src/maemo-mapper.c:5058
#, fuzzy
msgid "Speed Limit"
msgstr "Скорост"
-#: ../src/maemo-mapper.c:3150
+#: ../src/maemo-mapper.c:2936
msgid "Stations for purchasing fuel for vehicles."
msgstr ""
-#: ../src/maemo-mapper.c:3562
+#: ../src/maemo-mapper.c:3348
msgid "The current route is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3608 ../src/maemo-mapper.c:3623
+#: ../src/maemo-mapper.c:3394 ../src/maemo-mapper.c:3409
msgid "The current track is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3543 ../src/maemo-mapper.c:10230
+#: ../src/maemo-mapper.c:4580
+msgid "The following action is mapped to multiple keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8646
+msgid "There are no other next-able repositories."
+msgstr ""
+
+#: ../src/maemo-mapper.c:13222
+msgid "There are no waypoints."
+msgstr ""
+
+#: ../src/maemo-mapper.c:3329 ../src/maemo-mapper.c:10446
msgid "There is no next waypoint."
msgstr ""
-#: ../src/maemo-mapper.c:8040
+#: ../src/maemo-mapper.c:7921
+#, fuzzy
+msgid "Toggle Auto-Center"
+msgstr "Авто-Центр."
+
+#: ../src/maemo-mapper.c:7923
+#, fuzzy
+msgid "Toggle Fullscreen"
+msgstr "Пълноекранно"
+
+#: ../src/maemo-mapper.c:7939
msgid "Toggle GPS"
msgstr "Вкл/изкл GPS"
-#: ../src/maemo-mapper.c:8041
+#: ../src/maemo-mapper.c:7940
msgid "Toggle GPS Info"
msgstr "Вкл/изкл GPS инфо"
-#: ../src/maemo-mapper.c:8029
+#: ../src/maemo-mapper.c:7928
#, fuzzy
msgid "Toggle POIs"
msgstr "Вкл/изкл GPS"
-#: ../src/maemo-mapper.c:8042
+#: ../src/maemo-mapper.c:7927
+#, fuzzy
+msgid "Toggle Scale"
+msgstr "Вкл/изкл GPS"
+
+#: ../src/maemo-mapper.c:7942
msgid "Toggle Speed Limit"
msgstr ""
-#: ../src/maemo-mapper.c:8028
+#: ../src/maemo-mapper.c:7926
msgid "Toggle Tracks"
msgstr "Вкл/изкл Път"
-#: ../src/maemo-mapper.c:8049 ../src/maemo-mapper.c:11288
+#: ../src/maemo-mapper.c:7966 ../src/maemo-mapper.c:11572
msgid "Top-Left"
msgstr "Горе/Ляво"
-#: ../src/maemo-mapper.c:8050
+#: ../src/maemo-mapper.c:7967
#, fuzzy
msgid "Top-Right"
msgstr "Долу/Дясно"
-#: ../src/maemo-mapper.c:4938 ../src/maemo-mapper.c:6243
-#: ../src/maemo-mapper.c:6292
+#: ../src/maemo-mapper.c:4689 ../src/maemo-mapper.c:6043
+#: ../src/maemo-mapper.c:6104
msgid "Track"
msgstr "Път"
-#: ../src/maemo-mapper.c:9880
+#: ../src/maemo-mapper.c:9988
msgid "Track Opened"
msgstr "Път отворен"
-#: ../src/maemo-mapper.c:9902
+#: ../src/maemo-mapper.c:10010
msgid "Track Saved"
msgstr "Път записан"
-#: ../src/maemo-mapper.c:9998
+#: ../src/maemo-mapper.c:10201
msgid "Tracks are now hidden"
msgstr "Пътеки скрити"
-#: ../src/maemo-mapper.c:9992
+#: ../src/maemo-mapper.c:10195
msgid "Tracks are now shown"
msgstr "Пътеки показани"
-#: ../src/maemo-mapper.c:3159
+#: ../src/maemo-mapper.c:2945
msgid "Transportation"
msgstr ""
-#: ../src/maemo-mapper.c:10454
+#: ../src/maemo-mapper.c:10676
msgid "URL Format"
msgstr "URI формат"
-#: ../src/maemo-mapper.c:10773
+#: ../src/maemo-mapper.c:5445
msgid "Unable to create cache directory for repository"
msgstr ""
-#: ../src/maemo-mapper.c:5261
+#: ../src/maemo-mapper.c:5024
msgid "Units"
msgstr "Единици"
-#: ../src/maemo-mapper.c:9582
+#: ../src/maemo-mapper.c:9690
msgid "Use End of Route"
msgstr ""
-#: ../src/maemo-mapper.c:9568
+#: ../src/maemo-mapper.c:9676
msgid "Use GPS Location"
msgstr "Използвай GPS позиция"
-#: ../src/maemo-mapper.c:6297
+#: ../src/maemo-mapper.c:6109
msgid "Velocity Vector"
msgstr "Вектор скорост"
-#: ../src/maemo-mapper.c:6279
+#: ../src/maemo-mapper.c:6081
msgid "View"
msgstr "Изглед"
-#: ../src/maemo-mapper.c:11269
+#: ../src/maemo-mapper.c:11553
msgid "View Center"
msgstr "Видим център"
-#: ../src/maemo-mapper.c:10494
+#: ../src/maemo-mapper.c:10731
msgid "View Zoom Steps"
msgstr "Преглед Мащаб Стъпки"
-#: ../src/maemo-mapper.c:6537
+#: ../src/maemo-mapper.c:6361
msgid "View/Edit..."
msgstr ""
-#: ../src/maemo-mapper.c:11582
+#: ../src/maemo-mapper.c:11915
msgid "WARNING: All POIs in that category will also be deleted!"
msgstr "ВНИМАНИЕ: Всияки POI в Категорията ще бъдат изтрити!"
-#: ../src/maemo-mapper.c:6502
+#: ../src/maemo-mapper.c:6326
msgid "Waypoint"
msgstr "Точки по пътя"
-#: ../src/maemo-mapper.c:11217
+#: ../src/maemo-mapper.c:6472
+msgid ""
+"You will now see a blank screen. You can download maps using the \"Manage "
+"Maps\" menu item in the \"Maps\" menu. Or, press OK to enable Auto-Download."
+msgstr ""
+
+#: ../src/maemo-mapper.c:11501
msgid "Zoom"
msgstr "Мащаб"
-#: ../src/maemo-mapper.c:11223
+#: ../src/maemo-mapper.c:6085 ../src/maemo-mapper.c:7924
+#, fuzzy
+msgid "Zoom In"
+msgstr "Мащаб"
+
+#: ../src/maemo-mapper.c:11507
msgid "Zoom Levels to Download: (0 = most detail)"
msgstr "Мащаб нива за изтегляне: (0 = най-детайлно)"
-#: ../src/maemo-mapper.c:8463 ../src/maemo-mapper.c:8545
+#: ../src/maemo-mapper.c:6087 ../src/maemo-mapper.c:7925
+#, fuzzy
+msgid "Zoom Out"
+msgstr "Мащаб"
+
+#: ../src/maemo-mapper.c:8461 ../src/maemo-mapper.c:8573
+#: ../src/maemo-mapper.c:11735 ../src/maemo-mapper.c:11753
msgid "Zoom to Level"
msgstr "Мащаб"
-#: ../src/maemo-mapper.c:10995 ../src/maemo-mapper.c:11002
+#: ../src/maemo-mapper.c:11279 ../src/maemo-mapper.c:11286
msgid "about"
msgstr "относно"
-#: ../src/maemo-mapper.c:2872
+#: ../src/maemo-mapper.c:2661
msgid "in use"
msgstr "в употреба"
-#: ../src/maemo-mapper.c:8016
+#: ../src/maemo-mapper.c:7874
msgid "km"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "maps"
msgstr "карти"
-#: ../src/maemo-mapper.c:10909 ../src/maemo-mapper.c:10996
+#: ../src/maemo-mapper.c:11193 ../src/maemo-mapper.c:11280
msgid "maps "
msgstr "карти"
-#: ../src/maemo-mapper.c:8017
+#: ../src/maemo-mapper.c:7875
msgid "mi."
msgstr ""
-#: ../src/maemo-mapper.c:8018
+#: ../src/maemo-mapper.c:7876
msgid "n.m."
msgstr ""
-#: ../src/maemo-mapper.c:3027
+#: ../src/maemo-mapper.c:2813
msgid "nofix"
msgstr "не фикс"
-#: ../src/maemo-mapper.c:2396 ../src/maemo-mapper.c:3036
+#: ../src/maemo-mapper.c:2246 ../src/maemo-mapper.c:2822
msgid "none"
msgstr "няма"
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "up to about"
msgstr "до около"
#~ msgid "Copy Lat/Lon to Clipboard"
#~ msgstr "Копира Шир/Дълж в Клипборд"
+#~ msgid "Defaults"
+#~ msgstr "Възстановяване"
+
#~ msgid "Desc."
#~ msgstr "Опис."
#~ msgid "Distance to Location"
#~ msgstr "Разстояние до Локация"
+#~ msgid "GPS Mark"
+#~ msgstr "GPS знак"
+
#~ msgid "Label: "
#~ msgstr "Етикет: "
#~ msgid "No route is loaded."
#~ msgstr "Маршрът не е зареден."
+#~ msgid "No waypoints are visible."
+#~ msgstr "Няма видими точки по пътя."
+
+#, fuzzy
+#~ msgid "No waypoints found."
+#~ msgstr "Няма видими точки по пътя."
+
#~ msgid "Repositories"
#~ msgstr "Хранилища"
msgstr ""
"Project-Id-Version: maemo-mapper 1.2.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 16:40-0500\n"
+"POT-Creation-Date: 2007-03-12 01:23-0400\n"
"PO-Revision-Date: 2006-10-28 22:19-0400\n"
"Last-Translator: John Costigan <gnuite@gmail.com>\n"
"Language-Team: John Costigan <gnuite@gmail.com>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/maemo-mapper.c:11990
+#: ../src/maemo-mapper.c:12323
msgid "# POIs"
msgstr ""
-#: ../src/maemo-mapper.c:11939
+#: ../src/maemo-mapper.c:6186
+msgid "About..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:12272
msgid "Add"
msgstr ""
-#: ../src/maemo-mapper.c:11678
+#: ../src/maemo-mapper.c:12011
msgid "Add Category"
msgstr ""
-#: ../src/maemo-mapper.c:12341
+#: ../src/maemo-mapper.c:12674
msgid "Add POI"
msgstr ""
-#: ../src/maemo-mapper.c:6494 ../src/maemo-mapper.c:6523
+#: ../src/maemo-mapper.c:6318 ../src/maemo-mapper.c:6347
msgid "Add POI..."
msgstr ""
-#: ../src/maemo-mapper.c:6490 ../src/maemo-mapper.c:6545
+#: ../src/maemo-mapper.c:6314 ../src/maemo-mapper.c:6369
msgid "Add Route Point"
msgstr ""
-#: ../src/maemo-mapper.c:12631
+#: ../src/maemo-mapper.c:12964
msgid "Add Waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:6492 ../src/maemo-mapper.c:6547
+#: ../src/maemo-mapper.c:6316 ../src/maemo-mapper.c:6371
msgid "Add Waypoint..."
msgstr ""
-#: ../src/maemo-mapper.c:5166
+#: ../src/maemo-mapper.c:4936
msgid "Advance Notice"
msgstr ""
-#: ../src/maemo-mapper.c:11202
+#: ../src/maemo-mapper.c:11486
msgid "Along Route - Radius (tiles):"
msgstr ""
-#: ../src/maemo-mapper.c:2978
+#: ../src/maemo-mapper.c:2764
msgid "Altitude"
msgstr ""
-#: ../src/maemo-mapper.c:4773
+#: ../src/maemo-mapper.c:4426
msgid "An error occurred while attempting to scan for bluetooth devices."
msgstr ""
-#: ../src/maemo-mapper.c:10596
+#: ../src/maemo-mapper.c:10888
msgid ""
"An error occurred while retrieving the repositories. The web service may be "
"temporarily down."
msgstr ""
-#: ../src/maemo-mapper.c:8477
+#: ../src/maemo-mapper.c:8475
msgid ""
"An error occurred while trying to reset the bluetooth radio.\n"
"\n"
"the /etc/sudoers file?"
msgstr ""
-#: ../src/maemo-mapper.c:5162
+#: ../src/maemo-mapper.c:4932
msgid "Announce"
msgstr ""
-#: ../src/maemo-mapper.c:11239
+#: ../src/maemo-mapper.c:11523
msgid "Area"
msgstr ""
-#: ../src/maemo-mapper.c:5131 ../src/maemo-mapper.c:6310
+#: ../src/maemo-mapper.c:4901 ../src/maemo-mapper.c:6122
msgid "Auto-Center"
msgstr ""
-#: ../src/maemo-mapper.c:10091
+#: ../src/maemo-mapper.c:10307
msgid "Auto-Center Mode: Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:10076
+#: ../src/maemo-mapper.c:10292
msgid "Auto-Center Mode: Lead"
msgstr ""
-#: ../src/maemo-mapper.c:10105
+#: ../src/maemo-mapper.c:10321
msgid "Auto-Center Off"
msgstr ""
-#: ../src/maemo-mapper.c:6270
+#: ../src/maemo-mapper.c:6072
msgid "Auto-Download"
msgstr ""
-#: ../src/maemo-mapper.c:9572
+#: ../src/maemo-mapper.c:9680
msgid "Auto-Update"
msgstr ""
-#: ../src/maemo-mapper.c:8052
+#: ../src/maemo-mapper.c:7969
msgid "Bottom-Left"
msgstr ""
-#: ../src/maemo-mapper.c:8051 ../src/maemo-mapper.c:11306
+#: ../src/maemo-mapper.c:7968 ../src/maemo-mapper.c:11590
msgid "Bottom-Right"
msgstr ""
-#: ../src/maemo-mapper.c:5349 ../src/maemo-mapper.c:10473
+#: ../src/maemo-mapper.c:3700
+msgid "Break already inserted."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5097 ../src/maemo-mapper.c:10695
msgid "Browse..."
msgstr ""
-#: ../src/maemo-mapper.c:3160
+#: ../src/maemo-mapper.c:2946
msgid "Bus stops, airports, train stations, etc."
msgstr ""
-#: ../src/maemo-mapper.c:3165
+#: ../src/maemo-mapper.c:2951
msgid "Business"
msgstr ""
-#: ../src/maemo-mapper.c:11193
+#: ../src/maemo-mapper.c:11477
msgid "By Area (see tab)"
msgstr ""
-#: ../src/maemo-mapper.c:10463
+#: ../src/maemo-mapper.c:10685
msgid "Cache Dir."
msgstr ""
-#: ../src/maemo-mapper.c:10409
+#: ../src/maemo-mapper.c:10626
msgid ""
"Cannot delete the last repository - there must be at lease one repository."
msgstr ""
-#: ../src/maemo-mapper.c:11473
+#: ../src/maemo-mapper.c:11795
msgid ""
"Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."
msgstr ""
-#: ../src/maemo-mapper.c:12191 ../src/maemo-mapper.c:12378
+#: ../src/maemo-mapper.c:12524 ../src/maemo-mapper.c:12711
msgid "Category"
msgstr ""
-#: ../src/maemo-mapper.c:6239 ../src/maemo-mapper.c:6257
-#: ../src/maemo-mapper.c:11146
+#: ../src/maemo-mapper.c:6039 ../src/maemo-mapper.c:6059
+#: ../src/maemo-mapper.c:11430
msgid "Clear"
msgstr ""
-#: ../src/maemo-mapper.c:6374
+#: ../src/maemo-mapper.c:6188
msgid "Close"
msgstr ""
-#: ../src/maemo-mapper.c:4899
+#: ../src/maemo-mapper.c:4647
msgid "Colors"
msgstr ""
-#: ../src/maemo-mapper.c:5090
+#: ../src/maemo-mapper.c:4860
msgid "Colors..."
msgstr ""
-#: ../src/maemo-mapper.c:10908 ../src/maemo-mapper.c:10995
+#: ../src/maemo-mapper.c:11192 ../src/maemo-mapper.c:11279
msgid "Confirm DELETION of"
msgstr ""
-#: ../src/maemo-mapper.c:10416
+#: ../src/maemo-mapper.c:10633
msgid "Confirm delete of repository"
msgstr ""
-#: ../src/maemo-mapper.c:13034
+#: ../src/maemo-mapper.c:13335
msgid "Confirm delete of waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:10914 ../src/maemo-mapper.c:11001
+#: ../src/maemo-mapper.c:11198 ../src/maemo-mapper.c:11285
msgid "Confirm download of"
msgstr ""
-#: ../src/maemo-mapper.c:6513
+#: ../src/maemo-mapper.c:4583
+msgid "Continue?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6337
msgid "Copy Description"
msgstr ""
-#: ../src/maemo-mapper.c:6482 ../src/maemo-mapper.c:6511
+#: ../src/maemo-mapper.c:6306 ../src/maemo-mapper.c:6335
msgid "Copy Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:9709
+#: ../src/maemo-mapper.c:9817
msgid ""
"Could not generate directions. Make sure your source and destination are "
"valid."
msgstr ""
-#: ../src/maemo-mapper.c:12709
+#: ../src/maemo-mapper.c:13043
msgid ""
"Creating a \"waypoint\" with no description actually adds a break point. Is "
"that what you want?"
msgstr ""
-#: ../src/maemo-mapper.c:2389
+#: ../src/maemo-mapper.c:2239
msgid "DGPS"
msgstr ""
-#: ../src/maemo-mapper.c:4905
-msgid "Defaults"
-msgstr ""
-
-#: ../src/maemo-mapper.c:5277
+#: ../src/maemo-mapper.c:5035
msgid "Degrees Format"
msgstr ""
-#: ../src/maemo-mapper.c:11659 ../src/maemo-mapper.c:12316
+#: ../src/maemo-mapper.c:11992 ../src/maemo-mapper.c:12649
msgid "Delete"
msgstr ""
-#: ../src/maemo-mapper.c:11183
+#: ../src/maemo-mapper.c:11467
msgid "Delete Maps"
msgstr ""
-#: ../src/maemo-mapper.c:12032
+#: ../src/maemo-mapper.c:12365
msgid "Delete POI?"
msgstr ""
-#: ../src/maemo-mapper.c:11580
+#: ../src/maemo-mapper.c:11913
msgid "Delete category?"
msgstr ""
-#: ../src/maemo-mapper.c:6520 ../src/maemo-mapper.c:10676
+#: ../src/maemo-mapper.c:6344 ../src/maemo-mapper.c:10981
msgid "Delete..."
msgstr ""
-#: ../src/maemo-mapper.c:4761 ../src/maemo-mapper.c:11697
-#: ../src/maemo-mapper.c:11985 ../src/maemo-mapper.c:12405
-#: ../src/maemo-mapper.c:12657
+#: ../src/maemo-mapper.c:4414 ../src/maemo-mapper.c:10069
+#: ../src/maemo-mapper.c:12030 ../src/maemo-mapper.c:12318
+#: ../src/maemo-mapper.c:12738 ../src/maemo-mapper.c:12989
msgid "Description"
msgstr ""
-#: ../src/maemo-mapper.c:9600
+#: ../src/maemo-mapper.c:9708
msgid "Destination"
msgstr ""
-#: ../src/maemo-mapper.c:6359
+#: ../src/maemo-mapper.c:6171
msgid "Details..."
msgstr ""
-#: ../src/maemo-mapper.c:3153
+#: ../src/maemo-mapper.c:2939
msgid "Dining"
msgstr ""
-#: ../src/maemo-mapper.c:3528 ../src/maemo-mapper.c:3588
-#: ../src/maemo-mapper.c:12598
+#: ../src/maemo-mapper.c:3314 ../src/maemo-mapper.c:3374
+#: ../src/maemo-mapper.c:12931
msgid "Distance"
msgstr ""
-#: ../src/maemo-mapper.c:11170
+#: ../src/maemo-mapper.c:10752
+msgid "Double Pixels"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11454
msgid "Download Maps"
msgstr ""
-#: ../src/maemo-mapper.c:9532
+#: ../src/maemo-mapper.c:9640
msgid "Download Route"
msgstr ""
-#: ../src/maemo-mapper.c:6487 ../src/maemo-mapper.c:6518
-#: ../src/maemo-mapper.c:6542
+#: ../src/maemo-mapper.c:6311 ../src/maemo-mapper.c:6342
+#: ../src/maemo-mapper.c:6366
msgid "Download Route to..."
msgstr ""
-#: ../src/maemo-mapper.c:10478
+#: ../src/maemo-mapper.c:10715
msgid "Download Zoom Steps"
msgstr ""
-#: ../src/maemo-mapper.c:6229 ../src/maemo-mapper.c:10657
+#: ../src/maemo-mapper.c:6029 ../src/maemo-mapper.c:10962
msgid "Download..."
msgstr ""
-#: ../src/maemo-mapper.c:6960
+#: ../src/maemo-mapper.c:6827
msgid "Downloading maps"
msgstr ""
-#: ../src/maemo-mapper.c:11936
+#: ../src/maemo-mapper.c:12269
msgid "Edit"
msgstr ""
-#: ../src/maemo-mapper.c:12401
+#: ../src/maemo-mapper.c:12734
msgid "Edit Categories..."
msgstr ""
-#: ../src/maemo-mapper.c:11653
+#: ../src/maemo-mapper.c:11986
msgid "Edit Category"
msgstr ""
-#: ../src/maemo-mapper.c:12310
+#: ../src/maemo-mapper.c:12643
msgid "Edit POI"
msgstr ""
-#: ../src/maemo-mapper.c:3164
+#: ../src/maemo-mapper.c:2950
msgid "Elementary schools, college campuses, etc."
msgstr ""
-#: ../src/maemo-mapper.c:6351
+#: ../src/maemo-mapper.c:6163
msgid "Enable GPS"
msgstr ""
-#: ../src/maemo-mapper.c:5178
+#: ../src/maemo-mapper.c:4948
msgid "Enable Voice Synthesis (requires flite)"
msgstr ""
-#: ../src/maemo-mapper.c:11721 ../src/maemo-mapper.c:11973
+#: ../src/maemo-mapper.c:12054 ../src/maemo-mapper.c:12306
msgid "Enabled"
msgstr ""
-#: ../src/maemo-mapper.c:7212
+#: ../src/maemo-mapper.c:7064
msgid ""
"Error in download. Check internet connection and/or Map Repository URL "
"Format."
msgstr ""
-#: ../src/maemo-mapper.c:8229 ../src/maemo-mapper.c:9765
-#: ../src/maemo-mapper.c:9808 ../src/maemo-mapper.c:9883
+#: ../src/maemo-mapper.c:8227 ../src/maemo-mapper.c:9873
+#: ../src/maemo-mapper.c:9917 ../src/maemo-mapper.c:9991
msgid "Error parsing GPX file."
msgstr ""
-#: ../src/maemo-mapper.c:1472
+#: ../src/maemo-mapper.c:1475
msgid "Error while writing to file"
msgstr ""
-#: ../src/maemo-mapper.c:9905 ../src/maemo-mapper.c:9960
+#: ../src/maemo-mapper.c:10013 ../src/maemo-mapper.c:10163
msgid "Error writing GPX file."
msgstr ""
-#: ../src/maemo-mapper.c:5239
-msgid "Escape Key"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3311
+#: ../src/maemo-mapper.c:3097
msgid "Establishing GPS fix"
msgstr ""
-#: ../src/maemo-mapper.c:2393
+#: ../src/maemo-mapper.c:2243
msgid "Estimated"
msgstr ""
-#: ../src/maemo-mapper.c:4065
+#: ../src/maemo-mapper.c:3836
msgid "Failed to connect to GPS receiver. Retry?"
msgstr ""
-#: ../src/maemo-mapper.c:9697
+#: ../src/maemo-mapper.c:9805
msgid "Failed to connect to GPX Directions server"
msgstr ""
-#: ../src/maemo-mapper.c:5667
+#: ../src/maemo-mapper.c:5478
msgid "Failed to initialize GConf. Quitting."
msgstr ""
-#: ../src/maemo-mapper.c:4280
+#: ../src/maemo-mapper.c:3980
msgid "Failed to initialize GConf. Settings were not saved."
msgstr ""
-#: ../src/maemo-mapper.c:7768 ../src/maemo-mapper.c:8217
+#: ../src/maemo-mapper.c:7625 ../src/maemo-mapper.c:8216
msgid "Failed to open file for reading"
msgstr ""
-#: ../src/maemo-mapper.c:7425 ../src/maemo-mapper.c:7769
+#: ../src/maemo-mapper.c:7282 ../src/maemo-mapper.c:7626
msgid "Failed to open file for writing"
msgstr ""
-#: ../src/maemo-mapper.c:3178
+#: ../src/maemo-mapper.c:2964
msgid "Failed to open or create database"
msgstr ""
-#: ../src/maemo-mapper.c:1473
+#: ../src/maemo-mapper.c:1476
msgid "File is incomplete."
msgstr ""
-#: ../src/maemo-mapper.c:3023
+#: ../src/maemo-mapper.c:2809
msgid "Fix"
msgstr ""
-#: ../src/maemo-mapper.c:3032
+#: ../src/maemo-mapper.c:2818
msgid "Fix Quality"
msgstr ""
-#: ../src/maemo-mapper.c:2392
+#: ../src/maemo-mapper.c:2242
msgid "Float RTK"
msgstr ""
-#: ../src/maemo-mapper.c:3149
+#: ../src/maemo-mapper.c:2935
msgid "Fuel"
msgstr ""
-#: ../src/maemo-mapper.c:6283
+#: ../src/maemo-mapper.c:6089
msgid "Full Screen"
msgstr ""
-#: ../src/maemo-mapper.c:5101 ../src/maemo-mapper.c:6347
+#: ../src/maemo-mapper.c:4665 ../src/maemo-mapper.c:4871
+#: ../src/maemo-mapper.c:6159
msgid "GPS"
msgstr ""
-#: ../src/maemo-mapper.c:2926
+#: ../src/maemo-mapper.c:2712
msgid "GPS Details"
msgstr ""
-#: ../src/maemo-mapper.c:2939
+#: ../src/maemo-mapper.c:2725
msgid "GPS Information"
msgstr ""
-#: ../src/maemo-mapper.c:6339 ../src/maemo-mapper.c:11253
+#: ../src/maemo-mapper.c:6151 ../src/maemo-mapper.c:11537
msgid "GPS Location"
msgstr ""
-#: ../src/maemo-mapper.c:4917
-msgid "GPS Mark"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3168
+#: ../src/maemo-mapper.c:2954
msgid "General landmarks."
msgstr ""
-#: ../src/maemo-mapper.c:3166
+#: ../src/maemo-mapper.c:2952
msgid "General places of business."
msgstr ""
-#: ../src/maemo-mapper.c:6333
+#: ../src/maemo-mapper.c:6145
msgid "Go to"
msgstr ""
-#: ../src/maemo-mapper.c:10121
+#: ../src/maemo-mapper.c:10337
msgid "Go to Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6550
+#: ../src/maemo-mapper.c:6374
msgid "Go to Nearest"
msgstr ""
-#: ../src/maemo-mapper.c:6527
+#: ../src/maemo-mapper.c:6351
msgid "Go to Next"
msgstr ""
-#: ../src/maemo-mapper.c:2987
+#: ../src/maemo-mapper.c:4531
+msgid "Hardware Keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4857
+msgid "Hardware Keys..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2773
msgid "Heading"
msgstr ""
-#: ../src/maemo-mapper.c:6372
-msgid "Help"
+#: ../src/maemo-mapper.c:6184
+msgid "Help..."
msgstr ""
-#: ../src/maemo-mapper.c:3152
+#: ../src/maemo-mapper.c:2938
msgid "Houses, apartments, or other residences of import."
msgstr ""
-#: ../src/maemo-mapper.c:11965
+#: ../src/maemo-mapper.c:12298
msgid "ID"
msgstr ""
-#: ../src/maemo-mapper.c:3158
+#: ../src/maemo-mapper.c:2944
msgid "Indoor or Outdoor places to have fun."
msgstr ""
-#: ../src/maemo-mapper.c:5322
+#: ../src/maemo-mapper.c:5008
msgid "Information Font Size"
msgstr ""
-#: ../src/maemo-mapper.c:6251
+#: ../src/maemo-mapper.c:6051
+msgid "Insert Break"
+msgstr ""
+
+#: ../src/maemo-mapper.c:10044
msgid "Insert Mark"
msgstr ""
-#: ../src/maemo-mapper.c:8035
-msgid "Insert Track Mark"
+#: ../src/maemo-mapper.c:6053
+msgid "Insert Mark..."
msgstr ""
-#: ../src/maemo-mapper.c:11417
+#: ../src/maemo-mapper.c:7934
+msgid "Insert Track Break"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11703
msgid "Invalid Bottom-Right Latitude"
msgstr ""
-#: ../src/maemo-mapper.c:11424
+#: ../src/maemo-mapper.c:11710
msgid "Invalid Bottom-Right Longitude"
msgstr ""
-#: ../src/maemo-mapper.c:10177
+#: ../src/maemo-mapper.c:10393
msgid "Invalid Latitude"
msgstr ""
-#: ../src/maemo-mapper.c:10184
+#: ../src/maemo-mapper.c:10400
msgid "Invalid Longitude"
msgstr ""
-#: ../src/maemo-mapper.c:8995 ../src/maemo-mapper.c:9006
+#: ../src/maemo-mapper.c:9121 ../src/maemo-mapper.c:9132
msgid "Invalid NMEA input from receiver!"
msgstr ""
-#: ../src/maemo-mapper.c:11403
+#: ../src/maemo-mapper.c:11689
msgid "Invalid Top-Left Latitude"
msgstr ""
-#: ../src/maemo-mapper.c:11410
+#: ../src/maemo-mapper.c:11696
msgid "Invalid Top-Left Longitude"
msgstr ""
-#: ../src/maemo-mapper.c:5230
+#: ../src/maemo-mapper.c:6455
+msgid ""
+"It looks like this is your first time running Maemo Mapper. Press OK to "
+"view the the help pages. Otherwise, press Cancel to continue."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5000
msgid "Keep Display On Only in Fullscreen Mode"
msgstr ""
-#: ../src/maemo-mapper.c:11689 ../src/maemo-mapper.c:11980
-#: ../src/maemo-mapper.c:12186 ../src/maemo-mapper.c:12370
+#: ../src/maemo-mapper.c:12022 ../src/maemo-mapper.c:12313
+#: ../src/maemo-mapper.c:12519 ../src/maemo-mapper.c:12703
msgid "Label"
msgstr ""
-#: ../src/maemo-mapper.c:3167
+#: ../src/maemo-mapper.c:2953
msgid "Landmark"
msgstr ""
-#: ../src/maemo-mapper.c:12360 ../src/maemo-mapper.c:12641
+#: ../src/maemo-mapper.c:10054 ../src/maemo-mapper.c:12693
+#: ../src/maemo-mapper.c:12974
msgid "Lat, Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6314
+#: ../src/maemo-mapper.c:6126
msgid "Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6337
+#: ../src/maemo-mapper.c:6149
msgid "Lat/Lon..."
msgstr ""
-#: ../src/maemo-mapper.c:2951 ../src/maemo-mapper.c:10131
-#: ../src/maemo-mapper.c:11243 ../src/maemo-mapper.c:12544
+#: ../src/maemo-mapper.c:2737 ../src/maemo-mapper.c:10347
+#: ../src/maemo-mapper.c:11527 ../src/maemo-mapper.c:12877
msgid "Latitude"
msgstr ""
-#: ../src/maemo-mapper.c:6320
+#: ../src/maemo-mapper.c:6132
msgid "Lead"
msgstr ""
-#: ../src/maemo-mapper.c:5148
+#: ../src/maemo-mapper.c:4918
msgid "Lead Amount"
msgstr ""
-#: ../src/maemo-mapper.c:5218
+#: ../src/maemo-mapper.c:4988
msgid "Line Width"
msgstr ""
-#: ../src/maemo-mapper.c:2996
+#: ../src/maemo-mapper.c:2782
msgid "Local time"
msgstr ""
-#: ../src/maemo-mapper.c:5306 ../src/maemo-mapper.c:6474
-#: ../src/maemo-mapper.c:12181
+#: ../src/maemo-mapper.c:5068 ../src/maemo-mapper.c:6298
+#: ../src/maemo-mapper.c:12514
msgid "Location"
msgstr ""
-#: ../src/maemo-mapper.c:3161
+#: ../src/maemo-mapper.c:2947
msgid "Lodging"
msgstr ""
-#: ../src/maemo-mapper.c:2960 ../src/maemo-mapper.c:10143
-#: ../src/maemo-mapper.c:11247 ../src/maemo-mapper.c:12545
+#: ../src/maemo-mapper.c:2746 ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:11531 ../src/maemo-mapper.c:12878
msgid "Longitude"
msgstr ""
-#: ../src/maemo-mapper.c:4756 ../src/maemo-mapper.c:5105
+#: ../src/maemo-mapper.c:4409 ../src/maemo-mapper.c:4875
msgid "MAC"
msgstr ""
-#: ../src/maemo-mapper.c:10577
+#: ../src/maemo-mapper.c:10869
msgid ""
"Maemo Mapper will now download and add a list of possibly-duplicate "
"repositories from the internet. Continue?"
msgstr ""
-#: ../src/maemo-mapper.c:11135
+#: ../src/maemo-mapper.c:11419
msgid "Manage Maps"
msgstr ""
-#: ../src/maemo-mapper.c:6266
+#: ../src/maemo-mapper.c:6068
msgid "Manage Maps..."
msgstr ""
-#: ../src/maemo-mapper.c:10646
+#: ../src/maemo-mapper.c:10945
msgid "Manage Repositories"
msgstr ""
-#: ../src/maemo-mapper.c:6268
+#: ../src/maemo-mapper.c:6070
msgid "Manage Repositories..."
msgstr ""
-#: ../src/maemo-mapper.c:2394
+#: ../src/maemo-mapper.c:2244
msgid "Manual"
msgstr ""
-#: ../src/maemo-mapper.c:6261
+#: ../src/maemo-mapper.c:6063
msgid "Maps"
msgstr ""
-#: ../src/maemo-mapper.c:3929
-msgid "Mark already inserted."
-msgstr ""
-
-#: ../src/maemo-mapper.c:3041
+#: ../src/maemo-mapper.c:2827
msgid "Max speed"
msgstr ""
-#: ../src/maemo-mapper.c:5214
+#: ../src/maemo-mapper.c:4984
msgid "Misc."
msgstr ""
-#: ../src/maemo-mapper.c:5254
+#: ../src/maemo-mapper.c:5020
msgid "Misc. 2"
msgstr ""
-#: ../src/maemo-mapper.c:3170
+#: ../src/maemo-mapper.c:2956
msgid "Miscellaneous category for everything else."
msgstr ""
-#: ../src/maemo-mapper.c:11372 ../src/maemo-mapper.c:11506
+#: ../src/maemo-mapper.c:11658 ../src/maemo-mapper.c:11828
msgid ""
"NOTE: You must set a Map URI in the current repository in order to download "
"maps."
msgstr ""
-#: ../src/maemo-mapper.c:10369 ../src/maemo-mapper.c:10548
+#: ../src/maemo-mapper.c:10586 ../src/maemo-mapper.c:10805
msgid "Name"
msgstr ""
-#: ../src/maemo-mapper.c:6343
+#: ../src/maemo-mapper.c:6155
msgid "Nearest POI"
msgstr ""
-#: ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:10576
msgid "New Name"
msgstr ""
-#: ../src/maemo-mapper.c:10538
+#: ../src/maemo-mapper.c:10795
msgid "New Repository"
msgstr ""
-#: ../src/maemo-mapper.c:10679
+#: ../src/maemo-mapper.c:10984
msgid "New..."
msgstr ""
-#: ../src/maemo-mapper.c:6341
+#: ../src/maemo-mapper.c:6153
msgid "Next Waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:5439
-msgid ""
-"No GPS Receiver MAC Provided.\n"
-"GPS Disabled."
-msgstr ""
-
-#: ../src/maemo-mapper.c:10283 ../src/maemo-mapper.c:12133
-msgid "No POIs found."
+#: ../src/maemo-mapper.c:10760
+msgid "Next-able"
msgstr ""
-#: ../src/maemo-mapper.c:12926 ../src/maemo-mapper.c:12947
-#: ../src/maemo-mapper.c:12969 ../src/maemo-mapper.c:12990
-#: ../src/maemo-mapper.c:13011 ../src/maemo-mapper.c:13091
-msgid "No waypoints are visible."
+#: ../src/maemo-mapper.c:5188
+msgid ""
+"No GPS Receiver MAC provided.\n"
+"GPS will be disabled."
msgstr ""
-#: ../src/maemo-mapper.c:12903
-msgid "No waypoints found."
+#: ../src/maemo-mapper.c:10499 ../src/maemo-mapper.c:12466
+msgid "No POIs found."
msgstr ""
-#: ../src/maemo-mapper.c:6326
+#: ../src/maemo-mapper.c:6138
msgid "None"
msgstr ""
-#: ../src/maemo-mapper.c:5121
+#: ../src/maemo-mapper.c:4891
msgid ""
"Note: You can enter a device path\n"
"(e.g. \"/dev/rfcomm0\")."
msgstr ""
-#: ../src/maemo-mapper.c:6628
-msgid ""
-"Now you must set up at least one Map Repository. You can download a sample "
-"set from the internet by using the \"Download...\" button."
+#: ../src/maemo-mapper.c:6027 ../src/maemo-mapper.c:6047
+msgid "Open..."
msgstr ""
-#: ../src/maemo-mapper.c:6227 ../src/maemo-mapper.c:6247
-msgid "Open..."
+#: ../src/maemo-mapper.c:6465
+msgid ""
+"OpenStreetMap.org provides public, free-to-use maps. You can also download "
+"a sample set of repositories from the internet by using the \"Download...\" "
+"button."
msgstr ""
-#: ../src/maemo-mapper.c:9589
+#: ../src/maemo-mapper.c:9697
msgid "Origin"
msgstr ""
-#: ../src/maemo-mapper.c:3169
+#: ../src/maemo-mapper.c:2955
msgid "Other"
msgstr ""
-#: ../src/maemo-mapper.c:11177
+#: ../src/maemo-mapper.c:11461
msgid "Overwrite"
msgstr ""
-#: ../src/maemo-mapper.c:4975 ../src/maemo-mapper.c:5335
-#: ../src/maemo-mapper.c:6531
+#: ../src/maemo-mapper.c:4737 ../src/maemo-mapper.c:5083
+#: ../src/maemo-mapper.c:6355
msgid "POI"
msgstr ""
-#: ../src/maemo-mapper.c:11926
+#: ../src/maemo-mapper.c:12259
msgid "POI Categories"
msgstr ""
-#: ../src/maemo-mapper.c:6305
+#: ../src/maemo-mapper.c:6117
msgid "POI Categories..."
msgstr ""
-#: ../src/maemo-mapper.c:5339
+#: ../src/maemo-mapper.c:5087
msgid "POI database"
msgstr ""
-#: ../src/maemo-mapper.c:6301
+#: ../src/maemo-mapper.c:6113
msgid "POIs"
msgstr ""
-#: ../src/maemo-mapper.c:2390
+#: ../src/maemo-mapper.c:2240
msgid "PPS"
msgstr ""
+#: ../src/maemo-mapper.c:7919
+msgid "Pan East"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7916
+msgid "Pan North"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7918
+msgid "Pan South"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7917
+msgid "Pan West"
+msgstr ""
+
# This word refers to Pitch as in of a person's voice.
-#: ../src/maemo-mapper.c:5203
+#: ../src/maemo-mapper.c:4973
msgid "Pitch"
msgstr ""
-#: ../src/maemo-mapper.c:3154
+#: ../src/maemo-mapper.c:2940
msgid "Places to eat or drink."
msgstr ""
-#: ../src/maemo-mapper.c:3156
+#: ../src/maemo-mapper.c:2942
msgid "Places to shop or acquire services."
msgstr ""
-#: ../src/maemo-mapper.c:3162
+#: ../src/maemo-mapper.c:2948
msgid "Places to stay temporarily or for the night."
msgstr ""
-#: ../src/maemo-mapper.c:4791
+#: ../src/maemo-mapper.c:10112
+msgid "Please provide a description for the mark."
+msgstr ""
+
+#: ../src/maemo-mapper.c:4444
msgid "Please select a bluetooth device from the list."
msgstr ""
-#: ../src/maemo-mapper.c:12460
+#: ../src/maemo-mapper.c:12793
msgid "Please specify a category for the POI."
msgstr ""
-#: ../src/maemo-mapper.c:12453
+#: ../src/maemo-mapper.c:12786
msgid "Please specify a name for the POI."
msgstr ""
-#: ../src/maemo-mapper.c:11747
+#: ../src/maemo-mapper.c:12080
msgid "Please specify a name for the category."
msgstr ""
-#: ../src/maemo-mapper.c:9659
+#: ../src/maemo-mapper.c:9767
msgid "Please specify a source URL."
msgstr ""
-#: ../src/maemo-mapper.c:9671
+#: ../src/maemo-mapper.c:9779
msgid "Please specify a start location."
msgstr ""
-#: ../src/maemo-mapper.c:9678
+#: ../src/maemo-mapper.c:9786
msgid "Please specify an end location."
msgstr ""
-#: ../src/maemo-mapper.c:12507
+#: ../src/maemo-mapper.c:12840
msgid "Problem adding POI"
msgstr ""
-#: ../src/maemo-mapper.c:11784
+#: ../src/maemo-mapper.c:12117
msgid "Problem adding category"
msgstr ""
-#: ../src/maemo-mapper.c:11595 ../src/maemo-mapper.c:12043
+#: ../src/maemo-mapper.c:11928 ../src/maemo-mapper.c:12376
msgid "Problem deleting POI"
msgstr ""
-#: ../src/maemo-mapper.c:11604
+#: ../src/maemo-mapper.c:11937
msgid "Problem deleting category"
msgstr ""
-#: ../src/maemo-mapper.c:11825
+#: ../src/maemo-mapper.c:12158
msgid "Problem updating Category"
msgstr ""
-#: ../src/maemo-mapper.c:12485
+#: ../src/maemo-mapper.c:12818
msgid "Problem updating POI"
msgstr ""
-#: ../src/maemo-mapper.c:11769
+#: ../src/maemo-mapper.c:12102
msgid "Problem updating category"
msgstr ""
-#: ../src/maemo-mapper.c:3110
+#: ../src/maemo-mapper.c:2896
msgid "Problem with POI database"
msgstr ""
-#: ../src/maemo-mapper.c:2391
+#: ../src/maemo-mapper.c:2241
msgid "Real Time Kinematic"
msgstr ""
-#: ../src/maemo-mapper.c:3858
+#: ../src/maemo-mapper.c:3627
msgid "Recalculating directions..."
msgstr ""
-#: ../src/maemo-mapper.c:3157
+#: ../src/maemo-mapper.c:2943
msgid "Recreation"
msgstr ""
-#: ../src/maemo-mapper.c:10673
+#: ../src/maemo-mapper.c:10978
msgid "Rename..."
msgstr ""
-#: ../src/maemo-mapper.c:6237
+#: ../src/maemo-mapper.c:10833
+msgid "Replace all repositories with the default repository?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6037
msgid "Reset"
msgstr ""
-#: ../src/maemo-mapper.c:6362 ../src/maemo-mapper.c:8043
+#: ../src/maemo-mapper.c:6174 ../src/maemo-mapper.c:7943
msgid "Reset Bluetooth"
msgstr ""
-#: ../src/maemo-mapper.c:3151
+#: ../src/maemo-mapper.c:4619
+msgid "Reset all colors to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4505
+msgid "Reset all hardware keys to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4537 ../src/maemo-mapper.c:4653
+#: ../src/maemo-mapper.c:10956
+msgid "Reset..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2937
msgid "Residence"
msgstr ""
-#: ../src/maemo-mapper.c:4954 ../src/maemo-mapper.c:6223
-#: ../src/maemo-mapper.c:6287
+#: ../src/maemo-mapper.c:4713 ../src/maemo-mapper.c:6023
+#: ../src/maemo-mapper.c:6099
msgid "Route"
msgstr ""
-#: ../src/maemo-mapper.c:9757
+#: ../src/maemo-mapper.c:9865
msgid "Route Downloaded"
msgstr ""
-#: ../src/maemo-mapper.c:8226 ../src/maemo-mapper.c:9805
+#: ../src/maemo-mapper.c:8224 ../src/maemo-mapper.c:9914
msgid "Route Opened"
msgstr ""
-#: ../src/maemo-mapper.c:9957
+#: ../src/maemo-mapper.c:10160
msgid "Route Saved"
msgstr ""
-#: ../src/maemo-mapper.c:10022
+#: ../src/maemo-mapper.c:10238
msgid "Routes are now hidden"
msgstr ""
-#: ../src/maemo-mapper.c:10016
+#: ../src/maemo-mapper.c:10232
msgid "Routes are now shown"
msgstr ""
-#: ../src/maemo-mapper.c:2388
+#: ../src/maemo-mapper.c:2238
msgid "SPS"
msgstr ""
-#: ../src/maemo-mapper.c:3014
+#: ../src/maemo-mapper.c:2800
msgid "Sat in use"
msgstr ""
-#: ../src/maemo-mapper.c:3005
+#: ../src/maemo-mapper.c:2791
msgid "Sat in view"
msgstr ""
-#: ../src/maemo-mapper.c:2946
+#: ../src/maemo-mapper.c:2732
msgid "Satellites details"
msgstr ""
-#: ../src/maemo-mapper.c:2871
+#: ../src/maemo-mapper.c:2660
msgid "Satellites in view"
msgstr ""
-#: ../src/maemo-mapper.c:6231 ../src/maemo-mapper.c:6249
+#: ../src/maemo-mapper.c:6031 ../src/maemo-mapper.c:6049
msgid "Save..."
msgstr ""
-#: ../src/maemo-mapper.c:5115
+#: ../src/maemo-mapper.c:6094
+msgid "Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4885
msgid "Scan..."
msgstr ""
-#: ../src/maemo-mapper.c:4767
+#: ../src/maemo-mapper.c:4420
msgid "Scanning for Bluetooth Devices"
msgstr ""
-#: ../src/maemo-mapper.c:3163
+#: ../src/maemo-mapper.c:2949
msgid "School"
msgstr ""
-#: ../src/maemo-mapper.c:3301
+#: ../src/maemo-mapper.c:3087
msgid "Searching for GPS receiver"
msgstr ""
-#: ../src/maemo-mapper.c:4731
+#: ../src/maemo-mapper.c:4384
msgid "Select Bluetooth Device"
msgstr ""
-#: ../src/maemo-mapper.c:8030
+#: ../src/maemo-mapper.c:7929
msgid "Select Next Repository"
msgstr ""
-#: ../src/maemo-mapper.c:12153
+#: ../src/maemo-mapper.c:12486
msgid "Select POI"
msgstr ""
-#: ../src/maemo-mapper.c:12218
+#: ../src/maemo-mapper.c:12551
msgid "Select one POI from the list."
msgstr ""
-#: ../src/maemo-mapper.c:5135
+#: ../src/maemo-mapper.c:4905
msgid "Sensitivity"
msgstr ""
-#: ../src/maemo-mapper.c:6498
+#: ../src/maemo-mapper.c:6322
msgid "Set as GPS Location"
msgstr ""
-#: ../src/maemo-mapper.c:5080
+#: ../src/maemo-mapper.c:4847
msgid "Settings"
msgstr ""
-#: ../src/maemo-mapper.c:6369
+#: ../src/maemo-mapper.c:6181
msgid "Settings..."
msgstr ""
-#: ../src/maemo-mapper.c:11160
+#: ../src/maemo-mapper.c:11444
msgid "Setup"
msgstr ""
-#: ../src/maemo-mapper.c:3155
+#: ../src/maemo-mapper.c:2941
msgid "Shopping/Services"
msgstr ""
-#: ../src/maemo-mapper.c:6509
+#: ../src/maemo-mapper.c:6333
msgid "Show Description"
msgstr ""
-#: ../src/maemo-mapper.c:6255 ../src/maemo-mapper.c:8039
+#: ../src/maemo-mapper.c:6057 ../src/maemo-mapper.c:7938
msgid "Show Distance from Beginning"
msgstr ""
-#: ../src/maemo-mapper.c:6253 ../src/maemo-mapper.c:8037
+#: ../src/maemo-mapper.c:7936
+msgid "Show Distance from Last Break"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6055
msgid "Show Distance from Last Mark"
msgstr ""
-#: ../src/maemo-mapper.c:6485 ../src/maemo-mapper.c:6516
-#: ../src/maemo-mapper.c:6540
+#: ../src/maemo-mapper.c:6309 ../src/maemo-mapper.c:6340
+#: ../src/maemo-mapper.c:6364
msgid "Show Distance to"
msgstr ""
-#: ../src/maemo-mapper.c:6235 ../src/maemo-mapper.c:8034
+#: ../src/maemo-mapper.c:6035 ../src/maemo-mapper.c:7933
msgid "Show Distance to End of Route"
msgstr ""
-#: ../src/maemo-mapper.c:6233 ../src/maemo-mapper.c:8032
+#: ../src/maemo-mapper.c:6033 ../src/maemo-mapper.c:7931
msgid "Show Distance to Next Waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:6355
+#: ../src/maemo-mapper.c:6167
msgid "Show Information"
msgstr ""
-#: ../src/maemo-mapper.c:6480 ../src/maemo-mapper.c:6507
+#: ../src/maemo-mapper.c:6304 ../src/maemo-mapper.c:6331
msgid "Show Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:5354
+#: ../src/maemo-mapper.c:5102
msgid "Show POI below zoom"
msgstr ""
-#: ../src/maemo-mapper.c:2395
+#: ../src/maemo-mapper.c:2245
msgid "Simulation"
msgstr ""
-#: ../src/maemo-mapper.c:9554
+#: ../src/maemo-mapper.c:9662
msgid "Source URL"
msgstr ""
-#: ../src/maemo-mapper.c:2969 ../src/maemo-mapper.c:5191
+#: ../src/maemo-mapper.c:2755 ../src/maemo-mapper.c:4961
msgid "Speed"
msgstr ""
-#: ../src/maemo-mapper.c:5296
+#: ../src/maemo-mapper.c:5058
msgid "Speed Limit"
msgstr ""
-#: ../src/maemo-mapper.c:3150
+#: ../src/maemo-mapper.c:2936
msgid "Stations for purchasing fuel for vehicles."
msgstr ""
-#: ../src/maemo-mapper.c:3562
+#: ../src/maemo-mapper.c:3348
msgid "The current route is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3608 ../src/maemo-mapper.c:3623
+#: ../src/maemo-mapper.c:3394 ../src/maemo-mapper.c:3409
msgid "The current track is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3543 ../src/maemo-mapper.c:10230
+#: ../src/maemo-mapper.c:4580
+msgid "The following action is mapped to multiple keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8646
+msgid "There are no other next-able repositories."
+msgstr ""
+
+#: ../src/maemo-mapper.c:13222
+msgid "There are no waypoints."
+msgstr ""
+
+#: ../src/maemo-mapper.c:3329 ../src/maemo-mapper.c:10446
msgid "There is no next waypoint."
msgstr ""
-#: ../src/maemo-mapper.c:8040
+#: ../src/maemo-mapper.c:7921
+msgid "Toggle Auto-Center"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7923
+msgid "Toggle Fullscreen"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7939
msgid "Toggle GPS"
msgstr ""
-#: ../src/maemo-mapper.c:8041
+#: ../src/maemo-mapper.c:7940
msgid "Toggle GPS Info"
msgstr ""
-#: ../src/maemo-mapper.c:8029
+#: ../src/maemo-mapper.c:7928
msgid "Toggle POIs"
msgstr ""
-#: ../src/maemo-mapper.c:8042
+#: ../src/maemo-mapper.c:7927
+msgid "Toggle Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7942
msgid "Toggle Speed Limit"
msgstr ""
-#: ../src/maemo-mapper.c:8028
+#: ../src/maemo-mapper.c:7926
msgid "Toggle Tracks"
msgstr ""
-#: ../src/maemo-mapper.c:8049 ../src/maemo-mapper.c:11288
+#: ../src/maemo-mapper.c:7966 ../src/maemo-mapper.c:11572
msgid "Top-Left"
msgstr ""
-#: ../src/maemo-mapper.c:8050
+#: ../src/maemo-mapper.c:7967
msgid "Top-Right"
msgstr ""
-#: ../src/maemo-mapper.c:4938 ../src/maemo-mapper.c:6243
-#: ../src/maemo-mapper.c:6292
+#: ../src/maemo-mapper.c:4689 ../src/maemo-mapper.c:6043
+#: ../src/maemo-mapper.c:6104
msgid "Track"
msgstr ""
-#: ../src/maemo-mapper.c:9880
+#: ../src/maemo-mapper.c:9988
msgid "Track Opened"
msgstr ""
-#: ../src/maemo-mapper.c:9902
+#: ../src/maemo-mapper.c:10010
msgid "Track Saved"
msgstr ""
-#: ../src/maemo-mapper.c:9998
+#: ../src/maemo-mapper.c:10201
msgid "Tracks are now hidden"
msgstr ""
-#: ../src/maemo-mapper.c:9992
+#: ../src/maemo-mapper.c:10195
msgid "Tracks are now shown"
msgstr ""
-#: ../src/maemo-mapper.c:3159
+#: ../src/maemo-mapper.c:2945
msgid "Transportation"
msgstr ""
-#: ../src/maemo-mapper.c:10454
+#: ../src/maemo-mapper.c:10676
msgid "URL Format"
msgstr ""
-#: ../src/maemo-mapper.c:10773
+#: ../src/maemo-mapper.c:5445
msgid "Unable to create cache directory for repository"
msgstr ""
-#: ../src/maemo-mapper.c:5261
+#: ../src/maemo-mapper.c:5024
msgid "Units"
msgstr ""
-#: ../src/maemo-mapper.c:9582
+#: ../src/maemo-mapper.c:9690
msgid "Use End of Route"
msgstr ""
-#: ../src/maemo-mapper.c:9568
+#: ../src/maemo-mapper.c:9676
msgid "Use GPS Location"
msgstr ""
-#: ../src/maemo-mapper.c:6297
+#: ../src/maemo-mapper.c:6109
msgid "Velocity Vector"
msgstr ""
-#: ../src/maemo-mapper.c:6279
+#: ../src/maemo-mapper.c:6081
msgid "View"
msgstr ""
-#: ../src/maemo-mapper.c:11269
+#: ../src/maemo-mapper.c:11553
msgid "View Center"
msgstr ""
-#: ../src/maemo-mapper.c:10494
+#: ../src/maemo-mapper.c:10731
msgid "View Zoom Steps"
msgstr ""
-#: ../src/maemo-mapper.c:6537
+#: ../src/maemo-mapper.c:6361
msgid "View/Edit..."
msgstr ""
-#: ../src/maemo-mapper.c:11582
+#: ../src/maemo-mapper.c:11915
msgid "WARNING: All POIs in that category will also be deleted!"
msgstr ""
-#: ../src/maemo-mapper.c:6502
+#: ../src/maemo-mapper.c:6326
msgid "Waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:11217
+#: ../src/maemo-mapper.c:6472
+msgid ""
+"You will now see a blank screen. You can download maps using the \"Manage "
+"Maps\" menu item in the \"Maps\" menu. Or, press OK to enable Auto-Download."
+msgstr ""
+
+#: ../src/maemo-mapper.c:11501
msgid "Zoom"
msgstr ""
-#: ../src/maemo-mapper.c:11223
+#: ../src/maemo-mapper.c:6085 ../src/maemo-mapper.c:7924
+msgid "Zoom In"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11507
msgid "Zoom Levels to Download: (0 = most detail)"
msgstr ""
-#: ../src/maemo-mapper.c:8463 ../src/maemo-mapper.c:8545
+#: ../src/maemo-mapper.c:6087 ../src/maemo-mapper.c:7925
+msgid "Zoom Out"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8461 ../src/maemo-mapper.c:8573
+#: ../src/maemo-mapper.c:11735 ../src/maemo-mapper.c:11753
msgid "Zoom to Level"
msgstr ""
-#: ../src/maemo-mapper.c:10995 ../src/maemo-mapper.c:11002
+#: ../src/maemo-mapper.c:11279 ../src/maemo-mapper.c:11286
msgid "about"
msgstr ""
-#: ../src/maemo-mapper.c:2872
+#: ../src/maemo-mapper.c:2661
msgid "in use"
msgstr ""
-#: ../src/maemo-mapper.c:8016
+#: ../src/maemo-mapper.c:7874
msgid "km"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "maps"
msgstr ""
-#: ../src/maemo-mapper.c:10909 ../src/maemo-mapper.c:10996
+#: ../src/maemo-mapper.c:11193 ../src/maemo-mapper.c:11280
msgid "maps "
msgstr ""
-#: ../src/maemo-mapper.c:8017
+#: ../src/maemo-mapper.c:7875
msgid "mi."
msgstr ""
-#: ../src/maemo-mapper.c:8018
+#: ../src/maemo-mapper.c:7876
msgid "n.m."
msgstr ""
-#: ../src/maemo-mapper.c:3027
+#: ../src/maemo-mapper.c:2813
msgid "nofix"
msgstr ""
-#: ../src/maemo-mapper.c:2396 ../src/maemo-mapper.c:3036
+#: ../src/maemo-mapper.c:2246 ../src/maemo-mapper.c:2822
msgid "none"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "up to about"
msgstr ""
msgstr ""
"Project-Id-Version: maemo-mapper 1.2.4\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 16:40-0500\n"
+"POT-Creation-Date: 2007-03-12 01:23-0400\n"
"PO-Revision-Date: 2007-03-03 15:33+0200\n"
"Last-Translator: Marko Vertainen <marko.vertainen@iki.fi>\n"
"Language-Team: John Costigan <gnuite@gmail.com>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/maemo-mapper.c:11990
+#: ../src/maemo-mapper.c:12323
msgid "# POIs"
msgstr "# POI:t"
-#: ../src/maemo-mapper.c:11939
+#: ../src/maemo-mapper.c:6186
+#, fuzzy
+msgid "About..."
+msgstr "noin"
+
+#: ../src/maemo-mapper.c:12272
msgid "Add"
msgstr "Lisää"
-#: ../src/maemo-mapper.c:11678
+#: ../src/maemo-mapper.c:12011
msgid "Add Category"
msgstr "Lisää kategoria"
-#: ../src/maemo-mapper.c:12341
+#: ../src/maemo-mapper.c:12674
msgid "Add POI"
msgstr "Lisää POI"
-#: ../src/maemo-mapper.c:6494 ../src/maemo-mapper.c:6523
+#: ../src/maemo-mapper.c:6318 ../src/maemo-mapper.c:6347
msgid "Add POI..."
msgstr "Lisää POI..."
-#: ../src/maemo-mapper.c:6490 ../src/maemo-mapper.c:6545
+#: ../src/maemo-mapper.c:6314 ../src/maemo-mapper.c:6369
msgid "Add Route Point"
msgstr "Lisää reittipiste"
-#: ../src/maemo-mapper.c:12631
+#: ../src/maemo-mapper.c:12964
msgid "Add Waypoint"
msgstr "Lisää kohdepiste"
-#: ../src/maemo-mapper.c:6492 ../src/maemo-mapper.c:6547
+#: ../src/maemo-mapper.c:6316 ../src/maemo-mapper.c:6371
msgid "Add Waypoint..."
msgstr "Lisää kohdepiste..."
-#: ../src/maemo-mapper.c:5166
+#: ../src/maemo-mapper.c:4936
msgid "Advance Notice"
msgstr "Ennakkovaroitus"
-#: ../src/maemo-mapper.c:11202
+#: ../src/maemo-mapper.c:11486
msgid "Along Route - Radius (tiles):"
msgstr "Reitin varrelta - Säde:"
-#: ../src/maemo-mapper.c:2978
+#: ../src/maemo-mapper.c:2764
msgid "Altitude"
msgstr "Korkeus"
-#: ../src/maemo-mapper.c:4773
+#: ../src/maemo-mapper.c:4426
msgid "An error occurred while attempting to scan for bluetooth devices."
msgstr "Tapahtui virhe bluetooth laitteita haettaessa."
-#: ../src/maemo-mapper.c:10596
+#: ../src/maemo-mapper.c:10888
msgid ""
"An error occurred while retrieving the repositories. The web service may be "
"temporarily down."
"Tapahtui virhe varastoja haettaessa. Palvelu saattaa olla väliaikaisesti "
"pois käytöstä."
-#: ../src/maemo-mapper.c:8477
+#: ../src/maemo-mapper.c:8475
msgid ""
"An error occurred while trying to reset the bluetooth radio.\n"
"\n"
"Muistitko muokata\n"
"/etc/sudoers tiedostoa?"
-#: ../src/maemo-mapper.c:5162
+#: ../src/maemo-mapper.c:4932
msgid "Announce"
msgstr "Ilmoitus"
-#: ../src/maemo-mapper.c:11239
+#: ../src/maemo-mapper.c:11523
msgid "Area"
msgstr "Alue"
-#: ../src/maemo-mapper.c:5131 ../src/maemo-mapper.c:6310
+#: ../src/maemo-mapper.c:4901 ../src/maemo-mapper.c:6122
msgid "Auto-Center"
msgstr "Autom. keskitys"
-#: ../src/maemo-mapper.c:10091
+#: ../src/maemo-mapper.c:10307
msgid "Auto-Center Mode: Lat/Lon"
msgstr "Automaattinen keskitys: Lat/Lon"
-#: ../src/maemo-mapper.c:10076
+#: ../src/maemo-mapper.c:10292
msgid "Auto-Center Mode: Lead"
msgstr "Automaattinen keskitys: Etumatka"
-#: ../src/maemo-mapper.c:10105
+#: ../src/maemo-mapper.c:10321
msgid "Auto-Center Off"
msgstr "Automaattinen keskitys pois päältä"
-#: ../src/maemo-mapper.c:6270
+#: ../src/maemo-mapper.c:6072
msgid "Auto-Download"
msgstr "Autom. noutaminen"
-#: ../src/maemo-mapper.c:9572
+#: ../src/maemo-mapper.c:9680
msgid "Auto-Update"
msgstr "Autom. päivitys"
-#: ../src/maemo-mapper.c:8052
+#: ../src/maemo-mapper.c:7969
msgid "Bottom-Left"
msgstr "Ala-vasen"
-#: ../src/maemo-mapper.c:8051 ../src/maemo-mapper.c:11306
+#: ../src/maemo-mapper.c:7968 ../src/maemo-mapper.c:11590
msgid "Bottom-Right"
msgstr "Ala-oikea"
-#: ../src/maemo-mapper.c:5349 ../src/maemo-mapper.c:10473
+#: ../src/maemo-mapper.c:3700
+#, fuzzy
+msgid "Break already inserted."
+msgstr "Merkki on jo asetettu"
+
+#: ../src/maemo-mapper.c:5097 ../src/maemo-mapper.c:10695
msgid "Browse..."
msgstr "Selaa"
-#: ../src/maemo-mapper.c:3160
+#: ../src/maemo-mapper.c:2946
msgid "Bus stops, airports, train stations, etc."
msgstr "Bussi- ja rautatieasemat, lentokentät ym."
-#: ../src/maemo-mapper.c:3165
+#: ../src/maemo-mapper.c:2951
msgid "Business"
msgstr "Liike-elämä"
-#: ../src/maemo-mapper.c:11193
+#: ../src/maemo-mapper.c:11477
msgid "By Area (see tab)"
msgstr "Alueelta (katso välilehti)"
-#: ../src/maemo-mapper.c:10463
+#: ../src/maemo-mapper.c:10685
msgid "Cache Dir."
msgstr "Tallennuskansio"
-#: ../src/maemo-mapper.c:10409
+#: ../src/maemo-mapper.c:10626
msgid ""
"Cannot delete the last repository - there must be at lease one repository."
msgstr ""
"Ei voida poistaa viimeistä varastoa - vähintään yksi varasto pitää olla "
"määriteltynä."
-#: ../src/maemo-mapper.c:11473
+#: ../src/maemo-mapper.c:11795
msgid ""
"Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."
msgstr ""
"GPS:ää ei voida ottaa käyttöön ennenkuin GPS:n MAC-osoite on määritelty "
"asetusten valintaikkunassa."
-#: ../src/maemo-mapper.c:12191 ../src/maemo-mapper.c:12378
+#: ../src/maemo-mapper.c:12524 ../src/maemo-mapper.c:12711
msgid "Category"
msgstr "Kategoria"
-#: ../src/maemo-mapper.c:6239 ../src/maemo-mapper.c:6257
-#: ../src/maemo-mapper.c:11146
+#: ../src/maemo-mapper.c:6039 ../src/maemo-mapper.c:6059
+#: ../src/maemo-mapper.c:11430
msgid "Clear"
msgstr "Tyhjennä"
-#: ../src/maemo-mapper.c:6374
+#: ../src/maemo-mapper.c:6188
msgid "Close"
msgstr "Sulje"
-#: ../src/maemo-mapper.c:4899
+#: ../src/maemo-mapper.c:4647
msgid "Colors"
msgstr "Värit"
-#: ../src/maemo-mapper.c:5090
+#: ../src/maemo-mapper.c:4860
msgid "Colors..."
msgstr "Värit..."
-#: ../src/maemo-mapper.c:10908 ../src/maemo-mapper.c:10995
+#: ../src/maemo-mapper.c:11192 ../src/maemo-mapper.c:11279
msgid "Confirm DELETION of"
msgstr "Vahvista"
-#: ../src/maemo-mapper.c:10416
+#: ../src/maemo-mapper.c:10633
msgid "Confirm delete of repository"
msgstr "Vahvista varaston poisto"
-#: ../src/maemo-mapper.c:13034
+#: ../src/maemo-mapper.c:13335
msgid "Confirm delete of waypoint"
msgstr "Vahvista kohdepisteen poisto"
-#: ../src/maemo-mapper.c:10914 ../src/maemo-mapper.c:11001
+#: ../src/maemo-mapper.c:11198 ../src/maemo-mapper.c:11285
msgid "Confirm download of"
msgstr "Vahvista"
-#: ../src/maemo-mapper.c:6513
+#: ../src/maemo-mapper.c:4583
+msgid "Continue?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6337
msgid "Copy Description"
msgstr "Kopioi kuvaus"
-#: ../src/maemo-mapper.c:6482 ../src/maemo-mapper.c:6511
+#: ../src/maemo-mapper.c:6306 ../src/maemo-mapper.c:6335
msgid "Copy Lat/Lon"
msgstr "Kopioi Lat/Lon"
-#: ../src/maemo-mapper.c:9709
+#: ../src/maemo-mapper.c:9817
msgid ""
"Could not generate directions. Make sure your source and destination are "
"valid."
msgstr "Ei voitu luoda reittiä. Varmista, että lähde ja kohde ovat oikein."
-#: ../src/maemo-mapper.c:12709
+#: ../src/maemo-mapper.c:13043
msgid ""
"Creating a \"waypoint\" with no description actually adds a break point. Is "
"that what you want?"
"Luotaessa \"kohdepiste\" ilman kuvausta, lisää itseasiassa katkaisupisteen. "
"Tarkoititko sitä?"
-#: ../src/maemo-mapper.c:2389
+#: ../src/maemo-mapper.c:2239
msgid "DGPS"
msgstr ""
-#: ../src/maemo-mapper.c:4905
-msgid "Defaults"
-msgstr "Oletukset"
-
-#: ../src/maemo-mapper.c:5277
+#: ../src/maemo-mapper.c:5035
msgid "Degrees Format"
msgstr "Asteiden muoto"
-#: ../src/maemo-mapper.c:11659 ../src/maemo-mapper.c:12316
+#: ../src/maemo-mapper.c:11992 ../src/maemo-mapper.c:12649
msgid "Delete"
msgstr "Poista"
-#: ../src/maemo-mapper.c:11183
+#: ../src/maemo-mapper.c:11467
msgid "Delete Maps"
msgstr "Poista kartat"
-#: ../src/maemo-mapper.c:12032
+#: ../src/maemo-mapper.c:12365
msgid "Delete POI?"
msgstr "Poista POI?"
-#: ../src/maemo-mapper.c:11580
+#: ../src/maemo-mapper.c:11913
msgid "Delete category?"
msgstr "Poista kategoria?"
-#: ../src/maemo-mapper.c:6520 ../src/maemo-mapper.c:10676
+#: ../src/maemo-mapper.c:6344 ../src/maemo-mapper.c:10981
msgid "Delete..."
msgstr "Poista..."
-#: ../src/maemo-mapper.c:4761 ../src/maemo-mapper.c:11697
-#: ../src/maemo-mapper.c:11985 ../src/maemo-mapper.c:12405
-#: ../src/maemo-mapper.c:12657
+#: ../src/maemo-mapper.c:4414 ../src/maemo-mapper.c:10069
+#: ../src/maemo-mapper.c:12030 ../src/maemo-mapper.c:12318
+#: ../src/maemo-mapper.c:12738 ../src/maemo-mapper.c:12989
msgid "Description"
msgstr "Kuvaus"
-#: ../src/maemo-mapper.c:9600
+#: ../src/maemo-mapper.c:9708
msgid "Destination"
msgstr "Kohdepiste"
-#: ../src/maemo-mapper.c:6359
+#: ../src/maemo-mapper.c:6171
msgid "Details..."
msgstr "Yksityiskohdat..."
-#: ../src/maemo-mapper.c:3153
+#: ../src/maemo-mapper.c:2939
msgid "Dining"
msgstr "Ruokailu"
-#: ../src/maemo-mapper.c:3528 ../src/maemo-mapper.c:3588
-#: ../src/maemo-mapper.c:12598
+#: ../src/maemo-mapper.c:3314 ../src/maemo-mapper.c:3374
+#: ../src/maemo-mapper.c:12931
msgid "Distance"
msgstr "Etäisyys"
-#: ../src/maemo-mapper.c:11170
+#: ../src/maemo-mapper.c:10752
+msgid "Double Pixels"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11454
msgid "Download Maps"
msgstr "Lataa kartat"
-#: ../src/maemo-mapper.c:9532
+#: ../src/maemo-mapper.c:9640
msgid "Download Route"
msgstr "Lataa reitti"
-#: ../src/maemo-mapper.c:6487 ../src/maemo-mapper.c:6518
-#: ../src/maemo-mapper.c:6542
+#: ../src/maemo-mapper.c:6311 ../src/maemo-mapper.c:6342
+#: ../src/maemo-mapper.c:6366
msgid "Download Route to..."
msgstr "Lataa reitti kohteeseen..."
-#: ../src/maemo-mapper.c:10478
+#: ../src/maemo-mapper.c:10715
msgid "Download Zoom Steps"
msgstr "Latauksen zoom tasot"
-#: ../src/maemo-mapper.c:6229 ../src/maemo-mapper.c:10657
+#: ../src/maemo-mapper.c:6029 ../src/maemo-mapper.c:10962
msgid "Download..."
msgstr "Lataa..."
-#: ../src/maemo-mapper.c:6960
+#: ../src/maemo-mapper.c:6827
msgid "Downloading maps"
msgstr "Ladataan karttoja"
-#: ../src/maemo-mapper.c:11936
+#: ../src/maemo-mapper.c:12269
msgid "Edit"
msgstr "Muokkaa"
-#: ../src/maemo-mapper.c:12401
+#: ../src/maemo-mapper.c:12734
msgid "Edit Categories..."
msgstr "Muokkaa kategorioita..."
-#: ../src/maemo-mapper.c:11653
+#: ../src/maemo-mapper.c:11986
msgid "Edit Category"
msgstr "Muokkaa kategoriaa"
-#: ../src/maemo-mapper.c:12310
+#: ../src/maemo-mapper.c:12643
msgid "Edit POI"
msgstr "Muokkaa POI:ta"
-#: ../src/maemo-mapper.c:3164
+#: ../src/maemo-mapper.c:2950
msgid "Elementary schools, college campuses, etc."
msgstr "Elementary schools, college campuses, etc."
-#: ../src/maemo-mapper.c:6351
+#: ../src/maemo-mapper.c:6163
msgid "Enable GPS"
msgstr "Käytä GPS:ää"
-#: ../src/maemo-mapper.c:5178
+#: ../src/maemo-mapper.c:4948
msgid "Enable Voice Synthesis (requires flite)"
msgstr "Käytä puhesyntetisaattoria (vaatii flite:n)"
-#: ../src/maemo-mapper.c:11721 ../src/maemo-mapper.c:11973
+#: ../src/maemo-mapper.c:12054 ../src/maemo-mapper.c:12306
msgid "Enabled"
msgstr "Käytössä"
-#: ../src/maemo-mapper.c:7212
+#: ../src/maemo-mapper.c:7064
msgid ""
"Error in download. Check internet connection and/or Map Repository URL "
"Format."
"Virhe latauksessa. Tarkista Internet yhteys ja/tai karttavaraston URL:n "
"oikeellisuus."
-#: ../src/maemo-mapper.c:8229 ../src/maemo-mapper.c:9765
-#: ../src/maemo-mapper.c:9808 ../src/maemo-mapper.c:9883
+#: ../src/maemo-mapper.c:8227 ../src/maemo-mapper.c:9873
+#: ../src/maemo-mapper.c:9917 ../src/maemo-mapper.c:9991
msgid "Error parsing GPX file."
msgstr "Virhe tulkittaessa GPX tiedostoa."
-#: ../src/maemo-mapper.c:1472
+#: ../src/maemo-mapper.c:1475
msgid "Error while writing to file"
msgstr "Virhe kirjoitettaessa tiedostoa"
-#: ../src/maemo-mapper.c:9905 ../src/maemo-mapper.c:9960
+#: ../src/maemo-mapper.c:10013 ../src/maemo-mapper.c:10163
msgid "Error writing GPX file."
msgstr "Virhe kirjoitettaessa GPX tiedostoa."
-#: ../src/maemo-mapper.c:5239
-msgid "Escape Key"
-msgstr "Escape näppäin"
-
-#: ../src/maemo-mapper.c:3311
+#: ../src/maemo-mapper.c:3097
msgid "Establishing GPS fix"
msgstr "Odotetaan GPS:n lukittumista"
-#: ../src/maemo-mapper.c:2393
+#: ../src/maemo-mapper.c:2243
msgid "Estimated"
msgstr "Arvioitu"
-#: ../src/maemo-mapper.c:4065
+#: ../src/maemo-mapper.c:3836
msgid "Failed to connect to GPS receiver. Retry?"
msgstr "Yhteys GPS vastaanottimeen epäonnistui. Yritä uudelleen?"
-#: ../src/maemo-mapper.c:9697
+#: ../src/maemo-mapper.c:9805
msgid "Failed to connect to GPX Directions server"
msgstr "Yhteyden muodostus GPX reittipalvelimeen epäonnistui"
-#: ../src/maemo-mapper.c:5667
+#: ../src/maemo-mapper.c:5478
msgid "Failed to initialize GConf. Quitting."
msgstr "GConf alustus epäonnistui. Lopetetaan."
-#: ../src/maemo-mapper.c:4280
+#: ../src/maemo-mapper.c:3980
msgid "Failed to initialize GConf. Settings were not saved."
msgstr "GConf alustus epäonnistui. Asetuksia ei tallennettu."
-#: ../src/maemo-mapper.c:7768 ../src/maemo-mapper.c:8217
+#: ../src/maemo-mapper.c:7625 ../src/maemo-mapper.c:8216
msgid "Failed to open file for reading"
msgstr "Tiedoston avaus lukemista varten epäonnistui"
-#: ../src/maemo-mapper.c:7425 ../src/maemo-mapper.c:7769
+#: ../src/maemo-mapper.c:7282 ../src/maemo-mapper.c:7626
msgid "Failed to open file for writing"
msgstr "Tiedoston avaus kirjoitusta varten epäonnistui"
-#: ../src/maemo-mapper.c:3178
+#: ../src/maemo-mapper.c:2964
msgid "Failed to open or create database"
msgstr "Tietokannan avaus tai luonti epäonnistui"
-#: ../src/maemo-mapper.c:1473
+#: ../src/maemo-mapper.c:1476
msgid "File is incomplete."
msgstr "Tiedosto on vaillinainen."
-#: ../src/maemo-mapper.c:3023
+#: ../src/maemo-mapper.c:2809
msgid "Fix"
msgstr "Lukitus"
-#: ../src/maemo-mapper.c:3032
+#: ../src/maemo-mapper.c:2818
msgid "Fix Quality"
msgstr "Lukituksen laatu"
-#: ../src/maemo-mapper.c:2392
+#: ../src/maemo-mapper.c:2242
msgid "Float RTK"
msgstr "Kelluva RTK"
-#: ../src/maemo-mapper.c:3149
+#: ../src/maemo-mapper.c:2935
msgid "Fuel"
msgstr "Huoltoasemat"
-#: ../src/maemo-mapper.c:6283
+#: ../src/maemo-mapper.c:6089
msgid "Full Screen"
msgstr "Kokoruutu"
-#: ../src/maemo-mapper.c:5101 ../src/maemo-mapper.c:6347
+#: ../src/maemo-mapper.c:4665 ../src/maemo-mapper.c:4871
+#: ../src/maemo-mapper.c:6159
msgid "GPS"
msgstr ""
-#: ../src/maemo-mapper.c:2926
+#: ../src/maemo-mapper.c:2712
msgid "GPS Details"
msgstr "GPS:n yksityiskohdat"
-#: ../src/maemo-mapper.c:2939
+#: ../src/maemo-mapper.c:2725
msgid "GPS Information"
msgstr "GPS tieto"
-#: ../src/maemo-mapper.c:6339 ../src/maemo-mapper.c:11253
+#: ../src/maemo-mapper.c:6151 ../src/maemo-mapper.c:11537
msgid "GPS Location"
msgstr "GPS sijainti"
-#: ../src/maemo-mapper.c:4917
-msgid "GPS Mark"
-msgstr "GPS merkki"
-
-#: ../src/maemo-mapper.c:3168
+#: ../src/maemo-mapper.c:2954
msgid "General landmarks."
msgstr "Yleiset maamerkit."
-#: ../src/maemo-mapper.c:3166
+#: ../src/maemo-mapper.c:2952
msgid "General places of business."
msgstr "Liike-elämän yleiset paikat."
-#: ../src/maemo-mapper.c:6333
+#: ../src/maemo-mapper.c:6145
msgid "Go to"
msgstr "Siirry"
-#: ../src/maemo-mapper.c:10121
+#: ../src/maemo-mapper.c:10337
msgid "Go to Lat/Lon"
msgstr "Siirry Lat/Lon"
-#: ../src/maemo-mapper.c:6550
+#: ../src/maemo-mapper.c:6374
msgid "Go to Nearest"
msgstr "Siirry lähimpään"
-#: ../src/maemo-mapper.c:6527
+#: ../src/maemo-mapper.c:6351
msgid "Go to Next"
msgstr "Siirry seuraavaan"
-#: ../src/maemo-mapper.c:2987
+#: ../src/maemo-mapper.c:4531
+msgid "Hardware Keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4857
+msgid "Hardware Keys..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2773
msgid "Heading"
msgstr "Suunta"
-#: ../src/maemo-mapper.c:6372
-msgid "Help"
+#: ../src/maemo-mapper.c:6184
+#, fuzzy
+msgid "Help..."
msgstr "Ohje"
-#: ../src/maemo-mapper.c:3152
+#: ../src/maemo-mapper.c:2938
msgid "Houses, apartments, or other residences of import."
msgstr "Talot, asunnot tai muut tärkeät asuinpaikat."
-#: ../src/maemo-mapper.c:11965
+#: ../src/maemo-mapper.c:12298
msgid "ID"
msgstr ""
-#: ../src/maemo-mapper.c:3158
+#: ../src/maemo-mapper.c:2944
msgid "Indoor or Outdoor places to have fun."
msgstr "Sisä- tai ulkotiloja hauskanpitoon."
-#: ../src/maemo-mapper.c:5322
+#: ../src/maemo-mapper.c:5008
msgid "Information Font Size"
msgstr "Tietojen fonttikoko"
-#: ../src/maemo-mapper.c:6251
+#: ../src/maemo-mapper.c:6051
+#, fuzzy
+msgid "Insert Break"
+msgstr "Lisää merkki"
+
+#: ../src/maemo-mapper.c:10044
msgid "Insert Mark"
msgstr "Lisää merkki"
-#: ../src/maemo-mapper.c:8035
-msgid "Insert Track Mark"
+#: ../src/maemo-mapper.c:6053
+#, fuzzy
+msgid "Insert Mark..."
+msgstr "Lisää merkki"
+
+#: ../src/maemo-mapper.c:7934
+#, fuzzy
+msgid "Insert Track Break"
msgstr "Lisää merkki reittijälkeen"
-#: ../src/maemo-mapper.c:11417
+#: ../src/maemo-mapper.c:11703
msgid "Invalid Bottom-Right Latitude"
msgstr "Virheellinen ala-oikea latitudi"
-#: ../src/maemo-mapper.c:11424
+#: ../src/maemo-mapper.c:11710
msgid "Invalid Bottom-Right Longitude"
msgstr "Virheellinen ala-oikea longitudi"
-#: ../src/maemo-mapper.c:10177
+#: ../src/maemo-mapper.c:10393
msgid "Invalid Latitude"
msgstr "Virheellinen latitudi"
-#: ../src/maemo-mapper.c:10184
+#: ../src/maemo-mapper.c:10400
msgid "Invalid Longitude"
msgstr "Virheellinen longitudi"
-#: ../src/maemo-mapper.c:8995 ../src/maemo-mapper.c:9006
+#: ../src/maemo-mapper.c:9121 ../src/maemo-mapper.c:9132
msgid "Invalid NMEA input from receiver!"
msgstr "Virheellinen NMEA syöte vastaanottimelta!"
-#: ../src/maemo-mapper.c:11403
+#: ../src/maemo-mapper.c:11689
msgid "Invalid Top-Left Latitude"
msgstr "Virheellinen ylä-vasen latitudi"
-#: ../src/maemo-mapper.c:11410
+#: ../src/maemo-mapper.c:11696
msgid "Invalid Top-Left Longitude"
msgstr "Virheellinen ylä-vasen longitudi"
-#: ../src/maemo-mapper.c:5230
+#: ../src/maemo-mapper.c:6455
+msgid ""
+"It looks like this is your first time running Maemo Mapper. Press OK to "
+"view the the help pages. Otherwise, press Cancel to continue."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5000
msgid "Keep Display On Only in Fullscreen Mode"
msgstr "Pidä näyttö päällä vain kokoruudun ollessa käytössä"
-#: ../src/maemo-mapper.c:11689 ../src/maemo-mapper.c:11980
-#: ../src/maemo-mapper.c:12186 ../src/maemo-mapper.c:12370
+#: ../src/maemo-mapper.c:12022 ../src/maemo-mapper.c:12313
+#: ../src/maemo-mapper.c:12519 ../src/maemo-mapper.c:12703
msgid "Label"
msgstr "Nimike"
-#: ../src/maemo-mapper.c:3167
+#: ../src/maemo-mapper.c:2953
msgid "Landmark"
msgstr "Maamerkit"
-#: ../src/maemo-mapper.c:12360 ../src/maemo-mapper.c:12641
+#: ../src/maemo-mapper.c:10054 ../src/maemo-mapper.c:12693
+#: ../src/maemo-mapper.c:12974
msgid "Lat, Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6314
+#: ../src/maemo-mapper.c:6126
msgid "Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6337
+#: ../src/maemo-mapper.c:6149
msgid "Lat/Lon..."
msgstr ""
-#: ../src/maemo-mapper.c:2951 ../src/maemo-mapper.c:10131
-#: ../src/maemo-mapper.c:11243 ../src/maemo-mapper.c:12544
+#: ../src/maemo-mapper.c:2737 ../src/maemo-mapper.c:10347
+#: ../src/maemo-mapper.c:11527 ../src/maemo-mapper.c:12877
msgid "Latitude"
msgstr "Latitudi"
-#: ../src/maemo-mapper.c:6320
+#: ../src/maemo-mapper.c:6132
msgid "Lead"
msgstr "Etumatka"
-#: ../src/maemo-mapper.c:5148
+#: ../src/maemo-mapper.c:4918
msgid "Lead Amount"
msgstr "Etumatkan määrä"
-#: ../src/maemo-mapper.c:5218
+#: ../src/maemo-mapper.c:4988
msgid "Line Width"
msgstr "Rivin leveys"
-#: ../src/maemo-mapper.c:2996
+#: ../src/maemo-mapper.c:2782
msgid "Local time"
msgstr "Paikallinen aika"
-#: ../src/maemo-mapper.c:5306 ../src/maemo-mapper.c:6474
-#: ../src/maemo-mapper.c:12181
+#: ../src/maemo-mapper.c:5068 ../src/maemo-mapper.c:6298
+#: ../src/maemo-mapper.c:12514
msgid "Location"
msgstr "Sijainti"
-#: ../src/maemo-mapper.c:3161
+#: ../src/maemo-mapper.c:2947
msgid "Lodging"
msgstr "Majapaikat"
-#: ../src/maemo-mapper.c:2960 ../src/maemo-mapper.c:10143
-#: ../src/maemo-mapper.c:11247 ../src/maemo-mapper.c:12545
+#: ../src/maemo-mapper.c:2746 ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:11531 ../src/maemo-mapper.c:12878
msgid "Longitude"
msgstr "Longitudi"
-#: ../src/maemo-mapper.c:4756 ../src/maemo-mapper.c:5105
+#: ../src/maemo-mapper.c:4409 ../src/maemo-mapper.c:4875
msgid "MAC"
msgstr ""
-#: ../src/maemo-mapper.c:10577
+#: ../src/maemo-mapper.c:10869
msgid ""
"Maemo Mapper will now download and add a list of possibly-duplicate "
"repositories from the internet. Continue?"
"Maemo Mapper lataa ja lisää listan karttavarastoja Internetistä. Osa "
"karttavarastoista saattaa olla jo olemassa. Jatketaanko?"
-#: ../src/maemo-mapper.c:11135
+#: ../src/maemo-mapper.c:11419
msgid "Manage Maps"
msgstr "Karttojen hallinta"
-#: ../src/maemo-mapper.c:6266
+#: ../src/maemo-mapper.c:6068
msgid "Manage Maps..."
msgstr "Karttojen hallinta..."
-#: ../src/maemo-mapper.c:10646
+#: ../src/maemo-mapper.c:10945
msgid "Manage Repositories"
msgstr "Karttavarastojen hallinta"
-#: ../src/maemo-mapper.c:6268
+#: ../src/maemo-mapper.c:6070
msgid "Manage Repositories..."
msgstr "Karttavarastojen hallinta..."
-#: ../src/maemo-mapper.c:2394
+#: ../src/maemo-mapper.c:2244
msgid "Manual"
msgstr "Manuaalinen"
-#: ../src/maemo-mapper.c:6261
+#: ../src/maemo-mapper.c:6063
msgid "Maps"
msgstr "Kartat"
-#: ../src/maemo-mapper.c:3929
-msgid "Mark already inserted."
-msgstr "Merkki on jo asetettu"
-
-#: ../src/maemo-mapper.c:3041
+#: ../src/maemo-mapper.c:2827
msgid "Max speed"
msgstr "Maks. nopeus"
-#: ../src/maemo-mapper.c:5214
+#: ../src/maemo-mapper.c:4984
msgid "Misc."
msgstr "Sekal."
-#: ../src/maemo-mapper.c:5254
+#: ../src/maemo-mapper.c:5020
msgid "Misc. 2"
msgstr "Sekal. 2"
-#: ../src/maemo-mapper.c:3170
+#: ../src/maemo-mapper.c:2956
msgid "Miscellaneous category for everything else."
msgstr "Sekalainen kategoria kaikelle muulle."
-#: ../src/maemo-mapper.c:11372 ../src/maemo-mapper.c:11506
+#: ../src/maemo-mapper.c:11658 ../src/maemo-mapper.c:11828
msgid ""
"NOTE: You must set a Map URI in the current repository in order to download "
"maps."
"HUOM: Karttojen URI täytyy asettaa karttavarastojen hallinnassa, jotta "
"kartat voidaan ladata."
-#: ../src/maemo-mapper.c:10369 ../src/maemo-mapper.c:10548
+#: ../src/maemo-mapper.c:10586 ../src/maemo-mapper.c:10805
msgid "Name"
msgstr "Nimi"
-#: ../src/maemo-mapper.c:6343
+#: ../src/maemo-mapper.c:6155
msgid "Nearest POI"
msgstr "Lähin POI"
-#: ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:10576
msgid "New Name"
msgstr "Uusi nimi"
-#: ../src/maemo-mapper.c:10538
+#: ../src/maemo-mapper.c:10795
msgid "New Repository"
msgstr "Uusi karttavarasto"
-#: ../src/maemo-mapper.c:10679
+#: ../src/maemo-mapper.c:10984
msgid "New..."
msgstr "Uusi..."
-#: ../src/maemo-mapper.c:6341
+#: ../src/maemo-mapper.c:6153
msgid "Next Waypoint"
msgstr "Seuraava kohdepiste"
-#: ../src/maemo-mapper.c:5439
+#: ../src/maemo-mapper.c:10760
+msgid "Next-able"
+msgstr ""
+
+#: ../src/maemo-mapper.c:5188
+#, fuzzy
msgid ""
-"No GPS Receiver MAC Provided.\n"
-"GPS Disabled."
+"No GPS Receiver MAC provided.\n"
+"GPS will be disabled."
msgstr ""
"GPS:n MAC-osoitetta ei ole määritelty.\n"
"GPS ei käytettävissä."
-#: ../src/maemo-mapper.c:10283 ../src/maemo-mapper.c:12133
+#: ../src/maemo-mapper.c:10499 ../src/maemo-mapper.c:12466
msgid "No POIs found."
msgstr "POI:ta ei löytynyt."
-#: ../src/maemo-mapper.c:12926 ../src/maemo-mapper.c:12947
-#: ../src/maemo-mapper.c:12969 ../src/maemo-mapper.c:12990
-#: ../src/maemo-mapper.c:13011 ../src/maemo-mapper.c:13091
-msgid "No waypoints are visible."
-msgstr "Kohdepisteitä ei ole näkyvissä."
-
-#: ../src/maemo-mapper.c:12903
-msgid "No waypoints found."
-msgstr "Kohdepisteitä ei löytynyt."
-
-#: ../src/maemo-mapper.c:6326
+#: ../src/maemo-mapper.c:6138
msgid "None"
msgstr "Ei keskitystä"
-#: ../src/maemo-mapper.c:5121
+#: ../src/maemo-mapper.c:4891
msgid ""
"Note: You can enter a device path\n"
"(e.g. \"/dev/rfcomm0\")."
"Huom: Voit syöttää laitteen polun\n"
"(esim. \"/dev/rfcomm0\")."
-#: ../src/maemo-mapper.c:6628
+#: ../src/maemo-mapper.c:6027 ../src/maemo-mapper.c:6047
+msgid "Open..."
+msgstr "Avaa..."
+
+#: ../src/maemo-mapper.c:6465
+#, fuzzy
msgid ""
-"Now you must set up at least one Map Repository. You can download a sample "
-"set from the internet by using the \"Download...\" button."
+"OpenStreetMap.org provides public, free-to-use maps. You can also download "
+"a sample set of repositories from the internet by using the \"Download...\" "
+"button."
msgstr ""
"Nyt sinun täytyy lisätä vähintään yksi karttavarasto. Voit ladata otoksen "
"karttavarastoja Internetistä \"Lataa...\" painikkeella."
-#: ../src/maemo-mapper.c:6227 ../src/maemo-mapper.c:6247
-msgid "Open..."
-msgstr "Avaa..."
-
-#: ../src/maemo-mapper.c:9589
+#: ../src/maemo-mapper.c:9697
msgid "Origin"
msgstr "Lähtöpiste"
-#: ../src/maemo-mapper.c:3169
+#: ../src/maemo-mapper.c:2955
msgid "Other"
msgstr "Muut"
-#: ../src/maemo-mapper.c:11177
+#: ../src/maemo-mapper.c:11461
msgid "Overwrite"
msgstr "Ylikirjoita"
-#: ../src/maemo-mapper.c:4975 ../src/maemo-mapper.c:5335
-#: ../src/maemo-mapper.c:6531
+#: ../src/maemo-mapper.c:4737 ../src/maemo-mapper.c:5083
+#: ../src/maemo-mapper.c:6355
msgid "POI"
msgstr ""
-#: ../src/maemo-mapper.c:11926
+#: ../src/maemo-mapper.c:12259
msgid "POI Categories"
msgstr "POI kategoriat"
-#: ../src/maemo-mapper.c:6305
+#: ../src/maemo-mapper.c:6117
msgid "POI Categories..."
msgstr "POI kategoriat..."
-#: ../src/maemo-mapper.c:5339
+#: ../src/maemo-mapper.c:5087
msgid "POI database"
msgstr "POI tietokanta"
-#: ../src/maemo-mapper.c:6301
+#: ../src/maemo-mapper.c:6113
msgid "POIs"
msgstr "POI:t"
-#: ../src/maemo-mapper.c:2390
+#: ../src/maemo-mapper.c:2240
msgid "PPS"
msgstr ""
+#: ../src/maemo-mapper.c:7919
+msgid "Pan East"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7916
+msgid "Pan North"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7918
+msgid "Pan South"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7917
+msgid "Pan West"
+msgstr ""
+
# This word refers to Pitch as in of a person's voice.
-#: ../src/maemo-mapper.c:5203
+#: ../src/maemo-mapper.c:4973
msgid "Pitch"
msgstr "Korkeus"
-#: ../src/maemo-mapper.c:3154
+#: ../src/maemo-mapper.c:2940
msgid "Places to eat or drink."
msgstr "Baarit ja ruokailupaikat."
-#: ../src/maemo-mapper.c:3156
+#: ../src/maemo-mapper.c:2942
msgid "Places to shop or acquire services."
msgstr "Kauppat ja palvelut."
-#: ../src/maemo-mapper.c:3162
+#: ../src/maemo-mapper.c:2948
msgid "Places to stay temporarily or for the night."
msgstr "Paikat väliaikaiseen yöpymiseen."
-#: ../src/maemo-mapper.c:4791
+#: ../src/maemo-mapper.c:10112
+#, fuzzy
+msgid "Please provide a description for the mark."
+msgstr "Määrittele POI pisteen kategoria."
+
+#: ../src/maemo-mapper.c:4444
msgid "Please select a bluetooth device from the list."
msgstr "Valitse bluetooth laite listalta."
-#: ../src/maemo-mapper.c:12460
+#: ../src/maemo-mapper.c:12793
msgid "Please specify a category for the POI."
msgstr "Määrittele POI pisteen kategoria."
-#: ../src/maemo-mapper.c:12453
+#: ../src/maemo-mapper.c:12786
msgid "Please specify a name for the POI."
msgstr "Määrittele POI pisteen nimi."
-#: ../src/maemo-mapper.c:11747
+#: ../src/maemo-mapper.c:12080
msgid "Please specify a name for the category."
msgstr "Määrittele kategorian nimi."
-#: ../src/maemo-mapper.c:9659
+#: ../src/maemo-mapper.c:9767
msgid "Please specify a source URL."
msgstr "Määrittele lähde URL."
-#: ../src/maemo-mapper.c:9671
+#: ../src/maemo-mapper.c:9779
msgid "Please specify a start location."
msgstr "Määrittele lähtöpiste."
-#: ../src/maemo-mapper.c:9678
+#: ../src/maemo-mapper.c:9786
msgid "Please specify an end location."
msgstr "Määrittele kohdepiste."
-#: ../src/maemo-mapper.c:12507
+#: ../src/maemo-mapper.c:12840
msgid "Problem adding POI"
msgstr "Ongelma POI:n lisäämisessä"
-#: ../src/maemo-mapper.c:11784
+#: ../src/maemo-mapper.c:12117
msgid "Problem adding category"
msgstr "Ongelma kategorian lisäämisessä"
-#: ../src/maemo-mapper.c:11595 ../src/maemo-mapper.c:12043
+#: ../src/maemo-mapper.c:11928 ../src/maemo-mapper.c:12376
msgid "Problem deleting POI"
msgstr "Ongelma POI:n poistamisessa"
-#: ../src/maemo-mapper.c:11604
+#: ../src/maemo-mapper.c:11937
msgid "Problem deleting category"
msgstr "Ongelma kategorian poistossa"
-#: ../src/maemo-mapper.c:11825
+#: ../src/maemo-mapper.c:12158
msgid "Problem updating Category"
msgstr "Ongelma kategorian päivityksessä"
-#: ../src/maemo-mapper.c:12485
+#: ../src/maemo-mapper.c:12818
msgid "Problem updating POI"
msgstr "Ongelma POI:n päivityksessä"
-#: ../src/maemo-mapper.c:11769
+#: ../src/maemo-mapper.c:12102
msgid "Problem updating category"
msgstr "Ongelma kategorian päivityksessä"
-#: ../src/maemo-mapper.c:3110
+#: ../src/maemo-mapper.c:2896
msgid "Problem with POI database"
msgstr "Ongelma POI tietokannassa"
-#: ../src/maemo-mapper.c:2391
+#: ../src/maemo-mapper.c:2241
msgid "Real Time Kinematic"
msgstr ""
-#: ../src/maemo-mapper.c:3858
+#: ../src/maemo-mapper.c:3627
msgid "Recalculating directions..."
msgstr "Lasketaan uusi reitti..."
-#: ../src/maemo-mapper.c:3157
+#: ../src/maemo-mapper.c:2943
msgid "Recreation"
msgstr "Virkistäytyminen"
-#: ../src/maemo-mapper.c:10673
+#: ../src/maemo-mapper.c:10978
msgid "Rename..."
msgstr "Nimeä uud..."
-#: ../src/maemo-mapper.c:6237
+#: ../src/maemo-mapper.c:10833
+msgid "Replace all repositories with the default repository?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6037
msgid "Reset"
msgstr "Nollaa"
-#: ../src/maemo-mapper.c:6362 ../src/maemo-mapper.c:8043
+#: ../src/maemo-mapper.c:6174 ../src/maemo-mapper.c:7943
msgid "Reset Bluetooth"
msgstr "Nollaa bluetooth"
-#: ../src/maemo-mapper.c:3151
+#: ../src/maemo-mapper.c:4619
+msgid "Reset all colors to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4505
+msgid "Reset all hardware keys to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4537 ../src/maemo-mapper.c:4653
+#: ../src/maemo-mapper.c:10956
+#, fuzzy
+msgid "Reset..."
+msgstr "Nollaa"
+
+#: ../src/maemo-mapper.c:2937
msgid "Residence"
msgstr "Asuminen"
-#: ../src/maemo-mapper.c:4954 ../src/maemo-mapper.c:6223
-#: ../src/maemo-mapper.c:6287
+#: ../src/maemo-mapper.c:4713 ../src/maemo-mapper.c:6023
+#: ../src/maemo-mapper.c:6099
msgid "Route"
msgstr "Reitti"
-#: ../src/maemo-mapper.c:9757
+#: ../src/maemo-mapper.c:9865
msgid "Route Downloaded"
msgstr "Reitti ladattu"
-#: ../src/maemo-mapper.c:8226 ../src/maemo-mapper.c:9805
+#: ../src/maemo-mapper.c:8224 ../src/maemo-mapper.c:9914
msgid "Route Opened"
msgstr "Reitti avattu"
-#: ../src/maemo-mapper.c:9957
+#: ../src/maemo-mapper.c:10160
msgid "Route Saved"
msgstr "Reitti tallennettu"
-#: ../src/maemo-mapper.c:10022
+#: ../src/maemo-mapper.c:10238
msgid "Routes are now hidden"
msgstr "Reitit on nyt piilotettu"
-#: ../src/maemo-mapper.c:10016
+#: ../src/maemo-mapper.c:10232
msgid "Routes are now shown"
msgstr "Reitit on nyt näkyvissä"
-#: ../src/maemo-mapper.c:2388
+#: ../src/maemo-mapper.c:2238
msgid "SPS"
msgstr ""
-#: ../src/maemo-mapper.c:3014
+#: ../src/maemo-mapper.c:2800
msgid "Sat in use"
msgstr "Sat käytössä"
-#: ../src/maemo-mapper.c:3005
+#: ../src/maemo-mapper.c:2791
msgid "Sat in view"
msgstr "Sat näkyy"
-#: ../src/maemo-mapper.c:2946
+#: ../src/maemo-mapper.c:2732
msgid "Satellites details"
msgstr "Satelliittien yksityiskohdat"
-#: ../src/maemo-mapper.c:2871
+#: ../src/maemo-mapper.c:2660
msgid "Satellites in view"
msgstr "Satelliitteja näkyvissä"
-#: ../src/maemo-mapper.c:6231 ../src/maemo-mapper.c:6249
+#: ../src/maemo-mapper.c:6031 ../src/maemo-mapper.c:6049
msgid "Save..."
msgstr "Tallenna..."
-#: ../src/maemo-mapper.c:5115
+#: ../src/maemo-mapper.c:6094
+msgid "Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4885
msgid "Scan..."
msgstr "Etsi..."
-#: ../src/maemo-mapper.c:4767
+#: ../src/maemo-mapper.c:4420
msgid "Scanning for Bluetooth Devices"
msgstr "Etsitään bluetooth laitteita"
-#: ../src/maemo-mapper.c:3163
+#: ../src/maemo-mapper.c:2949
msgid "School"
msgstr "Koulut"
-#: ../src/maemo-mapper.c:3301
+#: ../src/maemo-mapper.c:3087
msgid "Searching for GPS receiver"
msgstr "Etsitään GPS-vastaanotinta"
-#: ../src/maemo-mapper.c:4731
+#: ../src/maemo-mapper.c:4384
msgid "Select Bluetooth Device"
msgstr "Valitse bluetooth laite"
-#: ../src/maemo-mapper.c:8030
+#: ../src/maemo-mapper.c:7929
msgid "Select Next Repository"
msgstr "Valitse seuraava karttavarasto"
-#: ../src/maemo-mapper.c:12153
+#: ../src/maemo-mapper.c:12486
msgid "Select POI"
msgstr "Valitse POI"
-#: ../src/maemo-mapper.c:12218
+#: ../src/maemo-mapper.c:12551
msgid "Select one POI from the list."
msgstr "Valitse yksi POI listalta."
-#: ../src/maemo-mapper.c:5135
+#: ../src/maemo-mapper.c:4905
msgid "Sensitivity"
msgstr "Herkkyys"
-#: ../src/maemo-mapper.c:6498
+#: ../src/maemo-mapper.c:6322
msgid "Set as GPS Location"
msgstr "Aseta GPS sijainniksi"
-#: ../src/maemo-mapper.c:5080
+#: ../src/maemo-mapper.c:4847
msgid "Settings"
msgstr "Asetukset"
-#: ../src/maemo-mapper.c:6369
+#: ../src/maemo-mapper.c:6181
msgid "Settings..."
msgstr "Asetukset..."
-#: ../src/maemo-mapper.c:11160
+#: ../src/maemo-mapper.c:11444
msgid "Setup"
msgstr "Asetus"
-#: ../src/maemo-mapper.c:3155
+#: ../src/maemo-mapper.c:2941
msgid "Shopping/Services"
msgstr "Kaupat/Palvelut"
-#: ../src/maemo-mapper.c:6509
+#: ../src/maemo-mapper.c:6333
msgid "Show Description"
msgstr "Näytä kuvaus"
-#: ../src/maemo-mapper.c:6255 ../src/maemo-mapper.c:8039
+#: ../src/maemo-mapper.c:6057 ../src/maemo-mapper.c:7938
msgid "Show Distance from Beginning"
msgstr "Näytä etäisyys lähtöpisteestä"
-#: ../src/maemo-mapper.c:6253 ../src/maemo-mapper.c:8037
+#: ../src/maemo-mapper.c:7936
+#, fuzzy
+msgid "Show Distance from Last Break"
+msgstr "Näytä etäisyys viimeisestä merkistä"
+
+#: ../src/maemo-mapper.c:6055
msgid "Show Distance from Last Mark"
msgstr "Näytä etäisyys viimeisestä merkistä"
-#: ../src/maemo-mapper.c:6485 ../src/maemo-mapper.c:6516
-#: ../src/maemo-mapper.c:6540
+#: ../src/maemo-mapper.c:6309 ../src/maemo-mapper.c:6340
+#: ../src/maemo-mapper.c:6364
msgid "Show Distance to"
msgstr "Näytä etäisyys kohteeseen"
-#: ../src/maemo-mapper.c:6235 ../src/maemo-mapper.c:8034
+#: ../src/maemo-mapper.c:6035 ../src/maemo-mapper.c:7933
msgid "Show Distance to End of Route"
msgstr "Näytä etäisyys reitin loppupisteeseen"
-#: ../src/maemo-mapper.c:6233 ../src/maemo-mapper.c:8032
+#: ../src/maemo-mapper.c:6033 ../src/maemo-mapper.c:7931
msgid "Show Distance to Next Waypoint"
msgstr "Näytä etäisyys seuraavaan kohdepisteeseen"
-#: ../src/maemo-mapper.c:6355
+#: ../src/maemo-mapper.c:6167
msgid "Show Information"
msgstr "Näytä tietoja"
-#: ../src/maemo-mapper.c:6480 ../src/maemo-mapper.c:6507
+#: ../src/maemo-mapper.c:6304 ../src/maemo-mapper.c:6331
msgid "Show Lat/Lon"
msgstr "Näytä Lat/Lon"
-#: ../src/maemo-mapper.c:5354
+#: ../src/maemo-mapper.c:5102
msgid "Show POI below zoom"
msgstr "Näytä POI:t alle zoom tason"
-#: ../src/maemo-mapper.c:2395
+#: ../src/maemo-mapper.c:2245
msgid "Simulation"
msgstr "Simulaatio"
-#: ../src/maemo-mapper.c:9554
+#: ../src/maemo-mapper.c:9662
msgid "Source URL"
msgstr "Lähde URL"
-#: ../src/maemo-mapper.c:2969 ../src/maemo-mapper.c:5191
+#: ../src/maemo-mapper.c:2755 ../src/maemo-mapper.c:4961
msgid "Speed"
msgstr "Nopeus"
-#: ../src/maemo-mapper.c:5296
+#: ../src/maemo-mapper.c:5058
msgid "Speed Limit"
msgstr "Nopeusrajoitus"
-#: ../src/maemo-mapper.c:3150
+#: ../src/maemo-mapper.c:2936
msgid "Stations for purchasing fuel for vehicles."
msgstr "Huoltoasemat ja autokorjaamot."
-#: ../src/maemo-mapper.c:3562
+#: ../src/maemo-mapper.c:3348
msgid "The current route is empty."
msgstr "Nykyinen reitti on tyhjä."
-#: ../src/maemo-mapper.c:3608 ../src/maemo-mapper.c:3623
+#: ../src/maemo-mapper.c:3394 ../src/maemo-mapper.c:3409
msgid "The current track is empty."
msgstr "Nykyinen reittijälki on tyhjä."
-#: ../src/maemo-mapper.c:3543 ../src/maemo-mapper.c:10230
+#: ../src/maemo-mapper.c:4580
+msgid "The following action is mapped to multiple keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8646
+msgid "There are no other next-able repositories."
+msgstr ""
+
+#: ../src/maemo-mapper.c:13222
+#, fuzzy
+msgid "There are no waypoints."
+msgstr "Seuraava kohdepiste puuttuu."
+
+#: ../src/maemo-mapper.c:3329 ../src/maemo-mapper.c:10446
msgid "There is no next waypoint."
msgstr "Seuraava kohdepiste puuttuu."
-#: ../src/maemo-mapper.c:8040
+#: ../src/maemo-mapper.c:7921
+#, fuzzy
+msgid "Toggle Auto-Center"
+msgstr "Autom. keskitys"
+
+#: ../src/maemo-mapper.c:7923
+#, fuzzy
+msgid "Toggle Fullscreen"
+msgstr "Kokoruutu"
+
+#: ../src/maemo-mapper.c:7939
msgid "Toggle GPS"
msgstr "GPS päällä/pois"
-#: ../src/maemo-mapper.c:8041
+#: ../src/maemo-mapper.c:7940
msgid "Toggle GPS Info"
msgstr "GPS-info päällä/pois"
-#: ../src/maemo-mapper.c:8029
+#: ../src/maemo-mapper.c:7928
msgid "Toggle POIs"
msgstr "POI:t päällä/pois"
-#: ../src/maemo-mapper.c:8042
+#: ../src/maemo-mapper.c:7927
+#, fuzzy
+msgid "Toggle Scale"
+msgstr "GPS päällä/pois"
+
+#: ../src/maemo-mapper.c:7942
msgid "Toggle Speed Limit"
msgstr "Nopeusrajoitus päällä/pois"
-#: ../src/maemo-mapper.c:8028
+#: ../src/maemo-mapper.c:7926
msgid "Toggle Tracks"
msgstr "Reittijäljet näkyvissä/poissa"
-#: ../src/maemo-mapper.c:8049 ../src/maemo-mapper.c:11288
+#: ../src/maemo-mapper.c:7966 ../src/maemo-mapper.c:11572
msgid "Top-Left"
msgstr "Ylä-vasen"
-#: ../src/maemo-mapper.c:8050
+#: ../src/maemo-mapper.c:7967
msgid "Top-Right"
msgstr "Ylä-oikea"
-#: ../src/maemo-mapper.c:4938 ../src/maemo-mapper.c:6243
-#: ../src/maemo-mapper.c:6292
+#: ../src/maemo-mapper.c:4689 ../src/maemo-mapper.c:6043
+#: ../src/maemo-mapper.c:6104
msgid "Track"
msgstr "Reittijälki"
-#: ../src/maemo-mapper.c:9880
+#: ../src/maemo-mapper.c:9988
msgid "Track Opened"
msgstr "Reittijälki avattu"
-#: ../src/maemo-mapper.c:9902
+#: ../src/maemo-mapper.c:10010
msgid "Track Saved"
msgstr "Reittijälki tallennettu"
-#: ../src/maemo-mapper.c:9998
+#: ../src/maemo-mapper.c:10201
msgid "Tracks are now hidden"
msgstr "Reittijäljet on nyt piilotettu"
-#: ../src/maemo-mapper.c:9992
+#: ../src/maemo-mapper.c:10195
msgid "Tracks are now shown"
msgstr "Reittijäljet on nyt nähtävissä"
-#: ../src/maemo-mapper.c:3159
+#: ../src/maemo-mapper.c:2945
msgid "Transportation"
msgstr "Julkinenliikenne"
-#: ../src/maemo-mapper.c:10454
+#: ../src/maemo-mapper.c:10676
msgid "URL Format"
msgstr "URL:n muotoilu"
-#: ../src/maemo-mapper.c:10773
+#: ../src/maemo-mapper.c:5445
msgid "Unable to create cache directory for repository"
msgstr "Ei voitu luoda tallennuskansiota karttavarastolle"
-#: ../src/maemo-mapper.c:5261
+#: ../src/maemo-mapper.c:5024
msgid "Units"
msgstr "Yksiköt"
-#: ../src/maemo-mapper.c:9582
+#: ../src/maemo-mapper.c:9690
msgid "Use End of Route"
msgstr "Käytä reitin loppupistettä"
-#: ../src/maemo-mapper.c:9568
+#: ../src/maemo-mapper.c:9676
msgid "Use GPS Location"
msgstr "Käytä GPS sijaintia"
-#: ../src/maemo-mapper.c:6297
+#: ../src/maemo-mapper.c:6109
msgid "Velocity Vector"
msgstr "Nopeusvektori"
-#: ../src/maemo-mapper.c:6279
+#: ../src/maemo-mapper.c:6081
msgid "View"
msgstr "Näytä"
-#: ../src/maemo-mapper.c:11269
+#: ../src/maemo-mapper.c:11553
msgid "View Center"
msgstr "Näytä keskusta"
-#: ../src/maemo-mapper.c:10494
+#: ../src/maemo-mapper.c:10731
msgid "View Zoom Steps"
msgstr "Näytä zoom tasot"
-#: ../src/maemo-mapper.c:6537
+#: ../src/maemo-mapper.c:6361
msgid "View/Edit..."
msgstr "Näytä/Muokkaa..."
-#: ../src/maemo-mapper.c:11582
+#: ../src/maemo-mapper.c:11915
msgid "WARNING: All POIs in that category will also be deleted!"
msgstr "VAROITUS: Kaikki POI:t tässä kategoriassa poistetaan!"
-#: ../src/maemo-mapper.c:6502
+#: ../src/maemo-mapper.c:6326
msgid "Waypoint"
msgstr "Kohdepiste"
-#: ../src/maemo-mapper.c:11217
+#: ../src/maemo-mapper.c:6472
+msgid ""
+"You will now see a blank screen. You can download maps using the \"Manage "
+"Maps\" menu item in the \"Maps\" menu. Or, press OK to enable Auto-Download."
+msgstr ""
+
+#: ../src/maemo-mapper.c:11501
msgid "Zoom"
msgstr ""
-#: ../src/maemo-mapper.c:11223
+#: ../src/maemo-mapper.c:6085 ../src/maemo-mapper.c:7924
+msgid "Zoom In"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11507
msgid "Zoom Levels to Download: (0 = most detail)"
msgstr "Ladattavat zoom tasot : (0 = tarkin)"
-#: ../src/maemo-mapper.c:8463 ../src/maemo-mapper.c:8545
+#: ../src/maemo-mapper.c:6087 ../src/maemo-mapper.c:7925
+msgid "Zoom Out"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8461 ../src/maemo-mapper.c:8573
+#: ../src/maemo-mapper.c:11735 ../src/maemo-mapper.c:11753
msgid "Zoom to Level"
msgstr "Zoomaa tasolle"
-#: ../src/maemo-mapper.c:10995 ../src/maemo-mapper.c:11002
+#: ../src/maemo-mapper.c:11279 ../src/maemo-mapper.c:11286
msgid "about"
msgstr "noin"
-#: ../src/maemo-mapper.c:2872
+#: ../src/maemo-mapper.c:2661
msgid "in use"
msgstr "käytössä"
-#: ../src/maemo-mapper.c:8016
+#: ../src/maemo-mapper.c:7874
msgid "km"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "maps"
msgstr "kartan palan lataus"
-#: ../src/maemo-mapper.c:10909 ../src/maemo-mapper.c:10996
+#: ../src/maemo-mapper.c:11193 ../src/maemo-mapper.c:11280
msgid "maps "
msgstr "kartan palan poisto"
-#: ../src/maemo-mapper.c:8017
+#: ../src/maemo-mapper.c:7875
msgid "mi."
msgstr ""
-#: ../src/maemo-mapper.c:8018
+#: ../src/maemo-mapper.c:7876
msgid "n.m."
msgstr ""
-#: ../src/maemo-mapper.c:3027
+#: ../src/maemo-mapper.c:2813
msgid "nofix"
msgstr ""
-#: ../src/maemo-mapper.c:2396 ../src/maemo-mapper.c:3036
+#: ../src/maemo-mapper.c:2246 ../src/maemo-mapper.c:2822
msgid "none"
msgstr "ei lainkaan"
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "up to about"
msgstr "noin"
+
+#~ msgid "Defaults"
+#~ msgstr "Oletukset"
+
+#~ msgid "Escape Key"
+#~ msgstr "Escape näppäin"
+
+#~ msgid "GPS Mark"
+#~ msgstr "GPS merkki"
+
+#~ msgid "No waypoints are visible."
+#~ msgstr "Kohdepisteitä ei ole näkyvissä."
+
+#~ msgid "No waypoints found."
+#~ msgstr "Kohdepisteitä ei löytynyt."
msgstr ""
"Project-Id-Version: it_IT\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 16:40-0500\n"
+"POT-Creation-Date: 2007-03-12 01:23-0400\n"
"PO-Revision-Date: 2006-11-05 18:27+0100\n"
"Last-Translator: Alessandro Pasotti <ale.pas@tiscali.it>\n"
"Language-Team: Italiano <it@li.org>\n"
"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: ../src/maemo-mapper.c:11990
+#: ../src/maemo-mapper.c:12323
msgid "# POIs"
msgstr ""
-#: ../src/maemo-mapper.c:11939
+#: ../src/maemo-mapper.c:6186
+#, fuzzy
+msgid "About..."
+msgstr "circa"
+
+#: ../src/maemo-mapper.c:12272
msgid "Add"
msgstr "Aggiungi"
-#: ../src/maemo-mapper.c:11678
+#: ../src/maemo-mapper.c:12011
msgid "Add Category"
msgstr "Aggiungi categoria"
-#: ../src/maemo-mapper.c:12341
+#: ../src/maemo-mapper.c:12674
msgid "Add POI"
msgstr "Aggiungi POI"
-#: ../src/maemo-mapper.c:6494 ../src/maemo-mapper.c:6523
+#: ../src/maemo-mapper.c:6318 ../src/maemo-mapper.c:6347
#, fuzzy
msgid "Add POI..."
msgstr "Aggiungi POI..."
-#: ../src/maemo-mapper.c:6490 ../src/maemo-mapper.c:6545
+#: ../src/maemo-mapper.c:6314 ../src/maemo-mapper.c:6369
#, fuzzy
msgid "Add Route Point"
msgstr "Aggiungi Route Point"
-#: ../src/maemo-mapper.c:12631
+#: ../src/maemo-mapper.c:12964
#, fuzzy
msgid "Add Waypoint"
msgstr "Aggiungi Waypoint"
-#: ../src/maemo-mapper.c:6492 ../src/maemo-mapper.c:6547
+#: ../src/maemo-mapper.c:6316 ../src/maemo-mapper.c:6371
#, fuzzy
msgid "Add Waypoint..."
msgstr "Aggiungi Waypoint..."
-#: ../src/maemo-mapper.c:5166
+#: ../src/maemo-mapper.c:4936
msgid "Advance Notice"
msgstr "Anticipo avvisi"
-#: ../src/maemo-mapper.c:11202
+#: ../src/maemo-mapper.c:11486
msgid "Along Route - Radius (tiles):"
msgstr "Lungo la rotta - raggio (riquadri):"
-#: ../src/maemo-mapper.c:2978
+#: ../src/maemo-mapper.c:2764
msgid "Altitude"
msgstr "Altitudine"
-#: ../src/maemo-mapper.c:4773
+#: ../src/maemo-mapper.c:4426
msgid "An error occurred while attempting to scan for bluetooth devices."
msgstr ""
-#: ../src/maemo-mapper.c:10596
+#: ../src/maemo-mapper.c:10888
msgid ""
"An error occurred while retrieving the repositories. The web service may be "
"temporarily down."
msgstr ""
-#: ../src/maemo-mapper.c:8477
+#: ../src/maemo-mapper.c:8475
msgid ""
"An error occurred while trying to reset the bluetooth radio.\n"
"\n"
"Sei sicuro di aver modificato il file\n"
"/etc/sudoers?"
-#: ../src/maemo-mapper.c:5162
+#: ../src/maemo-mapper.c:4932
msgid "Announce"
msgstr "Avviso"
-#: ../src/maemo-mapper.c:11239
+#: ../src/maemo-mapper.c:11523
msgid "Area"
msgstr ""
-#: ../src/maemo-mapper.c:5131 ../src/maemo-mapper.c:6310
+#: ../src/maemo-mapper.c:4901 ../src/maemo-mapper.c:6122
msgid "Auto-Center"
msgstr "Centro automatico"
-#: ../src/maemo-mapper.c:10091
+#: ../src/maemo-mapper.c:10307
msgid "Auto-Center Mode: Lat/Lon"
msgstr "Modalità centro automatico: Lat/Lon"
-#: ../src/maemo-mapper.c:10076
+#: ../src/maemo-mapper.c:10292
msgid "Auto-Center Mode: Lead"
msgstr "Modalità centro automatico: vettore"
-#: ../src/maemo-mapper.c:10105
+#: ../src/maemo-mapper.c:10321
msgid "Auto-Center Off"
msgstr "Disabilita centro automatico"
-#: ../src/maemo-mapper.c:6270
+#: ../src/maemo-mapper.c:6072
msgid "Auto-Download"
msgstr "Scaricamento automatico"
-#: ../src/maemo-mapper.c:9572
+#: ../src/maemo-mapper.c:9680
msgid "Auto-Update"
msgstr "Aggiornamento automatico"
-#: ../src/maemo-mapper.c:8052
+#: ../src/maemo-mapper.c:7969
msgid "Bottom-Left"
msgstr "Inferiore sinistro"
-#: ../src/maemo-mapper.c:8051 ../src/maemo-mapper.c:11306
+#: ../src/maemo-mapper.c:7968 ../src/maemo-mapper.c:11590
msgid "Bottom-Right"
msgstr "Inferiore destra"
-#: ../src/maemo-mapper.c:5349 ../src/maemo-mapper.c:10473
+#: ../src/maemo-mapper.c:3700
+msgid "Break already inserted."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5097 ../src/maemo-mapper.c:10695
msgid "Browse..."
msgstr "Scegli..."
-#: ../src/maemo-mapper.c:3160
+#: ../src/maemo-mapper.c:2946
msgid "Bus stops, airports, train stations, etc."
msgstr ""
-#: ../src/maemo-mapper.c:3165
+#: ../src/maemo-mapper.c:2951
msgid "Business"
msgstr ""
-#: ../src/maemo-mapper.c:11193
+#: ../src/maemo-mapper.c:11477
msgid "By Area (see tab)"
msgstr "Per area (vedi scheda)"
-#: ../src/maemo-mapper.c:10463
+#: ../src/maemo-mapper.c:10685
msgid "Cache Dir."
msgstr "Cartella cache"
-#: ../src/maemo-mapper.c:10409
+#: ../src/maemo-mapper.c:10626
msgid ""
"Cannot delete the last repository - there must be at lease one repository."
msgstr "Impossibile cancellare l'ultimo deposito - deve essercene almeno uno."
-#: ../src/maemo-mapper.c:11473
+#: ../src/maemo-mapper.c:11795
msgid ""
"Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."
msgstr ""
"Impossibile abilitare il GPS finché non viene impostato un indirizzo MAC\n"
"nella finestra Impostazioni."
-#: ../src/maemo-mapper.c:12191 ../src/maemo-mapper.c:12378
+#: ../src/maemo-mapper.c:12524 ../src/maemo-mapper.c:12711
msgid "Category"
msgstr "Categoria"
-#: ../src/maemo-mapper.c:6239 ../src/maemo-mapper.c:6257
-#: ../src/maemo-mapper.c:11146
+#: ../src/maemo-mapper.c:6039 ../src/maemo-mapper.c:6059
+#: ../src/maemo-mapper.c:11430
msgid "Clear"
msgstr "Cancella"
-#: ../src/maemo-mapper.c:6374
+#: ../src/maemo-mapper.c:6188
msgid "Close"
msgstr "Chiudi"
-#: ../src/maemo-mapper.c:4899
+#: ../src/maemo-mapper.c:4647
msgid "Colors"
msgstr "Colori"
-#: ../src/maemo-mapper.c:5090
+#: ../src/maemo-mapper.c:4860
msgid "Colors..."
msgstr "Colori..."
-#: ../src/maemo-mapper.c:10908 ../src/maemo-mapper.c:10995
+#: ../src/maemo-mapper.c:11192 ../src/maemo-mapper.c:11279
msgid "Confirm DELETION of"
msgstr "Conferma eliminazione di"
-#: ../src/maemo-mapper.c:10416
+#: ../src/maemo-mapper.c:10633
msgid "Confirm delete of repository"
msgstr "Conferma l'eliminazione del deposito"
-#: ../src/maemo-mapper.c:13034
+#: ../src/maemo-mapper.c:13335
msgid "Confirm delete of waypoint"
msgstr "Conferma l'eliminazione del waypoint"
-#: ../src/maemo-mapper.c:10914 ../src/maemo-mapper.c:11001
+#: ../src/maemo-mapper.c:11198 ../src/maemo-mapper.c:11285
msgid "Confirm download of"
msgstr "Conferma il download di"
-#: ../src/maemo-mapper.c:6513
+#: ../src/maemo-mapper.c:4583
+msgid "Continue?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6337
#, fuzzy
msgid "Copy Description"
msgstr "Descrizione"
-#: ../src/maemo-mapper.c:6482 ../src/maemo-mapper.c:6511
+#: ../src/maemo-mapper.c:6306 ../src/maemo-mapper.c:6335
#, fuzzy
msgid "Copy Lat/Lon"
msgstr "Mostra Lat/Lon"
-#: ../src/maemo-mapper.c:9709
+#: ../src/maemo-mapper.c:9817
msgid ""
"Could not generate directions. Make sure your source and destination are "
"valid."
"Impossibile generare le indicazioni. Controlla che la partenza e l'arrivo "
"siano validi."
-#: ../src/maemo-mapper.c:12709
+#: ../src/maemo-mapper.c:13043
msgid ""
"Creating a \"waypoint\" with no description actually adds a break point. Is "
"that what you want?"
msgstr ""
-#: ../src/maemo-mapper.c:2389
+#: ../src/maemo-mapper.c:2239
msgid "DGPS"
msgstr ""
-#: ../src/maemo-mapper.c:4905
-msgid "Defaults"
-msgstr "Default"
-
-#: ../src/maemo-mapper.c:5277
+#: ../src/maemo-mapper.c:5035
msgid "Degrees Format"
msgstr ""
-#: ../src/maemo-mapper.c:11659 ../src/maemo-mapper.c:12316
+#: ../src/maemo-mapper.c:11992 ../src/maemo-mapper.c:12649
msgid "Delete"
msgstr "Elimina"
-#: ../src/maemo-mapper.c:11183
+#: ../src/maemo-mapper.c:11467
msgid "Delete Maps"
msgstr "Elimina mappe"
-#: ../src/maemo-mapper.c:12032
+#: ../src/maemo-mapper.c:12365
msgid "Delete POI?"
msgstr "Elimina POI?"
-#: ../src/maemo-mapper.c:11580
+#: ../src/maemo-mapper.c:11913
msgid "Delete category?"
msgstr "Elimina categoria?"
-#: ../src/maemo-mapper.c:6520 ../src/maemo-mapper.c:10676
+#: ../src/maemo-mapper.c:6344 ../src/maemo-mapper.c:10981
msgid "Delete..."
msgstr "Elimina..."
-#: ../src/maemo-mapper.c:4761 ../src/maemo-mapper.c:11697
-#: ../src/maemo-mapper.c:11985 ../src/maemo-mapper.c:12405
-#: ../src/maemo-mapper.c:12657
+#: ../src/maemo-mapper.c:4414 ../src/maemo-mapper.c:10069
+#: ../src/maemo-mapper.c:12030 ../src/maemo-mapper.c:12318
+#: ../src/maemo-mapper.c:12738 ../src/maemo-mapper.c:12989
msgid "Description"
msgstr "Descrizione"
-#: ../src/maemo-mapper.c:9600
+#: ../src/maemo-mapper.c:9708
msgid "Destination"
msgstr "Destinazione"
-#: ../src/maemo-mapper.c:6359
+#: ../src/maemo-mapper.c:6171
msgid "Details..."
msgstr "Dettagli..."
-#: ../src/maemo-mapper.c:3153
+#: ../src/maemo-mapper.c:2939
msgid "Dining"
msgstr ""
-#: ../src/maemo-mapper.c:3528 ../src/maemo-mapper.c:3588
-#: ../src/maemo-mapper.c:12598
+#: ../src/maemo-mapper.c:3314 ../src/maemo-mapper.c:3374
+#: ../src/maemo-mapper.c:12931
#, fuzzy
msgid "Distance"
msgstr "Mostra la distanza verso"
-#: ../src/maemo-mapper.c:11170
+#: ../src/maemo-mapper.c:10752
+msgid "Double Pixels"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11454
msgid "Download Maps"
msgstr "Scaricamento mappe"
-#: ../src/maemo-mapper.c:9532
+#: ../src/maemo-mapper.c:9640
msgid "Download Route"
msgstr "Scarica rotta"
-#: ../src/maemo-mapper.c:6487 ../src/maemo-mapper.c:6518
-#: ../src/maemo-mapper.c:6542
+#: ../src/maemo-mapper.c:6311 ../src/maemo-mapper.c:6342
+#: ../src/maemo-mapper.c:6366
msgid "Download Route to..."
msgstr "Scarica la rotta per..."
-#: ../src/maemo-mapper.c:10478
+#: ../src/maemo-mapper.c:10715
msgid "Download Zoom Steps"
msgstr "Passi di zoom per lo scaricamento"
-#: ../src/maemo-mapper.c:6229 ../src/maemo-mapper.c:10657
+#: ../src/maemo-mapper.c:6029 ../src/maemo-mapper.c:10962
msgid "Download..."
msgstr "Scarica..."
-#: ../src/maemo-mapper.c:6960
+#: ../src/maemo-mapper.c:6827
msgid "Downloading maps"
msgstr "Scaricamento mappe in corso"
-#: ../src/maemo-mapper.c:11936
+#: ../src/maemo-mapper.c:12269
msgid "Edit"
msgstr "Modifica"
-#: ../src/maemo-mapper.c:12401
+#: ../src/maemo-mapper.c:12734
msgid "Edit Categories..."
msgstr "Modifica categorie"
-#: ../src/maemo-mapper.c:11653
+#: ../src/maemo-mapper.c:11986
msgid "Edit Category"
msgstr "Modifica categoria"
-#: ../src/maemo-mapper.c:12310
+#: ../src/maemo-mapper.c:12643
msgid "Edit POI"
msgstr "Modifica POI"
-#: ../src/maemo-mapper.c:3164
+#: ../src/maemo-mapper.c:2950
msgid "Elementary schools, college campuses, etc."
msgstr ""
-#: ../src/maemo-mapper.c:6351
+#: ../src/maemo-mapper.c:6163
msgid "Enable GPS"
msgstr "Abilita GPS"
-#: ../src/maemo-mapper.c:5178
+#: ../src/maemo-mapper.c:4948
msgid "Enable Voice Synthesis (requires flite)"
msgstr "Abilita sintesi vocale (necessita di flite)"
-#: ../src/maemo-mapper.c:11721 ../src/maemo-mapper.c:11973
+#: ../src/maemo-mapper.c:12054 ../src/maemo-mapper.c:12306
msgid "Enabled"
msgstr "Abilitato"
-#: ../src/maemo-mapper.c:7212
+#: ../src/maemo-mapper.c:7064
msgid ""
"Error in download. Check internet connection and/or Map Repository URL "
"Format."
msgstr ""
-#: ../src/maemo-mapper.c:8229 ../src/maemo-mapper.c:9765
-#: ../src/maemo-mapper.c:9808 ../src/maemo-mapper.c:9883
+#: ../src/maemo-mapper.c:8227 ../src/maemo-mapper.c:9873
+#: ../src/maemo-mapper.c:9917 ../src/maemo-mapper.c:9991
msgid "Error parsing GPX file."
msgstr "Errore analizzando il file GPX."
-#: ../src/maemo-mapper.c:1472
+#: ../src/maemo-mapper.c:1475
msgid "Error while writing to file"
msgstr "Errore scrivendo sul file"
-#: ../src/maemo-mapper.c:9905 ../src/maemo-mapper.c:9960
+#: ../src/maemo-mapper.c:10013 ../src/maemo-mapper.c:10163
msgid "Error writing GPX file."
msgstr "Errore scrivendo il file GPX."
-#: ../src/maemo-mapper.c:5239
-msgid "Escape Key"
-msgstr "Tasto ESC"
-
-#: ../src/maemo-mapper.c:3311
+#: ../src/maemo-mapper.c:3097
msgid "Establishing GPS fix"
msgstr "Connessione con il GPS in corso"
-#: ../src/maemo-mapper.c:2393
+#: ../src/maemo-mapper.c:2243
msgid "Estimated"
msgstr "Stimato"
-#: ../src/maemo-mapper.c:4065
+#: ../src/maemo-mapper.c:3836
msgid "Failed to connect to GPS receiver. Retry?"
msgstr ""
-#: ../src/maemo-mapper.c:9697
+#: ../src/maemo-mapper.c:9805
msgid "Failed to connect to GPX Directions server"
msgstr "Impossibile connettersi al server delle indicazioni GPX"
-#: ../src/maemo-mapper.c:5667
+#: ../src/maemo-mapper.c:5478
msgid "Failed to initialize GConf. Quitting."
msgstr "Impossibile inizializzare GConf. Esco."
-#: ../src/maemo-mapper.c:4280
+#: ../src/maemo-mapper.c:3980
msgid "Failed to initialize GConf. Settings were not saved."
msgstr ""
"Impossibile inizializzare GConf. Le impostazioni non sono state salvate."
-#: ../src/maemo-mapper.c:7768 ../src/maemo-mapper.c:8217
+#: ../src/maemo-mapper.c:7625 ../src/maemo-mapper.c:8216
msgid "Failed to open file for reading"
msgstr "Impossibile aprire il file per lettura"
-#: ../src/maemo-mapper.c:7425 ../src/maemo-mapper.c:7769
+#: ../src/maemo-mapper.c:7282 ../src/maemo-mapper.c:7626
msgid "Failed to open file for writing"
msgstr "Impossibile aprire il file in scrittura"
-#: ../src/maemo-mapper.c:3178
+#: ../src/maemo-mapper.c:2964
msgid "Failed to open or create database"
msgstr "Impossibile aprire o creare il database"
-#: ../src/maemo-mapper.c:1473
+#: ../src/maemo-mapper.c:1476
msgid "File is incomplete."
msgstr "Il file è incompleto."
-#: ../src/maemo-mapper.c:3023
+#: ../src/maemo-mapper.c:2809
msgid "Fix"
msgstr ""
-#: ../src/maemo-mapper.c:3032
+#: ../src/maemo-mapper.c:2818
msgid "Fix Quality"
msgstr "Qualità Fix"
-#: ../src/maemo-mapper.c:2392
+#: ../src/maemo-mapper.c:2242
msgid "Float RTK"
msgstr ""
-#: ../src/maemo-mapper.c:3149
+#: ../src/maemo-mapper.c:2935
msgid "Fuel"
msgstr ""
-#: ../src/maemo-mapper.c:6283
+#: ../src/maemo-mapper.c:6089
msgid "Full Screen"
msgstr "Schermo intero"
-#: ../src/maemo-mapper.c:5101 ../src/maemo-mapper.c:6347
+#: ../src/maemo-mapper.c:4665 ../src/maemo-mapper.c:4871
+#: ../src/maemo-mapper.c:6159
msgid "GPS"
msgstr ""
-#: ../src/maemo-mapper.c:2926
+#: ../src/maemo-mapper.c:2712
msgid "GPS Details"
msgstr "Dettagli GPS"
-#: ../src/maemo-mapper.c:2939
+#: ../src/maemo-mapper.c:2725
msgid "GPS Information"
msgstr "Informazioni GPS"
-#: ../src/maemo-mapper.c:6339 ../src/maemo-mapper.c:11253
+#: ../src/maemo-mapper.c:6151 ../src/maemo-mapper.c:11537
msgid "GPS Location"
msgstr "Località GPS"
-#: ../src/maemo-mapper.c:4917
-msgid "GPS Mark"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3168
+#: ../src/maemo-mapper.c:2954
msgid "General landmarks."
msgstr ""
-#: ../src/maemo-mapper.c:3166
+#: ../src/maemo-mapper.c:2952
msgid "General places of business."
msgstr ""
-#: ../src/maemo-mapper.c:6333
+#: ../src/maemo-mapper.c:6145
msgid "Go to"
msgstr ""
-#: ../src/maemo-mapper.c:10121
+#: ../src/maemo-mapper.c:10337
msgid "Go to Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6550
+#: ../src/maemo-mapper.c:6374
msgid "Go to Nearest"
msgstr ""
-#: ../src/maemo-mapper.c:6527
+#: ../src/maemo-mapper.c:6351
msgid "Go to Next"
msgstr ""
-#: ../src/maemo-mapper.c:2987
+#: ../src/maemo-mapper.c:4531
+msgid "Hardware Keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4857
+msgid "Hardware Keys..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2773
msgid "Heading"
msgstr ""
-#: ../src/maemo-mapper.c:6372
-msgid "Help"
+#: ../src/maemo-mapper.c:6184
+#, fuzzy
+msgid "Help..."
msgstr "Aiuto"
-#: ../src/maemo-mapper.c:3152
+#: ../src/maemo-mapper.c:2938
msgid "Houses, apartments, or other residences of import."
msgstr ""
-#: ../src/maemo-mapper.c:11965
+#: ../src/maemo-mapper.c:12298
msgid "ID"
msgstr ""
-#: ../src/maemo-mapper.c:3158
+#: ../src/maemo-mapper.c:2944
msgid "Indoor or Outdoor places to have fun."
msgstr ""
-#: ../src/maemo-mapper.c:5322
+#: ../src/maemo-mapper.c:5008
msgid "Information Font Size"
msgstr "Dimensione catattere Informazioni"
-#: ../src/maemo-mapper.c:6251
+#: ../src/maemo-mapper.c:6051
+#, fuzzy
+msgid "Insert Break"
+msgstr "Inserisci sosta"
+
+#: ../src/maemo-mapper.c:10044
#, fuzzy
msgid "Insert Mark"
msgstr "Inserisci sosta"
-#: ../src/maemo-mapper.c:8035
-msgid "Insert Track Mark"
-msgstr ""
+#: ../src/maemo-mapper.c:6053
+#, fuzzy
+msgid "Insert Mark..."
+msgstr "Inserisci sosta"
-#: ../src/maemo-mapper.c:11417
+#: ../src/maemo-mapper.c:7934
+#, fuzzy
+msgid "Insert Track Break"
+msgstr "Inserisci sosta"
+
+#: ../src/maemo-mapper.c:11703
msgid "Invalid Bottom-Right Latitude"
msgstr "Latitudine inferiore destra errata"
-#: ../src/maemo-mapper.c:11424
+#: ../src/maemo-mapper.c:11710
msgid "Invalid Bottom-Right Longitude"
msgstr "Longitudine inferiore destra errata"
-#: ../src/maemo-mapper.c:10177
+#: ../src/maemo-mapper.c:10393
#, fuzzy
msgid "Invalid Latitude"
msgstr "Latitudine superiore sinistra errata"
-#: ../src/maemo-mapper.c:10184
+#: ../src/maemo-mapper.c:10400
#, fuzzy
msgid "Invalid Longitude"
msgstr "Longitudine superiore sinistra errata"
-#: ../src/maemo-mapper.c:8995 ../src/maemo-mapper.c:9006
+#: ../src/maemo-mapper.c:9121 ../src/maemo-mapper.c:9132
msgid "Invalid NMEA input from receiver!"
msgstr "Dati NMEA dal ricevitore errati!"
-#: ../src/maemo-mapper.c:11403
+#: ../src/maemo-mapper.c:11689
msgid "Invalid Top-Left Latitude"
msgstr "Latitudine superiore sinistra errata"
-#: ../src/maemo-mapper.c:11410
+#: ../src/maemo-mapper.c:11696
msgid "Invalid Top-Left Longitude"
msgstr "Longitudine superiore sinistra errata"
-#: ../src/maemo-mapper.c:5230
+#: ../src/maemo-mapper.c:6455
+msgid ""
+"It looks like this is your first time running Maemo Mapper. Press OK to "
+"view the the help pages. Otherwise, press Cancel to continue."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5000
msgid "Keep Display On Only in Fullscreen Mode"
msgstr "Mantieni lo schermo sempre acceso solo quando full-screen"
-#: ../src/maemo-mapper.c:11689 ../src/maemo-mapper.c:11980
-#: ../src/maemo-mapper.c:12186 ../src/maemo-mapper.c:12370
+#: ../src/maemo-mapper.c:12022 ../src/maemo-mapper.c:12313
+#: ../src/maemo-mapper.c:12519 ../src/maemo-mapper.c:12703
msgid "Label"
msgstr "Etichetta"
-#: ../src/maemo-mapper.c:3167
+#: ../src/maemo-mapper.c:2953
msgid "Landmark"
msgstr ""
-#: ../src/maemo-mapper.c:12360 ../src/maemo-mapper.c:12641
+#: ../src/maemo-mapper.c:10054 ../src/maemo-mapper.c:12693
+#: ../src/maemo-mapper.c:12974
msgid "Lat, Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6314
+#: ../src/maemo-mapper.c:6126
msgid "Lat/Lon"
msgstr ""
-#: ../src/maemo-mapper.c:6337
+#: ../src/maemo-mapper.c:6149
msgid "Lat/Lon..."
msgstr ""
-#: ../src/maemo-mapper.c:2951 ../src/maemo-mapper.c:10131
-#: ../src/maemo-mapper.c:11243 ../src/maemo-mapper.c:12544
+#: ../src/maemo-mapper.c:2737 ../src/maemo-mapper.c:10347
+#: ../src/maemo-mapper.c:11527 ../src/maemo-mapper.c:12877
msgid "Latitude"
msgstr "Latitudine"
-#: ../src/maemo-mapper.c:6320
+#: ../src/maemo-mapper.c:6132
msgid "Lead"
msgstr "Anticipo"
-#: ../src/maemo-mapper.c:5148
+#: ../src/maemo-mapper.c:4918
msgid "Lead Amount"
msgstr "Lunghezza anticipo"
-#: ../src/maemo-mapper.c:5218
+#: ../src/maemo-mapper.c:4988
msgid "Line Width"
msgstr "Spessore linea"
-#: ../src/maemo-mapper.c:2996
+#: ../src/maemo-mapper.c:2782
msgid "Local time"
msgstr "Ora locale"
-#: ../src/maemo-mapper.c:5306 ../src/maemo-mapper.c:6474
-#: ../src/maemo-mapper.c:12181
+#: ../src/maemo-mapper.c:5068 ../src/maemo-mapper.c:6298
+#: ../src/maemo-mapper.c:12514
msgid "Location"
msgstr "Località"
-#: ../src/maemo-mapper.c:3161
+#: ../src/maemo-mapper.c:2947
msgid "Lodging"
msgstr ""
-#: ../src/maemo-mapper.c:2960 ../src/maemo-mapper.c:10143
-#: ../src/maemo-mapper.c:11247 ../src/maemo-mapper.c:12545
+#: ../src/maemo-mapper.c:2746 ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:11531 ../src/maemo-mapper.c:12878
msgid "Longitude"
msgstr "Longitudine"
-#: ../src/maemo-mapper.c:4756 ../src/maemo-mapper.c:5105
+#: ../src/maemo-mapper.c:4409 ../src/maemo-mapper.c:4875
msgid "MAC"
msgstr ""
-#: ../src/maemo-mapper.c:10577
+#: ../src/maemo-mapper.c:10869
msgid ""
"Maemo Mapper will now download and add a list of possibly-duplicate "
"repositories from the internet. Continue?"
msgstr ""
-#: ../src/maemo-mapper.c:11135
+#: ../src/maemo-mapper.c:11419
msgid "Manage Maps"
msgstr "Gestisci mappe"
-#: ../src/maemo-mapper.c:6266
+#: ../src/maemo-mapper.c:6068
msgid "Manage Maps..."
msgstr "Gestisci mappe..."
-#: ../src/maemo-mapper.c:10646
+#: ../src/maemo-mapper.c:10945
#, fuzzy
msgid "Manage Repositories"
msgstr "Gestisci depositi"
-#: ../src/maemo-mapper.c:6268
+#: ../src/maemo-mapper.c:6070
msgid "Manage Repositories..."
msgstr "Gestisci depositi..."
-#: ../src/maemo-mapper.c:2394
+#: ../src/maemo-mapper.c:2244
msgid "Manual"
msgstr "Manuale"
-#: ../src/maemo-mapper.c:6261
+#: ../src/maemo-mapper.c:6063
msgid "Maps"
msgstr "Mappe"
-#: ../src/maemo-mapper.c:3929
-msgid "Mark already inserted."
-msgstr ""
-
-#: ../src/maemo-mapper.c:3041
+#: ../src/maemo-mapper.c:2827
msgid "Max speed"
msgstr "Velocità massima"
-#: ../src/maemo-mapper.c:5214
+#: ../src/maemo-mapper.c:4984
msgid "Misc."
msgstr "Varie"
-#: ../src/maemo-mapper.c:5254
+#: ../src/maemo-mapper.c:5020
msgid "Misc. 2"
msgstr "Varie 2"
-#: ../src/maemo-mapper.c:3170
+#: ../src/maemo-mapper.c:2956
msgid "Miscellaneous category for everything else."
msgstr ""
-#: ../src/maemo-mapper.c:11372 ../src/maemo-mapper.c:11506
+#: ../src/maemo-mapper.c:11658 ../src/maemo-mapper.c:11828
#, fuzzy
msgid ""
"NOTE: You must set a Map URI in the current repository in order to download "
"NOTA: Devi impostare un URI per le mappe nel gestore dei depositi prima di "
"poter scaricare delle mappe."
-#: ../src/maemo-mapper.c:10369 ../src/maemo-mapper.c:10548
+#: ../src/maemo-mapper.c:10586 ../src/maemo-mapper.c:10805
msgid "Name"
msgstr "Nome"
-#: ../src/maemo-mapper.c:6343
+#: ../src/maemo-mapper.c:6155
#, fuzzy
msgid "Nearest POI"
msgstr "Seleziona POI"
-#: ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:10576
msgid "New Name"
msgstr "Nuovo nome"
-#: ../src/maemo-mapper.c:10538
+#: ../src/maemo-mapper.c:10795
msgid "New Repository"
msgstr "Nuovo deposito"
-#: ../src/maemo-mapper.c:10679
+#: ../src/maemo-mapper.c:10984
msgid "New..."
msgstr "Nuovo..."
-#: ../src/maemo-mapper.c:6341
+#: ../src/maemo-mapper.c:6153
#, fuzzy
msgid "Next Waypoint"
msgstr "Waypoint"
-#: ../src/maemo-mapper.c:5439
+#: ../src/maemo-mapper.c:10760
+msgid "Next-able"
+msgstr ""
+
+#: ../src/maemo-mapper.c:5188
+#, fuzzy
msgid ""
-"No GPS Receiver MAC Provided.\n"
-"GPS Disabled."
+"No GPS Receiver MAC provided.\n"
+"GPS will be disabled."
msgstr ""
"Nessun indirizzo MAC impostato per il ricevitore GPS.\n"
"GPS disabilitato."
-#: ../src/maemo-mapper.c:10283 ../src/maemo-mapper.c:12133
+#: ../src/maemo-mapper.c:10499 ../src/maemo-mapper.c:12466
msgid "No POIs found."
msgstr ""
-#: ../src/maemo-mapper.c:12926 ../src/maemo-mapper.c:12947
-#: ../src/maemo-mapper.c:12969 ../src/maemo-mapper.c:12990
-#: ../src/maemo-mapper.c:13011 ../src/maemo-mapper.c:13091
-msgid "No waypoints are visible."
-msgstr "Non ci sono waypoint visibili."
-
-#: ../src/maemo-mapper.c:12903
-#, fuzzy
-msgid "No waypoints found."
-msgstr "Non ci sono waypoint visibili."
-
-#: ../src/maemo-mapper.c:6326
+#: ../src/maemo-mapper.c:6138
msgid "None"
msgstr "Nessuno"
-#: ../src/maemo-mapper.c:5121
+#: ../src/maemo-mapper.c:4891
msgid ""
"Note: You can enter a device path\n"
"(e.g. \"/dev/rfcomm0\")."
msgstr ""
-#: ../src/maemo-mapper.c:6628
-msgid ""
-"Now you must set up at least one Map Repository. You can download a sample "
-"set from the internet by using the \"Download...\" button."
-msgstr ""
-
-#: ../src/maemo-mapper.c:6227 ../src/maemo-mapper.c:6247
+#: ../src/maemo-mapper.c:6027 ../src/maemo-mapper.c:6047
msgid "Open..."
msgstr "Apri..."
-#: ../src/maemo-mapper.c:9589
+#: ../src/maemo-mapper.c:6465
+msgid ""
+"OpenStreetMap.org provides public, free-to-use maps. You can also download "
+"a sample set of repositories from the internet by using the \"Download...\" "
+"button."
+msgstr ""
+
+#: ../src/maemo-mapper.c:9697
msgid "Origin"
msgstr "Partenza"
-#: ../src/maemo-mapper.c:3169
+#: ../src/maemo-mapper.c:2955
msgid "Other"
msgstr ""
-#: ../src/maemo-mapper.c:11177
+#: ../src/maemo-mapper.c:11461
msgid "Overwrite"
msgstr "Sovrascrivi"
-#: ../src/maemo-mapper.c:4975 ../src/maemo-mapper.c:5335
-#: ../src/maemo-mapper.c:6531
+#: ../src/maemo-mapper.c:4737 ../src/maemo-mapper.c:5083
+#: ../src/maemo-mapper.c:6355
msgid "POI"
msgstr ""
-#: ../src/maemo-mapper.c:11926
+#: ../src/maemo-mapper.c:12259
#, fuzzy
msgid "POI Categories"
msgstr "Categorie POI"
-#: ../src/maemo-mapper.c:6305
+#: ../src/maemo-mapper.c:6117
msgid "POI Categories..."
msgstr "Categorie POI..."
-#: ../src/maemo-mapper.c:5339
+#: ../src/maemo-mapper.c:5087
msgid "POI database"
msgstr "Database POI"
-#: ../src/maemo-mapper.c:6301
+#: ../src/maemo-mapper.c:6113
msgid "POIs"
msgstr ""
-#: ../src/maemo-mapper.c:2390
+#: ../src/maemo-mapper.c:2240
msgid "PPS"
msgstr ""
+#: ../src/maemo-mapper.c:7919
+msgid "Pan East"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7916
+msgid "Pan North"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7918
+msgid "Pan South"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7917
+msgid "Pan West"
+msgstr ""
+
# This word refers to Pitch as in of a person's voice.
-#: ../src/maemo-mapper.c:5203
+#: ../src/maemo-mapper.c:4973
msgid "Pitch"
msgstr "Intonazione"
-#: ../src/maemo-mapper.c:3154
+#: ../src/maemo-mapper.c:2940
msgid "Places to eat or drink."
msgstr ""
-#: ../src/maemo-mapper.c:3156
+#: ../src/maemo-mapper.c:2942
msgid "Places to shop or acquire services."
msgstr ""
-#: ../src/maemo-mapper.c:3162
+#: ../src/maemo-mapper.c:2948
msgid "Places to stay temporarily or for the night."
msgstr ""
-#: ../src/maemo-mapper.c:4791
+#: ../src/maemo-mapper.c:10112
+#, fuzzy
+msgid "Please provide a description for the mark."
+msgstr "Specifica un nome per il POI."
+
+#: ../src/maemo-mapper.c:4444
msgid "Please select a bluetooth device from the list."
msgstr "Scegli dalla lista un dispositivo bluetooth."
-#: ../src/maemo-mapper.c:12460
+#: ../src/maemo-mapper.c:12793
#, fuzzy
msgid "Please specify a category for the POI."
msgstr "Specifica un nome per il POI."
-#: ../src/maemo-mapper.c:12453
+#: ../src/maemo-mapper.c:12786
msgid "Please specify a name for the POI."
msgstr "Specifica un nome per il POI."
-#: ../src/maemo-mapper.c:11747
+#: ../src/maemo-mapper.c:12080
msgid "Please specify a name for the category."
msgstr "Specifica un nome per la categoria."
-#: ../src/maemo-mapper.c:9659
+#: ../src/maemo-mapper.c:9767
msgid "Please specify a source URL."
msgstr "Specifica un URL."
-#: ../src/maemo-mapper.c:9671
+#: ../src/maemo-mapper.c:9779
msgid "Please specify a start location."
msgstr "Indica una località di partenza."
-#: ../src/maemo-mapper.c:9678
+#: ../src/maemo-mapper.c:9786
msgid "Please specify an end location."
msgstr "Indica una località di arrivo."
-#: ../src/maemo-mapper.c:12507
+#: ../src/maemo-mapper.c:12840
msgid "Problem adding POI"
msgstr "Problema aggiungendo il POI"
-#: ../src/maemo-mapper.c:11784
+#: ../src/maemo-mapper.c:12117
msgid "Problem adding category"
msgstr "Problema aggiungendo la categoria"
-#: ../src/maemo-mapper.c:11595 ../src/maemo-mapper.c:12043
+#: ../src/maemo-mapper.c:11928 ../src/maemo-mapper.c:12376
msgid "Problem deleting POI"
msgstr "Problema rimuovendo il POI"
-#: ../src/maemo-mapper.c:11604
+#: ../src/maemo-mapper.c:11937
msgid "Problem deleting category"
msgstr "Problema rimuovendo la categoria"
-#: ../src/maemo-mapper.c:11825
+#: ../src/maemo-mapper.c:12158
msgid "Problem updating Category"
msgstr "Problema aggiornando la categoria"
-#: ../src/maemo-mapper.c:12485
+#: ../src/maemo-mapper.c:12818
msgid "Problem updating POI"
msgstr "Problema aggiornando il POI"
-#: ../src/maemo-mapper.c:11769
+#: ../src/maemo-mapper.c:12102
msgid "Problem updating category"
msgstr "Problema aggiornando la categoria"
-#: ../src/maemo-mapper.c:3110
+#: ../src/maemo-mapper.c:2896
msgid "Problem with POI database"
msgstr "Problema coni il database dei POI"
-#: ../src/maemo-mapper.c:2391
+#: ../src/maemo-mapper.c:2241
msgid "Real Time Kinematic"
msgstr ""
-#: ../src/maemo-mapper.c:3858
+#: ../src/maemo-mapper.c:3627
msgid "Recalculating directions..."
msgstr ""
-#: ../src/maemo-mapper.c:3157
+#: ../src/maemo-mapper.c:2943
#, fuzzy
msgid "Recreation"
msgstr "Località"
-#: ../src/maemo-mapper.c:10673
+#: ../src/maemo-mapper.c:10978
msgid "Rename..."
msgstr "Rinomina..."
-#: ../src/maemo-mapper.c:6237
+#: ../src/maemo-mapper.c:10833
+msgid "Replace all repositories with the default repository?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6037
msgid "Reset"
msgstr "Reimposta"
-#: ../src/maemo-mapper.c:6362 ../src/maemo-mapper.c:8043
+#: ../src/maemo-mapper.c:6174 ../src/maemo-mapper.c:7943
msgid "Reset Bluetooth"
msgstr "Riavvia Bluetooth"
-#: ../src/maemo-mapper.c:3151
+#: ../src/maemo-mapper.c:4619
+msgid "Reset all colors to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4505
+msgid "Reset all hardware keys to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4537 ../src/maemo-mapper.c:4653
+#: ../src/maemo-mapper.c:10956
+#, fuzzy
+msgid "Reset..."
+msgstr "Reimposta"
+
+#: ../src/maemo-mapper.c:2937
msgid "Residence"
msgstr ""
-#: ../src/maemo-mapper.c:4954 ../src/maemo-mapper.c:6223
-#: ../src/maemo-mapper.c:6287
+#: ../src/maemo-mapper.c:4713 ../src/maemo-mapper.c:6023
+#: ../src/maemo-mapper.c:6099
msgid "Route"
msgstr "Rotta"
-#: ../src/maemo-mapper.c:9757
+#: ../src/maemo-mapper.c:9865
msgid "Route Downloaded"
msgstr "Rotta scaricata"
-#: ../src/maemo-mapper.c:8226 ../src/maemo-mapper.c:9805
+#: ../src/maemo-mapper.c:8224 ../src/maemo-mapper.c:9914
msgid "Route Opened"
msgstr "Rotta aperta"
-#: ../src/maemo-mapper.c:9957
+#: ../src/maemo-mapper.c:10160
msgid "Route Saved"
msgstr "Rotta salvata"
-#: ../src/maemo-mapper.c:10022
+#: ../src/maemo-mapper.c:10238
msgid "Routes are now hidden"
msgstr "Le rotte sono nascoste"
-#: ../src/maemo-mapper.c:10016
+#: ../src/maemo-mapper.c:10232
msgid "Routes are now shown"
msgstr "Le rotte sono visibili"
-#: ../src/maemo-mapper.c:2388
+#: ../src/maemo-mapper.c:2238
msgid "SPS"
msgstr ""
-#: ../src/maemo-mapper.c:3014
+#: ../src/maemo-mapper.c:2800
msgid "Sat in use"
msgstr "Satelliti in uso"
-#: ../src/maemo-mapper.c:3005
+#: ../src/maemo-mapper.c:2791
msgid "Sat in view"
msgstr "Satelliti in vista"
-#: ../src/maemo-mapper.c:2946
+#: ../src/maemo-mapper.c:2732
msgid "Satellites details"
msgstr "Dettagli satelliti"
-#: ../src/maemo-mapper.c:2871
+#: ../src/maemo-mapper.c:2660
msgid "Satellites in view"
msgstr "Satelliti in vista"
-#: ../src/maemo-mapper.c:6231 ../src/maemo-mapper.c:6249
+#: ../src/maemo-mapper.c:6031 ../src/maemo-mapper.c:6049
msgid "Save..."
msgstr "Salva..."
-#: ../src/maemo-mapper.c:5115
+#: ../src/maemo-mapper.c:6094
+msgid "Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4885
msgid "Scan..."
msgstr "Cerca..."
-#: ../src/maemo-mapper.c:4767
+#: ../src/maemo-mapper.c:4420
msgid "Scanning for Bluetooth Devices"
msgstr "Sto cercando i dispositivi bluetooth"
-#: ../src/maemo-mapper.c:3163
+#: ../src/maemo-mapper.c:2949
msgid "School"
msgstr ""
-#: ../src/maemo-mapper.c:3301
+#: ../src/maemo-mapper.c:3087
msgid "Searching for GPS receiver"
msgstr "Sto cercando un ricevitore GPS"
-#: ../src/maemo-mapper.c:4731
+#: ../src/maemo-mapper.c:4384
msgid "Select Bluetooth Device"
msgstr "Scegli il dispositivo bluetooth"
-#: ../src/maemo-mapper.c:8030
+#: ../src/maemo-mapper.c:7929
#, fuzzy
msgid "Select Next Repository"
msgstr "Prossimo deposito"
-#: ../src/maemo-mapper.c:12153
+#: ../src/maemo-mapper.c:12486
msgid "Select POI"
msgstr "Seleziona POI"
-#: ../src/maemo-mapper.c:12218
+#: ../src/maemo-mapper.c:12551
msgid "Select one POI from the list."
msgstr "Scegli un POI dalla lista."
-#: ../src/maemo-mapper.c:5135
+#: ../src/maemo-mapper.c:4905
msgid "Sensitivity"
msgstr "Sensibilità"
-#: ../src/maemo-mapper.c:6498
+#: ../src/maemo-mapper.c:6322
#, fuzzy
msgid "Set as GPS Location"
msgstr "Usa la località del GPS"
-#: ../src/maemo-mapper.c:5080
+#: ../src/maemo-mapper.c:4847
#, fuzzy
msgid "Settings"
msgstr "Impostazioni"
-#: ../src/maemo-mapper.c:6369
+#: ../src/maemo-mapper.c:6181
msgid "Settings..."
msgstr "Impostazioni..."
-#: ../src/maemo-mapper.c:11160
+#: ../src/maemo-mapper.c:11444
msgid "Setup"
msgstr "Impostazioni"
-#: ../src/maemo-mapper.c:3155
+#: ../src/maemo-mapper.c:2941
msgid "Shopping/Services"
msgstr ""
-#: ../src/maemo-mapper.c:6509
+#: ../src/maemo-mapper.c:6333
msgid "Show Description"
msgstr "Mostra descrizione"
-#: ../src/maemo-mapper.c:6255 ../src/maemo-mapper.c:8039
+#: ../src/maemo-mapper.c:6057 ../src/maemo-mapper.c:7938
#, fuzzy
msgid "Show Distance from Beginning"
msgstr "Mostra la distanza verso"
-#: ../src/maemo-mapper.c:6253 ../src/maemo-mapper.c:8037
+#: ../src/maemo-mapper.c:7936
+#, fuzzy
+msgid "Show Distance from Last Break"
+msgstr "Mostra la distanza verso"
+
+#: ../src/maemo-mapper.c:6055
#, fuzzy
msgid "Show Distance from Last Mark"
msgstr "Mostra la distanza verso"
-#: ../src/maemo-mapper.c:6485 ../src/maemo-mapper.c:6516
-#: ../src/maemo-mapper.c:6540
+#: ../src/maemo-mapper.c:6309 ../src/maemo-mapper.c:6340
+#: ../src/maemo-mapper.c:6364
msgid "Show Distance to"
msgstr "Mostra la distanza verso"
-#: ../src/maemo-mapper.c:6235 ../src/maemo-mapper.c:8034
+#: ../src/maemo-mapper.c:6035 ../src/maemo-mapper.c:7933
#, fuzzy
msgid "Show Distance to End of Route"
msgstr "Mostra la distanza verso"
-#: ../src/maemo-mapper.c:6233 ../src/maemo-mapper.c:8032
+#: ../src/maemo-mapper.c:6033 ../src/maemo-mapper.c:7931
#, fuzzy
msgid "Show Distance to Next Waypoint"
msgstr "Distanza per il waypoint"
-#: ../src/maemo-mapper.c:6355
+#: ../src/maemo-mapper.c:6167
msgid "Show Information"
msgstr "Mostra informazioni"
-#: ../src/maemo-mapper.c:6480 ../src/maemo-mapper.c:6507
+#: ../src/maemo-mapper.c:6304 ../src/maemo-mapper.c:6331
msgid "Show Lat/Lon"
msgstr "Mostra Lat/Lon"
-#: ../src/maemo-mapper.c:5354
+#: ../src/maemo-mapper.c:5102
msgid "Show POI below zoom"
msgstr "Mostra POI con zoom"
-#: ../src/maemo-mapper.c:2395
+#: ../src/maemo-mapper.c:2245
msgid "Simulation"
msgstr "Simulazione"
-#: ../src/maemo-mapper.c:9554
+#: ../src/maemo-mapper.c:9662
msgid "Source URL"
msgstr ""
-#: ../src/maemo-mapper.c:2969 ../src/maemo-mapper.c:5191
+#: ../src/maemo-mapper.c:2755 ../src/maemo-mapper.c:4961
msgid "Speed"
msgstr "Velocità"
-#: ../src/maemo-mapper.c:5296
+#: ../src/maemo-mapper.c:5058
msgid "Speed Limit"
msgstr "Limite di velocità"
-#: ../src/maemo-mapper.c:3150
+#: ../src/maemo-mapper.c:2936
msgid "Stations for purchasing fuel for vehicles."
msgstr ""
-#: ../src/maemo-mapper.c:3562
+#: ../src/maemo-mapper.c:3348
msgid "The current route is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3608 ../src/maemo-mapper.c:3623
+#: ../src/maemo-mapper.c:3394 ../src/maemo-mapper.c:3409
msgid "The current track is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3543 ../src/maemo-mapper.c:10230
+#: ../src/maemo-mapper.c:4580
+msgid "The following action is mapped to multiple keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8646
+msgid "There are no other next-able repositories."
+msgstr ""
+
+#: ../src/maemo-mapper.c:13222
+msgid "There are no waypoints."
+msgstr ""
+
+#: ../src/maemo-mapper.c:3329 ../src/maemo-mapper.c:10446
msgid "There is no next waypoint."
msgstr ""
-#: ../src/maemo-mapper.c:8040
+#: ../src/maemo-mapper.c:7921
+#, fuzzy
+msgid "Toggle Auto-Center"
+msgstr "Centro automatico"
+
+#: ../src/maemo-mapper.c:7923
+#, fuzzy
+msgid "Toggle Fullscreen"
+msgstr "Schermo intero"
+
+#: ../src/maemo-mapper.c:7939
msgid "Toggle GPS"
msgstr "Abilita GPS"
-#: ../src/maemo-mapper.c:8041
+#: ../src/maemo-mapper.c:7940
msgid "Toggle GPS Info"
msgstr "Abilita informazioni GPS"
-#: ../src/maemo-mapper.c:8029
+#: ../src/maemo-mapper.c:7928
#, fuzzy
msgid "Toggle POIs"
msgstr "Abilita GPS"
-#: ../src/maemo-mapper.c:8042
+#: ../src/maemo-mapper.c:7927
+#, fuzzy
+msgid "Toggle Scale"
+msgstr "Abilita GPS"
+
+#: ../src/maemo-mapper.c:7942
msgid "Toggle Speed Limit"
msgstr ""
-#: ../src/maemo-mapper.c:8028
+#: ../src/maemo-mapper.c:7926
msgid "Toggle Tracks"
msgstr "Abilita tracce"
-#: ../src/maemo-mapper.c:8049 ../src/maemo-mapper.c:11288
+#: ../src/maemo-mapper.c:7966 ../src/maemo-mapper.c:11572
msgid "Top-Left"
msgstr "Superiore sinistra"
-#: ../src/maemo-mapper.c:8050
+#: ../src/maemo-mapper.c:7967
msgid "Top-Right"
msgstr "Superiore destro"
-#: ../src/maemo-mapper.c:4938 ../src/maemo-mapper.c:6243
-#: ../src/maemo-mapper.c:6292
+#: ../src/maemo-mapper.c:4689 ../src/maemo-mapper.c:6043
+#: ../src/maemo-mapper.c:6104
msgid "Track"
msgstr "Percorso"
-#: ../src/maemo-mapper.c:9880
+#: ../src/maemo-mapper.c:9988
msgid "Track Opened"
msgstr "Percorso aperto"
-#: ../src/maemo-mapper.c:9902
+#: ../src/maemo-mapper.c:10010
msgid "Track Saved"
msgstr "Percorso salvato"
-#: ../src/maemo-mapper.c:9998
+#: ../src/maemo-mapper.c:10201
msgid "Tracks are now hidden"
msgstr "I percorsi sono nascosti"
-#: ../src/maemo-mapper.c:9992
+#: ../src/maemo-mapper.c:10195
msgid "Tracks are now shown"
msgstr "I percorsi sono visibili"
-#: ../src/maemo-mapper.c:3159
+#: ../src/maemo-mapper.c:2945
msgid "Transportation"
msgstr ""
-#: ../src/maemo-mapper.c:10454
+#: ../src/maemo-mapper.c:10676
msgid "URL Format"
msgstr "Formato URL"
-#: ../src/maemo-mapper.c:10773
+#: ../src/maemo-mapper.c:5445
msgid "Unable to create cache directory for repository"
msgstr "Impossibile creare la cartella per il deposito"
-#: ../src/maemo-mapper.c:5261
+#: ../src/maemo-mapper.c:5024
msgid "Units"
msgstr "Unità"
-#: ../src/maemo-mapper.c:9582
+#: ../src/maemo-mapper.c:9690
msgid "Use End of Route"
msgstr ""
-#: ../src/maemo-mapper.c:9568
+#: ../src/maemo-mapper.c:9676
msgid "Use GPS Location"
msgstr "Usa la località del GPS"
-#: ../src/maemo-mapper.c:6297
+#: ../src/maemo-mapper.c:6109
msgid "Velocity Vector"
msgstr "Vettore di velocità"
-#: ../src/maemo-mapper.c:6279
+#: ../src/maemo-mapper.c:6081
msgid "View"
msgstr "Mostra"
-#: ../src/maemo-mapper.c:11269
+#: ../src/maemo-mapper.c:11553
msgid "View Center"
msgstr "Mostra centro"
-#: ../src/maemo-mapper.c:10494
+#: ../src/maemo-mapper.c:10731
msgid "View Zoom Steps"
msgstr "Mostra intervalli di zoom"
-#: ../src/maemo-mapper.c:6537
+#: ../src/maemo-mapper.c:6361
msgid "View/Edit..."
msgstr ""
-#: ../src/maemo-mapper.c:11582
+#: ../src/maemo-mapper.c:11915
msgid "WARNING: All POIs in that category will also be deleted!"
msgstr "ATTENZIONE: tutti i POI in questa categoria verranno eliminati!"
-#: ../src/maemo-mapper.c:6502
+#: ../src/maemo-mapper.c:6326
msgid "Waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:11217
+#: ../src/maemo-mapper.c:6472
+msgid ""
+"You will now see a blank screen. You can download maps using the \"Manage "
+"Maps\" menu item in the \"Maps\" menu. Or, press OK to enable Auto-Download."
+msgstr ""
+
+#: ../src/maemo-mapper.c:11501
msgid "Zoom"
msgstr ""
-#: ../src/maemo-mapper.c:11223
+#: ../src/maemo-mapper.c:6085 ../src/maemo-mapper.c:7924
+msgid "Zoom In"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11507
msgid "Zoom Levels to Download: (0 = most detail)"
msgstr "Livelli di Zoom da scaricare: (0 = massimo dettaglio)"
-#: ../src/maemo-mapper.c:8463 ../src/maemo-mapper.c:8545
+#: ../src/maemo-mapper.c:6087 ../src/maemo-mapper.c:7925
+msgid "Zoom Out"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8461 ../src/maemo-mapper.c:8573
+#: ../src/maemo-mapper.c:11735 ../src/maemo-mapper.c:11753
msgid "Zoom to Level"
msgstr "Zoom al livello"
-#: ../src/maemo-mapper.c:10995 ../src/maemo-mapper.c:11002
+#: ../src/maemo-mapper.c:11279 ../src/maemo-mapper.c:11286
msgid "about"
msgstr "circa"
-#: ../src/maemo-mapper.c:2872
+#: ../src/maemo-mapper.c:2661
msgid "in use"
msgstr "in uso"
-#: ../src/maemo-mapper.c:8016
+#: ../src/maemo-mapper.c:7874
msgid "km"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "maps"
msgstr "mappe"
-#: ../src/maemo-mapper.c:10909 ../src/maemo-mapper.c:10996
+#: ../src/maemo-mapper.c:11193 ../src/maemo-mapper.c:11280
msgid "maps "
msgstr "mappe"
-#: ../src/maemo-mapper.c:8017
+#: ../src/maemo-mapper.c:7875
msgid "mi."
msgstr ""
-#: ../src/maemo-mapper.c:8018
+#: ../src/maemo-mapper.c:7876
msgid "n.m."
msgstr ""
-#: ../src/maemo-mapper.c:3027
+#: ../src/maemo-mapper.c:2813
msgid "nofix"
msgstr ""
-#: ../src/maemo-mapper.c:2396 ../src/maemo-mapper.c:3036
+#: ../src/maemo-mapper.c:2246 ../src/maemo-mapper.c:2822
msgid "none"
msgstr "nessuna"
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "up to about"
msgstr "fino a circa"
#~ msgid "Copy Lat/Lon to Clipboard"
#~ msgstr "Copia Lat/Lon negli appunti"
+#~ msgid "Defaults"
+#~ msgstr "Default"
+
#~ msgid "Desc."
#~ msgstr "Descr."
#~ msgid "Distance to Location"
#~ msgstr "Distanza per la località"
+#~ msgid "Escape Key"
+#~ msgstr "Tasto ESC"
+
#~ msgid "Label: "
#~ msgstr "Etichetta"
#~ msgid "No route is loaded."
#~ msgstr "Nessuna rotta caricata."
+#~ msgid "No waypoints are visible."
+#~ msgstr "Non ci sono waypoint visibili."
+
+#, fuzzy
+#~ msgid "No waypoints found."
+#~ msgstr "Non ci sono waypoint visibili."
+
#~ msgid "Repositories"
#~ msgstr "Depositi"
msgstr ""
"Project-Id-Version: maemo-mapper 1.0.2\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-03 16:40-0500\n"
+"POT-Creation-Date: 2007-03-12 01:23-0400\n"
"PO-Revision-Date: 2006-07-04 09:56+0200\n"
"Last-Translator: Mischa Molhoek <mischamolhoek@gmail.com>\n"
"Language-Team: John Costigan <gnuite@gmail.com>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/maemo-mapper.c:11990
+#: ../src/maemo-mapper.c:12323
msgid "# POIs"
msgstr ""
-#: ../src/maemo-mapper.c:11939
+#: ../src/maemo-mapper.c:6186
+#, fuzzy
+msgid "About..."
+msgstr "Route"
+
+#: ../src/maemo-mapper.c:12272
msgid "Add"
msgstr ""
-#: ../src/maemo-mapper.c:11678
+#: ../src/maemo-mapper.c:12011
msgid "Add Category"
msgstr ""
-#: ../src/maemo-mapper.c:12341
+#: ../src/maemo-mapper.c:12674
msgid "Add POI"
msgstr ""
-#: ../src/maemo-mapper.c:6494 ../src/maemo-mapper.c:6523
+#: ../src/maemo-mapper.c:6318 ../src/maemo-mapper.c:6347
msgid "Add POI..."
msgstr ""
-#: ../src/maemo-mapper.c:6490 ../src/maemo-mapper.c:6545
+#: ../src/maemo-mapper.c:6314 ../src/maemo-mapper.c:6369
msgid "Add Route Point"
msgstr ""
-#: ../src/maemo-mapper.c:12631
+#: ../src/maemo-mapper.c:12964
#, fuzzy
msgid "Add Waypoint"
msgstr "Route Markering"
-#: ../src/maemo-mapper.c:6492 ../src/maemo-mapper.c:6547
+#: ../src/maemo-mapper.c:6316 ../src/maemo-mapper.c:6371
#, fuzzy
msgid "Add Waypoint..."
msgstr "Route Markering..."
-#: ../src/maemo-mapper.c:5166
+#: ../src/maemo-mapper.c:4936
msgid "Advance Notice"
msgstr "Aankondiging"
-#: ../src/maemo-mapper.c:11202
+#: ../src/maemo-mapper.c:11486
msgid "Along Route - Radius (tiles):"
msgstr ""
-#: ../src/maemo-mapper.c:2978
+#: ../src/maemo-mapper.c:2764
#, fuzzy
msgid "Altitude"
msgstr "Breedtegraad"
-#: ../src/maemo-mapper.c:4773
+#: ../src/maemo-mapper.c:4426
msgid "An error occurred while attempting to scan for bluetooth devices."
msgstr ""
-#: ../src/maemo-mapper.c:10596
+#: ../src/maemo-mapper.c:10888
msgid ""
"An error occurred while retrieving the repositories. The web service may be "
"temporarily down."
msgstr ""
-#: ../src/maemo-mapper.c:8477
+#: ../src/maemo-mapper.c:8475
msgid ""
"An error occurred while trying to reset the bluetooth radio.\n"
"\n"
"the /etc/sudoers file?"
msgstr ""
-#: ../src/maemo-mapper.c:5162
+#: ../src/maemo-mapper.c:4932
msgid "Announce"
msgstr "Aankondigen"
-#: ../src/maemo-mapper.c:11239
+#: ../src/maemo-mapper.c:11523
msgid "Area"
msgstr "Gebied"
-#: ../src/maemo-mapper.c:5131 ../src/maemo-mapper.c:6310
+#: ../src/maemo-mapper.c:4901 ../src/maemo-mapper.c:6122
msgid "Auto-Center"
msgstr "Automatisch-Centreren"
-#: ../src/maemo-mapper.c:10091
+#: ../src/maemo-mapper.c:10307
msgid "Auto-Center Mode: Lat/Lon"
msgstr "Automatisch-Centreren Mode: Lengtegr/Breedtegr"
-#: ../src/maemo-mapper.c:10076
+#: ../src/maemo-mapper.c:10292
msgid "Auto-Center Mode: Lead"
msgstr "Automatisch-Centreren Mode: Lead"
-#: ../src/maemo-mapper.c:10105
+#: ../src/maemo-mapper.c:10321
msgid "Auto-Center Off"
msgstr "Automatisch-Centreren Uit"
-#: ../src/maemo-mapper.c:6270
+#: ../src/maemo-mapper.c:6072
msgid "Auto-Download"
msgstr "Automatisch-Downloaden"
-#: ../src/maemo-mapper.c:9572
+#: ../src/maemo-mapper.c:9680
msgid "Auto-Update"
msgstr "Automatisch-Updaten"
-#: ../src/maemo-mapper.c:8052
+#: ../src/maemo-mapper.c:7969
#, fuzzy
msgid "Bottom-Left"
msgstr "Rechts-onder"
-#: ../src/maemo-mapper.c:8051 ../src/maemo-mapper.c:11306
+#: ../src/maemo-mapper.c:7968 ../src/maemo-mapper.c:11590
msgid "Bottom-Right"
msgstr "Rechts-onder"
-#: ../src/maemo-mapper.c:5349 ../src/maemo-mapper.c:10473
+#: ../src/maemo-mapper.c:3700
+msgid "Break already inserted."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5097 ../src/maemo-mapper.c:10695
msgid "Browse..."
msgstr "Blader..."
-#: ../src/maemo-mapper.c:3160
+#: ../src/maemo-mapper.c:2946
msgid "Bus stops, airports, train stations, etc."
msgstr ""
-#: ../src/maemo-mapper.c:3165
+#: ../src/maemo-mapper.c:2951
msgid "Business"
msgstr ""
-#: ../src/maemo-mapper.c:11193
+#: ../src/maemo-mapper.c:11477
msgid "By Area (see tab)"
msgstr ""
-#: ../src/maemo-mapper.c:10463
+#: ../src/maemo-mapper.c:10685
msgid "Cache Dir."
msgstr ""
-#: ../src/maemo-mapper.c:10409
+#: ../src/maemo-mapper.c:10626
msgid ""
"Cannot delete the last repository - there must be at lease one repository."
msgstr ""
-#: ../src/maemo-mapper.c:11473
+#: ../src/maemo-mapper.c:11795
msgid ""
"Cannot enable GPS until a GPS Receiver MAC is set in the Settings dialog box."
msgstr ""
"Kan GPS niet aanzetten totdat GPS MAC adres is ingevoerd in het Configuratie "
"scherm"
-#: ../src/maemo-mapper.c:12191 ../src/maemo-mapper.c:12378
+#: ../src/maemo-mapper.c:12524 ../src/maemo-mapper.c:12711
msgid "Category"
msgstr ""
-#: ../src/maemo-mapper.c:6239 ../src/maemo-mapper.c:6257
-#: ../src/maemo-mapper.c:11146
+#: ../src/maemo-mapper.c:6039 ../src/maemo-mapper.c:6059
+#: ../src/maemo-mapper.c:11430
msgid "Clear"
msgstr "Opschonen"
-#: ../src/maemo-mapper.c:6374
+#: ../src/maemo-mapper.c:6188
msgid "Close"
msgstr "Sluiten"
-#: ../src/maemo-mapper.c:4899
+#: ../src/maemo-mapper.c:4647
#, fuzzy
msgid "Colors"
msgstr "Sluiten"
-#: ../src/maemo-mapper.c:5090
+#: ../src/maemo-mapper.c:4860
#, fuzzy
msgid "Colors..."
msgstr "Download..."
-#: ../src/maemo-mapper.c:10908 ../src/maemo-mapper.c:10995
+#: ../src/maemo-mapper.c:11192 ../src/maemo-mapper.c:11279
msgid "Confirm DELETION of"
msgstr ""
-#: ../src/maemo-mapper.c:10416
+#: ../src/maemo-mapper.c:10633
msgid "Confirm delete of repository"
msgstr ""
-#: ../src/maemo-mapper.c:13034
+#: ../src/maemo-mapper.c:13335
msgid "Confirm delete of waypoint"
msgstr ""
-#: ../src/maemo-mapper.c:10914 ../src/maemo-mapper.c:11001
+#: ../src/maemo-mapper.c:11198 ../src/maemo-mapper.c:11285
msgid "Confirm download of"
msgstr ""
-#: ../src/maemo-mapper.c:6513
+#: ../src/maemo-mapper.c:4583
+msgid "Continue?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6337
#, fuzzy
msgid "Copy Description"
msgstr "Bestemming"
-#: ../src/maemo-mapper.c:6482 ../src/maemo-mapper.c:6511
+#: ../src/maemo-mapper.c:6306 ../src/maemo-mapper.c:6335
#, fuzzy
msgid "Copy Lat/Lon"
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:9709
+#: ../src/maemo-mapper.c:9817
#, fuzzy
msgid ""
"Could not generate directions. Make sure your source and destination are "
"valid."
msgstr "Kon geen route generen. Vul geldige locaties in."
-#: ../src/maemo-mapper.c:12709
+#: ../src/maemo-mapper.c:13043
msgid ""
"Creating a \"waypoint\" with no description actually adds a break point. Is "
"that what you want?"
msgstr ""
-#: ../src/maemo-mapper.c:2389
+#: ../src/maemo-mapper.c:2239
#, fuzzy
msgid "DGPS"
msgstr "GPS"
-#: ../src/maemo-mapper.c:4905
-msgid "Defaults"
-msgstr ""
-
-#: ../src/maemo-mapper.c:5277
+#: ../src/maemo-mapper.c:5035
msgid "Degrees Format"
msgstr ""
-#: ../src/maemo-mapper.c:11659 ../src/maemo-mapper.c:12316
+#: ../src/maemo-mapper.c:11992 ../src/maemo-mapper.c:12649
msgid "Delete"
msgstr ""
-#: ../src/maemo-mapper.c:11183
+#: ../src/maemo-mapper.c:11467
msgid "Delete Maps"
msgstr ""
-#: ../src/maemo-mapper.c:12032
+#: ../src/maemo-mapper.c:12365
msgid "Delete POI?"
msgstr ""
-#: ../src/maemo-mapper.c:11580
+#: ../src/maemo-mapper.c:11913
msgid "Delete category?"
msgstr ""
-#: ../src/maemo-mapper.c:6520 ../src/maemo-mapper.c:10676
+#: ../src/maemo-mapper.c:6344 ../src/maemo-mapper.c:10981
msgid "Delete..."
msgstr ""
-#: ../src/maemo-mapper.c:4761 ../src/maemo-mapper.c:11697
-#: ../src/maemo-mapper.c:11985 ../src/maemo-mapper.c:12405
-#: ../src/maemo-mapper.c:12657
+#: ../src/maemo-mapper.c:4414 ../src/maemo-mapper.c:10069
+#: ../src/maemo-mapper.c:12030 ../src/maemo-mapper.c:12318
+#: ../src/maemo-mapper.c:12738 ../src/maemo-mapper.c:12989
#, fuzzy
msgid "Description"
msgstr "Bestemming"
-#: ../src/maemo-mapper.c:9600
+#: ../src/maemo-mapper.c:9708
msgid "Destination"
msgstr "Bestemming"
-#: ../src/maemo-mapper.c:6359
+#: ../src/maemo-mapper.c:6171
#, fuzzy
msgid "Details..."
msgstr "Instellingen..."
-#: ../src/maemo-mapper.c:3153
+#: ../src/maemo-mapper.c:2939
msgid "Dining"
msgstr ""
-#: ../src/maemo-mapper.c:3528 ../src/maemo-mapper.c:3588
-#: ../src/maemo-mapper.c:12598
+#: ../src/maemo-mapper.c:3314 ../src/maemo-mapper.c:3374
+#: ../src/maemo-mapper.c:12931
#, fuzzy
msgid "Distance"
msgstr "Show Distance to"
-#: ../src/maemo-mapper.c:11170
+#: ../src/maemo-mapper.c:10752
+msgid "Double Pixels"
+msgstr ""
+
+#: ../src/maemo-mapper.c:11454
#, fuzzy
msgid "Download Maps"
msgstr "Landkaarten worden gedownload"
-#: ../src/maemo-mapper.c:9532
+#: ../src/maemo-mapper.c:9640
msgid "Download Route"
msgstr ""
-#: ../src/maemo-mapper.c:6487 ../src/maemo-mapper.c:6518
-#: ../src/maemo-mapper.c:6542
+#: ../src/maemo-mapper.c:6311 ../src/maemo-mapper.c:6342
+#: ../src/maemo-mapper.c:6366
msgid "Download Route to..."
msgstr ""
-#: ../src/maemo-mapper.c:10478
+#: ../src/maemo-mapper.c:10715
#, fuzzy
msgid "Download Zoom Steps"
msgstr "Download Route"
-#: ../src/maemo-mapper.c:6229 ../src/maemo-mapper.c:10657
+#: ../src/maemo-mapper.c:6029 ../src/maemo-mapper.c:10962
msgid "Download..."
msgstr ""
-#: ../src/maemo-mapper.c:6960
+#: ../src/maemo-mapper.c:6827
msgid "Downloading maps"
msgstr "Landkaarten worden gedownload"
-#: ../src/maemo-mapper.c:11936
+#: ../src/maemo-mapper.c:12269
msgid "Edit"
msgstr ""
-#: ../src/maemo-mapper.c:12401
+#: ../src/maemo-mapper.c:12734
msgid "Edit Categories..."
msgstr ""
-#: ../src/maemo-mapper.c:11653
+#: ../src/maemo-mapper.c:11986
msgid "Edit Category"
msgstr ""
-#: ../src/maemo-mapper.c:12310
+#: ../src/maemo-mapper.c:12643
msgid "Edit POI"
msgstr ""
-#: ../src/maemo-mapper.c:3164
+#: ../src/maemo-mapper.c:2950
msgid "Elementary schools, college campuses, etc."
msgstr ""
-#: ../src/maemo-mapper.c:6351
+#: ../src/maemo-mapper.c:6163
msgid "Enable GPS"
msgstr "Activeer GPS"
-#: ../src/maemo-mapper.c:5178
+#: ../src/maemo-mapper.c:4948
msgid "Enable Voice Synthesis (requires flite)"
msgstr "Activeer Spraak (heeft geinstallerde flite nodig)"
-#: ../src/maemo-mapper.c:11721 ../src/maemo-mapper.c:11973
+#: ../src/maemo-mapper.c:12054 ../src/maemo-mapper.c:12306
#, fuzzy
msgid "Enabled"
msgstr "Activeer GPS"
-#: ../src/maemo-mapper.c:7212
+#: ../src/maemo-mapper.c:7064
msgid ""
"Error in download. Check internet connection and/or Map Repository URL "
"Format."
msgstr ""
-#: ../src/maemo-mapper.c:8229 ../src/maemo-mapper.c:9765
-#: ../src/maemo-mapper.c:9808 ../src/maemo-mapper.c:9883
+#: ../src/maemo-mapper.c:8227 ../src/maemo-mapper.c:9873
+#: ../src/maemo-mapper.c:9917 ../src/maemo-mapper.c:9991
msgid "Error parsing GPX file."
msgstr "Fout by verwerken GPX bestand."
-#: ../src/maemo-mapper.c:1472
+#: ../src/maemo-mapper.c:1475
#, fuzzy
msgid "Error while writing to file"
msgstr "Fout bij schrijven GPX bestand."
-#: ../src/maemo-mapper.c:9905 ../src/maemo-mapper.c:9960
+#: ../src/maemo-mapper.c:10013 ../src/maemo-mapper.c:10163
msgid "Error writing GPX file."
msgstr "Fout bij schrijven GPX bestand."
-#: ../src/maemo-mapper.c:5239
-msgid "Escape Key"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3311
+#: ../src/maemo-mapper.c:3097
msgid "Establishing GPS fix"
msgstr "GPS zoekt satellieten"
-#: ../src/maemo-mapper.c:2393
+#: ../src/maemo-mapper.c:2243
msgid "Estimated"
msgstr ""
-#: ../src/maemo-mapper.c:4065
+#: ../src/maemo-mapper.c:3836
#, fuzzy
msgid "Failed to connect to GPS receiver. Retry?"
msgstr "Failed to connect to GPX Directions server"
-#: ../src/maemo-mapper.c:9697
+#: ../src/maemo-mapper.c:9805
msgid "Failed to connect to GPX Directions server"
msgstr ""
-#: ../src/maemo-mapper.c:5667
+#: ../src/maemo-mapper.c:5478
msgid "Failed to initialize GConf. Quitting."
msgstr "initialiseren GConf mislukt. Programma wordt afgesloten."
-#: ../src/maemo-mapper.c:4280
+#: ../src/maemo-mapper.c:3980
msgid "Failed to initialize GConf. Settings were not saved."
msgstr "initialiseren GConf mislukt. Instellingen niet opgeslagen."
-#: ../src/maemo-mapper.c:7768 ../src/maemo-mapper.c:8217
+#: ../src/maemo-mapper.c:7625 ../src/maemo-mapper.c:8216
msgid "Failed to open file for reading"
msgstr ""
-#: ../src/maemo-mapper.c:7425 ../src/maemo-mapper.c:7769
+#: ../src/maemo-mapper.c:7282 ../src/maemo-mapper.c:7626
msgid "Failed to open file for writing"
msgstr ""
-#: ../src/maemo-mapper.c:3178
+#: ../src/maemo-mapper.c:2964
msgid "Failed to open or create database"
msgstr ""
-#: ../src/maemo-mapper.c:1473
+#: ../src/maemo-mapper.c:1476
msgid "File is incomplete."
msgstr ""
-#: ../src/maemo-mapper.c:3023
+#: ../src/maemo-mapper.c:2809
msgid "Fix"
msgstr ""
-#: ../src/maemo-mapper.c:3032
+#: ../src/maemo-mapper.c:2818
msgid "Fix Quality"
msgstr ""
-#: ../src/maemo-mapper.c:2392
+#: ../src/maemo-mapper.c:2242
msgid "Float RTK"
msgstr ""
-#: ../src/maemo-mapper.c:3149
+#: ../src/maemo-mapper.c:2935
msgid "Fuel"
msgstr ""
-#: ../src/maemo-mapper.c:6283
+#: ../src/maemo-mapper.c:6089
msgid "Full Screen"
msgstr "Volledig Scherm"
-#: ../src/maemo-mapper.c:5101 ../src/maemo-mapper.c:6347
+#: ../src/maemo-mapper.c:4665 ../src/maemo-mapper.c:4871
+#: ../src/maemo-mapper.c:6159
msgid "GPS"
msgstr ""
-#: ../src/maemo-mapper.c:2926
+#: ../src/maemo-mapper.c:2712
msgid "GPS Details"
msgstr ""
-#: ../src/maemo-mapper.c:2939
+#: ../src/maemo-mapper.c:2725
#, fuzzy
msgid "GPS Information"
msgstr "GPS Locatie"
-#: ../src/maemo-mapper.c:6339 ../src/maemo-mapper.c:11253
+#: ../src/maemo-mapper.c:6151 ../src/maemo-mapper.c:11537
msgid "GPS Location"
msgstr "GPS Locatie"
-#: ../src/maemo-mapper.c:4917
-msgid "GPS Mark"
-msgstr ""
-
-#: ../src/maemo-mapper.c:3168
+#: ../src/maemo-mapper.c:2954
msgid "General landmarks."
msgstr ""
-#: ../src/maemo-mapper.c:3166
+#: ../src/maemo-mapper.c:2952
msgid "General places of business."
msgstr ""
-#: ../src/maemo-mapper.c:6333
+#: ../src/maemo-mapper.c:6145
msgid "Go to"
msgstr ""
-#: ../src/maemo-mapper.c:10121
+#: ../src/maemo-mapper.c:10337
#, fuzzy
msgid "Go to Lat/Lon"
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:6550
+#: ../src/maemo-mapper.c:6374
msgid "Go to Nearest"
msgstr ""
-#: ../src/maemo-mapper.c:6527
+#: ../src/maemo-mapper.c:6351
msgid "Go to Next"
msgstr ""
-#: ../src/maemo-mapper.c:2987
-msgid "Heading"
+#: ../src/maemo-mapper.c:4531
+msgid "Hardware Keys"
msgstr ""
-#: ../src/maemo-mapper.c:6372
-msgid "Help"
+#: ../src/maemo-mapper.c:4857
+msgid "Hardware Keys..."
+msgstr ""
+
+#: ../src/maemo-mapper.c:2773
+msgid "Heading"
msgstr ""
-#: ../src/maemo-mapper.c:3152
+#: ../src/maemo-mapper.c:6184
+#, fuzzy
+msgid "Help..."
+msgstr "Open..."
+
+#: ../src/maemo-mapper.c:2938
msgid "Houses, apartments, or other residences of import."
msgstr ""
-#: ../src/maemo-mapper.c:11965
+#: ../src/maemo-mapper.c:12298
msgid "ID"
msgstr ""
-#: ../src/maemo-mapper.c:3158
+#: ../src/maemo-mapper.c:2944
msgid "Indoor or Outdoor places to have fun."
msgstr ""
-#: ../src/maemo-mapper.c:5322
+#: ../src/maemo-mapper.c:5008
#, fuzzy
msgid "Information Font Size"
msgstr "GPS Locatie"
-#: ../src/maemo-mapper.c:6251
+#: ../src/maemo-mapper.c:6051
+#, fuzzy
+msgid "Insert Break"
+msgstr "Insert Breakpoint"
+
+#: ../src/maemo-mapper.c:10044
#, fuzzy
msgid "Insert Mark"
msgstr "Insert Breakpoint"
-#: ../src/maemo-mapper.c:8035
-msgid "Insert Track Mark"
-msgstr ""
+#: ../src/maemo-mapper.c:6053
+#, fuzzy
+msgid "Insert Mark..."
+msgstr "Insert Breakpoint"
+
+#: ../src/maemo-mapper.c:7934
+#, fuzzy
+msgid "Insert Track Break"
+msgstr "Insert Breakpoint"
-#: ../src/maemo-mapper.c:11417
+#: ../src/maemo-mapper.c:11703
msgid "Invalid Bottom-Right Latitude"
msgstr "Ongeldige Rechts-Onder Breedtegraad"
-#: ../src/maemo-mapper.c:11424
+#: ../src/maemo-mapper.c:11710
msgid "Invalid Bottom-Right Longitude"
msgstr "Ongeldige Rechts-Onder Lengtegraad"
-#: ../src/maemo-mapper.c:10177
+#: ../src/maemo-mapper.c:10393
#, fuzzy
msgid "Invalid Latitude"
msgstr "Ongeldige Links-Boven Breedtegraad"
-#: ../src/maemo-mapper.c:10184
+#: ../src/maemo-mapper.c:10400
#, fuzzy
msgid "Invalid Longitude"
msgstr "Ongeldige Links-Boven Lengtegraad"
-#: ../src/maemo-mapper.c:8995 ../src/maemo-mapper.c:9006
+#: ../src/maemo-mapper.c:9121 ../src/maemo-mapper.c:9132
msgid "Invalid NMEA input from receiver!"
msgstr "Ongeldige NMEA invoer van ontvanger!"
-#: ../src/maemo-mapper.c:11403
+#: ../src/maemo-mapper.c:11689
msgid "Invalid Top-Left Latitude"
msgstr "Ongeldige Links-Boven Breedtegraad"
-#: ../src/maemo-mapper.c:11410
+#: ../src/maemo-mapper.c:11696
msgid "Invalid Top-Left Longitude"
msgstr "Ongeldige Links-Boven Lengtegraad"
-#: ../src/maemo-mapper.c:5230
+#: ../src/maemo-mapper.c:6455
+msgid ""
+"It looks like this is your first time running Maemo Mapper. Press OK to "
+"view the the help pages. Otherwise, press Cancel to continue."
+msgstr ""
+
+#: ../src/maemo-mapper.c:5000
msgid "Keep Display On Only in Fullscreen Mode"
msgstr "Hou het display alleen aan in volledig scherm mode"
-#: ../src/maemo-mapper.c:11689 ../src/maemo-mapper.c:11980
-#: ../src/maemo-mapper.c:12186 ../src/maemo-mapper.c:12370
+#: ../src/maemo-mapper.c:12022 ../src/maemo-mapper.c:12313
+#: ../src/maemo-mapper.c:12519 ../src/maemo-mapper.c:12703
msgid "Label"
msgstr ""
-#: ../src/maemo-mapper.c:3167
+#: ../src/maemo-mapper.c:2953
msgid "Landmark"
msgstr ""
-#: ../src/maemo-mapper.c:12360 ../src/maemo-mapper.c:12641
+#: ../src/maemo-mapper.c:10054 ../src/maemo-mapper.c:12693
+#: ../src/maemo-mapper.c:12974
#, fuzzy
msgid "Lat, Lon"
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:6314
+#: ../src/maemo-mapper.c:6126
msgid "Lat/Lon"
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:6337
+#: ../src/maemo-mapper.c:6149
#, fuzzy
msgid "Lat/Lon..."
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:2951 ../src/maemo-mapper.c:10131
-#: ../src/maemo-mapper.c:11243 ../src/maemo-mapper.c:12544
+#: ../src/maemo-mapper.c:2737 ../src/maemo-mapper.c:10347
+#: ../src/maemo-mapper.c:11527 ../src/maemo-mapper.c:12877
msgid "Latitude"
msgstr "Breedtegraad"
-#: ../src/maemo-mapper.c:6320
+#: ../src/maemo-mapper.c:6132
msgid "Lead"
msgstr "Vooraf"
-#: ../src/maemo-mapper.c:5148
+#: ../src/maemo-mapper.c:4918
msgid "Lead Amount"
msgstr "Hoeveel Vooraf"
-#: ../src/maemo-mapper.c:5218
+#: ../src/maemo-mapper.c:4988
msgid "Line Width"
msgstr "Lijn Breedte"
-#: ../src/maemo-mapper.c:2996
+#: ../src/maemo-mapper.c:2782
msgid "Local time"
msgstr ""
-#: ../src/maemo-mapper.c:5306 ../src/maemo-mapper.c:6474
-#: ../src/maemo-mapper.c:12181
+#: ../src/maemo-mapper.c:5068 ../src/maemo-mapper.c:6298
+#: ../src/maemo-mapper.c:12514
#, fuzzy
msgid "Location"
msgstr "GPS Locatie"
-#: ../src/maemo-mapper.c:3161
+#: ../src/maemo-mapper.c:2947
msgid "Lodging"
msgstr ""
-#: ../src/maemo-mapper.c:2960 ../src/maemo-mapper.c:10143
-#: ../src/maemo-mapper.c:11247 ../src/maemo-mapper.c:12545
+#: ../src/maemo-mapper.c:2746 ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:11531 ../src/maemo-mapper.c:12878
msgid "Longitude"
msgstr "Lengtegraad"
-#: ../src/maemo-mapper.c:4756 ../src/maemo-mapper.c:5105
+#: ../src/maemo-mapper.c:4409 ../src/maemo-mapper.c:4875
msgid "MAC"
msgstr ""
-#: ../src/maemo-mapper.c:10577
+#: ../src/maemo-mapper.c:10869
msgid ""
"Maemo Mapper will now download and add a list of possibly-duplicate "
"repositories from the internet. Continue?"
msgstr ""
-#: ../src/maemo-mapper.c:11135
+#: ../src/maemo-mapper.c:11419
msgid "Manage Maps"
msgstr ""
-#: ../src/maemo-mapper.c:6266
+#: ../src/maemo-mapper.c:6068
msgid "Manage Maps..."
msgstr ""
-#: ../src/maemo-mapper.c:10646
+#: ../src/maemo-mapper.c:10945
#, fuzzy
msgid "Manage Repositories"
msgstr "Manage Repositories..."
-#: ../src/maemo-mapper.c:6268
+#: ../src/maemo-mapper.c:6070
msgid "Manage Repositories..."
msgstr ""
-#: ../src/maemo-mapper.c:2394
+#: ../src/maemo-mapper.c:2244
msgid "Manual"
msgstr ""
-#: ../src/maemo-mapper.c:6261
+#: ../src/maemo-mapper.c:6063
msgid "Maps"
msgstr "Kaarten"
-#: ../src/maemo-mapper.c:3929
-msgid "Mark already inserted."
-msgstr ""
-
-#: ../src/maemo-mapper.c:3041
+#: ../src/maemo-mapper.c:2827
msgid "Max speed"
msgstr ""
-#: ../src/maemo-mapper.c:5214
+#: ../src/maemo-mapper.c:4984
msgid "Misc."
msgstr ""
-#: ../src/maemo-mapper.c:5254
+#: ../src/maemo-mapper.c:5020
#, fuzzy
msgid "Misc. 2"
msgstr "Misc."
-#: ../src/maemo-mapper.c:3170
+#: ../src/maemo-mapper.c:2956
msgid "Miscellaneous category for everything else."
msgstr ""
-#: ../src/maemo-mapper.c:11372 ../src/maemo-mapper.c:11506
+#: ../src/maemo-mapper.c:11658 ../src/maemo-mapper.c:11828
#, fuzzy
msgid ""
"NOTE: You must set a Map URI in the current repository in order to download "
"NOTE: You must set a Map URI in the Repository Manager in order to download "
"maps."
-#: ../src/maemo-mapper.c:10369 ../src/maemo-mapper.c:10548
+#: ../src/maemo-mapper.c:10586 ../src/maemo-mapper.c:10805
msgid "Name"
msgstr ""
-#: ../src/maemo-mapper.c:6343
+#: ../src/maemo-mapper.c:6155
#, fuzzy
msgid "Nearest POI"
msgstr "Select POI"
-#: ../src/maemo-mapper.c:10359
+#: ../src/maemo-mapper.c:10576
msgid "New Name"
msgstr ""
-#: ../src/maemo-mapper.c:10538
+#: ../src/maemo-mapper.c:10795
msgid "New Repository"
msgstr ""
-#: ../src/maemo-mapper.c:10679
+#: ../src/maemo-mapper.c:10984
#, fuzzy
msgid "New..."
msgstr "Open..."
-#: ../src/maemo-mapper.c:6341
+#: ../src/maemo-mapper.c:6153
#, fuzzy
msgid "Next Waypoint"
msgstr "Route Markering"
-#: ../src/maemo-mapper.c:5439
+#: ../src/maemo-mapper.c:10760
+msgid "Next-able"
+msgstr ""
+
+#: ../src/maemo-mapper.c:5188
+#, fuzzy
msgid ""
-"No GPS Receiver MAC Provided.\n"
-"GPS Disabled."
+"No GPS Receiver MAC provided.\n"
+"GPS will be disabled."
msgstr ""
"Geen GPS MAC adres opgegeven.\n"
"GPS uitgeschakeld."
-#: ../src/maemo-mapper.c:10283 ../src/maemo-mapper.c:12133
+#: ../src/maemo-mapper.c:10499 ../src/maemo-mapper.c:12466
msgid "No POIs found."
msgstr ""
-#: ../src/maemo-mapper.c:12926 ../src/maemo-mapper.c:12947
-#: ../src/maemo-mapper.c:12969 ../src/maemo-mapper.c:12990
-#: ../src/maemo-mapper.c:13011 ../src/maemo-mapper.c:13091
-msgid "No waypoints are visible."
-msgstr ""
-
-#: ../src/maemo-mapper.c:12903
-#, fuzzy
-msgid "No waypoints found."
-msgstr "No waypoints are visible."
-
-#: ../src/maemo-mapper.c:6326
+#: ../src/maemo-mapper.c:6138
msgid "None"
msgstr "Geen"
-#: ../src/maemo-mapper.c:5121
+#: ../src/maemo-mapper.c:4891
#, fuzzy
msgid ""
"Note: You can enter a device path\n"
"Note: For manual rfcomm, enter a device path\n"
"(e.g. \"/dev/rfcomm0\")."
-#: ../src/maemo-mapper.c:6628
-msgid ""
-"Now you must set up at least one Map Repository. You can download a sample "
-"set from the internet by using the \"Download...\" button."
+#: ../src/maemo-mapper.c:6027 ../src/maemo-mapper.c:6047
+msgid "Open..."
msgstr ""
-#: ../src/maemo-mapper.c:6227 ../src/maemo-mapper.c:6247
-msgid "Open..."
+#: ../src/maemo-mapper.c:6465
+msgid ""
+"OpenStreetMap.org provides public, free-to-use maps. You can also download "
+"a sample set of repositories from the internet by using the \"Download...\" "
+"button."
msgstr ""
-#: ../src/maemo-mapper.c:9589
+#: ../src/maemo-mapper.c:9697
msgid "Origin"
msgstr "Oorsprong"
-#: ../src/maemo-mapper.c:3169
+#: ../src/maemo-mapper.c:2955
msgid "Other"
msgstr ""
-#: ../src/maemo-mapper.c:11177
+#: ../src/maemo-mapper.c:11461
msgid "Overwrite"
msgstr ""
-#: ../src/maemo-mapper.c:4975 ../src/maemo-mapper.c:5335
-#: ../src/maemo-mapper.c:6531
+#: ../src/maemo-mapper.c:4737 ../src/maemo-mapper.c:5083
+#: ../src/maemo-mapper.c:6355
msgid "POI"
msgstr ""
-#: ../src/maemo-mapper.c:11926
+#: ../src/maemo-mapper.c:12259
#, fuzzy
msgid "POI Categories"
msgstr "POI Categories..."
-#: ../src/maemo-mapper.c:6305
+#: ../src/maemo-mapper.c:6117
msgid "POI Categories..."
msgstr ""
-#: ../src/maemo-mapper.c:5339
+#: ../src/maemo-mapper.c:5087
msgid "POI database"
msgstr ""
-#: ../src/maemo-mapper.c:6301
+#: ../src/maemo-mapper.c:6113
#, fuzzy
msgid "POIs"
msgstr "POI"
-#: ../src/maemo-mapper.c:2390
+#: ../src/maemo-mapper.c:2240
#, fuzzy
msgid "PPS"
msgstr "GPS"
-#: ../src/maemo-mapper.c:5203
+#: ../src/maemo-mapper.c:7919
+msgid "Pan East"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7916
+msgid "Pan North"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7918
+msgid "Pan South"
+msgstr ""
+
+#: ../src/maemo-mapper.c:7917
+msgid "Pan West"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4973
msgid "Pitch"
msgstr "Hoogte"
-#: ../src/maemo-mapper.c:3154
+#: ../src/maemo-mapper.c:2940
msgid "Places to eat or drink."
msgstr ""
-#: ../src/maemo-mapper.c:3156
+#: ../src/maemo-mapper.c:2942
msgid "Places to shop or acquire services."
msgstr ""
-#: ../src/maemo-mapper.c:3162
+#: ../src/maemo-mapper.c:2948
msgid "Places to stay temporarily or for the night."
msgstr ""
-#: ../src/maemo-mapper.c:4791
+#: ../src/maemo-mapper.c:10112
+#, fuzzy
+msgid "Please provide a description for the mark."
+msgstr "Geef een bestemmings locatie op a.u.b."
+
+#: ../src/maemo-mapper.c:4444
msgid "Please select a bluetooth device from the list."
msgstr ""
-#: ../src/maemo-mapper.c:12460
+#: ../src/maemo-mapper.c:12793
#, fuzzy
msgid "Please specify a category for the POI."
msgstr "Geef een bestemmings locatie op a.u.b."
-#: ../src/maemo-mapper.c:12453
+#: ../src/maemo-mapper.c:12786
#, fuzzy
msgid "Please specify a name for the POI."
msgstr "Geef een bestemmings locatie op a.u.b."
-#: ../src/maemo-mapper.c:11747
+#: ../src/maemo-mapper.c:12080
#, fuzzy
msgid "Please specify a name for the category."
msgstr "Geef een start locatie op a.u.b."
-#: ../src/maemo-mapper.c:9659
+#: ../src/maemo-mapper.c:9767
#, fuzzy
msgid "Please specify a source URL."
msgstr "Geef een bestemmings locatie op a.u.b."
-#: ../src/maemo-mapper.c:9671
+#: ../src/maemo-mapper.c:9779
msgid "Please specify a start location."
msgstr "Geef een start locatie op a.u.b."
-#: ../src/maemo-mapper.c:9678
+#: ../src/maemo-mapper.c:9786
msgid "Please specify an end location."
msgstr "Geef een bestemmings locatie op a.u.b."
-#: ../src/maemo-mapper.c:12507
+#: ../src/maemo-mapper.c:12840
msgid "Problem adding POI"
msgstr ""
-#: ../src/maemo-mapper.c:11784
+#: ../src/maemo-mapper.c:12117
msgid "Problem adding category"
msgstr ""
-#: ../src/maemo-mapper.c:11595 ../src/maemo-mapper.c:12043
+#: ../src/maemo-mapper.c:11928 ../src/maemo-mapper.c:12376
msgid "Problem deleting POI"
msgstr ""
-#: ../src/maemo-mapper.c:11604
+#: ../src/maemo-mapper.c:11937
msgid "Problem deleting category"
msgstr ""
-#: ../src/maemo-mapper.c:11825
+#: ../src/maemo-mapper.c:12158
msgid "Problem updating Category"
msgstr ""
-#: ../src/maemo-mapper.c:12485
+#: ../src/maemo-mapper.c:12818
msgid "Problem updating POI"
msgstr ""
-#: ../src/maemo-mapper.c:11769
+#: ../src/maemo-mapper.c:12102
msgid "Problem updating category"
msgstr ""
-#: ../src/maemo-mapper.c:3110
+#: ../src/maemo-mapper.c:2896
msgid "Problem with POI database"
msgstr ""
-#: ../src/maemo-mapper.c:2391
+#: ../src/maemo-mapper.c:2241
msgid "Real Time Kinematic"
msgstr ""
-#: ../src/maemo-mapper.c:3858
+#: ../src/maemo-mapper.c:3627
msgid "Recalculating directions..."
msgstr ""
-#: ../src/maemo-mapper.c:3157
+#: ../src/maemo-mapper.c:2943
#, fuzzy
msgid "Recreation"
msgstr "GPS Locatie"
-#: ../src/maemo-mapper.c:10673
+#: ../src/maemo-mapper.c:10978
#, fuzzy
msgid "Rename..."
msgstr "Open..."
-#: ../src/maemo-mapper.c:6237
+#: ../src/maemo-mapper.c:10833
+msgid "Replace all repositories with the default repository?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:6037
msgid "Reset"
msgstr ""
-#: ../src/maemo-mapper.c:6362 ../src/maemo-mapper.c:8043
+#: ../src/maemo-mapper.c:6174 ../src/maemo-mapper.c:7943
msgid "Reset Bluetooth"
msgstr ""
-#: ../src/maemo-mapper.c:3151
+#: ../src/maemo-mapper.c:4619
+msgid "Reset all colors to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4505
+msgid "Reset all hardware keys to their original defaults?"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4537 ../src/maemo-mapper.c:4653
+#: ../src/maemo-mapper.c:10956
+#, fuzzy
+msgid "Reset..."
+msgstr "Open..."
+
+#: ../src/maemo-mapper.c:2937
msgid "Residence"
msgstr ""
-#: ../src/maemo-mapper.c:4954 ../src/maemo-mapper.c:6223
-#: ../src/maemo-mapper.c:6287
+#: ../src/maemo-mapper.c:4713 ../src/maemo-mapper.c:6023
+#: ../src/maemo-mapper.c:6099
msgid "Route"
msgstr ""
-#: ../src/maemo-mapper.c:9757
+#: ../src/maemo-mapper.c:9865
msgid "Route Downloaded"
msgstr ""
-#: ../src/maemo-mapper.c:8226 ../src/maemo-mapper.c:9805
+#: ../src/maemo-mapper.c:8224 ../src/maemo-mapper.c:9914
msgid "Route Opened"
msgstr "Route Geopend"
-#: ../src/maemo-mapper.c:9957
+#: ../src/maemo-mapper.c:10160
msgid "Route Saved"
msgstr "Route Opgeslagen"
-#: ../src/maemo-mapper.c:10022
+#: ../src/maemo-mapper.c:10238
msgid "Routes are now hidden"
msgstr "Routes zijn nu verborgen"
-#: ../src/maemo-mapper.c:10016
+#: ../src/maemo-mapper.c:10232
msgid "Routes are now shown"
msgstr "Routes zijn nu zichtbaar"
-#: ../src/maemo-mapper.c:2388
+#: ../src/maemo-mapper.c:2238
msgid "SPS"
msgstr ""
-#: ../src/maemo-mapper.c:3014
+#: ../src/maemo-mapper.c:2800
msgid "Sat in use"
msgstr ""
-#: ../src/maemo-mapper.c:3005
+#: ../src/maemo-mapper.c:2791
msgid "Sat in view"
msgstr ""
-#: ../src/maemo-mapper.c:2946
+#: ../src/maemo-mapper.c:2732
msgid "Satellites details"
msgstr ""
-#: ../src/maemo-mapper.c:2871
+#: ../src/maemo-mapper.c:2660
msgid "Satellites in view"
msgstr ""
-#: ../src/maemo-mapper.c:6231 ../src/maemo-mapper.c:6249
+#: ../src/maemo-mapper.c:6031 ../src/maemo-mapper.c:6049
msgid "Save..."
msgstr "Opslaan..."
-#: ../src/maemo-mapper.c:5115
+#: ../src/maemo-mapper.c:6094
+msgid "Scale"
+msgstr ""
+
+#: ../src/maemo-mapper.c:4885
#, fuzzy
msgid "Scan..."
msgstr "Opslaan..."
-#: ../src/maemo-mapper.c:4767
+#: ../src/maemo-mapper.c:4420
#, fuzzy
msgid "Scanning for Bluetooth Devices"
msgstr "Er wordt naar bluetooth apparaten gezocht"
-#: ../src/maemo-mapper.c:3163
+#: ../src/maemo-mapper.c:2949
msgid "School"
msgstr ""
-#: ../src/maemo-mapper.c:3301
+#: ../src/maemo-mapper.c:3087
msgid "Searching for GPS receiver"
msgstr "Er wordt naar GPS ontvanger gezocht"
-#: ../src/maemo-mapper.c:4731
+#: ../src/maemo-mapper.c:4384
#, fuzzy
msgid "Select Bluetooth Device"
msgstr "Er wordt naar bluetooth apparaten gezocht"
-#: ../src/maemo-mapper.c:8030
+#: ../src/maemo-mapper.c:7929
#, fuzzy
msgid "Select Next Repository"
msgstr "Next Repository"
-#: ../src/maemo-mapper.c:12153
+#: ../src/maemo-mapper.c:12486
msgid "Select POI"
msgstr ""
-#: ../src/maemo-mapper.c:12218
+#: ../src/maemo-mapper.c:12551
msgid "Select one POI from the list."
msgstr ""
-#: ../src/maemo-mapper.c:5135
+#: ../src/maemo-mapper.c:4905
msgid "Sensitivity"
msgstr "Gevoeligheid"
-#: ../src/maemo-mapper.c:6498
+#: ../src/maemo-mapper.c:6322
#, fuzzy
msgid "Set as GPS Location"
msgstr "Bebruik GPS Locatie"
-#: ../src/maemo-mapper.c:5080
+#: ../src/maemo-mapper.c:4847
#, fuzzy
msgid "Settings"
msgstr "Instellingen..."
-#: ../src/maemo-mapper.c:6369
+#: ../src/maemo-mapper.c:6181
msgid "Settings..."
msgstr "Instellingen..."
-#: ../src/maemo-mapper.c:11160
+#: ../src/maemo-mapper.c:11444
msgid "Setup"
msgstr ""
-#: ../src/maemo-mapper.c:3155
+#: ../src/maemo-mapper.c:2941
msgid "Shopping/Services"
msgstr ""
-#: ../src/maemo-mapper.c:6509
+#: ../src/maemo-mapper.c:6333
msgid "Show Description"
msgstr ""
-#: ../src/maemo-mapper.c:6255 ../src/maemo-mapper.c:8039
+#: ../src/maemo-mapper.c:6057 ../src/maemo-mapper.c:7938
#, fuzzy
msgid "Show Distance from Beginning"
msgstr "Show Distance to"
-#: ../src/maemo-mapper.c:6253 ../src/maemo-mapper.c:8037
+#: ../src/maemo-mapper.c:7936
+#, fuzzy
+msgid "Show Distance from Last Break"
+msgstr "Show Distance to"
+
+#: ../src/maemo-mapper.c:6055
#, fuzzy
msgid "Show Distance from Last Mark"
msgstr "Show Distance to"
-#: ../src/maemo-mapper.c:6485 ../src/maemo-mapper.c:6516
-#: ../src/maemo-mapper.c:6540
+#: ../src/maemo-mapper.c:6309 ../src/maemo-mapper.c:6340
+#: ../src/maemo-mapper.c:6364
msgid "Show Distance to"
msgstr ""
-#: ../src/maemo-mapper.c:6235 ../src/maemo-mapper.c:8034
+#: ../src/maemo-mapper.c:6035 ../src/maemo-mapper.c:7933
#, fuzzy
msgid "Show Distance to End of Route"
msgstr "Show Distance to"
-#: ../src/maemo-mapper.c:6233 ../src/maemo-mapper.c:8032
+#: ../src/maemo-mapper.c:6033 ../src/maemo-mapper.c:7931
#, fuzzy
msgid "Show Distance to Next Waypoint"
msgstr "Route Markering"
-#: ../src/maemo-mapper.c:6355
+#: ../src/maemo-mapper.c:6167
msgid "Show Information"
msgstr ""
-#: ../src/maemo-mapper.c:6480 ../src/maemo-mapper.c:6507
+#: ../src/maemo-mapper.c:6304 ../src/maemo-mapper.c:6331
#, fuzzy
msgid "Show Lat/Lon"
msgstr "Breedte/Lengtegraad"
-#: ../src/maemo-mapper.c:5354
+#: ../src/maemo-mapper.c:5102
msgid "Show POI below zoom"
msgstr ""
-#: ../src/maemo-mapper.c:2395
+#: ../src/maemo-mapper.c:2245
msgid "Simulation"
msgstr ""
-#: ../src/maemo-mapper.c:9554
+#: ../src/maemo-mapper.c:9662
msgid "Source URL"
msgstr ""
-#: ../src/maemo-mapper.c:2969 ../src/maemo-mapper.c:5191
+#: ../src/maemo-mapper.c:2755 ../src/maemo-mapper.c:4961
msgid "Speed"
msgstr "Snelheid"
-#: ../src/maemo-mapper.c:5296
+#: ../src/maemo-mapper.c:5058
#, fuzzy
msgid "Speed Limit"
msgstr "Snelheid"
-#: ../src/maemo-mapper.c:3150
+#: ../src/maemo-mapper.c:2936
msgid "Stations for purchasing fuel for vehicles."
msgstr ""
-#: ../src/maemo-mapper.c:3562
+#: ../src/maemo-mapper.c:3348
msgid "The current route is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3608 ../src/maemo-mapper.c:3623
+#: ../src/maemo-mapper.c:3394 ../src/maemo-mapper.c:3409
msgid "The current track is empty."
msgstr ""
-#: ../src/maemo-mapper.c:3543 ../src/maemo-mapper.c:10230
+#: ../src/maemo-mapper.c:4580
+msgid "The following action is mapped to multiple keys"
+msgstr ""
+
+#: ../src/maemo-mapper.c:8646
+msgid "There are no other next-able repositories."
+msgstr ""
+
+#: ../src/maemo-mapper.c:13222
+msgid "There are no waypoints."
+msgstr ""
+
+#: ../src/maemo-mapper.c:3329 ../src/maemo-mapper.c:10446
msgid "There is no next waypoint."
msgstr ""
-#: ../src/maemo-mapper.c:8040
+#: ../src/maemo-mapper.c:7921
+#, fuzzy
+msgid "Toggle Auto-Center"
+msgstr "Automatisch-Centreren"
+
+#: ../src/maemo-mapper.c:7923
+#, fuzzy
+msgid "Toggle Fullscreen"
+msgstr "Volledig Scherm"
+
+#: ../src/maemo-mapper.c:7939
#, fuzzy
msgid "Toggle GPS"
msgstr "Activeer GPS"
-#: ../src/maemo-mapper.c:8041
+#: ../src/maemo-mapper.c:7940
msgid "Toggle GPS Info"
msgstr ""
-#: ../src/maemo-mapper.c:8029
+#: ../src/maemo-mapper.c:7928
#, fuzzy
msgid "Toggle POIs"
msgstr "Activeer GPS"
-#: ../src/maemo-mapper.c:8042
+#: ../src/maemo-mapper.c:7927
+#, fuzzy
+msgid "Toggle Scale"
+msgstr "Activeer GPS"
+
+#: ../src/maemo-mapper.c:7942
msgid "Toggle Speed Limit"
msgstr ""
-#: ../src/maemo-mapper.c:8028
+#: ../src/maemo-mapper.c:7926
msgid "Toggle Tracks"
msgstr ""
-#: ../src/maemo-mapper.c:8049 ../src/maemo-mapper.c:11288
+#: ../src/maemo-mapper.c:7966 ../src/maemo-mapper.c:11572
msgid "Top-Left"
msgstr "Links-Boven"
-#: ../src/maemo-mapper.c:8050
+#: ../src/maemo-mapper.c:7967
#, fuzzy
msgid "Top-Right"
msgstr "Rechts-onder"
-#: ../src/maemo-mapper.c:4938 ../src/maemo-mapper.c:6243
-#: ../src/maemo-mapper.c:6292
+#: ../src/maemo-mapper.c:4689 ../src/maemo-mapper.c:6043
+#: ../src/maemo-mapper.c:6104
msgid "Track"
msgstr "Route"
-#: ../src/maemo-mapper.c:9880
+#: ../src/maemo-mapper.c:9988
msgid "Track Opened"
msgstr "Route Geopend"
-#: ../src/maemo-mapper.c:9902
+#: ../src/maemo-mapper.c:10010
msgid "Track Saved"
msgstr "Route Opgeslagen"
-#: ../src/maemo-mapper.c:9998
+#: ../src/maemo-mapper.c:10201
msgid "Tracks are now hidden"
msgstr "Routes zijn nu verborgen"
-#: ../src/maemo-mapper.c:9992
+#: ../src/maemo-mapper.c:10195
msgid "Tracks are now shown"
msgstr "Routes zijn nu zichtbaar"
-#: ../src/maemo-mapper.c:3159
+#: ../src/maemo-mapper.c:2945
msgid "Transportation"
msgstr ""
-#: ../src/maemo-mapper.c:10454
+#: ../src/maemo-mapper.c:10676
msgid "URL Format"
msgstr "URI Formaat"
-#: ../src/maemo-mapper.c:10773
+#: ../src/maemo-mapper.c:5445
msgid "Unable to create cache directory for repository"
msgstr ""
-#: ../src/maemo-mapper.c:5261
+#: ../src/maemo-mapper.c:5024
msgid "Units"
msgstr ""
-#: ../src/maemo-mapper.c:9582
+#: ../src/maemo-mapper.c:9690
msgid "Use End of Route"
msgstr ""
-#: ../src/maemo-mapper.c:9568
+#: ../src/maemo-mapper.c:9676
msgid "Use GPS Location"
msgstr "Bebruik GPS Locatie"
-#: ../src/maemo-mapper.c:6297
+#: ../src/maemo-mapper.c:6109
msgid "Velocity Vector"
msgstr "Snelheids Factor"
-#: ../src/maemo-mapper.c:6279
+#: ../src/maemo-mapper.c:6081
msgid "View"
msgstr ""
-#: ../src/maemo-mapper.c:11269
+#: ../src/maemo-mapper.c:11553
msgid "View Center"
msgstr "Bekijk Midden"
-#: ../src/maemo-mapper.c:10494
+#: ../src/maemo-mapper.c:10731
#, fuzzy
msgid "View Zoom Steps"
msgstr "Vergrootings-Stappen"
-#: ../src/maemo-mapper.c:6537
+#: ../src/maemo-mapper.c:6361
msgid "View/Edit..."
msgstr ""
-#: ../src/maemo-mapper.c:11582
+#: ../src/maemo-mapper.c:11915
msgid "WARNING: All POIs in that category will also be deleted!"
msgstr ""
-#: ../src/maemo-mapper.c:6502
+#: ../src/maemo-mapper.c:6326
#, fuzzy
msgid "Waypoint"
msgstr "Route Markering"
-#: ../src/maemo-mapper.c:11217
+#: ../src/maemo-mapper.c:6472
+msgid ""
+"You will now see a blank screen. You can download maps using the \"Manage "
+"Maps\" menu item in the \"Maps\" menu. Or, press OK to enable Auto-Download."
+msgstr ""
+
+#: ../src/maemo-mapper.c:11501
msgid "Zoom"
msgstr "Vergroot"
-#: ../src/maemo-mapper.c:11223
+#: ../src/maemo-mapper.c:6085 ../src/maemo-mapper.c:7924
+#, fuzzy
+msgid "Zoom In"
+msgstr "Vergroot"
+
+#: ../src/maemo-mapper.c:11507
msgid "Zoom Levels to Download: (0 = most detail)"
msgstr "Vergrotings-niveaus om te Downloaden: (0 = meeste detail)"
-#: ../src/maemo-mapper.c:8463 ../src/maemo-mapper.c:8545
+#: ../src/maemo-mapper.c:6087 ../src/maemo-mapper.c:7925
+#, fuzzy
+msgid "Zoom Out"
+msgstr "Vergroot"
+
+#: ../src/maemo-mapper.c:8461 ../src/maemo-mapper.c:8573
+#: ../src/maemo-mapper.c:11735 ../src/maemo-mapper.c:11753
#, fuzzy
msgid "Zoom to Level"
msgstr "Vergrootings-Stappen"
-#: ../src/maemo-mapper.c:10995 ../src/maemo-mapper.c:11002
+#: ../src/maemo-mapper.c:11279 ../src/maemo-mapper.c:11286
#, fuzzy
msgid "about"
msgstr "Route"
-#: ../src/maemo-mapper.c:2872
+#: ../src/maemo-mapper.c:2661
msgid "in use"
msgstr ""
-#: ../src/maemo-mapper.c:8016
+#: ../src/maemo-mapper.c:7874
msgid "km"
msgstr ""
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "maps"
msgstr "kaarten"
-#: ../src/maemo-mapper.c:10909 ../src/maemo-mapper.c:10996
+#: ../src/maemo-mapper.c:11193 ../src/maemo-mapper.c:11280
msgid "maps "
msgstr "kaarten"
-#: ../src/maemo-mapper.c:8017
+#: ../src/maemo-mapper.c:7875
msgid "mi."
msgstr ""
-#: ../src/maemo-mapper.c:8018
+#: ../src/maemo-mapper.c:7876
msgid "n.m."
msgstr ""
-#: ../src/maemo-mapper.c:3027
+#: ../src/maemo-mapper.c:2813
msgid "nofix"
msgstr ""
-#: ../src/maemo-mapper.c:2396 ../src/maemo-mapper.c:3036
+#: ../src/maemo-mapper.c:2246 ../src/maemo-mapper.c:2822
#, fuzzy
msgid "none"
msgstr "Geen"
-#: ../src/maemo-mapper.c:10915 ../src/maemo-mapper.c:11003
+#: ../src/maemo-mapper.c:11199 ../src/maemo-mapper.c:11287
msgid "up to about"
msgstr ""
#~ msgid "No route is loaded."
#~ msgstr "Route Downloaded"
+#, fuzzy
+#~ msgid "No waypoints found."
+#~ msgstr "No waypoints are visible."
+
#~ msgid "Repositories"
#~ msgstr "Repositories"
/*
* This file is part of maemo-mapper
*
- * Copyright (C) 2006 John Costigan.
+ * Copyright (C) 2006-2007 John Costigan.
*
* POI and GPS-Info code originally written by Cezary Jackiewicz.
*
+ * Default map data provided by http://www.openstreetmap.org/
+ *
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
#include <curl/multi.h>
#include <gconf/gconf-client.h>
#include <libxml/parser.h>
+#include <device_symbols.h>
#include <libintl.h>
#include <locale.h>
#define GCONF_KEY_VOICE_PITCH GCONF_KEY_PREFIX"/voice_pitch"
#define GCONF_KEY_ALWAYS_KEEP_ON GCONF_KEY_PREFIX"/always_keep_on"
#define GCONF_KEY_UNITS GCONF_KEY_PREFIX"/units"
-#define GCONF_KEY_ESCAPE_KEY GCONF_KEY_PREFIX"/escape_key"
#define GCONF_KEY_SPEED_LIMIT_ON GCONF_KEY_PREFIX"/speed_limit_on"
#define GCONF_KEY_SPEED_LIMIT GCONF_KEY_PREFIX"/speed_limit"
#define GCONF_KEY_SPEED_LOCATION GCONF_KEY_PREFIX"/speed_location"
#define GCONF_KEY_POI_DB GCONF_KEY_PREFIX"/poi_db"
#define GCONF_KEY_POI_ZOOM GCONF_KEY_PREFIX"/poi_zoom"
-#define GCONF_KEY_COLOR_MARK GCONF_KEY_PREFIX"/color_mark"
-#define GCONF_KEY_COLOR_MARK_VELOCITY GCONF_KEY_PREFIX"/color_mark_velocity"
-#define GCONF_KEY_COLOR_MARK_OLD GCONF_KEY_PREFIX"/color_mark_old"
-#define GCONF_KEY_COLOR_TRACK GCONF_KEY_PREFIX"/color_track"
-#define GCONF_KEY_COLOR_TRACK_BREAK GCONF_KEY_PREFIX"/color_track_break"
-#define GCONF_KEY_COLOR_ROUTE GCONF_KEY_PREFIX"/color_route"
-#define GCONF_KEY_COLOR_ROUTE_WAY GCONF_KEY_PREFIX"/color_route_way"
-#define GCONF_KEY_COLOR_ROUTE_NEXTWAY GCONF_KEY_PREFIX"/color_route_nextway"
-#define GCONF_KEY_COLOR_POI GCONF_KEY_PREFIX"/color_poi"
-
#define GCONF_KEY_AUTOCENTER_MODE GCONF_KEY_PREFIX"/autocenter_mode"
#define GCONF_KEY_LEAD_AMOUNT GCONF_KEY_PREFIX"/lead_amount"
#define GCONF_KEY_LAT GCONF_KEY_PREFIX"/last_latitude"
#define GCONF_KEY_ZOOM GCONF_KEY_PREFIX"/zoom"
#define GCONF_KEY_ROUTEDIR GCONF_KEY_PREFIX"/route_directory"
#define GCONF_KEY_TRACKFILE GCONF_KEY_PREFIX"/track_file"
+#define GCONF_KEY_SHOWSCALE GCONF_KEY_PREFIX"/show_scale"
#define GCONF_KEY_SHOWTRACKS GCONF_KEY_PREFIX"/show_tracks"
#define GCONF_KEY_SHOWROUTES GCONF_KEY_PREFIX"/show_routes"
#define GCONF_KEY_SHOWVELVEC GCONF_KEY_PREFIX"/show_velocity_vector"
#define CONFIG_FILE_ROUTE "route.gpx"
#define CONFIG_FILE_TRACK "track.gpx"
-#define XML_DATE_FORMAT "%FT%T"
-
-#define XML_TRKSEG_HEADER ( \
- "<?xml version=\"1.0\"?>\n" \
- "<gpx version=\"1.0\" creator=\"maemo-mapper\" " \
- "xmlns=\"http://www.topografix.com/GPX/1/0\">\n" \
- " <trk>\n" \
- " <trkseg>\n" \
-)
+#define REPO_DEFAULT_NAME "OpenStreet"
+#define REPO_DEFAULT_CACHE_BASE "~/MyDocs/.documents/Maps/"
+#define REPO_DEFAULT_CACHE_DIR REPO_DEFAULT_CACHE_BASE"OpenStreet"
+#define REPO_DEFAULT_MAP_URI "http://tile.openstreetmap.org/%0d/%d/%d.png"
+#define REPO_DEFAULT_DL_ZOOM_STEPS (2)
+#define REPO_DEFAULT_VIEW_ZOOM_STEPS (1)
-#define XML_TRKSEG_FOOTER ( \
- " </trkseg>\n" \
- " </trk>\n" \
- "</gpx>\n" \
-)
+#define XML_DATE_FORMAT "%FT%T"
#define HELP_ID_PREFIX "help_maemomapper_"
#define HELP_ID_INTRO HELP_ID_PREFIX"intro"
+#define HELP_ID_GETSTARTED HELP_ID_PREFIX"getstarted"
+#define HELP_ID_ABOUT HELP_ID_PREFIX"about"
#define HELP_ID_SETTINGS HELP_ID_PREFIX"settings"
#define HELP_ID_REPOMAN HELP_ID_PREFIX"repoman"
#define HELP_ID_MAPMAN HELP_ID_PREFIX"mapman"
_max_center.unity = WORLD_SIZE_UNITS-grid2unit(_screen_grids_halfheight)- 1;\
}
-#define MACRO_INIT_TRACK(track) { \
- (track).head = (track).tail = g_new(TrackPoint, ARRAY_CHUNK_SIZE); \
- *((track).tail) = _track_null; \
- (track).cap = (track).head + ARRAY_CHUNK_SIZE; \
+#define MACRO_PATH_INIT(path) { \
+ (path).head = (path).tail = g_new(Point, ARRAY_CHUNK_SIZE); \
+ *((path).tail) = _point_null; \
+ (path).cap = (path).head + ARRAY_CHUNK_SIZE; \
+ (path).whead = g_new(WayPoint, ARRAY_CHUNK_SIZE); \
+ (path).wtail = (path).whead - 1; \
+ (path).wcap = (path).whead + ARRAY_CHUNK_SIZE; \
}
-#define MACRO_FREE_TRACK(path) if((path).head) { \
+#define MACRO_PATH_FREE(path) if((path).head) { \
+ WayPoint *curr; \
g_free((path).head); \
(path).head = (path).tail = (path).cap = NULL; \
+ for(curr = (path).whead - 1; curr++ != (path).wtail; ) \
+ g_free(curr->desc); \
+ g_free((path).whead); \
+ (path).whead = (path).wtail = (path).wcap = NULL; \
}
-#define MACRO_INIT_ROUTE(route) { \
- (route).head = (route).tail = g_new(Point, ARRAY_CHUNK_SIZE); \
- *((route).tail) = _pos_null; \
- (route).cap = (route).head + ARRAY_CHUNK_SIZE; \
- (route).whead = g_new(WayPoint, ARRAY_CHUNK_SIZE); \
- (route).wtail = (route).whead - 1; \
- (route).wcap = (route).whead + ARRAY_CHUNK_SIZE; \
+#define MACRO_PATH_INCREMENT_TAIL(route) { \
+ if(++(route).tail == (route).cap) \
+ path_resize(&(route), (route).cap - (route).head + ARRAY_CHUNK_SIZE);\
}
-#define MACRO_FREE_ROUTE(route) if((route).head) { \
- WayPoint *curr; \
- g_free((route).head); \
- (route).head = (route).tail = (route).cap = NULL; \
- for(curr = (route).whead - 1; curr++ != (route).wtail; ) \
- g_free(curr->desc); \
- g_free((route).whead); \
- (route).whead = (route).wtail = (route).wcap = NULL; \
+#define MACRO_PATH_INCREMENT_WTAIL(route) { \
+ if(++(route).wtail == (route).wcap) \
+ path_wresize(&(route), \
+ (route).wcap - (route).whead + ARRAY_CHUNK_SIZE); \
}
#define DISTANCE_SQUARED(a, b) \
} \
}
-#define MACRO_TRACK_INCREMENT_TAIL(track) { \
- if(++(track).tail == (track).cap) \
- track_resize(&(track), (track).cap - (track).head + ARRAY_CHUNK_SIZE);\
-}
-
-#define MACRO_ROUTE_INCREMENT_TAIL(route) { \
- if(++(route).tail == (route).cap) \
- route_resize(&(route), (route).cap - (route).head + ARRAY_CHUNK_SIZE);\
-}
-
-#define MACRO_ROUTE_INCREMENT_WTAIL(route) { \
- if(++(route).wtail == (route).wcap) \
- route_wresize(&(route), \
- (route).wcap - (route).whead + ARRAY_CHUNK_SIZE); \
-}
+#define lat_format(A, B) deg_format((A), (B), 'S', 'N')
+#define lon_format(A, B) deg_format((A), (B), 'W', 'E')
#define TRACKS_MASK 0x00000001
#define ROUTES_MASK 0x00000002
/** This enumerated type defines the supported types of repositories. */
typedef enum
{
+ REPOTYPE_NONE, /* No URL set. */
REPOTYPE_XYZ, /* x=%d, y=%d, and zoom=%d */
+ REPOTYPE_XYZ_INV, /* zoom=%0d, x=%d, y=%d */
REPOTYPE_QUAD_QRST, /* t=%s (%s = {qrst}*) */
REPOTYPE_QUAD_ZERO, /* t=%0s (%0s = {0123}*) */
REPOTYPE_WMS /* "service=wms" */
} InfoFontSize;
gchar *INFO_FONT_TEXT[INFO_FONT_ENUM_COUNT];
+/** This enum defines all of the key-customizable actions. */
+typedef enum
+{
+ CUSTOM_ACTION_PAN_NORTH,
+ CUSTOM_ACTION_PAN_WEST,
+ CUSTOM_ACTION_PAN_SOUTH,
+ CUSTOM_ACTION_PAN_EAST,
+ CUSTOM_ACTION_TOGGLE_AUTOCENTER,
+ CUSTOM_ACTION_ZOOM_IN,
+ CUSTOM_ACTION_ZOOM_OUT,
+ CUSTOM_ACTION_TOGGLE_FULLSCREEN,
+ CUSTOM_ACTION_TOGGLE_TRACKS,
+ CUSTOM_ACTION_TOGGLE_SCALE,
+ CUSTOM_ACTION_TOGGLE_POI,
+ CUSTOM_ACTION_CHANGE_REPO,
+ CUSTOM_ACTION_ROUTE_DISTNEXT,
+ CUSTOM_ACTION_ROUTE_DISTLAST,
+ CUSTOM_ACTION_TRACK_BREAK,
+ CUSTOM_ACTION_TRACK_DISTLAST,
+ CUSTOM_ACTION_TRACK_DISTFIRST,
+ CUSTOM_ACTION_TOGGLE_GPS,
+ CUSTOM_ACTION_TOGGLE_GPSINFO,
+ CUSTOM_ACTION_TOGGLE_SPEEDLIMIT,
+ CUSTOM_ACTION_RESET_BLUETOOTH,
+ CUSTOM_ACTION_ENUM_COUNT
+} CustomAction;
+gchar *CUSTOM_ACTION_TEXT[CUSTOM_ACTION_ENUM_COUNT];
+
+/** This enum defines all of the customizable keys. */
+typedef enum
+{
+ CUSTOM_KEY_UP,
+ CUSTOM_KEY_LEFT,
+ CUSTOM_KEY_DOWN,
+ CUSTOM_KEY_RIGHT,
+ CUSTOM_KEY_SELECT,
+ CUSTOM_KEY_INCREASE,
+ CUSTOM_KEY_DECREASE,
+ CUSTOM_KEY_FULLSCREEN,
+ CUSTOM_KEY_ESC,
+ CUSTOM_KEY_ENUM_COUNT
+} CustomKey;
+gchar *CUSTOM_KEY_GCONF[CUSTOM_KEY_ENUM_COUNT];
+gchar *CUSTOM_KEY_ICON[CUSTOM_KEY_ENUM_COUNT];
+CustomAction CUSTOM_KEY_DEFAULT[CUSTOM_KEY_ENUM_COUNT];
+
+/** This enum defines all of the colorable objects. */
typedef enum
{
- ESCAPE_KEY_TOGGLE_TRACKS,
- ESCAPE_KEY_TOGGLE_POI,
- ESCAPE_KEY_CHANGE_REPO,
- ESCAPE_KEY_ROUTE_DISTNEXT,
- ESCAPE_KEY_ROUTE_DISTLAST,
- ESCAPE_KEY_TRACK_WAYPOINT,
- ESCAPE_KEY_TRACK_DISTLAST,
- ESCAPE_KEY_TRACK_DISTFIRST,
- ESCAPE_KEY_TOGGLE_GPS,
- ESCAPE_KEY_TOGGLE_GPSINFO,
- ESCAPE_KEY_TOGGLE_SPEEDLIMIT,
- ESCAPE_KEY_RESET_BLUETOOTH,
- ESCAPE_KEY_ENUM_COUNT
-} EscapeKeyAction;
-gchar *ESCAPE_KEY_TEXT[ESCAPE_KEY_ENUM_COUNT];
+ COLORABLE_MARK,
+ COLORABLE_MARK_VELOCITY,
+ COLORABLE_MARK_OLD,
+ COLORABLE_TRACK,
+ COLORABLE_TRACK_MARK,
+ COLORABLE_TRACK_BREAK,
+ COLORABLE_ROUTE,
+ COLORABLE_ROUTE_WAY,
+ COLORABLE_ROUTE_BREAK,
+ COLORABLE_POI,
+ COLORABLE_ENUM_COUNT
+} Colorable;
+gchar *COLORABLE_GCONF[COLORABLE_ENUM_COUNT];
+GdkColor COLORABLE_DEFAULT[COLORABLE_ENUM_COUNT] = {
+ {0, 0x0000, 0x0000, 0xc000}, /* COLORABLE_MARK */
+ {0, 0x6000, 0x6000, 0xf800}, /* COLORABLE_MARK_VELOCITY */
+ {0, 0x8000, 0x8000, 0x8000}, /* COLORABLE_MARK_OLD */
+ {0, 0xe000, 0x0000, 0x0000}, /* COLORABLE_TRACK */
+ {0, 0xa000, 0x0000, 0x0000}, /* COLORABLE_TRACK_MARK */
+ {0, 0x7000, 0x0000, 0x0000}, /* COLORABLE_TRACK_BREAK */
+ {0, 0x0000, 0xa000, 0x0000}, /* COLORABLE_ROUTE */
+ {0, 0x0000, 0x8000, 0x0000}, /* COLORABLE_ROUTE_WAY */
+ {0, 0x0000, 0x6000, 0x0000}, /* COLORABLE_ROUTE_BREAK */
+ {0, 0xa000, 0x0000, 0xa000} /* COLORABLE_POI */
+};
typedef enum
{
DDPDDDDD,
DD_MMPMMM,
DD_MM_SSPS,
+ DDPDDDDD_NSEW,
+ DD_MMPMMM_NSEW,
+ DD_MM_SSPS_NSEW,
DEG_FORMAT_ENUM_COUNT
-} Degree_format;
+} DegFormat;
gchar *DEG_FORMAT_TEXT[DEG_FORMAT_ENUM_COUNT];
typedef enum
struct _Point {
guint unitx;
guint unity;
-};
-
-/** A TrackPoint, which is a Point with a time. */
-typedef struct _TrackPoint TrackPoint;
-struct _TrackPoint {
- Point point;
time_t time;
gfloat altitude;
};
gchar *desc;
};
-/** A Track is a set of timed TrackPoints. */
-typedef struct _Track Track;
-struct _Track {
- TrackPoint *head; /* points to first element in array; NULL if empty. */
- TrackPoint *tail; /* points to last element in array. */
- TrackPoint *cap; /* points after last slot in array. */
-};
-
-/** A Route is a set of untimed Points and WayPoints. */
-typedef struct _Route Route;
-struct _Route {
+/** A Path is a set of PathPoints and WayPoints. */
+typedef struct _Path Path;
+struct _Path {
Point *head; /* points to first element in array; NULL if empty. */
Point *tail; /* points to last element in array. */
Point *cap; /* points after last slot in array. */
WayPoint *wcap; /* points after last slot in array. */
};
-typedef enum _PathType PathType;
-enum _PathType {
- TRACK,
- ROUTE,
-};
-
-typedef struct _Path Path;
-struct _Path {
- union {
- Track track;
- Route route;
- } path;
- PathType path_type;
-};
-
/** Data used during the SAX parsing operation. */
typedef struct _SaxData SaxData;
struct _SaxData {
gchar *cache_dir;
guint dl_zoom_steps;
guint view_zoom_steps;
+ gboolean double_size;
+ gboolean nextable;
RepoType type;
GtkWidget *menu_item;
};
struct _GpsData {
guint fix;
guint fixquality;
- time_t timeloc; /* local time */
gfloat lat;
gfloat lon;
- gchar slat[15];
- gchar slon[15];
gfloat speed; /* in knots */
gfloat maxspeed; /* in knots */
- gfloat altitude; /* in meters */
gfloat heading;
gfloat hdop;
gfloat pdop;
static guint _curl_sid = 0;
/** GPS data. */
-static Point _pos = {0, 0};
-static const Point _pos_null = {0, 0};
-static const TrackPoint _track_null = { { 0, 0 }, FP_NAN};
+static Point _pos = { 0, 0, 0, NAN};
+static const Point _point_null = { 0, 0, 0, NAN};
static gint _vel_offsetx = 0;
static gint _vel_offsety = 0;
static gint _mark_width = -1;
static gint _mark_height = -1;
+/** Pango stuff. */
+static GdkRectangle _scale_rect;
+static PangoContext *_scale_context = NULL;
+static PangoFontDescription *_scale_font = NULL;
+static PangoLayout *_scale_layout = NULL;
+static GdkGC *_speed_limit_gc1 = NULL;
+static GdkGC *_speed_limit_gc2 = NULL;
+static PangoContext *_speed_limit_context = NULL;
+static PangoLayout *_speed_limit_layout = NULL;
+static PangoFontDescription *_speed_limit_fontdesc = NULL;
+static PangoContext *_sat_panel_context = NULL;
+static PangoLayout *_sat_panel_layout = NULL;
+static PangoFontDescription *_sat_panel_fontdesc = NULL;
+static PangoContext *_heading_panel_context = NULL;
+static PangoLayout *_heading_panel_layout = NULL;
+static PangoFontDescription *_heading_panel_fontdesc = NULL;
+static GdkGC *_sat_info_gc1 = NULL;
+static GdkGC *_sat_info_gc2 = NULL;
+static PangoContext *_sat_info_context = NULL;
+static PangoLayout *_sat_info_layout = NULL;
+static PangoFontDescription *_sat_info_fontdesc = NULL;
+static PangoContext *_sat_details_context = NULL;
+static PangoLayout *_sat_details_layout = NULL;
+static PangoFontDescription *_sat_details_fontdesc = NULL;
+static PangoContext *_sat_details_expose_context = NULL;
+static PangoLayout *_sat_details_expose_layout = NULL;
+static PangoFontDescription *_sat_details_expose_fontdesc = NULL;
+#define SCALE_WIDTH (100)
+
/** The current track and route. */
-static Track _track;
-static Route _route;
+static Path _track;
+static Path _route;
/** Data for tracking waypoints for the purpose of announcement. */
/* _near_point is the route point to which we are closest. */
static Point *_next_wpt = NULL;
static guint64 _next_wpt_dist_squared = -1;
-static WayPoint *_visible_way_first = NULL;
-static WayPoint *_visible_way_last = NULL;
-
static guint _key_zoom_new = 0;
static guint _key_zoom_timeout_sid = 0;
/** THE GdkGC OBJECTS USED FOR DRAWING. */
-static GdkGC *_gc_mark = NULL;
-static GdkGC *_gc_mark_velocity = NULL;
-static GdkGC *_gc_mark_old = NULL;
-static GdkGC *_gc_track = NULL;
-static GdkGC *_gc_track_break = NULL;
-static GdkGC *_gc_route = NULL;
-static GdkGC *_gc_route_way = NULL;
-static GdkGC *_gc_route_nextway = NULL;
-static GdkGC *_gc_poi = NULL;
-static GdkColor _color_mark = {0, 0, 0, 0};
-static GdkColor _color_mark_velocity = {0, 0, 0, 0};
-static GdkColor _color_mark_old = {0, 0, 0, 0};
-static GdkColor _color_track = {0, 0, 0, 0};
-static GdkColor _color_track_break = {0, 0, 0, 0};
-static GdkColor _color_route = {0, 0, 0, 0};
-static GdkColor _color_route_way = {0, 0, 0, 0};
-static GdkColor _color_route_nextway = {0, 0, 0, 0};
-static GdkColor _color_poi = {0, 0, 0, 0};
-static GdkColor DEFAULT_COLOR_MARK = {0, 0x0000, 0x0000, 0xc000};
-static GdkColor DEFAULT_COLOR_MARK_VELOCITY = {0, 0x6000, 0x6000, 0xf800};
-static GdkColor DEFAULT_COLOR_MARK_OLD = {0, 0x8000, 0x8000, 0x8000};
-static GdkColor DEFAULT_COLOR_TRACK = {0, 0xe000, 0x0000, 0x0000};
-static GdkColor DEFAULT_COLOR_TRACK_BREAK = {0, 0xa000, 0x0000, 0x0000};
-static GdkColor DEFAULT_COLOR_ROUTE = {0, 0x0000, 0xa000, 0x0000};
-static GdkColor DEFAULT_COLOR_ROUTE_WAY = {0, 0x0000, 0x8000, 0x0000};
-static GdkColor DEFAULT_COLOR_ROUTE_NEXTWAY = {0, 0x0000, 0x6000, 0x0000};
-static GdkColor DEFAULT_COLOR_POI = {0, 0xa000, 0x0000, 0xa000};
+static GdkGC *_gc[COLORABLE_ENUM_COUNT];
+static GdkColor _color[COLORABLE_ENUM_COUNT];
/* Menu items for the "Route" submenu. */
static GtkWidget *_menu_route_download_item = NULL;
/* Menu items for the "Track" submenu. */
static GtkWidget *_menu_track_open_item = NULL;
static GtkWidget *_menu_track_save_item = NULL;
+static GtkWidget *_menu_track_insert_break_item = NULL;
static GtkWidget *_menu_track_insert_mark_item = NULL;
static GtkWidget *_menu_track_distlast_item = NULL;
static GtkWidget *_menu_track_distfirst_item = NULL;
static GtkWidget *_menu_auto_download_item = NULL;
/* Menu items for the "View" submenu. */
+static GtkWidget *_menu_zoomin_item = NULL;
+static GtkWidget *_menu_zoomout_item = NULL;
static GtkWidget *_menu_fullscreen_item = NULL;
-static GtkWidget *_menu_show_tracks_item = NULL;
+static GtkWidget *_menu_show_scale_item = NULL;
static GtkWidget *_menu_show_routes_item = NULL;
+static GtkWidget *_menu_show_tracks_item = NULL;
static GtkWidget *_menu_show_velvec_item = NULL;
static GtkWidget *_menu_show_poi_item = NULL;
static GtkWidget *_menu_poi_item = NULL;
/* Menu items for the other menu items. */
static GtkWidget *_menu_settings_item = NULL;
static GtkWidget *_menu_help_item = NULL;
+static GtkWidget *_menu_about_item = NULL;
static GtkWidget *_menu_close_item = NULL;
/** CONTEXT MENU ITEMS. */
static gchar *_route_dl_url = NULL;
static guint _route_dl_radius = 4;
static gint _show_tracks = 0;
+static gboolean _show_scale = TRUE;
static gboolean _show_velvec = TRUE;
static gboolean _show_poi = TRUE;
static gboolean _auto_download = FALSE;
static GSList *_loc_list;
static GtkListStore *_loc_model;
static UnitType _units = UNITS_KM;
-static EscapeKeyAction _escape_key = ESCAPE_KEY_TOGGLE_TRACKS;
+static CustomAction _action[CUSTOM_KEY_ENUM_COUNT];
static guint _degformat = DDPDDDDD;
static gboolean _speed_limit_on = FALSE;
static guint _speed_limit = 100;
static SpeedLocation _speed_location = SPEED_LOCATION_TOP_RIGHT;
static InfoFontSize _info_font_size = INFO_FONT_MEDIUM;
-static gchar *_config_dir_uri;
-
static GList *_repo_list = NULL;
static RepoData *_curr_repo = NULL;
static gboolean
menu_cb_track_save(GtkAction *action);
static gboolean
+menu_cb_track_insert_break(GtkAction *action);
+static gboolean
menu_cb_track_insert_mark(GtkAction *action);
static gboolean
menu_cb_track_distlast(GtkAction *action);
/* Callbacks for the "View" submenu. */
static gboolean
+menu_cb_zoomin(GtkAction *action);
+static gboolean
+menu_cb_zoomout(GtkAction *action);
+static gboolean
menu_cb_fullscreen(GtkAction *action);
static gboolean
-menu_cb_show_tracks(GtkAction *action);
+menu_cb_show_scale(GtkAction *action);
static gboolean
menu_cb_show_routes(GtkAction *action);
static gboolean
+menu_cb_show_tracks(GtkAction *action);
+static gboolean
menu_cb_show_velvec(GtkAction *action);
static gboolean
menu_cb_show_poi(GtkAction *action);
menu_cb_settings(GtkAction *action);
static gboolean
menu_cb_help(GtkAction *action);
+static gboolean
+menu_cb_about(GtkAction *action);
/* Callbacks for the "Location" context menu. */
}
static void
-track_resize(Track *track, guint size)
-{
- printf("%s()\n", __PRETTY_FUNCTION__);
-
- if(track->head + size != track->cap)
- {
- TrackPoint *old_head = track->head;
- track->head = g_renew(TrackPoint, old_head, size);
- track->cap = track->head + size;
- if(track->head != old_head)
- track->tail = track->head + (track->tail - old_head);
- }
-
- vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-}
-
-static void
-route_resize(Route *route, guint size)
+path_resize(Path *path, guint size)
{
printf("%s()\n", __PRETTY_FUNCTION__);
- if(route->head + size != route->cap)
+ if(path->head + size != path->cap)
{
- Point *old_head = route->head;
+ Point *old_head = path->head;
WayPoint *curr;
- route->head = g_renew(Point, old_head, size);
- route->cap = route->head + size;
- if(route->head != old_head)
+ path->head = g_renew(Point, old_head, size);
+ path->cap = path->head + size;
+ if(path->head != old_head)
{
- route->tail = route->head + (route->tail - old_head);
+ path->tail = path->head + (path->tail - old_head);
/* Adjust all of the waypoints. */
- for(curr = route->whead - 1; curr++ != route->wtail; )
- curr->point = route->head + (curr->point - old_head);
+ for(curr = path->whead - 1; curr++ != path->wtail; )
+ curr->point = path->head + (curr->point - old_head);
}
}
}
static void
-route_wresize(Route *route, guint wsize)
+path_wresize(Path *path, guint wsize)
{
printf("%s()\n", __PRETTY_FUNCTION__);
- if(route->whead + wsize != route->wcap)
+ if(path->whead + wsize != path->wcap)
{
- WayPoint *old_whead = route->whead;
- route->whead = g_renew(WayPoint, old_whead, wsize);
- route->wtail = route->whead + (route->wtail - old_whead);
- route->wcap = route->whead + wsize;
+ WayPoint *old_whead = path->whead;
+ path->whead = g_renew(WayPoint, old_whead, wsize);
+ path->wtail = path->whead + (path->wtail - old_whead);
+ path->wcap = path->whead + wsize;
}
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
static gboolean
-write_track_gpx(GnomeVFSHandle *handle)
+write_gpx(Path *path, GnomeVFSHandle *handle)
{
- TrackPoint *curr;
+ Point *curr = NULL;
+ WayPoint *wcurr = NULL;
gboolean trkseg_break = FALSE;
printf("%s()\n", __PRETTY_FUNCTION__);
/* Find first non-zero point. */
- for(curr = _track.head-1; curr++ != _track.tail; )
- if(curr->point.unity)
+ for(curr = path->head - 1, wcurr = path->whead; curr++ != path->tail; )
+ {
+ if(curr->unity)
break;
+ else if(wcurr && curr == wcurr->point)
+ wcurr++;
+ }
/* Write the header. */
- WRITE_STRING(XML_TRKSEG_HEADER);
+ WRITE_STRING(
+ "<?xml version=\"1.0\"?>\n"
+ "<gpx version=\"1.0\" creator=\"maemo-mapper\" "
+ "xmlns=\"http://www.topografix.com/GPX/1/0\">\n"
+ " <trk>\n"
+ " <trkseg>\n");
/* Curr points to first non-zero point. */
- for(curr--; curr++ != _track.tail; )
+ for(curr--; curr++ != path->tail; )
{
gfloat lat, lon;
- if(curr->point.unity)
+ if(curr->unity)
{
gchar buffer[80];
- gchar strlat[80], strlon[80];
+ gboolean first_sub = TRUE;
if(trkseg_break)
{
/* First trkpt of the segment - write trkseg header. */
WRITE_STRING(" </trkseg>\n"
- /* Write trkseg header. */
" <trkseg>\n");
trkseg_break = FALSE;
}
- unit2latlon(curr->point.unitx, curr->point.unity, lat, lon);
- g_ascii_formatd(strlat, 80, "%.06f", lat);
- g_ascii_formatd(strlon, 80, "%.06f", lon);
- snprintf(buffer, sizeof(buffer),
- " <trkpt lat=\"%s\" lon=\"%s\">\n",
- strlat, strlon);
+ unit2latlon(curr->unitx, curr->unity, lat, lon);
+ WRITE_STRING(" <trkpt lat=\"");
+ g_ascii_formatd(buffer, sizeof(buffer), "%.06f", lat);
+ WRITE_STRING(buffer);
+ WRITE_STRING("\" lon=\"");
+ g_ascii_formatd(buffer, sizeof(buffer), "%.06f", lon);
WRITE_STRING(buffer);
+ WRITE_STRING("\"");
/* write the elevation */
if(!isnan(curr->altitude))
{
+ if(first_sub)
+ {
+ WRITE_STRING(">\n");
+ first_sub = FALSE;
+ }
WRITE_STRING(" <ele>");
{
g_ascii_formatd(buffer, 80, "%.2f", curr->altitude);
/* write the time */
if(curr->time)
{
- WRITE_STRING(" <time>");
+ if(first_sub)
{
- struct tm time;
- localtime_r(&curr->time, &time);
- strftime(buffer, 80, XML_DATE_FORMAT, &time);
- WRITE_STRING(buffer);
- WRITE_STRING(XML_TZONE);
+ WRITE_STRING(">\n");
+ first_sub = FALSE;
}
+ WRITE_STRING(" <time>");
+ strftime(buffer, 80, XML_DATE_FORMAT, localtime(&curr->time));
+ WRITE_STRING(buffer);
+ WRITE_STRING(XML_TZONE);
WRITE_STRING("</time>\n");
}
- WRITE_STRING(" </trkpt>\n");
- }
- else
- trkseg_break = TRUE;
- }
-
- /* Write the footer. */
- WRITE_STRING(XML_TRKSEG_FOOTER);
-
- vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
- return TRUE;
-}
-
-static gboolean
-write_route_gpx(GnomeVFSHandle *handle)
-{
- Point *curr = NULL;
- WayPoint *wcurr = NULL;
- gboolean trkseg_break = FALSE;
- printf("%s()\n", __PRETTY_FUNCTION__);
-
- /* Find first non-zero point. */
- for(curr = _route.head - 1, wcurr = _route.whead; curr++ != _route.tail; )
- {
- if(curr->unity)
- break;
- else if(wcurr && curr == wcurr->point)
- wcurr++;
- }
- /* Write the header. */
- WRITE_STRING(XML_TRKSEG_HEADER);
-
- /* Curr points to first non-zero point. */
- for(curr--; curr++ != _route.tail; )
- {
- gfloat lat, lon;
- if(curr->unity)
- {
- gchar buffer[BUFFER_SIZE];
- gchar strlat[80], strlon[80];
- if(trkseg_break)
+ if(wcurr && curr == wcurr->point)
{
- /* First trkpt of the segment - write trkseg header. */
- WRITE_STRING(" </trkseg>\n"
- " <trkseg>\n");
- trkseg_break = FALSE;
+ if(first_sub)
+ {
+ WRITE_STRING(">\n");
+ first_sub = FALSE;
+ }
+ WRITE_STRING(" <desc>");
+ WRITE_STRING(wcurr->desc);
+ WRITE_STRING("</desc>\n");
+ wcurr++;
+ }
+ if(first_sub)
+ {
+ WRITE_STRING("/>\n");
}
- unit2latlon(curr->unitx, curr->unity, lat, lon);
- g_ascii_formatd(strlat, 80, "%.06f", lat);
- g_ascii_formatd(strlon, 80, "%.06f", lon);
- snprintf(buffer, sizeof(buffer),
- " <trkpt lat=\"%s\" lon=\"%s\"",
- strlat, strlon);
- if(wcurr && curr == wcurr->point)
- snprintf(buffer + strlen(buffer),
- BUFFER_SIZE - strlen(buffer),
- "><desc>%s</desc></trkpt>\n", wcurr++->desc);
else
- strcat(buffer, "/>\n");
- WRITE_STRING(buffer);
+ {
+ WRITE_STRING(" </trkpt>\n");
+ }
}
else
trkseg_break = TRUE;
}
/* Write the footer. */
- WRITE_STRING(XML_TRKSEG_FOOTER);
+ WRITE_STRING(
+ " </trkseg>\n"
+ " </trk>\n"
+ "</gpx>\n");
+
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
static void
speed_limit(void)
{
- PangoContext *context = NULL;
- PangoLayout *layout = NULL;
- PangoFontDescription *fontdesc = NULL;
- GdkColor color;
GdkGC *gc;
gfloat cur_speed;
gchar *buffer;
cur_speed = _gps.speed * UNITS_CONVERT[_units];
- context = gtk_widget_get_pango_context(_map_widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
-
- pango_font_description_set_size(fontdesc, 64 * PANGO_SCALE);
- pango_layout_set_font_description (layout, fontdesc);
-
if(cur_speed > _speed_limit)
{
- color.red = 0xffff;
+ gc = _speed_limit_gc1;
if(!_speed_excess)
{
_speed_excess = TRUE;
}
else
{
- color.red = 0;
+ gc = _speed_limit_gc2;
_speed_excess = FALSE;
}
- color.green = 0;
- color.blue = 0;
- gc = gdk_gc_new (_map_widget->window);
- gdk_gc_set_rgb_fg_color (gc, &color);
-
buffer = g_strdup_printf("%0.0f", cur_speed);
- pango_layout_set_text(layout, buffer, strlen(buffer));
+ pango_layout_set_text(_speed_limit_layout, buffer, -1);
+
+ pango_layout_get_pixel_size(_speed_limit_layout, &width, &height);
- gtk_widget_queue_draw_area ( _map_widget,
+ gtk_widget_queue_draw_area (_map_widget,
x - 5,
y - 5,
width + 5,
height + 5);
gdk_window_process_all_updates();
- pango_layout_get_pixel_size(layout, &width, &height);
switch (_speed_location)
{
case SPEED_LOCATION_TOP_RIGHT:
gdk_draw_layout(_map_widget->window,
gc,
x, y,
- layout);
+ _speed_limit_layout);
g_free(buffer);
- pango_font_description_free (fontdesc);
- g_object_unref (layout);
- g_object_unref (gc);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
}
if(has_lat && has_lon)
{
- if(data->path.path_type == TRACK)
- {
- MACRO_TRACK_INCREMENT_TAIL(data->path.path.track);
- latlon2unit(lat, lon,
- data->path.path.track.tail->point.unitx,
- data->path.path.track.tail->point.unity);
- data->path.path.track.tail->time = 0;
- data->path.path.track.tail->altitude = NAN;
- }
- else
- {
- MACRO_ROUTE_INCREMENT_TAIL(data->path.path.route);
- latlon2unit(lat, lon,
- data->path.path.route.tail->unitx,
- data->path.path.route.tail->unity);
- }
+ MACRO_PATH_INCREMENT_TAIL(data->path);
+ latlon2unit(lat, lon,
+ data->path.tail->unitx,
+ data->path.tail->unity);
+ data->path.tail->time = 0;
+ data->path.tail->altitude = NAN;
data->state = INSIDE_PATH_POINT;
}
else
MACRO_SET_UNKNOWN();
break;
case INSIDE_PATH_POINT:
- /* only parse time/ele for tracks */
- if(data->path.path_type == TRACK)
- {
- if(!strcmp((gchar*)name, "time"))
- data->state = INSIDE_PATH_POINT_TIME;
- else if(!strcmp((gchar*)name, "ele"))
- data->state = INSIDE_PATH_POINT_ELE;
- }
- /* only parse description for routes */
- else if(data->path.path_type == ROUTE
- && !strcmp((gchar*)name, "desc"))
+ if(!strcmp((gchar*)name, "time"))
+ data->state = INSIDE_PATH_POINT_TIME;
+ else if(!strcmp((gchar*)name, "ele"))
+ data->state = INSIDE_PATH_POINT_ELE;
+ else if(!strcmp((gchar*)name, "desc"))
data->state = INSIDE_PATH_POINT_DESC;
else
{
if(data->at_least_one_trkpt)
{
- if(data->path.path_type == TRACK)
- {
- MACRO_TRACK_INCREMENT_TAIL(data->path.path.track);
- *data->path.path.track.tail = _track_null;
- }
- else
- {
- MACRO_ROUTE_INCREMENT_TAIL(data->path.path.route);
- *data->path.path.route.tail = _pos_null;
- }
+ MACRO_PATH_INCREMENT_TAIL(data->path);
+ *data->path.tail = _point_null;
}
data->state = INSIDE_PATH;
}
data->state = ERROR;
break;
case INSIDE_PATH_POINT_ELE:
- /* only parse time for tracks */
if(!strcmp((gchar*)name, "ele"))
{
gchar *error_check;
- data->path.path.track.tail->altitude
+ data->path.tail->altitude
= g_ascii_strtod(data->chars->str, &error_check);
if(error_check == data->chars->str)
- data->path.path.track.tail->altitude = NAN;
+ data->path.tail->altitude = NAN;
data->state = INSIDE_PATH_POINT;
g_string_free(data->chars, TRUE);
data->chars = g_string_new("");
data->state = ERROR;
break;
case INSIDE_PATH_POINT_TIME:
- /* only parse time for tracks */
if(!strcmp((gchar*)name, "time"))
{
struct tm time;
gchar *error_check;
/* First, set time in "local" time zone. */
- data->path.path.track.tail->time = (mktime(&time));
+ data->path.tail->time = (mktime(&time));
/* Now, skip inconsequential characters */
while(*ptr && *ptr != 'Z' && *ptr != '-' && *ptr != '+')
if(*ptr == 'Z')
/* Zulu (UTC) time. Undo the local time zone's
* offset. */
- data->path.path.track.tail->time += time.tm_gmtoff;
+ data->path.tail->time += time.tm_gmtoff;
else
{
/* Not Zulu (UTC). Must parse hours and minutes. */
if(error_check != (ptr + 1))
{
/* Parse of minutes worked. Calculate. */
- data->path.path.track.tail->time
+ data->path.tail->time
+= (time.tm_gmtoff
- (offhours * 60 * 60
+ offmins * 60));
/* only parse description for routes */
if(!strcmp((gchar*)name, "desc"))
{
- MACRO_ROUTE_INCREMENT_WTAIL(data->path.path.route);
- data->path.path.route.wtail->point= data->path.path.route.tail;
- data->path.path.route.wtail->desc
+ MACRO_PATH_INCREMENT_WTAIL(data->path);
+ data->path.wtail->point= data->path.tail;
+ data->path.wtail->desc
= g_string_free(data->chars, FALSE);
data->chars = g_string_new("");
data->state = INSIDE_PATH_POINT;
data->state = ERROR;
}
-/**
- * Parse the given character buffer of the given size, replacing the given
- * Track's pointers with pointers to new arrays depending on the given
- * policy, adding extra_bins slots in the arrays for new data.
- *
- * policy_old should be negative to indicate that the existing data should
- * be prepended to the new GPX data, positive to indicate the opposite, and
- * zero to indicate that we should throw away the old data.
- *
- * When importing tracks, we *prepend* the GPX data and provide extra_bins.
- * When importing routes, we *append* in the case of regular routes, and we
- * *replace* in the case of automatic routing. Routes get no extra bins.
- */
-static gboolean
-parse_track_gpx(gchar *buffer, gint size, gint policy_old)
-{
- SaxData data;
- xmlSAXHandler sax_handler;
- printf("%s()\n", __PRETTY_FUNCTION__);
-
- data.path.path_type = TRACK;
- MACRO_INIT_TRACK(data.path.path.track);
- data.state = START;
- data.chars = g_string_new("");
-
- memset(&sax_handler, 0, sizeof(sax_handler));
- sax_handler.characters = (charactersSAXFunc)gpx_chars;
- sax_handler.startElement = (startElementSAXFunc)gpx_start_element;
- sax_handler.endElement = (endElementSAXFunc)gpx_end_element;
- sax_handler.entityDecl = (entityDeclSAXFunc)gpx_get_entity;
- sax_handler.warning = (warningSAXFunc)gpx_error;
- sax_handler.error = (errorSAXFunc)gpx_error;
- sax_handler.fatalError = (fatalErrorSAXFunc)gpx_error;
-
- xmlSAXUserParseMemory(&sax_handler, &data, buffer, size);
- g_string_free(data.chars, TRUE);
-
- if(data.state != FINISH)
- {
- vprintf("%s(): return FALSE\n", __PRETTY_FUNCTION__);
- return FALSE;
- }
-
- /* Successful parsing - replace given Track structure. */
- if(policy_old && _track.head)
- {
- TrackPoint *src_first;
- Track *src, *dest;
-
- if(policy_old > 0)
- {
- /* Append to current track. */
- src = &data.path.path.track;
- dest = &_track;
- }
- else
- {
- /* Prepend to current track. */
- src = &_track;
- dest = &data.path.path.track;
- }
-
- /* Find src_first non-zero point. */
- for(src_first = src->head - 1; src_first++ != src->tail; )
- if(src_first->point.unity)
- break;
-
- /* Append track points from src to dest. */
- if(src->tail >= src_first)
- {
- guint num_dest_points = dest->tail - dest->head + 1;
- guint num_src_points = src->tail - src_first + 1;
-
- /* Adjust dest->tail to be able to fit src track data
- * plus room for more track data. */
- track_resize(dest,
- num_dest_points + num_src_points + ARRAY_CHUNK_SIZE);
-
- memcpy(dest->tail + 1, src_first,
- num_src_points * sizeof(TrackPoint));
-
- dest->tail += num_src_points;
- }
-
- MACRO_FREE_TRACK(*src);
- if(policy_old < 0)
- _track = *dest;
- }
- else
- {
- MACRO_FREE_TRACK(_track);
- /* Overwrite with data.track. */
- _track = data.path.path.track;
- track_resize(&_track,
- _track.tail - _track.head + 1 + ARRAY_CHUNK_SIZE);
- }
-
- vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
- return TRUE;
-}
-
static gboolean
-parse_route_gpx(gchar *buffer, gint size, gint policy_old)
+parse_gpx(Path *to_replace, gchar *buffer, gint size, gint policy_old)
{
SaxData data;
xmlSAXHandler sax_handler;
printf("%s()\n", __PRETTY_FUNCTION__);
- data.path.path_type = ROUTE;
- MACRO_INIT_ROUTE(data.path.path.route);
+ MACRO_PATH_INIT(data.path);
data.state = START;
data.chars = g_string_new("");
return FALSE;
}
- if(policy_old && _route.head != _route.tail)
+ if(policy_old && to_replace->head != to_replace->tail)
{
Point *src_first;
- Route *src, *dest;
+ Path *src, *dest;
if(policy_old > 0)
{
- /* Append to current route. Make sure last route point is zero. */
- if(_route.tail->unity != 0)
+ /* Append to current path. Make sure last path point is zero. */
+ if(to_replace->tail->unity != 0)
{
- MACRO_ROUTE_INCREMENT_TAIL(_route);
- *_route.tail = _pos_null;
+ MACRO_PATH_INCREMENT_TAIL((*to_replace));
+ *to_replace->tail = _point_null;
}
- src = &data.path.path.route;
- dest = &_route;
+ src = &data.path;
+ dest = to_replace;
}
else
{
/* Prepend to current route. */
- src = &_route;
- dest = &data.path.path.route;
+ src = to_replace;
+ dest = &data.path;
}
/* Find src_first non-zero point. */
/* Adjust dest->tail to be able to fit src route data
* plus room for more route data. */
- route_resize(dest, num_dest_points + num_src_points);
+ path_resize(dest, num_dest_points + num_src_points);
memcpy(dest->tail + 1, src_first,
num_src_points * sizeof(Point));
dest->tail += num_src_points;
/* Append waypoints from src to dest->. */
- route_wresize(dest, (dest->wtail - dest->whead)
+ path_wresize(dest, (dest->wtail - dest->whead)
+ (src->wtail - src->whead) + 2);
for(curr = src->whead - 1; curr++ != src->wtail; )
{
}
- /* Kill old route - don't use MACRO_FREE_ROUTE(), because that
+ /* Kill old route - don't use MACRO_PATH_FREE(), because that
* would free the string desc's that we just moved to data.route. */
g_free(src->head);
g_free(src->whead);
if(policy_old < 0)
- _route = *dest;
+ (*to_replace) = *dest;
}
else
{
- MACRO_FREE_ROUTE(_route);
+ MACRO_PATH_FREE((*to_replace));
/* Overwrite with data.route. */
- _route = data.path.path.route;
- route_resize(&_route, _route.tail - _route.head + 1);
- route_wresize(&_route, _route.wtail - _route.whead + 1);
+ (*to_replace) = data.path;
+ path_resize(to_replace, to_replace->tail - to_replace->head + 1);
+ path_wresize(to_replace, to_replace->wtail - to_replace->whead + 1);
}
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
****************************************************************************/
static void
-deg_format(gfloat coor, gchar scoor[15])
+deg_format(gfloat coor, gchar *scoor, gchar neg_char, gchar pos_char)
{
- gint deg;
- gfloat min, sec;
+ gfloat min;
+ gfloat acoor = fabs(coor);
printf("%s()\n", __PRETTY_FUNCTION__);
switch(_degformat)
{
+ case DDPDDDDD:
+ sprintf(scoor, "%.5f°", coor);
+ break;
+ case DDPDDDDD_NSEW:
+ sprintf(scoor, "%.5f° %c", acoor,
+ coor < 0.f ? neg_char : pos_char);
+ break;
+
case DD_MMPMMM:
sprintf(scoor, "%d°%06.3f'",
- (int)coor, (coor - (int)coor)*60.0);
+ (int)coor, (acoor - (int)acoor)*60.0);
break;
+ case DD_MMPMMM_NSEW:
+ sprintf(scoor, "%d°%06.3f' %c",
+ (int)acoor, (acoor - (int)acoor)*60.0,
+ coor < 0.f ? neg_char : pos_char);
+ break;
+
case DD_MM_SSPS:
- deg = (int)coor;
- min = (coor - (int)coor)*60.0;
- sec = (min - (int)min)*60.0;
- sprintf(scoor, "%d°%02d'%04.1f\"", deg, (int) min, sec);
+ min = (acoor - (int)acoor)*60.0;
+ sprintf(scoor, "%d°%02d'%04.1f\"", (int)coor, (int)min,
+ ((min - (int)min)*60.0));
break;
- default:
- sprintf(scoor, "%.5f°", coor);
+ case DD_MM_SSPS_NSEW:
+ min = (acoor - (int)acoor)*60.0;
+ sprintf(scoor, "%d°%02d'%04.1f\" %c", (int)acoor, (int)min,
+ ((min - (int)min)*60.0),
+ coor < 0.f ? neg_char : pos_char);
break;
}
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
static gboolean
gps_display_details(void)
{
- gchar *buffer, strtime[15];
+ gchar *buffer, litbuf[16];
printf("%s()\n", __PRETTY_FUNCTION__);
if(_gps.fix < 2)
gfloat speed = _gps.speed * UNITS_CONVERT[_units];
/* latitude */
- gtk_label_set_label(GTK_LABEL(_sdi_lat), _gps.slat);
+ lat_format(_gps.lat, litbuf);
+ gtk_label_set_label(GTK_LABEL(_sdi_lat), litbuf);
/* longitude */
- gtk_label_set_label(GTK_LABEL(_sdi_lon), _gps.slon);
+ lon_format(_gps.lon, litbuf);
+ gtk_label_set_label(GTK_LABEL(_sdi_lon), litbuf);
/* speed */
switch(_units)
case UNITS_MI:
case UNITS_NM:
buffer = g_strdup_printf("%.1f ft",
- _gps.altitude * 3.2808399f);
+ _pos.altitude * 3.2808399f);
break;
default:
- buffer = g_strdup_printf("%.1f m", _gps.altitude);
+ buffer = g_strdup_printf("%.1f m", _pos.altitude);
break;
}
gtk_label_set_label(GTK_LABEL(_sdi_alt), buffer);
g_free(buffer);
/* local time */
- {
- struct tm time;
- localtime_r(&_gps.timeloc, &time);
- strftime(strtime, 15, "%X", &time);
- }
- gtk_label_set_label(GTK_LABEL(_sdi_tim), strtime);
+ strftime(litbuf, 15, "%X", localtime(&_pos.time));
+ gtk_label_set_label(GTK_LABEL(_sdi_tim), litbuf);
}
/* Sat in view */
static void
gps_display_data(void)
{
- gchar *buffer, strtime[15];
+ gchar *buffer, litbuf[16];
printf("%s()\n", __PRETTY_FUNCTION__);
if(_gps.fix < 2)
gfloat speed = _gps.speed * UNITS_CONVERT[_units];
/* latitude */
- gtk_label_set_label(GTK_LABEL(_text_lat), _gps.slat);
+ lat_format(_gps.lat, litbuf);
+ gtk_label_set_label(GTK_LABEL(_text_lat), litbuf);
/* longitude */
- gtk_label_set_label(GTK_LABEL(_text_lon), _gps.slon);
+ lon_format(_gps.lon, litbuf);
+ gtk_label_set_label(GTK_LABEL(_text_lon), litbuf);
/* speed */
switch(_units)
case UNITS_MI:
case UNITS_NM:
buffer = g_strdup_printf("Alt: %.1f ft",
- _gps.altitude * 3.2808399f);
+ _pos.altitude * 3.2808399f);
break;
default:
- buffer = g_strdup_printf("Alt: %.1f m", _gps.altitude);
+ buffer = g_strdup_printf("Alt: %.1f m", _pos.altitude);
}
gtk_label_set_label(GTK_LABEL(_text_alt), buffer);
g_free(buffer);
/* local time */
- {
- struct tm time;
- localtime_r(&_gps.timeloc, &time);
- strftime(strtime, 15, "%X", &time);
- }
- gtk_label_set_label(GTK_LABEL(_text_time), strtime);
+ strftime(litbuf, 15, "%X", localtime(&_pos.time));
+ gtk_label_set_label(GTK_LABEL(_text_time), litbuf);
}
/* refresh sat panel */
draw_sat_info(GtkWidget *widget, guint x0, guint y0,
guint width, guint height, gboolean showsnr)
{
- PangoContext *context = NULL;
- PangoLayout *layout = NULL;
- PangoFontDescription *fontdesc = NULL;
- GdkColor color;
- GdkGC *gc1, *gc2, *gc;
+ GdkGC *gc;
guint step, i, j, snr_height, bymargin, xoffset, yoffset;
guint x, y, x1, y1;
gchar *tmp = NULL;
xoffset + 5, yoffset + bymargin - 1,
xoffset + width - 10 - 2, yoffset + bymargin - 1);
- context = gtk_widget_get_pango_context(widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
-
- pango_font_description_set_family(fontdesc,"Sans Serif");
-
if(_gps.satinview > 0 )
{
- pango_font_description_set_size(fontdesc, 8*PANGO_SCALE);
-
- pango_layout_set_font_description (layout, fontdesc);
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-
/* Left margin - 5pix, Right margin - 5pix */
step = (width - 10) / _gps.satinview;
- color.red = 0;
- color.green = 0;
- color.blue = 0;
- gc1 = gdk_gc_new (widget->window);
- gdk_gc_set_rgb_fg_color (gc1, &color);
-
- color.red = 0;
- color.green = 0;
- color.blue = 0xffff;
- gc2 = gdk_gc_new (widget->window);
- gdk_gc_set_rgb_fg_color (gc2, &color);
-
for(i = 0; i < _gps.satinview; i++)
{
/* Sat used or not */
- gc = gc1;
+ gc = _sat_info_gc1;
for(j = 0; j < _gps.satinuse ; j++)
{
if(_gps.satforfix[j] == _gps_sat[i].prn)
{
- gc = gc2;
+ gc = _sat_info_gc2;
break;
}
}
{
/* ...snr.. */
tmp = g_strdup_printf("%02d", _gps_sat[i].snr);
- pango_layout_set_text(layout, tmp, 2);
- pango_layout_get_pixel_size(layout, &x1, &y1);
+ pango_layout_set_text(_sat_info_layout, tmp, 2);
+ pango_layout_get_pixel_size(_sat_info_layout, &x1, &y1);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
xoffset + x + ((step - 2) - x1)/2,
yoffset + y - 15,
- layout);
+ _sat_info_layout);
g_free(tmp);
}
/* ...and sat number */
tmp = g_strdup_printf("%02d", _gps_sat[i].prn);
- pango_layout_set_text(layout, tmp, 2);
- pango_layout_get_pixel_size(layout, &x1, &y1);
+ pango_layout_set_text(_sat_info_layout, tmp, 2);
+ pango_layout_get_pixel_size(_sat_info_layout, &x1, &y1);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
xoffset + x + ((step - 2) - x1)/2 ,
yoffset + bymargin + 1,
- layout);
+ _sat_info_layout);
g_free(tmp);
}
- g_object_unref (gc1);
- g_object_unref (gc2);
}
- pango_font_description_free (fontdesc);
- g_object_unref (layout);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return;
}
gfloat tmp;
GdkColor color;
GdkGC *gc1, *gc2, *gc3, *gc;
- PangoContext *context = NULL;
- PangoLayout *layout = NULL;
- PangoFontDescription *fontdesc = NULL;
gchar *buffer = NULL;
printf("%s()\n", __PRETTY_FUNCTION__);
yoffset = y0 + (height - width - 10) / 2;
}
- context = gtk_widget_get_pango_context(widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
-
- pango_font_description_set_family(fontdesc,"Sans Serif");
- pango_font_description_set_size(fontdesc, 10*PANGO_SCALE);
- pango_layout_set_font_description (layout, fontdesc);
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
-
/* 90 */
gdk_draw_arc(widget->window,
widget->style->fg_gc[GTK_WIDGET_STATE(widget)],
buffer = g_strdup_printf("N");
else
buffer = g_strdup_printf("%d°", line[i]);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(xoffset + halfsize + (halfsize - size/12) * sinf(tmp)) - x/2,
(yoffset + halfsize - (halfsize - size/12) * cosf(tmp)) - y/2,
- layout);
+ _sat_details_layout);
g_free(buffer);
}
/* elevation 30 */
tmp = (30 * (1.f / 180.f)) * PI;
buffer = g_strdup_printf("30°");
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(xoffset + halfsize + size/6*2 * sinf(tmp)) - x/2,
(yoffset + halfsize - size/6*2 * cosf(tmp)) - y/2,
- layout);
+ _sat_details_layout);
g_free(buffer);
/* elevation 60 */
tmp = (30 * (1.f / 180.f)) * PI;
buffer = g_strdup_printf("60°");
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(xoffset + halfsize + size/6 * sinf(tmp)) - x/2,
(yoffset + halfsize - size/6 * cosf(tmp)) - y/2,
- layout);
+ _sat_details_layout);
g_free(buffer);
color.red = 0;
0, 64 * 360);
buffer = g_strdup_printf("%02d", _gps_sat[i].prn);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x1, &y1);
+ pango_layout_set_text(_sat_details_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_layout, &x1, &y1);
gdk_draw_layout(widget->window,
gc3,
x - x1/2,
y - y1/2,
- layout);
+ _sat_details_layout);
g_free(buffer);
}
g_object_unref (gc1);
g_object_unref (gc2);
g_object_unref (gc3);
- pango_font_description_free (fontdesc);
- g_object_unref (layout);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return;
}
sat_details_panel_expose(GtkWidget *widget, GdkEventExpose *event)
{
guint width, height, x, y;
- PangoContext *context = NULL;
- PangoLayout *layout = NULL;
- PangoFontDescription *fontdesc = NULL;
gchar *buffer = NULL;
printf("%s()\n", __PRETTY_FUNCTION__);
draw_sat_info(widget, 0, 0, width/2, height, TRUE);
draw_sat_details(widget, width/2, 0, width/2, height);
- context = gtk_widget_get_pango_context(widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
-
- pango_font_description_set_family(fontdesc,"Sans Serif");
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
- pango_font_description_set_size(fontdesc, 14*PANGO_SCALE);
- pango_layout_set_font_description (layout, fontdesc);
-
buffer = g_strdup_printf(
"%s: %d; %s: %d",
_("Satellites in view"), _gps.satinview,
_("in use"), _gps.satinuse);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_expose_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_expose_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
10,
height*0.9 + 10,
- layout);
+ _sat_details_expose_layout);
g_free(buffer);
buffer = g_strdup_printf("HDOP: %.01f", _gps.hdop);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_expose_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_expose_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(width/8) - x/2,
(height/6) - y/2,
- layout);
+ _sat_details_expose_layout);
g_free(buffer);
buffer = g_strdup_printf("PDOP: %.01f", _gps.pdop);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_expose_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_expose_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(width/8) - x/2,
(height/6) - y/2 + 20,
- layout);
+ _sat_details_expose_layout);
g_free(buffer);
buffer = g_strdup_printf("VDOP: %.01f", _gps.vdop);
- pango_layout_set_text(layout, buffer, strlen(buffer));
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_details_expose_layout, buffer, -1);
+ pango_layout_get_pixel_size(_sat_details_expose_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
(width/8) - x/2,
(height/6) - y/2 + 40,
- layout);
+ _sat_details_expose_layout);
g_free(buffer);
- pango_font_description_free (fontdesc);
- g_object_unref (layout);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return TRUE;
}
gtk_table_attach(GTK_TABLE(table),
_sdi_fqu = gtk_label_new(_("none")),
3, 4, 3, 4, GTK_EXPAND | GTK_FILL, 0, 2, 4);
- gtk_misc_set_alignment(GTK_MISC(_sdi_fix), 0.f, 0.5f);
+ gtk_misc_set_alignment(GTK_MISC(_sdi_fqu), 0.f, 0.5f);
gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(_("Max speed")),
}
static void
-track_show_distance_from(TrackPoint *point)
+track_show_distance_from(Point *point)
{
gchar buffer[80];
gfloat lat1, lon1, lat2, lon2;
gdouble sum = 0.0;
- TrackPoint *curr;
+ Point *curr;
unit2latlon(_pos.unitx, _pos.unity, lat1, lon1);
/* Skip _track.tail because that should be _pos. */
for(curr = _track.tail; curr > point; --curr)
{
- if(curr->point.unity)
+ if(curr->unity)
{
- unit2latlon(curr->point.unitx, curr->point.unity, lat2, lon2);
+ unit2latlon(curr->unitx, curr->unity, lat2, lon2);
sum += calculate_distance(lat1, lon1, lat2, lon2);
lat1 = lat2;
lon1 = lon2;
/* Find last zero point. */
if(_track.head != _track.tail)
{
- TrackPoint *point;
+ Point *point;
/* Find last zero point. */
- for(point = _track.tail; point->point.unity; point--) { }
+ for(point = _track.tail; point->unity; point--) { }
track_show_distance_from(point);
}
else
* redrawn.
*/
static void
-map_render_track()
+map_render_path(Path *path, GdkGC **gc)
{
- TrackPoint *curr;
+ Point *curr;
+ WayPoint *wcurr;
printf("%s()\n", __PRETTY_FUNCTION__);
- for(curr = _track.head; curr != _track.tail; curr++)
- map_render_segment(_gc_track, _gc_track_break,
- curr->point.unitx, curr->point.unity,
- curr[1].point.unitx, curr[1].point.unity);
+ /* gc is a pointer to the first GC to use (for plain points). (gc + 1)
+ * is a pointer to the GC to use for waypoints, and (gc + 2) is a pointer
+ * to the GC to use for breaks. */
- vprintf("%s(): return\n", __PRETTY_FUNCTION__);
-}
-
-/**
- * Render all track data onto the _map_pixmap. Note that this does not
- * clear the pixmap of previous track data (use map_force_redraw() for
- * that), and also note that this method does not queue any redraws, so it
- * is up to the caller to decide which part of the track really needs to be
- * redrawn.
- */
-static void
-map_render_route()
-{
- Point *curr;
- WayPoint *wcurr;
- printf("%s()\n", __PRETTY_FUNCTION__);
-
- _visible_way_first = _visible_way_last = NULL;
-
- /* else there is a route to draw. */
- for(curr = _route.head, wcurr = _route.whead; curr++ != _route.tail; )
- {
- /* Draw the line from (curr - 1) to (curr). */
- map_render_segment(_gc_route, _gc_route_way,
- curr[-1].unitx, curr[-1].unity, curr->unitx, curr->unity);
+ /* else there is a route to draw. */
+ for(curr = path->head, wcurr = path->whead; curr++ != path->tail; )
+ {
+ /* Draw the line from (curr - 1) to (curr). */
+ map_render_segment(gc[0], gc[2],
+ curr[-1].unitx, curr[-1].unity, curr->unitx, curr->unity);
/* Now, check if curr is a waypoint. */
- if(wcurr && wcurr <= _route.wtail && wcurr->point == curr)
+ if(wcurr && wcurr <= path->wtail && wcurr->point == curr)
{
guint x1 = unit2bufx(wcurr->point->unitx);
guint y1 = unit2bufy(wcurr->point->unity);
&& (y1 < BUF_HEIGHT_PIXELS))
{
gdk_draw_arc(_map_pixmap,
- _gc_route_way,
+ gc[1],
FALSE, /* FALSE: not filled. */
x1 - _draw_width,
y1 - _draw_width,
2 * _draw_width,
0, /* start at 0 degrees. */
360 * 64);
- if(!_visible_way_first)
- _visible_way_first = wcurr;
- _visible_way_last = wcurr;
}
wcurr++;
}
}
- /* Now, draw the next waypoint on top of all other waypoints. */
- if(_next_way)
- {
- guint x1 = unit2bufx(_next_way->point->unitx);
- guint y1 = unit2bufy(_next_way->point->unity);
- if((x1 < BUF_WIDTH_PIXELS)
- && (y1 < BUF_HEIGHT_PIXELS))
- {
- gdk_draw_arc(_map_pixmap,
- _gc_route_nextway,
- FALSE, /* FALSE: not filled. */
- x1 - _draw_width,
- y1 - _draw_width,
- 2 * _draw_width,
- 2 * _draw_width,
- 0, /* start at 0 degrees. */
- 360 * 64);
- }
- }
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
printf("%s()\n", __PRETTY_FUNCTION__);
if((_show_tracks & ROUTES_MASK) && _route.head != _route.tail)
- map_render_route();
+ {
+ map_render_path(&_route, _gc + COLORABLE_ROUTE);
+
+ /* Now, draw the next waypoint on top of all other waypoints. */
+ if(_next_way)
+ {
+ guint x1 = unit2bufx(_next_way->point->unitx);
+ guint y1 = unit2bufy(_next_way->point->unity);
+ if((x1 < BUF_WIDTH_PIXELS)
+ && (y1 < BUF_HEIGHT_PIXELS))
+ {
+ /* Draw the next waypoint as a break. */
+ gdk_draw_arc(_map_pixmap,
+ _gc[COLORABLE_ROUTE_BREAK],
+ FALSE, /* FALSE: not filled. */
+ x1 - _draw_width,
+ y1 - _draw_width,
+ 2 * _draw_width,
+ 2 * _draw_width,
+ 0, /* start at 0 degrees. */
+ 360 * 64);
+ }
+ }
+ }
if(_show_tracks & TRACKS_MASK)
- map_render_track();
+ map_render_path(&_track, _gc + COLORABLE_TRACK);
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
*
* If a non-zero time is given, then the current position (as taken from the
* _pos variable) is appended to _track with the given time. If time is zero,
- * then _pos_null is appended to _track with time zero (this produces a "break"
+ * then _point_null is appended to _track with time zero (this produces a "break"
* in the track).
*/
static void
track_add(time_t time, gboolean newly_fixed)
{
gboolean show_directions = TRUE;
- Point pos = (time == 0 ? _pos_null : _pos);
- printf("%s(%u, %u)\n", __PRETTY_FUNCTION__, pos.unitx, pos.unity);
+ gint announce_thres_unsquared;
+ printf("%s(%u, %u)\n", __PRETTY_FUNCTION__, _pos.unitx, _pos.unity);
- if(abs((gint)pos.unitx - _track.tail->point.unitx) > _draw_width
- || abs((gint)pos.unity - _track.tail->point.unity) > _draw_width)
+ if(abs((gint)_pos.unitx - _track.tail->unitx) > _draw_width
+ || abs((gint)_pos.unity - _track.tail->unity) > _draw_width)
{
/* If time != 0, update the nearest-waypoint data. */
if(time && _route.head != _route.tail
/* Instead of calling map_render_paths(), we'll draw the new line
* ourselves and call gtk_widget_queue_draw_area(). */
gint tx1, ty1, tx2, ty2;
- map_render_segment(_gc_track, _gc_track_break,
- _track.tail->point.unitx, _track.tail->point.unity,
- pos.unitx, pos.unity);
- if(time && _track.tail->point.unity)
+ map_render_segment(_gc[COLORABLE_TRACK],
+ _gc[COLORABLE_TRACK_BREAK],
+ _track.tail->unitx, _track.tail->unity,
+ _pos.unitx, _pos.unity);
+ if(time && _track.tail->unity)
{
- tx1 = unit2x(_track.tail->point.unitx);
- ty1 = unit2y(_track.tail->point.unity);
- tx2 = unit2x(pos.unitx);
- ty2 = unit2y(pos.unity);
+ tx1 = unit2x(_track.tail->unitx);
+ ty1 = unit2y(_track.tail->unity);
+ tx2 = unit2x(_pos.unitx);
+ ty2 = unit2y(_pos.unity);
gtk_widget_queue_draw_area(_map_widget,
MIN(tx1, tx2) - _draw_width,
MIN(ty1, ty2) - _draw_width,
abs(ty1 - ty2) + (2 * _draw_width));
}
}
- MACRO_TRACK_INCREMENT_TAIL(_track);
+ MACRO_PATH_INCREMENT_TAIL(_track);
- _track.tail->point = pos;
- _track.tail->time = time;
- _track.tail->altitude = _gps.altitude;
+ if(time)
+ *_track.tail = _pos;
+ else
+ *_track.tail = _point_null;
if(_autoroute_data.enabled && !_autoroute_data.in_progress
&& _near_point_dist_squared > 400)
KEEP_DISPLAY_ON();
}
+ announce_thres_unsquared = (20 + (guint)_gps.speed)
+ * _announce_notice_ratio * 3;
/* Check if we should announce upcoming waypoints. */
if(show_directions && time && _next_way_dist_squared
- < (20 + (guint)_gps.speed) * _announce_notice_ratio * 3)
+ < (announce_thres_unsquared * announce_thres_unsquared))
{
if(_enable_voice && strcmp(_next_way->desc, _last_spoken_phrase))
{
}
static void
-track_insert_mark()
+track_insert_break()
{
printf("%s()\n", __PRETTY_FUNCTION__);
- if(_track.tail->point.unity)
+ if(_track.tail->unity)
{
guint x1, y1;
/* To mark a "waypoint" in a track, we'll add a (0, 0) point and then
* another instance of the most recent track point. */
- MACRO_TRACK_INCREMENT_TAIL(_track);
- *_track.tail = _track_null;
- MACRO_TRACK_INCREMENT_TAIL(_track);
+ MACRO_PATH_INCREMENT_TAIL(_track);
+ *_track.tail = _point_null;
+ MACRO_PATH_INCREMENT_TAIL(_track);
*_track.tail = _track.tail[-2];
/** Instead of calling map_render_paths(), we'll just add the waypoint
* ourselves. */
- x1 = unit2bufx(_track.tail->point.unitx);
- y1 = unit2bufy(_track.tail->point.unity);
+ x1 = unit2bufx(_track.tail->unitx);
+ y1 = unit2bufy(_track.tail->unity);
/* Make sure this circle will be visible. */
if((x1 < BUF_WIDTH_PIXELS)
&& ((unsigned)y1 < BUF_HEIGHT_PIXELS))
- gdk_draw_arc(_map_pixmap, _gc_track_break,
+ gdk_draw_arc(_map_pixmap, _gc[COLORABLE_TRACK_BREAK],
FALSE, /* FALSE: not filled. */
x1 - _draw_width,
y1 - _draw_width,
}
else
{
- MACRO_BANNER_SHOW_INFO(_window, _("Mark already inserted."));
+ MACRO_BANNER_SHOW_INFO(_window, _("Break already inserted."));
}
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
rcvr_connect_later(); /* Try again later. */
+ else
+ set_conn_state(RCVR_OFF);
gtk_widget_destroy(confirm);
return;
gint mybool = TRUE;
dbus_g_proxy_begin_call(
_rfcomm_req_proxy, BTCOND_RFCOMM_CONNECT_REQ,
- (DBusGProxyCallNotify)rcvr_connect_response, NULL, NULL,
+ (DBusGProxyCallNotify)rcvr_connect_response,
+ NULL, NULL,
G_TYPE_STRING, _rcvr_mac,
G_TYPE_STRING, "SPP",
G_TYPE_BOOLEAN, &mybool,
static void
update_gcs()
{
+ gint i;
printf("%s()\n", __PRETTY_FUNCTION__);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_mark);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_mark_velocity);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_mark_old);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_track);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_track_break);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_route);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_route_way);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_route_nextway);
- gdk_color_alloc(gtk_widget_get_colormap(_map_widget),
- &_color_poi);
-
- if(_gc_mark)
- {
- g_object_unref(_gc_mark);
- g_object_unref(_gc_mark_velocity);
- g_object_unref(_gc_mark_old);
- g_object_unref(_gc_track);
- g_object_unref(_gc_track_break);
- g_object_unref(_gc_route);
- g_object_unref(_gc_route_way);
- g_object_unref(_gc_route_nextway);
- g_object_unref(_gc_poi);
- }
-
- /* _gc_mark is used to draw the mark when data is current. */
- _gc_mark = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_mark, &_color_mark);
- gdk_gc_set_line_attributes(_gc_mark,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_mark_old is used to draw the mark when data is old. */
- _gc_mark_old = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_mark_old, &_color_mark_old);
- gdk_gc_set_line_attributes(_gc_mark_old,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_mark_velocity is used to draw the vel_current line. */
- _gc_mark_velocity = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_mark_velocity, &_color_mark_velocity);
- gdk_gc_set_line_attributes(_gc_mark_velocity,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_track is used to draw the track line. */
- _gc_track = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_track, &_color_track);
- gdk_gc_set_line_attributes(_gc_track,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_track_break is used to draw the track_insert_mark dots. */
- _gc_track_break = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_track_break, &_color_track_break);
- gdk_gc_set_line_attributes(_gc_track_break,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_route is used to draw the route line. */
- _gc_route = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_route, &_color_route);
- gdk_gc_set_line_attributes(_gc_route,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _way_gc is used to draw the waypoint dots. */
- _gc_route_way = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_route_way, &_color_route_way);
- gdk_gc_set_line_attributes(_gc_route_way,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_route_nextway is used to draw the next_way labels. */
- _gc_route_nextway = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_route_nextway, &_color_route_nextway);
- gdk_gc_set_line_attributes(_gc_route_nextway,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
-
- /* _gc_poi is used to draw the default POI icon. */
- _gc_poi = gdk_gc_new(_map_pixmap);
- gdk_gc_set_foreground(_gc_poi, &_color_poi);
- gdk_gc_set_background(_gc_poi, &_color_poi);
- gdk_gc_set_line_attributes(_gc_poi,
- _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
+ for(i = 0; i < COLORABLE_ENUM_COUNT; i++)
+ {
+ gdk_color_alloc(gtk_widget_get_colormap(_map_widget), &_color[i]);
+ if(_gc[i])
+ g_object_unref(_gc[i]);
+ _gc[i] = gdk_gc_new(_map_pixmap);
+ gdk_gc_set_foreground(_gc[i], &_color[i]);
+ gdk_gc_set_line_attributes(_gc[i],
+ _draw_width, GDK_LINE_SOLID, GDK_CAP_ROUND, GDK_JOIN_ROUND);
+ }
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
static void
config_save()
{
+ gchar *config_dir;
GConfClient *gconf_client = gconf_client_get_default();
gchar buffer[16];
printf("%s()\n", __PRETTY_FUNCTION__);
return;
}
+ /* Initialize config_dir. */
+ config_dir = gnome_vfs_expand_initial_tilde(CONFIG_DIR_NAME);
+ g_mkdir_with_parents(config_dir, 0700);
+
/* Save Receiver MAC from GConf. */
if(_rcvr_mac)
gconf_client_set_string(gconf_client,
gconf_client_unset(gconf_client,
GCONF_KEY_RCVR_MAC, NULL);
- /* Save Map Download URL Format. */
- gconf_client_set_string(gconf_client,
- GCONF_KEY_MAP_URI_FORMAT, _curr_repo->url, NULL);
-
- /* Save Map Download Zoom Steps. */
- gconf_client_set_int(gconf_client,
- GCONF_KEY_MAP_ZOOM_STEPS, _curr_repo->dl_zoom_steps, NULL);
-
- /* Save Map Cache Directory. */
- if(_curr_repo->cache_dir)
- gconf_client_set_string(gconf_client,
- GCONF_KEY_MAP_DIR_NAME, _curr_repo->cache_dir, NULL);
-
/* Save Auto-Download. */
gconf_client_set_bool(gconf_client,
GCONF_KEY_AUTO_DOWNLOAD, _auto_download, NULL);
gconf_client_set_string(gconf_client,
GCONF_KEY_UNITS, UNITS_TEXT[_units], NULL);
- /* Save Escape Key Function. */
- gconf_client_set_string(gconf_client,
- GCONF_KEY_ESCAPE_KEY, ESCAPE_KEY_TEXT[_escape_key], NULL);
+ /* Save Custom Key Actions. */
+ {
+ gint i;
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ gconf_client_set_string(gconf_client,
+ CUSTOM_KEY_GCONF[i],
+ CUSTOM_ACTION_TEXT[_action[i]], NULL);
+ }
/* Save Deg Format. */
gconf_client_set_string(gconf_client,
RepoData *rd = curr->data;
gchar buffer[BUFFER_SIZE];
snprintf(buffer, sizeof(buffer),
- "%s\t%s\t%s\t%d\t%d",
+ "%s\t%s\t%s\t%d\t%d\t%d\t%d",
rd->name,
rd->url,
rd->cache_dir,
rd->dl_zoom_steps,
- rd->view_zoom_steps);
+ rd->view_zoom_steps,
+ rd->double_size,
+ rd->nextable);
temp_list = g_slist_append(temp_list, g_strdup(buffer));
if(rd == _curr_repo)
gconf_client_set_int(gconf_client,
gconf_client_set_int(gconf_client,
GCONF_KEY_AUTOCENTER_MODE, _center_mode, NULL);
+ /* Save Show Scale flag. */
+ gconf_client_set_bool(gconf_client,
+ GCONF_KEY_SHOWSCALE, _show_scale, NULL);
+
/* Save Show Tracks flag. */
gconf_client_set_bool(gconf_client,
GCONF_KEY_SHOWTRACKS, _show_tracks & TRACKS_MASK, NULL);
GCONF_KEY_ROUTE_DL_RADIUS, _route_dl_radius, NULL);
/* Save Colors. */
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_mark.red >> 8,
- _color_mark.green >> 8,
- _color_mark.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_MARK, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_mark_velocity.red >> 8,
- _color_mark_velocity.green >> 8,
- _color_mark_velocity.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_MARK_VELOCITY, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_mark_old.red >> 8,
- _color_mark_old.green >> 8,
- _color_mark_old.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_MARK_OLD, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_track.red >> 8,
- _color_track.green >> 8,
- _color_track.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_TRACK, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_track_break.red >> 8,
- _color_track_break.green >> 8,
- _color_track_break.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_TRACK_BREAK, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_route.red >> 8,
- _color_route.green >> 8,
- _color_route.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_route_way.red >> 8,
- _color_route_way.green >> 8,
- _color_route_way.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE_WAY, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_route_nextway.red >> 8,
- _color_route_nextway.green >> 8,
- _color_route_nextway.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE_NEXTWAY, buffer, NULL);
-
- snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
- _color_poi.red >> 8,
- _color_poi.green >> 8,
- _color_poi.blue >> 8);
- gconf_client_set_string(gconf_client,
- GCONF_KEY_COLOR_POI, buffer, NULL);
+ {
+ gint i;
+ for(i = 0; i < COLORABLE_ENUM_COUNT; i++)
+ {
+ snprintf(buffer, sizeof(buffer), "#%02x%02x%02x",
+ _color[i].red >> 8,
+ _color[i].green >> 8,
+ _color[i].blue >> 8);
+ gconf_client_set_string(gconf_client,
+ COLORABLE_GCONF[i], buffer, NULL);
+ }
+ }
/* Save POI database. */
if(_poi_db)
gconf_client_set_int(gconf_client,
GCONF_KEY_POI_ZOOM, _poi_zoom, NULL);
- gconf_client_clear_cache(gconf_client);
- g_object_unref(gconf_client);
-
/* Save route. */
{
GnomeVFSHandle *handle;
gchar *route_file;
route_file = gnome_vfs_uri_make_full_from_relative(
- _config_dir_uri, CONFIG_FILE_ROUTE);
+ config_dir, CONFIG_FILE_ROUTE);
if(GNOME_VFS_OK == gnome_vfs_create(&handle, route_file,
GNOME_VFS_OPEN_WRITE, FALSE, 0600))
{
- write_route_gpx(handle);
+ write_gpx(&_route, handle);
gnome_vfs_close(handle);
}
g_free(route_file);
GnomeVFSHandle *handle;
gchar *track_file;
track_file = gnome_vfs_uri_make_full_from_relative(
- _config_dir_uri, CONFIG_FILE_TRACK);
+ config_dir, CONFIG_FILE_TRACK);
if(GNOME_VFS_OK == gnome_vfs_create(&handle, track_file,
GNOME_VFS_OPEN_WRITE, FALSE, 0600))
{
- write_track_gpx(handle);
+ write_gpx(&_track, handle);
gnome_vfs_close(handle);
}
g_free(track_file);
}
+ gconf_client_clear_cache(gconf_client);
+ g_object_unref(gconf_client);
+ g_free(config_dir);
+
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
return TRUE;
}
+typedef struct _KeysDialogInfo KeysDialogInfo;
+struct _KeysDialogInfo {
+ GtkWidget *cmb[CUSTOM_KEY_ENUM_COUNT];
+};
+
+static gboolean
+settings_dialog_hardkeys_reset(GtkWidget *widget, KeysDialogInfo *cdi)
+{
+ GtkWidget *confirm;
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ _("Reset all hardware keys to their original defaults?"));
+
+ if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
+ {
+ gint i;
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ gtk_combo_box_set_active(GTK_COMBO_BOX(cdi->cmb[i]),
+ CUSTOM_KEY_DEFAULT[i]);
+ }
+ gtk_widget_destroy(confirm);
+
+ vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
+static gboolean
+settings_dialog_hardkeys(GtkWidget *widget, GtkWidget *parent)
+{
+ gint i;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *label;
+ KeysDialogInfo bdi;
+ GtkWidget *btn_defaults;
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ dialog = gtk_dialog_new_with_buttons(_("Hardware Keys"),
+ GTK_WINDOW(parent), GTK_DIALOG_MODAL,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+ btn_defaults = gtk_button_new_with_label(_("Reset...")));
+ g_signal_connect(G_OBJECT(btn_defaults), "clicked",
+ G_CALLBACK(settings_dialog_hardkeys_reset), &bdi);
+
+ gtk_dialog_add_button(GTK_DIALOG(dialog),
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+ table = gtk_table_new(2, 9, FALSE), TRUE, TRUE, 0);
+
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ {
+ gint j;
+ gtk_table_attach(GTK_TABLE(table),
+ label = gtk_label_new(""),
+ 0, 1, i, i + 1, GTK_FILL, 0, 2, 1);
+ gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+ gtk_label_set_markup(GTK_LABEL(label), CUSTOM_KEY_ICON[i]);
+ gtk_table_attach(GTK_TABLE(table),
+ bdi.cmb[i] = gtk_combo_box_new_text(),
+ 1, 2, i, i + 1, GTK_FILL, 0, 2, 1);
+ for(j = 0; j < CUSTOM_ACTION_ENUM_COUNT; j++)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(bdi.cmb[i]),
+ CUSTOM_ACTION_TEXT[j]);
+ gtk_combo_box_set_active(GTK_COMBO_BOX(bdi.cmb[i]), _action[i]);
+ }
+
+ gtk_widget_show_all(dialog);
+
+OUTER_WHILE:
+ while(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog)))
+ {
+ /* Check for duplicates. */
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ {
+ gint j;
+ for(j = i + 1; j < CUSTOM_KEY_ENUM_COUNT; j++)
+ {
+ if(gtk_combo_box_get_active(GTK_COMBO_BOX(bdi.cmb[i]))
+ == gtk_combo_box_get_active(GTK_COMBO_BOX(bdi.cmb[j])))
+ {
+ GtkWidget *confirm;
+ gchar *buffer = g_strdup_printf("%s:\n %s\n%s",
+ _("The following action is mapped to multiple keys"),
+ CUSTOM_ACTION_TEXT[gtk_combo_box_get_active(
+ GTK_COMBO_BOX(bdi.cmb[i]))],
+ _("Continue?"));
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ buffer);
+
+ if(GTK_RESPONSE_OK != gtk_dialog_run(GTK_DIALOG(confirm)))
+ {
+ gtk_widget_destroy(confirm);
+ goto OUTER_WHILE;
+ }
+ gtk_widget_destroy(confirm);
+ }
+ }
+ }
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ _action[i] = gtk_combo_box_get_active(GTK_COMBO_BOX(bdi.cmb[i]));
+ break;
+ }
+
+ gtk_widget_destroy(dialog);
+
+ vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
typedef struct _ColorsDialogInfo ColorsDialogInfo;
struct _ColorsDialogInfo {
- GtkWidget *col_mark;
- GtkWidget *col_mark_velocity;
- GtkWidget *col_mark_old;
- GtkWidget *col_track;
- GtkWidget *col_track_break;
- GtkWidget *col_route;
- GtkWidget *col_route_way;
- GtkWidget *col_route_nextway;
- GtkWidget *col_poi;
+ GtkWidget *col[COLORABLE_ENUM_COUNT];
};
static gboolean
settings_dialog_colors_reset(GtkWidget *widget, ColorsDialogInfo *cdi)
{
+ GtkWidget *confirm;
printf("%s()\n", __PRETTY_FUNCTION__);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_mark),
- &DEFAULT_COLOR_MARK);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_mark_velocity),
- &DEFAULT_COLOR_MARK_VELOCITY);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_mark_old),
- &DEFAULT_COLOR_MARK_OLD);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_track),
- &DEFAULT_COLOR_TRACK);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_track_break),
- &DEFAULT_COLOR_TRACK_BREAK);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_route),
- &DEFAULT_COLOR_ROUTE);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_route_way),
- &DEFAULT_COLOR_ROUTE_WAY);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_route_nextway),
- &DEFAULT_COLOR_ROUTE_NEXTWAY);
- hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi->col_poi),
- &DEFAULT_COLOR_POI);
+
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ _("Reset all colors to their original defaults?"));
+
+ if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
+ {
+ gint i;
+ for(i = 0; i < COLORABLE_ENUM_COUNT; i++)
+ {
+ hildon_color_button_set_color(
+ HILDON_COLOR_BUTTON(cdi->col[i]),
+ &COLORABLE_DEFAULT[i]);
+ }
+ }
+ gtk_widget_destroy(confirm);
+
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return TRUE;
}
NULL);
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
- btn_defaults = gtk_button_new_with_label(_("Defaults")));
+ btn_defaults = gtk_button_new_with_label(_("Reset...")));
g_signal_connect(G_OBJECT(btn_defaults), "clicked",
G_CALLBACK(settings_dialog_colors_reset), &cdi);
gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
table = gtk_table_new(4, 3, FALSE), TRUE, TRUE, 0);
- /* Mark. */
+ /* GPS. */
gtk_table_attach(GTK_TABLE(table),
- label = gtk_label_new(_("GPS Mark")),
+ label = gtk_label_new(_("GPS")),
0, 1, 0, 1, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_mark = hildon_color_button_new(),
+ cdi.col[COLORABLE_MARK] = hildon_color_button_new(),
1, 2, 0, 1, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_mark), &_color_mark);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK]),
+ &_color[COLORABLE_MARK]);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_mark_velocity = hildon_color_button_new(),
+ cdi.col[COLORABLE_MARK_VELOCITY] = hildon_color_button_new(),
2, 3, 0, 1, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_mark_velocity), &_color_mark_velocity);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK_VELOCITY]),
+ &_color[COLORABLE_MARK_VELOCITY]);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_mark_old = hildon_color_button_new(),
+ cdi.col[COLORABLE_MARK_OLD] = hildon_color_button_new(),
3, 4, 0, 1, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_mark_old), &_color_mark_old);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK_OLD]),
+ &_color[COLORABLE_MARK_OLD]);
/* Track. */
gtk_table_attach(GTK_TABLE(table),
0, 1, 1, 2, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_track = hildon_color_button_new(),
+ cdi.col[COLORABLE_TRACK] = hildon_color_button_new(),
1, 2, 1, 2, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_track), &_color_track);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK]),
+ &_color[COLORABLE_TRACK]);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_track_break = hildon_color_button_new(),
+ cdi.col[COLORABLE_TRACK_MARK] = hildon_color_button_new(),
2, 3, 1, 2, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_track_break), &_color_track_break);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK_MARK]),
+ &_color[COLORABLE_TRACK_MARK]);
+ gtk_table_attach(GTK_TABLE(table),
+ cdi.col[COLORABLE_TRACK_BREAK] = hildon_color_button_new(),
+ 3, 4, 1, 2, 0, 0, 2, 4);
+ hildon_color_button_set_color(
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK_BREAK]),
+ &_color[COLORABLE_TRACK_BREAK]);
/* Route. */
gtk_table_attach(GTK_TABLE(table),
0, 1, 2, 3, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_route = hildon_color_button_new(),
+ cdi.col[COLORABLE_ROUTE] = hildon_color_button_new(),
1, 2, 2, 3, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_route), &_color_route);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE]),
+ &_color[COLORABLE_ROUTE]);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_route_way = hildon_color_button_new(),
+ cdi.col[COLORABLE_ROUTE_WAY] = hildon_color_button_new(),
2, 3, 2, 3, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_route_way), &_color_route_way);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE_WAY]),
+ &_color[COLORABLE_ROUTE_WAY]);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_route_nextway = hildon_color_button_new(),
+ cdi.col[COLORABLE_ROUTE_BREAK] = hildon_color_button_new(),
3, 4, 2, 3, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_route_nextway), &_color_route_nextway);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE_BREAK]),
+ &_color[COLORABLE_ROUTE_BREAK]);
/* POI. */
gtk_table_attach(GTK_TABLE(table),
0, 1, 3, 4, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
gtk_table_attach(GTK_TABLE(table),
- cdi.col_poi = hildon_color_button_new(),
+ cdi.col[COLORABLE_POI] = hildon_color_button_new(),
1, 2, 3, 4, 0, 0, 2, 4);
hildon_color_button_set_color(
- HILDON_COLOR_BUTTON(cdi.col_poi), &_color_poi);
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_POI]),
+ &_color[COLORABLE_POI]);
gtk_widget_show_all(dialog);
GdkColor *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_mark));
- _color_mark = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK]));
+ _color[COLORABLE_MARK] = *color;
+
+ color = hildon_color_button_get_color(
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK_VELOCITY]));
+ _color[COLORABLE_MARK_VELOCITY] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_mark_velocity));
- _color_mark_velocity = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_MARK_OLD]));
+ _color[COLORABLE_MARK_OLD] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_mark_old));
- _color_mark_old = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK]));
+ _color[COLORABLE_TRACK] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_track));
- _color_track = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK_MARK]));
+ _color[COLORABLE_TRACK_MARK] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_track_break));
- _color_track_break = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_TRACK_BREAK]));
+ _color[COLORABLE_TRACK_BREAK] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_route));
- _color_route = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE]));
+ _color[COLORABLE_ROUTE] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_route_way));
- _color_route_way = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE_WAY]));
+ _color[COLORABLE_ROUTE_WAY] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_route_nextway));
- _color_route_nextway = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_ROUTE_BREAK]));
+ _color[COLORABLE_ROUTE_BREAK] = *color;
color = hildon_color_button_get_color(
- HILDON_COLOR_BUTTON(cdi.col_poi));
- _color_poi = *color;
+ HILDON_COLOR_BUTTON(cdi.col[COLORABLE_POI]));
+ _color[COLORABLE_POI] = *color;
update_gcs();
break;
GtkWidget *num_draw_width;
GtkWidget *chk_always_keep_on;
GtkWidget *cmb_units;
- GtkWidget *cmb_escape_key;
GtkWidget *cmb_degformat;
GtkWidget *btn_scan;
+ GtkWidget *btn_buttons;
GtkWidget *btn_colors;
GtkWidget *txt_poi_db;
ossohelp_dialog_help_enable(
GTK_DIALOG(dialog), HELP_ID_SETTINGS, _osso);
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
+ btn_buttons = gtk_button_new_with_label(_("Hardware Keys...")));
+
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(dialog)->action_area),
btn_colors = gtk_button_new_with_label(_("Colors...")));
_("Keep Display On Only in Fullscreen Mode")),
0, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+ /* Information Font Size. */
gtk_table_attach(GTK_TABLE(table),
hbox = gtk_hbox_new(FALSE, 4),
0, 2, 2, 3, GTK_FILL, 0, 2, 4);
-
- /* Escape Key. */
gtk_box_pack_start(GTK_BOX(hbox),
- label = gtk_label_new(_("Escape Key")),
+ label = gtk_label_new(_("Information Font Size")),
FALSE, FALSE, 0);
- gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
gtk_box_pack_start(GTK_BOX(hbox),
- label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f),
- TRUE, TRUE, 0);
- gtk_container_add(GTK_CONTAINER(label),
- cmb_escape_key = gtk_combo_box_new_text());
- for(i = 0; i < ESCAPE_KEY_ENUM_COUNT; i++)
- gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_escape_key),
- ESCAPE_KEY_TEXT[i]);
+ cmb_info_font_size = gtk_combo_box_new_text(),
+ FALSE, FALSE, 0);
+ for(i = 0; i < INFO_FONT_ENUM_COUNT; i++)
+ gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_info_font_size),
+ INFO_FONT_TEXT[i]);
/* Misc. 2 page. */
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
/* Units. */
gtk_table_attach(GTK_TABLE(table),
- hbox = gtk_hbox_new(FALSE, 4),
- 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
- gtk_box_pack_start(GTK_BOX(hbox),
label = gtk_label_new(_("Units")),
- FALSE, FALSE, 0);
+ 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_box_pack_start(GTK_BOX(hbox),
- label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f),
- TRUE, TRUE, 0);
- gtk_container_add(GTK_CONTAINER(label),
- cmb_units = gtk_combo_box_new_text());
+ gtk_table_attach(GTK_TABLE(table),
+ cmb_units = gtk_combo_box_new_text(),
+ 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
for(i = 0; i < UNITS_ENUM_COUNT; i++)
gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_units), UNITS_TEXT[i]);
/* Degrees format */
gtk_table_attach(GTK_TABLE(table),
- hbox = gtk_hbox_new(FALSE, 4),
- 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
- gtk_box_pack_start(GTK_BOX(hbox),
label = gtk_label_new(_("Degrees Format")),
- FALSE, FALSE, 0);
+ 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_box_pack_start(GTK_BOX(hbox),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f),
- TRUE, TRUE, 0);
+ 1, 2, 1, 2, GTK_FILL, 0, 2, 4);
gtk_container_add(GTK_CONTAINER(label),
cmb_degformat = gtk_combo_box_new_text());
for(i = 0; i < DEG_FORMAT_ENUM_COUNT; i++)
gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_degformat),
DEG_FORMAT_TEXT[i]);
+ gtk_table_attach(GTK_TABLE(table),
+ gtk_label_new(""),
+ 2, 3, 0, 2, GTK_FILL | GTK_EXPAND, 0, 2, 4);
+
/* Speed warner. */
gtk_table_attach(GTK_TABLE(table),
hbox = gtk_hbox_new(FALSE, 4),
- 0, 2, 1, 2, GTK_FILL, 0, 2, 4);
+ 0, 3, 2, 3, GTK_FILL, 0, 2, 4);
gtk_box_pack_start(GTK_BOX(hbox),
chk_speed_limit_on = gtk_check_button_new_with_label(
gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_speed_location),
SPEED_LOCATION_TEXT[i]);
- /* Information Font Size. */
- gtk_table_attach(GTK_TABLE(table),
- hbox = gtk_hbox_new(FALSE, 4),
- 0, 2, 2, 3, GTK_FILL, 0, 2, 4);
- gtk_box_pack_start(GTK_BOX(hbox),
- label = gtk_label_new(_("Information Font Size")),
- FALSE, FALSE, 0);
- gtk_box_pack_start(GTK_BOX(hbox),
- cmb_info_font_size = gtk_combo_box_new_text(),
- FALSE, FALSE, 0);
- for(i = 0; i < INFO_FONT_ENUM_COUNT; i++)
- gtk_combo_box_append_text(GTK_COMBO_BOX(cmb_info_font_size),
- INFO_FONT_TEXT[i]);
-
/* POI page */
gtk_notebook_append_page(GTK_NOTEBOOK(notebook),
scan_info.txt_rcvr_mac = txt_rcvr_mac;
g_signal_connect(G_OBJECT(btn_scan), "clicked",
G_CALLBACK(scan_bluetooth), &scan_info);
+ g_signal_connect(G_OBJECT(btn_buttons), "clicked",
+ G_CALLBACK(settings_dialog_hardkeys), dialog);
g_signal_connect(G_OBJECT(btn_colors), "clicked",
G_CALLBACK(settings_dialog_colors), dialog);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk_always_keep_on),
!_always_keep_on);
gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_units), _units);
- gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_escape_key), _escape_key);
gtk_combo_box_set_active(GTK_COMBO_BOX(cmb_degformat), _degformat);
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(chk_speed_limit_on),
_speed_limit_on);
{
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(_menu_enable_gps_item), FALSE);
- popup_error(dialog, _("No GPS Receiver MAC Provided.\n"
- "GPS Disabled."));
+ popup_error(dialog, _("No GPS Receiver MAC provided.\n"
+ "GPS will be disabled."));
rcvr_changed = TRUE;
gtk_widget_set_sensitive(GTK_WIDGET(_menu_gps_details_item),
FALSE);
GTK_TOGGLE_BUTTON(chk_always_keep_on));
_units = gtk_combo_box_get_active(GTK_COMBO_BOX(cmb_units));
- _escape_key = gtk_combo_box_get_active(GTK_COMBO_BOX(cmb_escape_key));
_degformat = gtk_combo_box_get_active(GTK_COMBO_BOX(cmb_degformat));
_speed_limit_on = gtk_toggle_button_get_active(
static void
set_repo_type(RepoData *repo)
{
- gchar *url;
- printf("%s()\n", __PRETTY_FUNCTION__);
+ printf("%s(%s)\n", __PRETTY_FUNCTION__, repo->url);
- url = g_utf8_strdown(repo->url, -1);
+ if(repo->url && *repo->url)
+ {
+ gchar *url = g_utf8_strdown(repo->url, -1);
- /* Determine type of repository. */
- if(strstr(repo->url, "%s"))
- repo->type = REPOTYPE_QUAD_QRST;
- else if(strstr(repo->url, "%0s"))
- repo->type = REPOTYPE_QUAD_ZERO;
- else if(strstr(repo->url, "service=wms"))
- repo->type = REPOTYPE_WMS;
- else
- repo->type = REPOTYPE_XYZ;
+ /* Determine type of repository. */
+ if(strstr(url, "service=wms"))
+ repo->type = REPOTYPE_WMS;
+ else if(strstr(url, "%s"))
+ repo->type = REPOTYPE_QUAD_QRST;
+ else if(strstr(url, "%0d"))
+ repo->type = REPOTYPE_XYZ_INV;
+ else if(strstr(url, "%0s"))
+ repo->type = REPOTYPE_QUAD_ZERO;
+ else
+ repo->type = REPOTYPE_XYZ;
- g_free(url);
+ g_free(url);
+ }
+ else
+ repo->type = REPOTYPE_NONE;
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
* 4. dl_zoom_steps
* 5. view_zoom_steps
*/
- printf("%s()\n", __PRETTY_FUNCTION__);
- RepoData *rd = g_new(RepoData, 1);
- rd->name = g_strdup(strsep(&str, "\n\t"));
- rd->url = g_strdup(strsep(&str, "\n\t"));
- rd->cache_dir = g_strdup(strsep(&str, "\n\t"));
- if(!(rd->dl_zoom_steps = atoi(strsep(&str, "\n\t"))))
+ gchar *token, *error_check;
+ printf("%s(%s)\n", __PRETTY_FUNCTION__, str);
+
+ RepoData *rd = g_new0(RepoData, 1);
+
+ /* Parse name. */
+ token = strsep(&str, "\n\t");
+ if(token)
+ rd->name = g_strdup(token);
+
+ /* Parse URL format. */
+ token = strsep(&str, "\n\t");
+ if(token)
+ rd->url = g_strdup(token);
+
+ /* Parse cache dir. */
+ token = strsep(&str, "\n\t");
+ if(token)
+ rd->cache_dir = gnome_vfs_expand_initial_tilde(token);
+
+ /* Parse download zoom steps. */
+ token = strsep(&str, "\n\t");
+ if(!token || !*token || !(rd->dl_zoom_steps = atoi(token)))
rd->dl_zoom_steps = 2;
- if(!(rd->view_zoom_steps = atoi(strsep(&str, "\n\t"))))
+
+ /* Parse view zoom steps. */
+ token = strsep(&str, "\n\t");
+ if(!token || !*token || !(rd->view_zoom_steps = atoi(token)))
rd->view_zoom_steps = 1;
+
+ /* Parse double-size. */
+ token = strsep(&str, "\n\t");
+ if(token)
+ rd->double_size = atoi(token); /* Default is zero (FALSE) */
+
+ /* Parse next-able. */
+ token = strsep(&str, "\n\t");
+ if(!token || !*token
+ || (rd->nextable = strtol(token, &error_check, 10), token == str))
+ rd->nextable = TRUE;
+
set_repo_type(rd);
- vprintf("%s(): return %p\n", __PRETTY_FUNCTION__, rd);
- return rd;
+ vprintf("%s(): return %p\n", __PRETTY_FUNCTION__, rd);
+ return rd;
+}
+
+static gboolean
+repo_make_cache_dir(gchar *name, const gchar *cache_dir, GtkWidget *parent)
+{
+ printf("%s(%s)\n", __PRETTY_FUNCTION__, cache_dir);
+ if(g_mkdir_with_parents(cache_dir, 0755))
+ {
+ /* Failed to create Map Cache directory. */
+ gchar buffer[BUFFER_SIZE];
+ snprintf(buffer, sizeof(buffer), "%s: %s",
+ _("Unable to create cache directory for repository"),
+ name);
+ popup_error(parent, buffer);
+ vprintf("%s(): return FALSE\n", __PRETTY_FUNCTION__);
+ return FALSE;
+ }
+ vprintf("%s(): return %d\n", __PRETTY_FUNCTION__,
+ g_file_test(cache_dir, G_FILE_TEST_EXISTS));
+ return g_file_test(cache_dir, G_FILE_TEST_EXISTS);
+}
+
+static gboolean
+repo_set_curr(RepoData *rd)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+ _curr_repo = rd;
+ return repo_make_cache_dir(rd->name, rd->cache_dir, _window);
}
/**
{
GConfValue *value;
GConfClient *gconf_client = gconf_client_get_default();
+ gchar *config_dir;
gchar *str;
printf("%s()\n", __PRETTY_FUNCTION__);
exit(1);
}
- /* Initialize _config_dir. */
- {
- gchar *config_dir;
- config_dir = gnome_vfs_expand_initial_tilde(CONFIG_DIR_NAME);
- _config_dir_uri = gnome_vfs_make_uri_from_input(config_dir);
- gnome_vfs_make_directory(_config_dir_uri, 0700);
- g_free(config_dir);
- }
+ /* Initialize config_dir. */
+ config_dir = gnome_vfs_expand_initial_tilde(CONFIG_DIR_NAME);
+ g_mkdir_with_parents(config_dir, 0700);
/* Retrieve route. */
{
gint size;
route_file = gnome_vfs_uri_make_full_from_relative(
- _config_dir_uri, CONFIG_FILE_ROUTE);
+ config_dir, CONFIG_FILE_ROUTE);
if(GNOME_VFS_OK == gnome_vfs_read_entire_file(
route_file, &size, &bytes))
- parse_route_gpx(bytes, size, 0); /* 0 to replace route. */
+ parse_gpx(&_route, bytes, size, 0); /* 0 to replace route. */
g_free(route_file);
}
gint size;
track_file = gnome_vfs_uri_make_full_from_relative(
- _config_dir_uri, CONFIG_FILE_TRACK);
+ config_dir, CONFIG_FILE_TRACK);
if(GNOME_VFS_OK == gnome_vfs_read_entire_file(
track_file, &size, &bytes))
- parse_track_gpx(bytes, size, 0); /* 0 to replace track. */
+ parse_gpx(&_track, bytes, size, 0); /* 0 to replace track. */
g_free(track_file);
}
_units = i;
}
- /* Get Escape Key. Default is ESCAPE_KEY_TOGGLE_TRACKS. */
+ /* Get Custom Key Actions. */
{
- gchar *escape_key_str = gconf_client_get_string(gconf_client,
- GCONF_KEY_ESCAPE_KEY, NULL);
- guint i = 0;
- if(escape_key_str)
- for(i = ESCAPE_KEY_ENUM_COUNT - 1; i > 0; i--)
- if(!strcmp(escape_key_str, ESCAPE_KEY_TEXT[i]))
- break;
- _escape_key = i;
+ gint i;
+ for(i = 0; i < CUSTOM_KEY_ENUM_COUNT; i++)
+ {
+ gint j = CUSTOM_KEY_DEFAULT[i];
+ gchar *str = gconf_client_get_string(gconf_client,
+ CUSTOM_KEY_GCONF[i], NULL);
+ if(str)
+ for(j = CUSTOM_ACTION_ENUM_COUNT - 1; j > 0; j--)
+ if(!strcmp(str, CUSTOM_ACTION_TEXT[j]))
+ break;
+ _action[i] = j;
+ }
}
/* Get Deg format. Default is DDPDDDDD. */
_info_font_size = i;
}
- /* Get last saved latitude. Default is 0. */
- _gps.lat = gconf_client_get_float(gconf_client, GCONF_KEY_LAT, NULL);
+ /* Get last saved latitude. Default is 50.f. */
+ value = gconf_client_get(gconf_client, GCONF_KEY_LAT, NULL);
+ if(value)
+ {
+ _gps.lat = gconf_value_get_float(value);
+ gconf_value_free(value);
+ }
+ else
+ _gps.lat = 50.f;
- /* Get last saved longitude. Default is somewhere in Midwest. */
+ /* Get last saved longitude. Default is 0. */
value = gconf_client_get(gconf_client, GCONF_KEY_LON, NULL);
_gps.lon = gconf_client_get_float(gconf_client, GCONF_KEY_LON, NULL);
RepoData *rd = config_parse_repo(curr->data);
_repo_list = g_list_append(_repo_list, rd);
if(!curr_repo_index--)
- _curr_repo = rd;
+ repo_set_curr(rd);
g_free(curr->data);
}
g_slist_free(list);
/* Many fields can be retrieved from the "old" gconf keys. */
- /* Get Map Cache Dir. Default is ~/MyDocs/.documents/Maps. */
+ /* Get Map Cache Dir. Default is REPO_DEFAULT_CACHE_DIR. */
repo->cache_dir = gconf_client_get_string(gconf_client,
GCONF_KEY_MAP_DIR_NAME, NULL);
-
if(!repo->cache_dir)
repo->cache_dir = gnome_vfs_expand_initial_tilde(
- "~/MyDocs/.documents/Maps");
+ REPO_DEFAULT_CACHE_DIR);
/* Get Map Download URL Format. Default is "". */
repo->url = gconf_client_get_string(gconf_client,
GCONF_KEY_MAP_URI_FORMAT, NULL);
if(!repo->url)
- repo->url = g_strdup("");
+ repo->url=g_strdup(REPO_DEFAULT_MAP_URI);
/* Get Map Download Zoom Steps. Default is 2. */
repo->dl_zoom_steps = gconf_client_get_int(gconf_client,
GCONF_KEY_MAP_ZOOM_STEPS, NULL);
if(!repo->dl_zoom_steps)
- repo->dl_zoom_steps = 2;
+ repo->dl_zoom_steps = REPO_DEFAULT_DL_ZOOM_STEPS;
/* Other fields are brand new. */
- repo->name = g_strdup("Default");
- repo->view_zoom_steps = 1;
+ repo->name = g_strdup(REPO_DEFAULT_NAME);
+ repo->view_zoom_steps = REPO_DEFAULT_VIEW_ZOOM_STEPS;
+ repo->double_size = FALSE;
+ repo->nextable = TRUE;
set_repo_type(repo);
_repo_list = g_list_append(_repo_list, repo);
- _curr_repo = repo;
+ repo_set_curr(repo);
}
- /* Get last Zoom Level. Default is 16. */
+ /* Get last Zoom Level. Default is 12. */
value = gconf_client_get(gconf_client, GCONF_KEY_ZOOM, NULL);
if(value)
{
gconf_value_free(value);
}
else
- _zoom = 16 / _curr_repo->view_zoom_steps
+ _zoom = 12 / _curr_repo->view_zoom_steps
* _curr_repo->view_zoom_steps;
BOUND(_zoom, 0, MAX_ZOOM - 1);
_world_size_tiles = unit2tile(WORLD_SIZE_UNITS);
else
_center_mode = CENTER_LEAD;
+ /* Get Show Scale flag. Default is TRUE. */
+ value = gconf_client_get(gconf_client, GCONF_KEY_SHOWSCALE, NULL);
+ if(value)
+ {
+ _show_scale = gconf_value_get_bool(value);
+ gconf_value_free(value);
+ }
+ else
+ _show_scale = TRUE;
+
/* Get Show Tracks flag. Default is TRUE. */
value = gconf_client_get(gconf_client, GCONF_KEY_SHOWTRACKS, NULL);
if(value)
}
}
- /* Get POI Database. Default is in ~/MyDocs/.documents/Maps */
+ /* Get POI Database. Default is in REPO_DEFAULT_CACHE_BASE */
_poi_db = gconf_client_get_string(gconf_client,
GCONF_KEY_POI_DB, NULL);
if(_poi_db == NULL)
- _poi_db = gnome_vfs_make_uri_full_from_relative(
- _curr_repo->cache_dir, "poi.db");
+ {
+ gchar *poi_base = gnome_vfs_expand_initial_tilde(
+ REPO_DEFAULT_CACHE_BASE);
+ _poi_db = gnome_vfs_uri_make_full_from_relative(
+ poi_base, "poi.db");
+ g_free(poi_base);
+ }
db_connect();
_poi_zoom = gconf_client_get_int(gconf_client,
else
_route_dl_radius = 4;
- /* Initialize colors. */
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_MARK, NULL);
- if(!str || !gdk_color_parse(str, &_color_mark))
- _color_mark = DEFAULT_COLOR_MARK;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_MARK_VELOCITY, NULL);
- if(!str || !gdk_color_parse(str, &_color_mark_velocity))
- _color_mark_velocity = DEFAULT_COLOR_MARK_VELOCITY;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_MARK_OLD, NULL);
- if(!str || !gdk_color_parse(str, &_color_mark_old))
- _color_mark_old = DEFAULT_COLOR_MARK_OLD;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_TRACK, NULL);
- if(!str || !gdk_color_parse(str, &_color_track))
- _color_track = DEFAULT_COLOR_TRACK;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_TRACK_BREAK, NULL);
- if(!str || !gdk_color_parse(str, &_color_track_break))
- _color_track_break = DEFAULT_COLOR_TRACK_BREAK;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE, NULL);
- if(!str || !gdk_color_parse(str, &_color_route))
- _color_route = DEFAULT_COLOR_ROUTE;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE_WAY, NULL);
- if(!str || !gdk_color_parse(str, &_color_route_way))
- _color_route_way = DEFAULT_COLOR_ROUTE_WAY;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_ROUTE_NEXTWAY, NULL);
- if(!str || !gdk_color_parse(str, &_color_route_nextway))
- _color_route_nextway = DEFAULT_COLOR_ROUTE_NEXTWAY;
-
- str = gconf_client_get_string(gconf_client,
- GCONF_KEY_COLOR_POI, NULL);
- if(!str || !gdk_color_parse(str, &_color_poi))
- _color_poi = DEFAULT_COLOR_POI;
+ /* Get Colors. */
+ {
+ gint i;
+ for(i = 0; i < COLORABLE_ENUM_COUNT; i++)
+ {
+ str = gconf_client_get_string(gconf_client,
+ COLORABLE_GCONF[i], NULL);
+ if(!str || !gdk_color_parse(str, &_color[i]))
+ _color[i] = COLORABLE_DEFAULT[i];
+ }
+ }
/* Get current proxy settings. */
config_update_proxy();
gconf_client_clear_cache(gconf_client);
g_object_unref(gconf_client);
+ g_free(config_dir);
/* GPS data init */
_gps.fix = 1;
= gtk_menu_item_new_with_label(_("Open...")));
gtk_menu_append(submenu, _menu_track_save_item
= gtk_menu_item_new_with_label(_("Save...")));
+ gtk_menu_append(submenu, _menu_track_insert_break_item
+ = gtk_menu_item_new_with_label(_("Insert Break")));
gtk_menu_append(submenu, _menu_track_insert_mark_item
- = gtk_menu_item_new_with_label(_("Insert Mark")));
+ = gtk_menu_item_new_with_label(_("Insert Mark...")));
gtk_menu_append(submenu, _menu_track_distlast_item
= gtk_menu_item_new_with_label(_("Show Distance from Last Mark")));
gtk_menu_append(submenu, _menu_track_distfirst_item
= gtk_menu_item_new_with_label(_("View")));
gtk_menu_item_set_submenu(GTK_MENU_ITEM(menu_item),
submenu = gtk_menu_new());
+ gtk_menu_append(submenu, _menu_zoomin_item
+ = gtk_menu_item_new_with_label(_("Zoom In")));
+ gtk_menu_append(submenu, _menu_zoomout_item
+ = gtk_menu_item_new_with_label(_("Zoom Out")));
gtk_menu_append(submenu, _menu_fullscreen_item
= gtk_check_menu_item_new_with_label(_("Full Screen")));
gtk_check_menu_item_set_active(
GTK_CHECK_MENU_ITEM(_menu_fullscreen_item), _fullscreen);
+ gtk_menu_append(submenu, gtk_separator_menu_item_new());
+ gtk_menu_append(submenu, _menu_show_scale_item
+ = gtk_check_menu_item_new_with_label(_("Scale")));
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_scale_item),
+ _show_scale);
gtk_menu_append(submenu, _menu_show_routes_item
= gtk_check_menu_item_new_with_label(_("Route")));
gtk_check_menu_item_set_active(
= gtk_menu_item_new_with_label(_("Settings...")));
gtk_menu_append(menu, gtk_separator_menu_item_new());
gtk_menu_append(menu, _menu_help_item
- = gtk_menu_item_new_with_label(_("Help")));
+ = gtk_menu_item_new_with_label(_("Help...")));
+ gtk_menu_append(menu, _menu_about_item
+ = gtk_menu_item_new_with_label(_("About...")));
gtk_menu_append(menu, _menu_close_item
= gtk_menu_item_new_with_label(_("Close")));
G_CALLBACK(menu_cb_track_open), NULL);
g_signal_connect(G_OBJECT(_menu_track_save_item), "activate",
G_CALLBACK(menu_cb_track_save), NULL);
+ g_signal_connect(G_OBJECT(_menu_track_insert_break_item), "activate",
+ G_CALLBACK(menu_cb_track_insert_break), NULL);
g_signal_connect(G_OBJECT(_menu_track_insert_mark_item), "activate",
G_CALLBACK(menu_cb_track_insert_mark), NULL);
g_signal_connect(G_OBJECT(_menu_track_distlast_item), "activate",
G_CALLBACK(menu_cb_mapman), NULL);
/* Connect the "View" signals. */
+ g_signal_connect(G_OBJECT(_menu_zoomin_item), "activate",
+ G_CALLBACK(menu_cb_zoomin), NULL);
+ g_signal_connect(G_OBJECT(_menu_zoomout_item), "activate",
+ G_CALLBACK(menu_cb_zoomout), NULL);
g_signal_connect(G_OBJECT(_menu_fullscreen_item), "toggled",
G_CALLBACK(menu_cb_fullscreen), NULL);
g_signal_connect(G_OBJECT(_menu_show_tracks_item), "toggled",
G_CALLBACK(menu_cb_show_tracks), NULL);
+ g_signal_connect(G_OBJECT(_menu_show_scale_item), "toggled",
+ G_CALLBACK(menu_cb_show_scale), NULL);
g_signal_connect(G_OBJECT(_menu_show_routes_item), "toggled",
G_CALLBACK(menu_cb_show_routes), NULL);
g_signal_connect(G_OBJECT(_menu_show_velvec_item), "toggled",
G_CALLBACK(menu_cb_settings), NULL);
g_signal_connect(G_OBJECT(_menu_help_item), "activate",
G_CALLBACK(menu_cb_help), NULL);
+ g_signal_connect(G_OBJECT(_menu_about_item), "activate",
+ G_CALLBACK(menu_cb_about), NULL);
g_signal_connect(G_OBJECT(_menu_close_item), "activate",
G_CALLBACK(gtk_main_quit), NULL);
/* Set connection state first, to avoid going into this if twice. */
if(!_rcvr_mac && _enable_gps)
{
+ GtkWidget *confirm;
+
+ gtk_window_present(GTK_WINDOW(_window));
+
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ _("It looks like this is your first time running"
+ " Maemo Mapper. Press OK to view the the help pages."
+ " Otherwise, press Cancel to continue."));
+
+ if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
+ ossohelp_show(_osso, HELP_ID_INTRO, 0);
+ gtk_widget_destroy(confirm);
if(settings_dialog())
{
popup_error(_window,
- _("Now you must set up at least one Map Repository. "
- "You can download a sample set from the internet "
- "by using the \"Download...\" button."));
+ _("OpenStreetMap.org provides public, free-to-use maps. "
+ "You can also download a sample set of repositories from "
+ " the internet by using the \"Download...\" button."));
repoman_dialog();
+ if(_curr_repo->type != REPOTYPE_NONE)
+ {
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ _("You will now see a blank screen. You can download"
+ " maps using the \"Manage Maps\" menu item in the"
+ " \"Maps\" menu. Or, press OK to enable"
+ " Auto-Download."));
+ if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
+ {
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_auto_download_item),
+ TRUE);
+ }
+ gtk_widget_destroy(confirm);
+ }
}
else
gtk_main_quit();
gdk_draw_arc(
_map_widget->window,
- _conn_state == RCVR_FIXED ? _gc_mark : _gc_mark_old,
+ _conn_state == RCVR_FIXED
+ ? _gc[COLORABLE_MARK] : _gc[COLORABLE_MARK_OLD],
FALSE, /* not filled. */
_mark_x1 - _draw_width, _mark_y1 - _draw_width,
2 * _draw_width, 2 * _draw_width,
gdk_draw_line(
_map_widget->window,
_conn_state == RCVR_FIXED
- ? (_show_velvec ? _gc_mark_velocity : _gc_mark)
- : _gc_mark_old,
+ ? (_show_velvec
+ ? _gc[COLORABLE_MARK_VELOCITY] : _gc[COLORABLE_MARK])
+ : _gc[COLORABLE_MARK_OLD],
_mark_x1, _mark_y1, _mark_x2, _mark_y2);
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
static gchar*
map_convert_wms_to_wms(gint tilex, gint tiley, gint zoomlevel, gchar* uri)
{
+ gint system_retcode;
gchar cmd[BUFFER_SIZE], srs[BUFFER_SIZE];
gchar *ret = NULL;
FILE* in;
"/usr/bin/cs2cs +proj=longlat +datum=WGS84 +to +init=%s -f %%.6f "
" > /tmp/tmpcs2cs ",
lon1, lat1, lon2, lat2, srs);
- system(cmd);
+ vprintf("Running command: %s\n", cmd);
+ system_retcode = system(cmd);
- if(!(in = g_fopen("/tmp/tmpcs2cs","r")))
+ if(system_retcode)
+ g_printerr("cs2cs returned error code %d\n",
+ WEXITSTATUS(system_retcode));
+ else if(!(in = g_fopen("/tmp/tmpcs2cs","r")))
g_printerr("Cannot open results of conversion\n");
else if(5 != fscanf(in,"%f %f %s %f %f", &lon1, &lat1, cmd, &lon2, &lat2))
{
setlocale(LC_NUMERIC, "");
- vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+ vprintf("%s(): return %s\n", __PRETTY_FUNCTION__, ret);
return ret;
}
case REPOTYPE_XYZ:
return g_strdup_printf(_curr_repo->url, tilex, tiley, zoom);
+ case REPOTYPE_XYZ_INV:
+ return g_strdup_printf(_curr_repo->url, 17 - zoom, tilex, tiley);
+
case REPOTYPE_QUAD_QRST:
{
gchar location[MAX_ZOOM + 2];
case REPOTYPE_WMS:
return map_convert_wms_to_wms(tilex, tiley, zoom, _curr_repo->url);
+
+ default:
+ return NULL;
}
vprintf("%s(): ERROR\n", __PRETTY_FUNCTION__);
return "";
{
/* No icon for POI or for category - draw default. */
error = NULL;
- gdk_draw_rectangle(_map_pixmap, _gc_poi, TRUE,
+ gdk_draw_rectangle(_map_pixmap, _gc[COLORABLE_POI], TRUE,
poix - (gint)(1.5f * _draw_width),
poiy - (gint)(1.5f * _draw_width),
3 * _draw_width,
{
gdk_draw_pixbuf(
_map_pixmap,
- _gc_poi,
+ _gc[COLORABLE_POI],
pixbuf,
0, 0,
poix - gdk_pixbuf_get_width(pixbuf) / 2,
static void
map_render_tile(guint tilex, guint tiley, guint destx, guint desty,
- gboolean fast_fail) {
- gchar buffer[BUFFER_SIZE];
+ gboolean fast_fail)
+{
GdkPixbuf *pixbuf = NULL;
- GError *error = NULL;
- guint zoff;
if(tilex < _world_size_tiles && tiley < _world_size_tiles)
{
/* The tile is possible. */
+ gchar buffer[BUFFER_SIZE];
+ GError *error = NULL;
+ gint zoff;
vprintf("%s(%u, %u, %u, %u)\n", __PRETTY_FUNCTION__,
tilex, tiley, destx, desty);
- snprintf(buffer, sizeof(buffer), "%s/%u/%u/%u.jpg",
- _curr_repo->cache_dir, _zoom, tilex, tiley);
- pixbuf = gdk_pixbuf_new_from_file(buffer, &error);
-
- if(error)
- {
- pixbuf = NULL;
- error = NULL;
- }
-
- if(!pixbuf && !fast_fail && _auto_download && *_curr_repo->url
- && !(_zoom % _curr_repo->dl_zoom_steps))
- {
- map_initiate_download(tilex, tiley, _zoom,
- -INITIAL_DOWNLOAD_RETRIES);
- fast_fail = TRUE;
- }
- /* Check if we need to trim. */
- else if(pixbuf && (gdk_pixbuf_get_width(pixbuf) != TILE_SIZE_PIXELS
- || gdk_pixbuf_get_height(pixbuf) != TILE_SIZE_PIXELS))
- pixbuf = pixbuf_trim(pixbuf);
- for(zoff = 1; !pixbuf && (_zoom + zoff) <= MAX_ZOOM
- && zoff <= TILE_SIZE_P2; zoff += 1)
+ for(zoff = (_curr_repo->double_size ? 1 : 0);
+ !pixbuf && (_zoom + zoff) <= MAX_ZOOM && zoff <= TILE_SIZE_P2;
+ zoff += 1)
{
- /* Attempt to blit a wider map. */
snprintf(buffer, sizeof(buffer), "%s/%u/%u/%u.jpg",
- _curr_repo->cache_dir, _zoom + zoff,
- (tilex >> zoff), (tiley >> zoff));
+ _curr_repo->cache_dir,
+ _zoom + zoff,
+ (tilex >> zoff),
+ (tiley >> zoff));
pixbuf = gdk_pixbuf_new_from_file(buffer, &error);
- if(error)
+ if(error || !pixbuf)
{
+ g_unlink(buffer); /* Delete so we try again some other day. */
pixbuf = NULL;
error = NULL;
+
+ /* Download, if we should. */
+ if(_auto_download && _curr_repo->type != REPOTYPE_NONE
+ && !((_zoom + zoff - (_curr_repo->double_size ? 1 : 0))
+ % _curr_repo->dl_zoom_steps))
+ {
+ if(!fast_fail)
+ map_initiate_download(
+ tilex >> zoff, tiley >> zoff, _zoom + zoff,
+ -INITIAL_DOWNLOAD_RETRIES);
+ fast_fail = TRUE;
+ }
}
- if(pixbuf)
+ else
{
/* Check if we need to trim. */
if(gdk_pixbuf_get_width(pixbuf) != TILE_SIZE_PIXELS
|| gdk_pixbuf_get_height(pixbuf) != TILE_SIZE_PIXELS)
pixbuf = pixbuf_trim(pixbuf);
- map_pixbuf_scale_inplace(pixbuf, zoff,
+ /* Check if we need to blit. */
+ if(zoff)
+ map_pixbuf_scale_inplace(pixbuf, zoff,
(tilex - ((tilex>>zoff) << zoff)) << (TILE_SIZE_P2-zoff),
(tiley - ((tiley>>zoff) << zoff)) << (TILE_SIZE_P2-zoff));
}
- else
- {
- if(_auto_download && *_curr_repo->url
- && !((_zoom + zoff) % _curr_repo->dl_zoom_steps))
- {
- if(!fast_fail)
- map_initiate_download(
- tilex >> zoff, tiley >> zoff, _zoom + zoff,
- -INITIAL_DOWNLOAD_RETRIES);
- fast_fail = TRUE;
- }
- }
}
}
if(pixbuf)
{
gdk_draw_pixbuf(
_map_pixmap,
- _gc_mark,
+ _gc[COLORABLE_MARK],
pixbuf,
0, 0,
destx, desty,
static gboolean
map_download_idle_refresh(ProgressUpdateInfo *pui)
{
- vprintf("%s(%p)\n", __PRETTY_FUNCTION__, pui);
+ vprintf("%s(%p, %s)\n", __PRETTY_FUNCTION__, pui, pui->src_str);
/* Test if download succeeded (only if retries != 0). */
if(!pui->retries || g_file_test(pui->dest_str, G_FILE_TEST_EXISTS))
{
/* This is the autoroute download. */
/* Now, parse the autoroute and update the display. */
- if(_autoroute_data.enabled && parse_route_gpx(
+ if(_autoroute_data.enabled && parse_gpx(&_route,
_autoroute_data.rdl_data.bytes,
_autoroute_data.rdl_data.bytes_read, 0))
{
pui->dest_str = g_strdup_printf("%s/%u/%u/%u.jpg",
pui->repo->cache_dir, pui->zoom, pui->tilex, pui->tiley);
+ if(!pui->src_str)
+ {
+ /* Failed to generate URL. */
+ g_idle_add_full(G_PRIORITY_HIGH_IDLE,
+ (GSourceFunc)map_download_idle_refresh, pui, NULL);
+ continue;
+ }
+
/* Check to see if we need to overwrite. */
if(pui->retries > 0)
{
{
/* Directory doesn't exist yet - create it, then we'll retry */
gchar buffer[BUFFER_SIZE];
- snprintf(buffer, sizeof(buffer), "%s/%u",
- pui->repo->cache_dir, pui->zoom);
- gnome_vfs_make_directory(buffer, 0775);
snprintf(buffer, sizeof(buffer), "%s/%u/%u",
pui->repo->cache_dir, pui->zoom, pui->tilex);
- gnome_vfs_make_directory(buffer, 0775);
+ g_mkdir_with_parents(buffer, 0775);
f = g_fopen(pui->dest_str, "w");
}
/* Copy from old buffer to new buffer. */
gdk_draw_drawable(
_map_pixmap,
- _gc_mark,
+ _gc[COLORABLE_MARK],
_map_pixmap,
old_x * TILE_SIZE_PIXELS,
old_y * TILE_SIZE_PIXELS,
_db = NULL;
}
- MACRO_FREE_TRACK(_track);
- MACRO_FREE_ROUTE(_route);
+ MACRO_PATH_FREE(_track);
+ MACRO_PATH_FREE(_route);
/* Clean up CURL. */
if(_curl_multi)
maemo_mapper_init(gint argc, gchar **argv)
{
GtkWidget *hbox, *label, *vbox;
+ GdkColor color;
printf("%s()\n", __PRETTY_FUNCTION__);
/* Set enum-based constants. */
INFO_FONT_TEXT[INFO_FONT_XLARGE] = "x-large";
INFO_FONT_TEXT[INFO_FONT_XXLARGE] = "xx-large";
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TOGGLE_TRACKS] = _("Toggle Tracks");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TOGGLE_POI] = _("Toggle POIs");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_CHANGE_REPO] = _("Select Next Repository");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_ROUTE_DISTNEXT]
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_UP] = GCONF_KEY_PREFIX"/key_up";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_DOWN] = GCONF_KEY_PREFIX"/key_down";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_LEFT] = GCONF_KEY_PREFIX"/key_left";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_RIGHT] = GCONF_KEY_PREFIX"/key_right";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_SELECT] = GCONF_KEY_PREFIX"/key_select";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_INCREASE] = GCONF_KEY_PREFIX"/key_increase";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_DECREASE] = GCONF_KEY_PREFIX"/key_decrease";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_FULLSCREEN]= GCONF_KEY_PREFIX"/key_fullscreen";
+ CUSTOM_KEY_GCONF[CUSTOM_KEY_ESC] = GCONF_KEY_PREFIX"/key_esc";
+
+ CUSTOM_KEY_ICON[CUSTOM_KEY_UP] = HWK_BUTTON_UP;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_LEFT] = HWK_BUTTON_LEFT;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_DOWN] = HWK_BUTTON_DOWN;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_RIGHT] = HWK_BUTTON_RIGHT;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_SELECT] = HWK_BUTTON_SELECT;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_INCREASE] = HWK_BUTTON_INCREASE;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_DECREASE] = HWK_BUTTON_DECREASE;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_FULLSCREEN] = HWK_BUTTON_VIEW;
+ CUSTOM_KEY_ICON[CUSTOM_KEY_ESC] = HWK_BUTTON_CANCEL;
+
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_UP] = CUSTOM_ACTION_PAN_NORTH;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_LEFT] = CUSTOM_ACTION_PAN_WEST;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_DOWN] = CUSTOM_ACTION_PAN_SOUTH;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_RIGHT] = CUSTOM_ACTION_PAN_EAST;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_SELECT] = CUSTOM_ACTION_TOGGLE_AUTOCENTER;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_INCREASE] = CUSTOM_ACTION_ZOOM_IN;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_DECREASE] = CUSTOM_ACTION_ZOOM_OUT;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_FULLSCREEN]= CUSTOM_ACTION_TOGGLE_FULLSCREEN;
+ CUSTOM_KEY_DEFAULT[CUSTOM_KEY_ESC] = CUSTOM_ACTION_TOGGLE_TRACKS;
+
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_PAN_NORTH] = _("Pan North");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_PAN_WEST] = _("Pan West");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_PAN_SOUTH] = _("Pan South");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_PAN_EAST] = _("Pan East");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_AUTOCENTER]
+ = _("Toggle Auto-Center");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_FULLSCREEN]
+ = _("Toggle Fullscreen");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_ZOOM_IN] = _("Zoom In");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_ZOOM_OUT] = _("Zoom Out");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_TRACKS] = _("Toggle Tracks");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_SCALE] = _("Toggle Scale");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_POI] = _("Toggle POIs");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_CHANGE_REPO]= _("Select Next Repository");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_ROUTE_DISTNEXT]
= _("Show Distance to Next Waypoint");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_ROUTE_DISTLAST]
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_ROUTE_DISTLAST]
= _("Show Distance to End of Route");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TRACK_WAYPOINT] = _("Insert Track Mark");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TRACK_DISTLAST]
- = _("Show Distance from Last Mark");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TRACK_DISTFIRST]
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TRACK_BREAK] = _("Insert Track Break");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TRACK_DISTLAST]
+ = _("Show Distance from Last Break");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TRACK_DISTFIRST]
= _("Show Distance from Beginning");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TOGGLE_GPS] = _("Toggle GPS");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TOGGLE_GPSINFO] = _("Toggle GPS Info");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_TOGGLE_SPEEDLIMIT] = _("Toggle Speed Limit");
- ESCAPE_KEY_TEXT[ESCAPE_KEY_RESET_BLUETOOTH] = _("Reset Bluetooth");
-
- DEG_FORMAT_TEXT[DDPDDDDD] = "dd.ddddd°";
- DEG_FORMAT_TEXT[DD_MMPMMM] = "dd°mm.mmm'";
- DEG_FORMAT_TEXT[DD_MM_SSPS] = "dd°mm'ss.s\"";
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_GPS] = _("Toggle GPS");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_GPSINFO] = _("Toggle GPS Info");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_TOGGLE_SPEEDLIMIT]
+ = _("Toggle Speed Limit");
+ CUSTOM_ACTION_TEXT[CUSTOM_ACTION_RESET_BLUETOOTH] = _("Reset Bluetooth");
+
+ COLORABLE_GCONF[COLORABLE_MARK] = GCONF_KEY_PREFIX"/color_mark";
+ COLORABLE_GCONF[COLORABLE_MARK_VELOCITY]
+ = GCONF_KEY_PREFIX"/color_mark_velocity";
+ COLORABLE_GCONF[COLORABLE_MARK_OLD] = GCONF_KEY_PREFIX"/color_mark_old";
+ COLORABLE_GCONF[COLORABLE_TRACK] = GCONF_KEY_PREFIX"/color_track";
+ COLORABLE_GCONF[COLORABLE_TRACK_MARK] = GCONF_KEY_PREFIX"/color_track_mark";
+ COLORABLE_GCONF[COLORABLE_TRACK_BREAK]
+ = GCONF_KEY_PREFIX"/color_track_break";
+ COLORABLE_GCONF[COLORABLE_ROUTE] = GCONF_KEY_PREFIX"/color_route";
+ COLORABLE_GCONF[COLORABLE_ROUTE_WAY] = GCONF_KEY_PREFIX"/color_route_way";
+ COLORABLE_GCONF[COLORABLE_ROUTE_BREAK]
+ = GCONF_KEY_PREFIX"/color_route_break";
+ COLORABLE_GCONF[COLORABLE_POI] = GCONF_KEY_PREFIX"/color_poi";
+
+ DEG_FORMAT_TEXT[DDPDDDDD] = "-dd.ddddd°";
+ DEG_FORMAT_TEXT[DD_MMPMMM] = "-dd°mm.mmm'";
+ DEG_FORMAT_TEXT[DD_MM_SSPS] = "-dd°mm'ss.s\"";
+ DEG_FORMAT_TEXT[DDPDDDDD_NSEW] = "dd.ddddd° S";
+ DEG_FORMAT_TEXT[DD_MMPMMM_NSEW] = "dd°mm.mmm' S";
+ DEG_FORMAT_TEXT[DD_MM_SSPS_NSEW] = "dd°mm'ss.s\" S";
SPEED_LOCATION_TEXT[SPEED_LOCATION_TOP_LEFT] = _("Top-Left");
SPEED_LOCATION_TEXT[SPEED_LOCATION_TOP_RIGHT] = _("Top-Right");
/* Set up track array (must be done before config). */
memset(&_track, 0, sizeof(_track));
memset(&_route, 0, sizeof(_route));
- MACRO_INIT_TRACK(_track);
- MACRO_INIT_ROUTE(_route);
+ MACRO_PATH_INIT(_track);
+ MACRO_PATH_INIT(_route);
config_init();
/* Initialize data. */
+ /* Cache some pango and GCs for drawing. */
+ _scale_context = gtk_widget_get_pango_context(_map_widget);
+ _scale_layout = pango_layout_new(_scale_context);
+ _scale_font = pango_font_description_new();
+ pango_font_description_set_size(_scale_font, 12 * PANGO_SCALE);
+ pango_layout_set_font_description(_scale_layout, _scale_font);
+
+ /* speed limit */
+ _speed_limit_gc1 = gdk_gc_new (_map_widget->window);
+ color.red = 0xffff;
+ color.green = 0;
+ color.blue = 0;
+ gdk_gc_set_rgb_fg_color(_speed_limit_gc1, &color);
+ color.red = 0;
+ color.green = 0;
+ color.blue = 0;
+ _speed_limit_gc2 = gdk_gc_new(_map_widget->window);
+ gdk_gc_set_rgb_fg_color(_speed_limit_gc2, &color);
+ _speed_limit_context = gtk_widget_get_pango_context(_map_widget);
+ _speed_limit_layout = pango_layout_new(_speed_limit_context);
+ _speed_limit_fontdesc = pango_font_description_new();
+ pango_font_description_set_size(_speed_limit_fontdesc, 64 * PANGO_SCALE);
+ pango_layout_set_font_description(_speed_limit_layout,
+ _speed_limit_fontdesc);
+ pango_layout_set_alignment(_speed_limit_layout, PANGO_ALIGN_CENTER);
+
+ /* draw_sat_info() */
+ _sat_info_gc1 = gdk_gc_new(_map_widget->window);
+ color.red = 0;
+ color.green = 0;
+ color.blue = 0;
+ gdk_gc_set_rgb_fg_color(_sat_info_gc1, &color);
+ color.red = 0;
+ color.green = 0;
+ color.blue = 0xffff;
+ _sat_info_gc2 = gdk_gc_new(_map_widget->window);
+ gdk_gc_set_rgb_fg_color(_sat_info_gc2, &color);
+ _sat_info_context = gtk_widget_get_pango_context(_map_widget);
+ _sat_info_layout = pango_layout_new(_sat_info_context);
+ _sat_info_fontdesc = pango_font_description_new();
+ pango_font_description_set_family(_sat_info_fontdesc,"Sans Serif");
+ pango_font_description_set_size(_sat_info_fontdesc, 8*PANGO_SCALE);
+ pango_layout_set_font_description(_sat_info_layout, _sat_info_fontdesc);
+ pango_layout_set_alignment(_sat_info_layout, PANGO_ALIGN_CENTER);
+
+ /* sat_panel_expose() */
+ _sat_panel_context = gtk_widget_get_pango_context(_map_widget);
+ _sat_panel_layout = pango_layout_new(_sat_panel_context);
+ _sat_panel_fontdesc = pango_font_description_new();
+ pango_font_description_set_family(_sat_panel_fontdesc,"Sans Serif");
+ pango_font_description_set_size(_sat_panel_fontdesc, 14*PANGO_SCALE);
+ pango_layout_set_font_description (_sat_panel_layout, _sat_panel_fontdesc);
+
+ /* heading_panel_expose() */
+ _heading_panel_context = gtk_widget_get_pango_context(_map_widget);
+ _heading_panel_layout = pango_layout_new(_heading_panel_context);
+ _heading_panel_fontdesc = pango_font_description_new();
+ pango_font_description_set_family(_heading_panel_fontdesc,"Sans Serif");
+
+ /* draw_sat_details() */
+ _sat_details_context = gtk_widget_get_pango_context(_map_widget);
+ _sat_details_layout = pango_layout_new(_sat_details_context);
+ _sat_details_fontdesc = pango_font_description_new();
+
+ pango_font_description_set_family(_sat_details_fontdesc,"Sans Serif");
+ pango_font_description_set_size(_sat_details_fontdesc, 10*PANGO_SCALE);
+ pango_layout_set_font_description(_sat_details_layout,
+ _sat_details_fontdesc);
+ pango_layout_set_alignment(_sat_details_layout, PANGO_ALIGN_CENTER);
+
+ /* sat_details_panel_expose() */
+ _sat_details_expose_context = gtk_widget_get_pango_context(_map_widget);
+ _sat_details_expose_layout = pango_layout_new(_sat_details_expose_context);
+ _sat_details_expose_fontdesc = pango_font_description_new();
+ pango_font_description_set_family(
+ _sat_details_expose_fontdesc,"Sans Serif");
+ pango_layout_set_alignment(_sat_details_expose_layout,
+ PANGO_ALIGN_CENTER);
+ pango_font_description_set_size(_sat_details_expose_fontdesc,
+ 14*PANGO_SCALE);
+ pango_layout_set_font_description(_sat_details_expose_layout,
+ _sat_details_expose_fontdesc);
+
+
/* set XML_TZONE */
{
time_t time1;
}
else
{
- /* If auto is enabled, append the route, otherwise replace it. */
- if(parse_route_gpx(buffer, size, 0))
+ if(parse_gpx(&_route, buffer, size, 0))
{
MACRO_BANNER_SHOW_INFO(_window, _("Route Opened"));
}
static gboolean
window_cb_key_press(GtkWidget* widget, GdkEventKey *event)
{
+ CustomKey custom_key;
printf("%s()\n", __PRETTY_FUNCTION__);
switch(event->keyval)
{
case HILDON_HARDKEY_UP:
- map_pan(0, -PAN_UNITS);
- return TRUE;
-
+ custom_key = CUSTOM_KEY_UP;
+ break;
case HILDON_HARDKEY_DOWN:
- map_pan(0, PAN_UNITS);
- return TRUE;
-
+ custom_key = CUSTOM_KEY_DOWN;
+ break;
case HILDON_HARDKEY_LEFT:
+ custom_key = CUSTOM_KEY_LEFT;
+ break;
+ case HILDON_HARDKEY_RIGHT:
+ custom_key = CUSTOM_KEY_RIGHT;
+ break;
+ case HILDON_HARDKEY_SELECT:
+ custom_key = CUSTOM_KEY_SELECT;
+ break;
+ case HILDON_HARDKEY_INCREASE:
+ custom_key = CUSTOM_KEY_INCREASE;
+ break;
+ case HILDON_HARDKEY_DECREASE:
+ custom_key = CUSTOM_KEY_DECREASE;
+ break;
+ case HILDON_HARDKEY_FULLSCREEN:
+ custom_key = CUSTOM_KEY_FULLSCREEN;
+ break;
+ case HILDON_HARDKEY_ESC:
+ custom_key = CUSTOM_KEY_ESC;
+ break;
+ default:
+ vprintf("%s(): return FALSE\n", __PRETTY_FUNCTION__);
+ return FALSE;
+ }
+
+ switch(_action[custom_key])
+ {
+ case CUSTOM_ACTION_PAN_NORTH:
+ map_pan(0, -PAN_UNITS);
+ break;
+
+ case CUSTOM_ACTION_PAN_WEST:
map_pan(-PAN_UNITS, 0);
- return TRUE;
+ break;
- case HILDON_HARDKEY_RIGHT:
+ case CUSTOM_ACTION_PAN_SOUTH:
+ map_pan(0, PAN_UNITS);
+ break;
+
+ case CUSTOM_ACTION_PAN_EAST:
map_pan(PAN_UNITS, 0);
- return TRUE;
+ break;
- case HILDON_HARDKEY_SELECT:
+ case CUSTOM_ACTION_TOGGLE_AUTOCENTER:
switch(_center_mode)
{
case CENTER_LATLON:
_menu_ac_latlon_item), TRUE);
break;
}
- return TRUE;
-
- case HILDON_HARDKEY_FULLSCREEN:
- gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
- _menu_fullscreen_item), !_fullscreen);
- return TRUE;
+ break;
- case HILDON_HARDKEY_INCREASE:
- case HILDON_HARDKEY_DECREASE:
+ case CUSTOM_ACTION_ZOOM_IN:
+ case CUSTOM_ACTION_ZOOM_OUT:
if(!_key_zoom_timeout_sid)
{
_key_zoom_new = _zoom
- + (event->keyval == HILDON_HARDKEY_INCREASE
+ + (_action[custom_key] == CUSTOM_ACTION_ZOOM_IN
? -_curr_repo->view_zoom_steps
: _curr_repo->view_zoom_steps);
/* Remember, _key_zoom_new is unsigned. */
500, key_zoom_timeout, NULL);
}
}
- return TRUE;
+ break;
- case HILDON_HARDKEY_ESC:
- switch(_escape_key)
+ case CUSTOM_ACTION_TOGGLE_FULLSCREEN:
+ gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(
+ _menu_fullscreen_item), !_fullscreen);
+ break;
+
+ case CUSTOM_ACTION_TOGGLE_TRACKS:
+ switch(_show_tracks)
{
- case ESCAPE_KEY_TOGGLE_POI:
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_menu_show_poi_item),
- !_show_poi);
- break;
- case ESCAPE_KEY_CHANGE_REPO:
- {
- GList *curr = g_list_find(_repo_list, _curr_repo);
- if(curr && curr->next)
- curr = curr->next;
- else
- curr = _repo_list;
- _curr_repo = curr->data;
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_curr_repo->menu_item),
- TRUE);
- }
- break;
- case ESCAPE_KEY_RESET_BLUETOOTH:
- reset_bluetooth();
- break;
- case ESCAPE_KEY_ROUTE_DISTNEXT:
- route_show_distance_to_next();
- break;
- case ESCAPE_KEY_ROUTE_DISTLAST:
- route_show_distance_to_last();
- break;
- case ESCAPE_KEY_TRACK_WAYPOINT:
- track_insert_mark();
+ case 0:
+ /* Nothing shown, nothing saved; just set both. */
+ _show_tracks = TRACKS_MASK | ROUTES_MASK;
break;
- case ESCAPE_KEY_TRACK_DISTLAST:
- track_show_distance_from_last();
+ case TRACKS_MASK << 16:
+ case ROUTES_MASK << 16:
+ case (ROUTES_MASK | TRACKS_MASK) << 16:
+ /* Something was saved and nothing changed since.
+ * Restore saved. */
+ _show_tracks = _show_tracks >> 16;
break;
- case ESCAPE_KEY_TRACK_DISTFIRST:
- track_show_distance_from_first();
- break;
- case ESCAPE_KEY_TOGGLE_GPS:
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_menu_enable_gps_item),
- !_enable_gps);
- break;
- case ESCAPE_KEY_TOGGLE_GPSINFO:
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_menu_gps_show_info_item),
- !_gps_info);
- break;
- case ESCAPE_KEY_TOGGLE_SPEEDLIMIT:
- _speed_limit_on ^= 1;
- break;
- default: /* ESCAPE_KEY_TOGGLE_TRACKS */
- switch(_show_tracks)
- {
- case 0:
- /* Nothing shown, nothing saved; just set both. */
- _show_tracks = TRACKS_MASK | ROUTES_MASK;
- break;
- case TRACKS_MASK << 16:
- case ROUTES_MASK << 16:
- case (ROUTES_MASK | TRACKS_MASK) << 16:
- /* Something was saved and nothing changed since.
- * Restore saved. */
- _show_tracks = _show_tracks >> 16;
- break;
- default:
- /* There is no history, or they changed something
- * since the last historical change. Save and
- * clear. */
- _show_tracks = _show_tracks << 16;
- }
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_menu_show_routes_item),
- _show_tracks & ROUTES_MASK);
+ default:
+ /* There is no history, or they changed something
+ * since the last historical change. Save and
+ * clear. */
+ _show_tracks = _show_tracks << 16;
+ }
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_routes_item),
+ _show_tracks & ROUTES_MASK);
+
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_tracks_item),
+ _show_tracks & TRACKS_MASK);
+
+ case CUSTOM_ACTION_TOGGLE_SCALE:
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_scale_item),
+ !_show_scale);
+ break;
+
+ case CUSTOM_ACTION_TOGGLE_POI:
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_poi_item),
+ !_show_poi);
+ break;
+ case CUSTOM_ACTION_CHANGE_REPO: {
+ GList *curr = g_list_find(_repo_list, _curr_repo);
+ if(!curr)
+ break;
+
+ /* Loop until we reach a next-able repo, or until we get
+ * back to the current repo. */
+ while((curr = (curr->next ? curr->next : _repo_list))
+ && !((RepoData*)curr->data)->nextable
+ && curr->data != _curr_repo) { }
- gtk_check_menu_item_set_active(
- GTK_CHECK_MENU_ITEM(_menu_show_tracks_item),
- _show_tracks & TRACKS_MASK);
+ if(curr->data != _curr_repo)
+ {
+ repo_set_curr(curr->data);
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_curr_repo->menu_item),
+ TRUE);
}
- return TRUE;
+ else
+ {
+ popup_error(_window,
+ _("There are no other next-able repositories."));
+ }
+ break;
+ }
+
+ case CUSTOM_ACTION_RESET_BLUETOOTH:
+ reset_bluetooth();
+ break;
+
+ case CUSTOM_ACTION_ROUTE_DISTNEXT:
+ route_show_distance_to_next();
+ break;
+
+ case CUSTOM_ACTION_ROUTE_DISTLAST:
+ route_show_distance_to_last();
+ break;
+
+ case CUSTOM_ACTION_TRACK_BREAK:
+ track_insert_break();
+ break;
+
+ case CUSTOM_ACTION_TRACK_DISTLAST:
+ track_show_distance_from_last();
+ break;
+
+ case CUSTOM_ACTION_TRACK_DISTFIRST:
+ track_show_distance_from_first();
+ break;
+
+ case CUSTOM_ACTION_TOGGLE_GPS:
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_enable_gps_item),
+ !_enable_gps);
+ break;
+
+ case CUSTOM_ACTION_TOGGLE_GPSINFO:
+ gtk_check_menu_item_set_active(
+ GTK_CHECK_MENU_ITEM(_menu_gps_show_info_item),
+ !_gps_info);
+ break;
+
+ case CUSTOM_ACTION_TOGGLE_SPEEDLIMIT:
+ _speed_limit_on ^= 1;
+ break;
default:
+ vprintf("%s(): return FALSE\n", __PRETTY_FUNCTION__);
return FALSE;
}
- vprintf("%s(): return\n", __PRETTY_FUNCTION__);
+
+ return TRUE;
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
}
static gboolean
_screen_grids_halfwidth = pixel2grid(_screen_width_pixels) / 2;
_screen_grids_halfheight = pixel2grid(_screen_height_pixels) / 2;
+ /* Set _scale_rect. */
+ _scale_rect.x = (_screen_width_pixels - SCALE_WIDTH) / 2;
+ _scale_rect.width = SCALE_WIDTH;
+ pango_layout_set_text(_scale_layout, "0", -1);
+ pango_layout_get_pixel_size(_scale_layout, NULL, &_scale_rect.height);
+ _scale_rect.y = _screen_height_pixels - _scale_rect.height - 1;
+
+
MACRO_RECALC_FOCUS_BASE();
MACRO_RECALC_FOCUS_SIZE();
static gboolean
sat_panel_expose(GtkWidget *widget, GdkEventExpose *event)
{
- PangoContext *context = NULL;
- PangoLayout *layout = NULL;
- PangoFontDescription *fontdesc = NULL;
gchar *tmp = NULL;
guint x, y;
printf("%s()\n", __PRETTY_FUNCTION__);
widget->allocation.height,
FALSE);
- context = gtk_widget_get_pango_context(widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
-
- pango_font_description_set_family(fontdesc,"Sans Serif");
- pango_font_description_set_size(fontdesc, 14*PANGO_SCALE);
-
/* Sat View/In Use */
tmp = g_strdup_printf("%d/%d", _gps.satinuse, _gps.satinview);
- pango_layout_set_font_description (layout, fontdesc);
- pango_layout_set_text(layout, tmp, strlen(tmp));
+ pango_layout_set_text(_sat_panel_layout, tmp, -1);
+ pango_layout_set_alignment(_sat_panel_layout, PANGO_ALIGN_LEFT);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
20, 2,
- layout);
+ _sat_panel_layout);
g_free(tmp);
switch(_gps.fix)
case 3: tmp = g_strdup_printf("%dD fix", _gps.fix); break;
default: tmp = g_strdup_printf("nofix"); break;
}
- pango_layout_set_text(layout, tmp, strlen(tmp));
- pango_layout_set_alignment(layout, PANGO_ALIGN_RIGHT);
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_sat_panel_layout, tmp, -1);
+ pango_layout_set_alignment(_sat_panel_layout, PANGO_ALIGN_RIGHT);
+ pango_layout_get_pixel_size(_sat_panel_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
widget->allocation.width - 20 - x, 2,
- layout);
+ _sat_panel_layout);
g_free(tmp);
- pango_font_description_free(fontdesc);
- g_object_unref(layout);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return TRUE;
}
gint dir;
gfloat tmp;
gchar *text;
- PangoContext *context=NULL;
- PangoLayout *layout=NULL;
- PangoFontDescription *fontdesc=NULL;
printf("%s()\n", __PRETTY_FUNCTION__);
size = MIN(widget->allocation.width, widget->allocation.height);
xoffset = 0;
yoffset = (widget->allocation.height - widget->allocation.width) / 2;
}
- context = gtk_widget_get_pango_context(widget);
- layout = pango_layout_new(context);
- fontdesc = pango_font_description_new();
- pango_font_description_set_family(fontdesc,"Sans Serif");
- pango_font_description_set_size(fontdesc,12*PANGO_SCALE);
- pango_layout_set_font_description (layout, fontdesc);
- pango_layout_set_alignment(layout, PANGO_ALIGN_CENTER);
+ pango_font_description_set_size(_heading_panel_fontdesc,12*PANGO_SCALE);
+ pango_layout_set_font_description(_heading_panel_layout,
+ _heading_panel_fontdesc);
+ pango_layout_set_alignment(_heading_panel_layout, PANGO_ALIGN_CENTER);
text = g_strdup_printf("%3.0f°", _gps.heading);
- pango_layout_set_text(layout, text, -1);
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_layout_set_text(_heading_panel_layout, text, -1);
+ pango_layout_get_pixel_size(_heading_panel_layout, &x, &y);
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
xoffset + size/2 - x/2,
- yoffset + size - y - 2, layout);
+ yoffset + size - y - 2, _heading_panel_layout);
g_free(text);
gdk_draw_arc (widget->window,
&& (i > 0))
x = fsize[i - 1];
- pango_font_description_set_size(fontdesc,(10 + x)*PANGO_SCALE);
- pango_layout_set_font_description (layout, fontdesc);
- pango_layout_set_text(layout, text, -1);
- pango_layout_get_pixel_size(layout, &x, &y);
+ pango_font_description_set_size(_heading_panel_fontdesc,
+ (10 + x)*PANGO_SCALE);
+ pango_layout_set_font_description(_heading_panel_layout,
+ _heading_panel_fontdesc);
+ pango_layout_set_text(_heading_panel_layout, text, -1);
+ pango_layout_get_pixel_size(_heading_panel_layout, &x, &y);
x = xoffset + size/2 + ((size/2 + 15) * sinf(tmp)) - x/2,
y = yoffset + size - ((size/2 + 15) * cosf(tmp)) - y/2,
gdk_draw_layout(widget->window,
widget->style->fg_gc[GTK_STATE_NORMAL],
- x, y, layout);
+ x, y, _heading_panel_layout);
g_free(text);
}
- pango_font_description_free (fontdesc);
- g_object_unref (layout);
-
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return TRUE;
}
gdk_draw_drawable(
_map_widget->window,
- _gc_mark,
+ _gc[COLORABLE_MARK],
_map_pixmap,
event->area.x + _offsetx, event->area.y + _offsety,
event->area.x, event->area.y,
event->area.width, event->area.height);
map_draw_mark();
+ /* Draw scale, if necessary. */
+ if(_show_scale)
+ {
+ gdk_rectangle_intersect(&event->area, &_scale_rect, &event->area);
+ if(event->area.width && event->area.height)
+ {
+ gdk_draw_rectangle(_map_widget->window,
+ _map_widget->style->bg_gc[GTK_WIDGET_STATE(_map_widget)],
+ TRUE,
+ _scale_rect.x, _scale_rect.y,
+ _scale_rect.width, _scale_rect.height);
+ gdk_draw_rectangle(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ FALSE,
+ _scale_rect.x, _scale_rect.y,
+ _scale_rect.width, _scale_rect.height);
+
+ /* Now calculate and draw the distance. */
+ {
+ gchar buffer[16];
+ gfloat distance;
+ gfloat lat1, lon1, lat2, lon2;
+ gint width;
+
+ unit2latlon(_center.unitx - pixel2unit(SCALE_WIDTH / 2 - 4),
+ _center.unity, lat1, lon1);
+ unit2latlon(_center.unitx + pixel2unit(SCALE_WIDTH / 2 - 4),
+ _center.unity, lat2, lon2);
+ distance = calculate_distance(lat1, lon1, lat2, lon2)
+ * UNITS_CONVERT[_units];
+
+ if(distance < 1.f)
+ snprintf(buffer, sizeof(buffer), "%0.2f %s", distance,
+ UNITS_TEXT[_units]);
+ else if(distance < 10.f)
+ snprintf(buffer, sizeof(buffer), "%0.1f %s", distance,
+ UNITS_TEXT[_units]);
+ else
+ snprintf(buffer, sizeof(buffer), "%0.f %s", distance,
+ UNITS_TEXT[_units]);
+ pango_layout_set_text(_scale_layout, buffer, -1);
+
+ pango_layout_get_pixel_size(_scale_layout, &width, NULL);
+
+ /* Draw the layout itself. */
+ gdk_draw_layout(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ _scale_rect.x + (_scale_rect.width - width) / 2,
+ _scale_rect.y, _scale_layout);
+
+ /* Draw little hashes on the ends. */
+ gdk_draw_line(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ _scale_rect.x + 4,
+ _scale_rect.y + _scale_rect.height / 2 - 4,
+ _scale_rect.x + 4,
+ _scale_rect.y + _scale_rect.height / 2 + 4);
+ gdk_draw_line(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ _scale_rect.x + 4,
+ _scale_rect.y + _scale_rect.height / 2,
+ _scale_rect.x + (_scale_rect.width - width) / 2 - 4,
+ _scale_rect.y + _scale_rect.height / 2);
+ gdk_draw_line(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ _scale_rect.x + _scale_rect.width - 4,
+ _scale_rect.y + _scale_rect.height / 2 - 4,
+ _scale_rect.x + _scale_rect.width - 4,
+ _scale_rect.y + _scale_rect.height / 2 + 4);
+ gdk_draw_line(_map_widget->window,
+ _map_widget->style->fg_gc[GTK_WIDGET_STATE(_map_widget)],
+ _scale_rect.x + _scale_rect.width - 4,
+ _scale_rect.y + _scale_rect.height / 2,
+ _scale_rect.x + (_scale_rect.width + width) / 2 + 4,
+ _scale_rect.y + _scale_rect.height / 2);
+ }
+ }
+ }
+
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
}
* 12) FAA mode indicator (NMEA 2.3 and later)
* 13) Checksum
*/
- gchar *token, *dpoint, *gpstime = NULL, *gpsdate = NULL, tmp[15];
+ gchar *token, *dpoint, *gpsdate = NULL;
gdouble tmpd = 0.f;
guint tmpi = 0;
gboolean newly_fixed = FALSE;
/* Parse time. */
token = strsep(&sentence, DELIM);
- if(*token)
- gpstime = g_strdup(token);
+ if(token && *token)
+ gpsdate = token;
- token = strsep(&sentence, DELIM);
- /* Token is now Status. */
- if(*token != 'A')
- {
- /* Data is invalid - not enough satellites?. */
- if(_conn_state != RCVR_UP)
- {
- set_conn_state(RCVR_UP);
- track_add(0, FALSE);
- }
- }
- else
+ token = strsep(&sentence, DELIM);
+ /* Token is now Status. */
+ if(token && *token == 'A')
{
/* Data is valid. */
if(_conn_state != RCVR_FIXED)
set_conn_state(RCVR_FIXED);
}
}
+ else
+ {
+ /* Data is invalid - not enough satellites?. */
+ if(_conn_state != RCVR_UP)
+ {
+ set_conn_state(RCVR_UP);
+ track_add(0, FALSE);
+ }
+ }
/* Parse the latitude. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
dpoint = strchr(token, '.');
MACRO_PARSE_FLOAT(tmpd, dpoint - 2);
/* Parse N or S. */
token = strsep(&sentence, DELIM);
- if(*token)
- {
- deg_format(_gps.lat, tmp);
- snprintf(_gps.slat, sizeof(_gps.slat),
- "%c %s", token[0], tmp);
- if(token[0] == 'S')
- _gps.lat = -_gps.lat;
- }
+ if(token && *token == 'S')
+ _gps.lat = -_gps.lat;
/* Parse the longitude. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
dpoint = strchr(token, '.');
MACRO_PARSE_FLOAT(tmpd, dpoint - 2);
/* Parse E or W. */
token = strsep(&sentence, DELIM);
- if(*token)
- {
- deg_format(_gps.lon, tmp);
- snprintf(_gps.slon, sizeof(_gps.slon),
- "%c %s", token[0], tmp);
- if(*token && token[0] == 'W')
- _gps.lon = -_gps.lon;
- }
+ if(token && *token == 'W')
+ _gps.lon = -_gps.lon;
/* Parse speed over ground, knots. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
MACRO_PARSE_FLOAT(_gps.speed, token);
if(_gps.fix > 1)
/* Parse heading, degrees from true north. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
MACRO_PARSE_FLOAT(_gps.heading, token);
}
/* Parse date. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
struct tm time;
- gpsdate = g_strdup_printf("%s%s", token, gpstime);
- strptime(gpsdate, "%d%m%y%H%M%S", &time);
- if(time.tm_year >= 0 && time.tm_year <= 68)
- time.tm_year += 100; /* year 2000 */
- time.tm_mon -= 1;
- _gps.timeloc = mktime(&time);
- _gps.timeloc += _gmtoffset;
- g_free(gpstime);
- g_free(gpsdate);
+ gpsdate[6] = '\0'; /* Make sure time is 6 chars long. */
+ strcat(gpsdate, token);
+ strptime(gpsdate, "%H%M%S%d%m%y", &time);
+ _pos.time = mktime(&time) + _gmtoffset;
}
+ else
+ _pos.time = time(NULL);
/* Translate data into integers. */
integerize_data();
/* Add new data to track. */
if(_conn_state == RCVR_FIXED)
- track_add(time(NULL), newly_fixed);
+ track_add(_pos.time, newly_fixed);
/* Move mark to new location. */
refresh_mark();
/* Parse Fix quality */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_INT(_gps.fixquality, token);
/* Skip number of satellites */
/* Parse Horizontal dilution of position */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_INT(_gps.hdop, token);
/* Altitude */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
{
- MACRO_PARSE_FLOAT(_gps.altitude, token);
+ MACRO_PARSE_FLOAT(_pos.altitude, token);
}
else
- _gps.altitude = NAN;
+ _pos.altitude = NAN;
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
}
/* 3D fix. */
token = strsep(&sentence, DELIM);
- MACRO_PARSE_INT(_gps.fix, token);
+ if(token && *token)
+ MACRO_PARSE_INT(_gps.fix, token);
_gps.satinuse = 0;
for(i = 0; i < 12; i++)
{
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
_gps.satforfix[_gps.satinuse++] = atoi(token);
}
/* PDOP */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_FLOAT(_gps.pdop, token);
/* HDOP */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_FLOAT(_gps.hdop, token);
/* VDOP */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_FLOAT(_gps.vdop, token);
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
* n) checksum
*/
gchar *token;
- guint msgcnt, nummsgs;
+ guint msgcnt = 0, nummsgs = 0;
static guint running_total = 0;
static guint num_sats_used = 0;
static guint satcnt = 0;
/* Parse number of messages. */
token = strsep(&sentence, DELIM);
- if(!*token)
- return; /* because this is an invalid sentence. */
- MACRO_PARSE_INT(nummsgs, token);
+ if(token && *token)
+ MACRO_PARSE_INT(nummsgs, token);
/* Parse message number. */
token = strsep(&sentence, DELIM);
- if(!*token)
- return; /* because this is an invalid sentence. */
- MACRO_PARSE_INT(msgcnt, token);
+ if(token && *token)
+ MACRO_PARSE_INT(msgcnt, token);
/* Parse number of satellites in view. */
token = strsep(&sentence, DELIM);
- if(*token)
+ if(token && *token)
MACRO_PARSE_INT(_gps.satinview, token);
/* Loop until there are no more satellites to parse. */
{
/* Get token for Satellite Number. */
token = strsep(&sentence, DELIM);
- if(!sentence)
- break; /* because this is an invalid sentence. */
- _gps_sat[satcnt].prn = atoi(token);
+ if(token && *token)
+ _gps_sat[satcnt].prn = atoi(token);
/* Get token for elevation in degrees (0-90). */
token = strsep(&sentence, DELIM);
- if(!sentence)
- break; /* because this is an invalid sentence. */
- _gps_sat[satcnt].elevation = atoi(token);
+ if(token && *token)
+ _gps_sat[satcnt].elevation = atoi(token);
/* Get token for azimuth in degrees to true north (0-359). */
token = strsep(&sentence, DELIM);
- if(!sentence)
- break; /* because this is an invalid sentence. */
- _gps_sat[satcnt].azimuth = atoi(token);
+ if(token && *token)
+ _gps_sat[satcnt].azimuth = atoi(token);
/* Get token for SNR. */
token = strsep(&sentence, DELIM);
- if((_gps_sat[satcnt].snr = atoi(token)))
+ if(token && *token && (_gps_sat[satcnt].snr = atoi(token)))
{
/* SNR is non-zero - add to total and count as used. */
running_total += _gps_sat[satcnt].snr;
/* Let them try again. */
}
/* Else, if GPS is enabled, replace the route, otherwise append it. */
- else if(parse_route_gpx(rdl_data.bytes, rdl_data.bytes_read,
+ else if(parse_gpx(&_route, rdl_data.bytes, rdl_data.bytes_read,
(gtk_toggle_button_get_active(
GTK_TOGGLE_BUTTON(oti.rad_use_gps))
? 0 : 1)))
GTK_FILE_CHOOSER_ACTION_OPEN))
{
/* If auto is enabled, append the route, otherwise replace it. */
- if(parse_route_gpx(buffer, size, _autoroute_data.enabled ? 0 : 1))
+ if(parse_gpx(&_route, buffer, size,
+ _autoroute_data.enabled ? 0 : 1))
{
cancel_autoroute(FALSE);
printf("%s()\n", __PRETTY_FUNCTION__);
cancel_autoroute(FALSE);
- MACRO_FREE_ROUTE(_route);
- MACRO_INIT_ROUTE(_route);
- _visible_way_first = _visible_way_last = NULL;
+ MACRO_PATH_FREE(_route);
+ MACRO_PATH_INIT(_route);
route_find_nearest_point();
map_force_redraw();
if(open_file(&buffer, NULL, &size, NULL, &_track_file_uri,
GTK_FILE_CHOOSER_ACTION_OPEN))
{
- if(parse_track_gpx(buffer, size, -1))
+ if(parse_gpx(&_track, buffer, size, -1))
{
map_force_redraw();
MACRO_BANNER_SHOW_INFO(_window, _("Track Opened"));
if(open_file(NULL, &handle, NULL, NULL, &_track_file_uri,
GTK_FILE_CHOOSER_ACTION_SAVE))
{
- if(write_track_gpx(handle))
+ if(write_gpx(&_track, handle))
{
MACRO_BANNER_SHOW_INFO(_window, _("Track Saved"));
}
return TRUE;
}
+static gboolean
+menu_cb_track_insert_break(GtkAction *action)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ track_insert_break();
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
static gboolean
menu_cb_track_insert_mark(GtkAction *action)
{
+ gfloat lat, lon;
+ gchar tmp1[16], tmp2[16], *p_latlon;
+ GtkWidget *dialog;
+ GtkWidget *table;
+ GtkWidget *label;
+ GtkWidget *txt_scroll;
+ GtkWidget *txt_desc;
printf("%s()\n", __PRETTY_FUNCTION__);
- track_insert_mark();
+ dialog = gtk_dialog_new_with_buttons(_("Insert Mark"),
+ GTK_WINDOW(_window), GTK_DIALOG_MODAL,
+ GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_REJECT,
+ NULL);
+
+ gtk_box_pack_start(GTK_BOX(GTK_DIALOG(dialog)->vbox),
+ table = gtk_table_new(2, 2, FALSE), TRUE, TRUE, 0);
+
+ gtk_table_attach(GTK_TABLE(table),
+ label = gtk_label_new(_("Lat, Lon")),
+ 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
+ gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+ unit2latlon(_pos.unitx, _pos.unity, lat, lon);
+ lat_format(lat, tmp1);
+ lon_format(lon, tmp2);
+ p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
+ gtk_table_attach(GTK_TABLE(table),
+ label = gtk_label_new(p_latlon),
+ 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
+ gtk_misc_set_alignment(GTK_MISC(label), 0.0f, 0.5f);
+ g_free(p_latlon);
+
+ gtk_table_attach(GTK_TABLE(table),
+ label = gtk_label_new(_("Description")),
+ 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
+ gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
+
+ txt_scroll = gtk_scrolled_window_new(NULL, NULL);
+ gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(txt_scroll),
+ GTK_SHADOW_IN);
+ gtk_table_attach(GTK_TABLE(table),
+ txt_scroll,
+ 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+
+ gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(txt_scroll),
+ GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
+
+ txt_desc = gtk_text_view_new ();
+ gtk_text_view_set_wrap_mode(GTK_TEXT_VIEW(txt_desc), GTK_WRAP_WORD);
+
+ gtk_container_add(GTK_CONTAINER(txt_scroll), txt_desc);
+ gtk_widget_set_size_request(GTK_WIDGET(txt_scroll), 400, 60);
+
+ gtk_widget_show_all(dialog);
+
+ while(GTK_RESPONSE_ACCEPT == gtk_dialog_run(GTK_DIALOG(dialog)))
+ {
+ GtkTextBuffer *tbuf;
+ GtkTextIter ti1, ti2;
+ gchar *desc;
+
+ tbuf = gtk_text_view_get_buffer(GTK_TEXT_VIEW(txt_desc));
+ gtk_text_buffer_get_iter_at_offset(tbuf, &ti1, 0);
+ gtk_text_buffer_get_end_iter(tbuf, &ti2);
+ desc = gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
+
+ if(*desc)
+ {
+ MACRO_PATH_INCREMENT_WTAIL(_track);
+ _track.wtail->point = _track.tail;
+ _track.wtail->desc
+ = gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
+ }
+ else
+ {
+ popup_error(dialog,
+ _("Please provide a description for the mark."));
+ g_free(desc);
+ continue;
+ }
+
+ map_render_paths();
+ MACRO_QUEUE_DRAW_AREA();
+ break;
+ }
+ gtk_widget_destroy(dialog);
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
if(open_file(NULL, &handle, NULL, &_route_dir_uri, NULL,
GTK_FILE_CHOOSER_ACTION_SAVE))
{
- if(write_route_gpx(handle))
+ if(write_gpx(&_route, handle))
{
MACRO_BANNER_SHOW_INFO(_window, _("Route Saved"));
}
return TRUE;
}
+static gboolean
+menu_cb_show_scale(GtkAction *action)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ _show_scale = gtk_check_menu_item_get_active(
+ GTK_CHECK_MENU_ITEM(_menu_show_scale_item));
+ MACRO_QUEUE_DRAW_AREA();
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
static gboolean
menu_cb_show_routes(GtkAction *action)
{
typedef struct _RepoEditInfo RepoEditInfo;
struct _RepoEditInfo {
gchar *name;
- GtkWidget *page_table;
GtkWidget *txt_url;
GtkWidget *txt_cache_dir;
GtkWidget *num_dl_zoom_steps;
GtkWidget *num_view_zoom_steps;
+ GtkWidget *chk_double_size;
+ GtkWidget *chk_nextable;
GtkWidget *btn_browse;
BrowseInfo browse_info;
};
static RepoEditInfo*
repoman_dialog_add_repo(RepoManInfo *rmi, gchar *name)
{
+ GtkWidget *vbox;
+ GtkWidget *table;
GtkWidget *label;
GtkWidget *hbox;
RepoEditInfo *rei = g_new(RepoEditInfo, 1);
/* Maps page. */
gtk_notebook_append_page(GTK_NOTEBOOK(rmi->notebook),
- rei->page_table = gtk_table_new(4, 4, FALSE),
+ vbox = gtk_vbox_new(FALSE, 4),
gtk_label_new(name));
+ gtk_box_pack_start(GTK_BOX(vbox),
+ table = gtk_table_new(2, 2, FALSE),
+ FALSE, FALSE, 0);
/* Map download URI. */
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(_("URL Format")),
0, 1, 0, 1, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
rei->txt_url = gtk_entry_new(),
- 1, 3, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+ 1, 2, 0, 1, GTK_EXPAND | GTK_FILL, 0, 2, 4);
/* Map Directory. */
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(_("Cache Dir.")),
0, 1, 1, 2, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
hbox = gtk_hbox_new(FALSE, 4),
- 1, 3, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+ 1, 2, 1, 2, GTK_EXPAND | GTK_FILL, 0, 2, 4);
gtk_box_pack_start(GTK_BOX(hbox),
rei->txt_cache_dir = gtk_entry_new(),
TRUE, TRUE, 0);
rei->btn_browse = gtk_button_new_with_label(_("Browse...")),
FALSE, FALSE, 0);
+ /* Initialize cache dir */
+ {
+ gchar *cache_base = gnome_vfs_expand_initial_tilde(
+ REPO_DEFAULT_CACHE_BASE);
+ gchar *cache_dir = gnome_vfs_uri_make_full_from_relative(
+ cache_base, name);
+ gtk_entry_set_text(GTK_ENTRY(rei->txt_cache_dir), cache_dir);
+ g_free(cache_dir);
+ g_free(cache_base);
+ }
+
+ gtk_box_pack_start(GTK_BOX(vbox),
+ table = gtk_table_new(3, 2, FALSE),
+ FALSE, FALSE, 0);
+
/* Download Zoom Steps. */
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(_("Download Zoom Steps")),
- 0, 2, 2, 3, GTK_FILL, 0, 2, 4);
+ 0, 1, 0, 1, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f),
- 2, 3, 2, 3, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+ 1, 2, 0, 1, GTK_FILL, 0, 2, 4);
gtk_container_add(GTK_CONTAINER(label),
rei->num_dl_zoom_steps = hildon_controlbar_new());
hildon_controlbar_set_range(
HILDON_CONTROLBAR(rei->num_dl_zoom_steps), 1, 4);
- hildon_controlbar_set_value(
- HILDON_CONTROLBAR(rei->num_dl_zoom_steps), 2);
+ hildon_controlbar_set_value(HILDON_CONTROLBAR(rei->num_dl_zoom_steps),
+ REPO_DEFAULT_DL_ZOOM_STEPS);
force_min_visible_bars(HILDON_CONTROLBAR(rei->num_dl_zoom_steps), 1);
/* Download Zoom Steps. */
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(_("View Zoom Steps")),
- 0, 2, 3, 4, GTK_FILL, 0, 2, 4);
+ 0, 1, 1, 2, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- gtk_table_attach(GTK_TABLE(rei->page_table),
+ gtk_table_attach(GTK_TABLE(table),
label = gtk_alignment_new(0.f, 0.5f, 0.f, 0.f),
- 2, 3, 3, 4, GTK_EXPAND | GTK_FILL, 0, 2, 4);
+ 1, 2, 1, 2, GTK_FILL, 0, 2, 4);
gtk_container_add(GTK_CONTAINER(label),
rei->num_view_zoom_steps = hildon_controlbar_new());
hildon_controlbar_set_range(
HILDON_CONTROLBAR(rei->num_view_zoom_steps), 1, 4);
- hildon_controlbar_set_value(
- HILDON_CONTROLBAR(rei->num_view_zoom_steps), 1);
+ hildon_controlbar_set_value(HILDON_CONTROLBAR(rei->num_view_zoom_steps),
+ REPO_DEFAULT_VIEW_ZOOM_STEPS);
force_min_visible_bars(HILDON_CONTROLBAR(rei->num_view_zoom_steps), 1);
+ gtk_table_attach(GTK_TABLE(table),
+ label = gtk_vseparator_new(),
+ 2, 3, 0, 2, GTK_FILL, GTK_FILL, 4, 4);
+
+ /* Double-size. */
+ gtk_table_attach(GTK_TABLE(table),
+ rei->chk_double_size = gtk_check_button_new_with_label(
+ _("Double Pixels")),
+ 3, 4, 0, 1, GTK_FILL, GTK_FILL, 0, 4);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_double_size), FALSE);
+
+ /* Next-able */
+ gtk_table_attach(GTK_TABLE(table),
+ rei->chk_nextable = gtk_check_button_new_with_label(
+ _("Next-able")),
+ 3, 4, 1, 2, GTK_FILL, GTK_FILL, 0, 4);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_nextable), TRUE);
+
rmi->repo_edits = g_list_append(rmi->repo_edits, rei);
/* Connect signals. */
G_CALLBACK(repoman_dialog_browse),
&rei->browse_info);
- gtk_widget_show_all(rei->page_table);
+ gtk_widget_show_all(vbox);
gtk_combo_box_append_text(GTK_COMBO_BOX(rmi->cmb_repos), name);
gtk_combo_box_set_active(GTK_COMBO_BOX(rmi->cmb_repos),
return TRUE;
}
+static gboolean
+repoman_reset(GtkWidget *widget, RepoManInfo *rmi)
+{
+ GtkWidget *confirm;
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ _("Replace all repositories with the default repository?"));
+
+ if(GTK_RESPONSE_OK == gtk_dialog_run(GTK_DIALOG(confirm)))
+ {
+ /* First, delete all existing repositories. */
+ while(rmi->repo_edits)
+ {
+ gtk_combo_box_remove_text(GTK_COMBO_BOX(rmi->cmb_repos), 0);
+ gtk_notebook_remove_page(GTK_NOTEBOOK(rmi->notebook), 0);
+ rmi->repo_edits = g_list_remove_link(
+ rmi->repo_edits,
+ g_list_first(rmi->repo_edits));
+ }
+
+ /* Now, add the default repository. */
+ repoman_dialog_add_repo(rmi, REPO_DEFAULT_NAME);
+ gtk_entry_set_text(
+ GTK_ENTRY(((RepoEditInfo*)rmi->repo_edits->data)->txt_url),
+ REPO_DEFAULT_MAP_URI);
+
+ gtk_combo_box_set_active(GTK_COMBO_BOX(rmi->cmb_repos), 0);
+ }
+ gtk_widget_destroy(confirm);
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
static gboolean
repoman_download(GtkWidget *widget, RepoManInfo *rmi)
{
{
RepoData *rd;
RepoEditInfo *rei;
- tail = strchr(head, '\n') + 1;
- printf("head: %s\n", head);
+ tail = strchr(head, '\n');
+ *tail++ = '\0';
rd = config_parse_repo(head);
rei = repoman_dialog_add_repo(
rmi, g_strdup(rd->name));
hildon_controlbar_set_value(
HILDON_CONTROLBAR(rei->num_view_zoom_steps),
rd->view_zoom_steps);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_double_size),
+ rd->double_size);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_nextable),
+ rd->nextable);
}
g_free(bytes);
}
GtkWidget *btn_rename;
GtkWidget *btn_delete;
GtkWidget *btn_new;
+ GtkWidget *btn_reset;
GtkWidget *btn_download;
guint i, curr_repo_index = 0;
GList *curr;
ossohelp_dialog_help_enable(
GTK_DIALOG(rmi.dialog), HELP_ID_REPOMAN, _osso);
- /* Retrieve button. */
+ /* Reset button. */
+ gtk_container_add(GTK_CONTAINER(GTK_DIALOG(rmi.dialog)->action_area),
+ btn_reset = gtk_button_new_with_label(_("Reset...")));
+ g_signal_connect(G_OBJECT(btn_reset), "clicked",
+ G_CALLBACK(repoman_reset), &rmi);
+
+ /* Download button. */
gtk_container_add(GTK_CONTAINER(GTK_DIALOG(rmi.dialog)->action_area),
btn_download = gtk_button_new_with_label(_("Download...")));
g_signal_connect(G_OBJECT(btn_download), "clicked",
hbox = gtk_hbox_new(FALSE, 4);
gtk_box_pack_start(GTK_BOX(hbox),
- rmi.cmb_repos = gtk_combo_box_new_text(), FALSE, FALSE, 4);
+ rmi.cmb_repos = gtk_combo_box_new_text(), TRUE, TRUE, 4);
gtk_box_pack_start(GTK_BOX(hbox),
- gtk_vseparator_new(), TRUE, TRUE, 4);
+ gtk_vseparator_new(), FALSE, FALSE, 4);
gtk_box_pack_start(GTK_BOX(hbox),
btn_rename = gtk_button_new_with_label(_("Rename...")),
FALSE, FALSE, 4);
hildon_controlbar_set_value(
HILDON_CONTROLBAR(rei->num_view_zoom_steps),
rd->view_zoom_steps);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_double_size),
+ rd->double_size);
+ gtk_toggle_button_set_active(
+ GTK_TOGGLE_BUTTON(rei->chk_nextable),
+ rd->nextable);
if(rd == _curr_repo)
curr_repo_index = i;
}
verified && curr; curr = curr->next, i++)
{
RepoEditInfo *rei = curr->data;
- /* Verify that cache directory exists or can be created. */
- GnomeVFSURI *map_dir_uri = gnome_vfs_uri_new(gtk_entry_get_text(
- GTK_ENTRY(rei->txt_cache_dir)));
- if(!gnome_vfs_uri_exists(map_dir_uri))
- {
- GnomeVFSURI *parent, *curr_uri;
- GList *list = NULL;
-
- list = g_list_prepend(list, curr_uri = map_dir_uri);
- while(GNOME_VFS_ERROR_NOT_FOUND
- == gnome_vfs_make_directory_for_uri(
- parent = gnome_vfs_uri_get_parent(curr_uri), 0755))
- list = g_list_prepend(list, curr_uri = parent);
-
- while(list != NULL)
- {
- if(verified)
- {
- verified = (GNOME_VFS_OK
- == gnome_vfs_make_directory_for_uri(
- (GnomeVFSURI*)list->data, 0755));
- }
- gnome_vfs_uri_unref((GnomeVFSURI*)list->data);
- list = g_list_remove(list, list->data);
- }
- /* verified now equals result of last make-dir attempt. */
- }
-
- if(!verified)
- {
- /* Failed to create Map Cache directory. */
- gchar buffer[BUFFER_SIZE];
- snprintf(buffer, sizeof(buffer), "%s: %s",
- _("Unable to create cache directory for repository"),
- rei->name);
- gtk_combo_box_set_active(GTK_COMBO_BOX(rmi.cmb_repos), i);
- popup_error(rmi.dialog, buffer);
- }
+ gchar *expanded = gnome_vfs_expand_initial_tilde(
+ gtk_entry_get_text(GTK_ENTRY(rei->txt_cache_dir)));
+ verified = repo_make_cache_dir(rei->name, expanded, rmi.dialog);
+ g_free(expanded);
}
if(!verified)
+ {
+ gtk_combo_box_set_active(GTK_COMBO_BOX(rmi.cmb_repos), i - 1);
continue;
+ }
/* We're good to replace. Remove old _repo_list menu items. */
menu_maps_remove_repos();
RepoData *rd = g_new(RepoData, 1);
rd->name = g_strdup(rei->name);
rd->url = g_strdup(gtk_entry_get_text(GTK_ENTRY(rei->txt_url)));
- rd->cache_dir = g_strdup(gtk_entry_get_text(
- GTK_ENTRY(rei->txt_cache_dir)));
+ rd->cache_dir = gnome_vfs_expand_initial_tilde(
+ gtk_entry_get_text(GTK_ENTRY(rei->txt_cache_dir)));
rd->dl_zoom_steps = hildon_controlbar_get_value(
HILDON_CONTROLBAR(rei->num_dl_zoom_steps));
rd->view_zoom_steps = hildon_controlbar_get_value(
HILDON_CONTROLBAR(rei->num_view_zoom_steps));
+ rd->double_size = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(rei->chk_double_size));
+ rd->nextable = gtk_toggle_button_get_active(
+ GTK_TOGGLE_BUTTON(rei->chk_nextable));
set_repo_type(rd);
_repo_list = g_list_append(_repo_list, rd);
if(!_curr_repo && !strcmp(old_curr_repo_name, rd->name))
- _curr_repo = rd;
- if(i == curr_repo_index)
- _curr_repo = rd;
+ repo_set_curr(rd);
+ else if(i == curr_repo_index)
+ repo_set_curr(rd);
}
if(!_curr_repo)
- _curr_repo = (RepoData*)g_list_first(_repo_list)->data;
+ repo_set_curr((RepoData*)g_list_first(_repo_list)->data);
menu_maps_add_repos();
config_save();
menu_cb_maps_select(GtkAction *action, gpointer new_repo)
{
printf("%s()\n", __PRETTY_FUNCTION__);
- _curr_repo = new_repo;
+ repo_set_curr(new_repo);
map_force_redraw();
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
mapman_info.txt_botright_lat = gtk_entry_new(),
1, 2, 4, 5, GTK_EXPAND | GTK_FILL, 0, 4, 0);
gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lat), 1.f);
- g_object_set(G_OBJECT(mapman_info.txt_botright_lat), HILDON_INPUT_MODE_HINT,
+ g_object_set(G_OBJECT(mapman_info.txt_botright_lat),
+ HILDON_INPUT_MODE_HINT,
HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
gtk_table_attach(GTK_TABLE(mapman_info.tbl_area),
mapman_info.txt_botright_lon = gtk_entry_new(),
2, 3, 4, 5, GTK_EXPAND | GTK_FILL, 0, 4, 0);
gtk_entry_set_alignment(GTK_ENTRY(mapman_info.txt_botright_lon), 1.f);
- g_object_set(G_OBJECT(mapman_info.txt_botright_lon), HILDON_INPUT_MODE_HINT,
+ g_object_set(G_OBJECT(mapman_info.txt_botright_lon),
+ HILDON_INPUT_MODE_HINT,
HILDON_INPUT_MODE_HINT_NUMERICSPECIAL, NULL);
/* Default action is to download by area. */
mapman_update_state(NULL, &mapman_info);
/* Connect signals. */
- if(*_curr_repo->url)
+ if(_curr_repo->type != REPOTYPE_NONE)
{
g_signal_connect(G_OBJECT(mapman_info.rad_download), "clicked",
G_CALLBACK(mapman_update_state), &mapman_info);
return TRUE;
}
+static gboolean
+menu_cb_zoomin(GtkAction *action)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ if(_zoom > 0)
+ {
+ gchar buffer[80];
+ snprintf(buffer, sizeof(buffer),"%s %d",
+ _("Zoom to Level"), _zoom - 1);
+ MACRO_BANNER_SHOW_INFO(_window, buffer);
+ map_set_zoom(_zoom - 1);
+ }
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
+static gboolean
+menu_cb_zoomout(GtkAction *action)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ if(_zoom < MAX_ZOOM - 1)
+ {
+ gchar buffer[80];
+ snprintf(buffer, sizeof(buffer),"%s %d",
+ _("Zoom to Level"), _zoom + 1);
+ MACRO_BANNER_SHOW_INFO(_window, buffer);
+ map_set_zoom(_zoom + 1);
+ }
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
static gboolean
menu_cb_fullscreen(GtkAction *action)
{
if((_auto_download = gtk_check_menu_item_get_active(
GTK_CHECK_MENU_ITEM(_menu_auto_download_item))))
{
- if(!*_curr_repo->url)
+ if(_curr_repo->url == REPOTYPE_NONE)
popup_error(_window,
_("NOTE: You must set a Map URI in the current repository in "
"order to download maps."));
return TRUE;
}
+static gboolean
+menu_cb_about(GtkAction *action)
+{
+ printf("%s()\n", __PRETTY_FUNCTION__);
+
+ ossohelp_show(_osso, HELP_ID_ABOUT, OSSO_HELP_SHOW_DIALOG);
+
+ vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
+ return TRUE;
+}
+
static gboolean
category_delete(GtkWidget *widget, DeletePOI *dpoi)
{
GtkListStore *store;
GtkTreeIter iter;
gboolean selected = FALSE;
- gchar tmp1[15], tmp2[15];
+ gchar tmp1[16], tmp2[16];
guint num_cats = 0;
printf("%s()\n", __PRETTY_FUNCTION__);
sqlite3_column_text(_stmt_select_poi, 3),
sqlite3_column_text(_stmt_select_poi, 4),
sqlite3_column_text(_stmt_select_poi, 6));
- deg_format(lat, tmp1);
- deg_format(lon, tmp2);
+ lat_format(lat, tmp1);
+ lon_format(lon, tmp2);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
POI_POIID, sqlite3_column_int(_stmt_select_poi, 2),
gtk_widget_destroy(dialog);
- vprintf("%s(): return %d\n", __PRETTY_FUNCTION__);
+ vprintf("%s(): return %d\n", __PRETTY_FUNCTION__, selected);
return selected;
}
/* Set the p_latlon string. */
{
- gchar tmp1[15], tmp2[15];
- deg_format(poi.lat, tmp1);
- deg_format(poi.lon, tmp2);
+ gchar tmp1[16], tmp2[16];
+ lat_format(poi.lat, tmp1);
+ lon_format(poi.lon, tmp2);
p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
}
cmenu_show_latlon(guint unitx, guint unity)
{
gfloat lat, lon;
- gchar buffer[80], tmp1[15], tmp2[15];
+ gchar buffer[80], tmp1[16], tmp2[16];
printf("%s()\n", __PRETTY_FUNCTION__);
unit2latlon(unitx, unity, lat, lon);
- deg_format(lat, tmp1);
- deg_format(lon, tmp2);
+ lat_format(lat, tmp1);
+ lon_format(lon, tmp2);
snprintf(buffer, sizeof(buffer),
"%s: %s\n"
cmenu_add_route(guint unitx, guint unity)
{
printf("%s()\n", __PRETTY_FUNCTION__);
- MACRO_ROUTE_INCREMENT_TAIL(_route);
+ MACRO_PATH_INCREMENT_TAIL(_route);
_route.tail->unitx = x2unit(_cmenu_position_x);
_route.tail->unity = y2unit(_cmenu_position_y);
route_find_nearest_point();
}
static void
-cmenu_add_way(guint unitx, guint unity)
+cmenu_route_add_way(guint unitx, guint unity)
{
gfloat lat, lon;
- gchar tmp1[15], tmp2[15], *p_latlon;
+ gchar tmp1[16], tmp2[16], *p_latlon;
GtkWidget *dialog;
GtkWidget *table;
GtkWidget *label;
0, 1, 0, 1, GTK_FILL, 0, 2, 4);
gtk_misc_set_alignment(GTK_MISC(label), 1.f, 0.5f);
- unit2latlon(x2unit(_cmenu_position_x), y2unit(_cmenu_position_y),
- lat, lon);
- deg_format(lat, tmp1);
- deg_format(lon, tmp2);
+ unit2latlon(unitx, unity, lat, lon);
+ lat_format(lat, tmp1);
+ lon_format(lon, tmp2);
p_latlon = g_strdup_printf("%s, %s", tmp1, tmp2);
gtk_table_attach(GTK_TABLE(table),
label = gtk_label_new(p_latlon),
if(*desc)
{
/* There's a description. Add a waypoint. */
- MACRO_ROUTE_INCREMENT_TAIL(_route);
- _route.tail->unitx = x2unit(_cmenu_position_x);
- _route.tail->unity = y2unit(_cmenu_position_y);
+ MACRO_PATH_INCREMENT_TAIL(_route);
+ _route.tail->unitx = unitx;
+ _route.tail->unity = unity;
+ _route.tail->time = 0;
+ _route.tail->altitude = NAN;
- MACRO_ROUTE_INCREMENT_WTAIL(_route);
+ MACRO_PATH_INCREMENT_WTAIL(_route);
_route.wtail->point = _route.tail;
_route.wtail->desc
= gtk_text_buffer_get_text(tbuf, &ti1, &ti2, TRUE);
g_free(desc);
- confirm = hildon_note_new_confirmation(GTK_WINDOW(_window),
+ confirm = hildon_note_new_confirmation(GTK_WINDOW(dialog),
_("Creating a \"waypoint\" with no description actually "
"adds a break point. Is that what you want?"));
* point (if necessary), and then the ordinary route point. */
if(_route.tail->unity)
{
- MACRO_ROUTE_INCREMENT_TAIL(_route);
- *_route.tail = _pos_null;
+ MACRO_PATH_INCREMENT_TAIL(_route);
+ *_route.tail = _point_null;
}
- MACRO_ROUTE_INCREMENT_TAIL(_route);
- _route.tail->unitx = x2unit(_cmenu_position_x);
- _route.tail->unity = y2unit(_cmenu_position_y);
+ MACRO_PATH_INCREMENT_TAIL(_route);
+ _route.tail->unitx = unitx;
+ _route.tail->unity = unity;
+ _route.tail->time = 0;
+ _route.tail->altitude = NAN;
+
gtk_widget_destroy(confirm);
}
{
printf("%s()\n", __PRETTY_FUNCTION__);
- cmenu_add_way(
+ cmenu_route_add_way(
x2unit(_cmenu_position_x),
y2unit(_cmenu_position_y));
}
static WayPoint *
-find_nearest_visible_waypoint(guint unitx, guint unity)
+find_nearest_waypoint(guint unitx, guint unity)
{
WayPoint *wcurr;
WayPoint *wnear;
guint64 nearest_squared;
- Point pos = { unitx, unity };
+ Point pos = { unitx, unity, 0, NAN };
printf("%s()\n", __PRETTY_FUNCTION__);
- wcurr = wnear = _visible_way_first;
- if(wcurr && wcurr != _visible_way_last)
+ wcurr = wnear = _route.whead;
+ if(wcurr && wcurr != _route.wtail)
{
nearest_squared = DISTANCE_SQUARED(pos, *(wcurr->point));
- while(wcurr++ != _visible_way_last)
+ while(wcurr++ != _route.wtail)
{
guint64 test_squared = DISTANCE_SQUARED(pos, *(wcurr->point));
if(test_squared < nearest_squared)
return wnear;
}
+ MACRO_BANNER_SHOW_INFO(_window, _("There are no waypoints."));
+
vprintf("%s(): return\n", __PRETTY_FUNCTION__);
return NULL;
}
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
cmenu_show_latlon(way->point->unitx, way->point->unity);
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints found."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
{
MACRO_BANNER_SHOW_INFO(_window, way->desc);
}
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
cmenu_clip_latlon(way->point->unitx, way->point->unity);
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
gtk_clipboard_set_text(
gtk_clipboard_get(GDK_SELECTION_CLIPBOARD), way->desc, -1);
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
cmenu_route_to(way->point->unitx, way->point->unity);
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
route_show_distance_to(way->point);
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- if(way)
+ y2unit(_cmenu_position_y))))
{
gchar buffer[BUFFER_SIZE];
GtkWidget *confirm;
}
gtk_widget_destroy(confirm);
}
- else
- {
- MACRO_BANNER_SHOW_INFO(_window, _("No waypoints are visible."));
- }
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
WayPoint *way;
printf("%s()\n", __PRETTY_FUNCTION__);
- way = find_nearest_visible_waypoint(
+ if((way = find_nearest_waypoint(
x2unit(_cmenu_position_x),
- y2unit(_cmenu_position_y));
-
- poi_dialog(ACTION_ADD_POI, way->point->unitx, way->point->unity);
+ y2unit(_cmenu_position_y))))
+ poi_dialog(ACTION_ADD_POI, way->point->unitx, way->point->unity);
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
return TRUE;
{
guint unitx, unity;
latlon2unit(poi.lat, poi.lon, unitx, unity);
- cmenu_add_way(unitx, unity);
+ cmenu_route_add_way(unitx, unity);
}
vprintf("%s(): return TRUE\n", __PRETTY_FUNCTION__);
projects / maemo-mapper / commitdiff