[qmapshack] 01/04: Imported Upstream version 1.2.1
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sat Apr 25 14:29:09 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository qmapshack.
commit aaf2348f14b426e414a5dde96a91e45f6e97d3f9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sat Apr 25 16:14:10 2015 +0200
Imported Upstream version 1.2.1
---
CMakeLists.txt | 2 +-
CMakeLists.txt.user | 14 +-
...eLists.txt.user => CMakeLists.txt.user.3.3-pre1 | 20 +-
changelog.txt | 14 +
src/CMainWindow.cpp | 34 ++
src/CMainWindow.h | 3 +
src/CMakeLists.txt | 9 +
src/IMainWindow.ui | 16 +-
src/gis/CGisListDB.cpp | 30 +-
src/gis/CGisListWks.cpp | 34 +-
src/gis/CGisWidget.cpp | 48 ++
src/gis/CGisWidget.h | 14 +
src/gis/IGisItem.cpp | 19 +-
src/gis/IGisItem.h | 51 +-
src/gis/db/CDBFolderDatabase.cpp | 1 +
src/gis/db/CDBFolderDatabase.h | 6 +
src/gis/db/CDBProject.cpp | 246 ++++++--
src/gis/db/CDBProject.h | 4 +
src/gis/db/CSelectDBFolder.cpp | 79 +++
.../CPositionDialog.h => gis/db/CSelectDBFolder.h} | 25 +-
.../db/CSelectSaveAction.cpp} | 48 +-
.../db/CSelectSaveAction.h} | 36 +-
src/gis/db/CSetupFolder.cpp | 4 +-
src/gis/db/CSetupFolder.h | 2 +-
src/gis/db/IDB.cpp | 23 +-
src/gis/db/IDB.h | 3 +
src/gis/db/IDBFolder.cpp | 53 +-
src/gis/db/IDBFolder.h | 4 +-
src/gis/db/ISelectDBFolder.ui | 78 +++
src/gis/db/ISelectSaveAction.ui | 119 ++++
src/gis/db/ISetupFolder.ui | 24 +-
src/gis/ovl/CGisItemOvlArea.cpp | 15 +
src/gis/ovl/CScrOptOvlArea.cpp | 2 -
src/gis/ovl/IDetailsOvlArea.ui | 6 +
src/gis/prj/CDetailsPrj.cpp | 4 +-
src/gis/prj/IGisProject.cpp | 26 +-
src/gis/prj/IGisProject.h | 42 +-
src/gis/rte/CGisItemRte.cpp | 15 +
src/gis/trk/CGisItemTrk.cpp | 78 ++-
src/gis/trk/CGisItemTrk.h | 3 +
src/gis/trk/CScrOptTrk.cpp | 2 +-
src/gis/trk/IDetailsTrk.ui | 16 +-
src/gis/wpt/CDetailsWpt.cpp | 4 +-
src/gis/wpt/CGisItemWpt.cpp | 48 +-
src/gis/wpt/CGisItemWpt.h | 4 +-
src/gis/wpt/CScrOptWpt.cpp | 3 +-
src/gis/wpt/CSetupNewWpt.cpp | 132 +++++
.../CPositionDialog.h => gis/wpt/CSetupNewWpt.h} | 27 +-
src/gis/wpt/IDetailsWpt.ui | 4 +-
src/gis/wpt/IScrOptWpt.ui | 2 +-
src/gis/wpt/ISetupNewWpt.ui | 115 ++++
src/helpers/CFileExt.h | 18 +-
src/helpers/CPositionDialog.cpp | 83 +--
src/helpers/CPositionDialog.h | 8 +
src/helpers/CSelectProjectDialog.cpp | 9 +
src/helpers/CSelectProjectDialog.h | 2 +
src/helpers/ISelectProjectDialog.ui | 119 ++--
src/locale/qmapshack_cs.ts | 640 ++++++++++++--------
src/locale/qmapshack_de.ts | 651 +++++++++++++--------
src/locale/qmapshack_es.ts | 640 ++++++++++++--------
src/locale/qmapshack_fr.ts | 637 ++++++++++++--------
src/map/CMapIMG.cpp | 2 +
src/map/CMapPathSetup.cpp | 2 +-
src/mouse/CMouseNormal.cpp | 18 +-
src/mouse/CMouseRangeTrk.cpp | 9 +
src/mouse/CScrOptRangeTrk.cpp | 5 -
src/mouse/IMouseEditLine.cpp | 8 +-
src/qlgt/CQlgtDb.cpp | 19 +-
src/qlgt/CQmsDb.cpp | 10 +
src/qlgt/CQmsDb.h | 1 +
src/qlgt/IQlgtOverlay.cpp | 10 +-
src/qlgt/IQlgtOverlay.h | 1 +
src/qlgt/converter.cpp | 32 +
73 files changed, 3172 insertions(+), 1363 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 680c9f4..b5f6823 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,7 +21,7 @@ set(APPLICATION_NAME qmapshack)
set(APPLICATION_VERSION_MAJOR "1")
set(APPLICATION_VERSION_MINOR "2")
-set(APPLICATION_VERSION_PATCH "0")
+set(APPLICATION_VERSION_PATCH "1")
add_definitions(-DVER_MAJOR=${APPLICATION_VERSION_MAJOR} -DVER_MINOR=${APPLICATION_VERSION_MINOR} -DVER_STEP=${APPLICATION_VERSION_PATCH} -DAPPLICATION_NAME=${PROJECT_NAME})
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user
index b4358f2..8a3010e 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.1, 2015-04-13T09:23:04. -->
+<!-- Written by QtCreator 3.3.1, 2015-04-24T20:10:59. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{2664d6c3-cac3-44ef-bde0-590e210eae25}</value>
+ <value type="QByteArray">{044d553a-749a-4a4b-b707-1344605bd255}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -58,9 +58,9 @@
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{021ef025-5564-47de-9a05-7e6d336dd5ab}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in Pfad (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 4.8.4 in Pfad (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{b3896d75-6773-49ab-b85b-a90805c4269a}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -157,9 +157,9 @@
<value type="int">14</value>
</valuelist>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">-d</value>
+ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">-d </value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory">/home/oeichler/Code/cpp/build_QMapShack/</value>
+ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmapshack</value>
diff --git a/CMakeLists.txt.user b/CMakeLists.txt.user.3.3-pre1
similarity index 95%
copy from CMakeLists.txt.user
copy to CMakeLists.txt.user.3.3-pre1
index b4358f2..2d183c2 100644
--- a/CMakeLists.txt.user
+++ b/CMakeLists.txt.user.3.3-pre1
@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
-<!-- Written by QtCreator 3.3.1, 2015-04-13T09:23:04. -->
+<!-- Written by QtCreator 3.2.2, 2015-03-13T18:02:53. -->
<qtcreator>
<data>
<variable>EnvironmentId</variable>
- <value type="QByteArray">{2664d6c3-cac3-44ef-bde0-590e210eae25}</value>
+ <value type="QByteArray">{044d553a-749a-4a4b-b707-1344605bd255}</value>
</data>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
@@ -58,9 +58,9 @@
<data>
<variable>ProjectExplorer.Project.Target.0</variable>
<valuemap type="QVariantMap">
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
- <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{021ef025-5564-47de-9a05-7e6d336dd5ab}</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Qt 4.8.4 in Pfad (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Qt 4.8.4 in Pfad (System)</value>
+ <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{b3896d75-6773-49ab-b85b-a90805c4269a}</value>
<value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
<value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
@@ -72,7 +72,6 @@
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">-j8</value>
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="CMakeProjectManager.MakeStep.Clean">false</value>
- <value type="QString" key="CMakeProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
@@ -88,7 +87,6 @@
<value type="QString" key="CMakeProjectManager.MakeStep.AdditionalArguments">clean</value>
<valuelist type="QVariantList" key="CMakeProjectManager.MakeStep.BuildTargets"/>
<value type="bool" key="CMakeProjectManager.MakeStep.Clean">true</value>
- <value type="QString" key="CMakeProjectManager.MakeStep.MakeCommand"></value>
<value type="bool" key="ProjectExplorer.BuildStep.Enabled">true</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Make</value>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
@@ -157,9 +155,9 @@
<value type="int">14</value>
</valuelist>
<value type="QString" key="CMakeProjectManager.CMakeRunConfiguation.Title">qmapshack</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments">-d</value>
+ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.Arguments"></value>
<value type="bool" key="CMakeProjectManager.CMakeRunConfiguration.UseTerminal">false</value>
- <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory">/home/oeichler/Code/cpp/build_QMapShack/</value>
+ <value type="QString" key="CMakeProjectManager.CMakeRunConfiguration.UserWorkingDirectory"></value>
<value type="int" key="PE.EnvironmentAspect.Base">2</value>
<valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
<value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">qmapshack</value>
@@ -181,10 +179,10 @@
</data>
<data>
<variable>ProjectExplorer.Project.Updater.FileVersion</variable>
- <value type="int">18</value>
+ <value type="int">16</value>
</data>
<data>
<variable>Version</variable>
- <value type="int">18</value>
+ <value type="int">16</value>
</data>
</qtcreator>
diff --git a/changelog.txt b/changelog.txt
index c61cd89..9af20c6 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,3 +1,17 @@
+V 1.2.1
+* Add drag-n-drop of gpx and qms files to QMapShack
+* Fix wait cursor when asking to save project
+* [Issue #15] Using Garmin IMG files crashes on machines with small memory
+* [Issue #16] In Title-bar no Shutdown (Close QMapShack) entry
+* QlgtDB: Convert distance overlays to tracks
+* Fix several issues with range selection
+* Unlock items automatically on edit functions
+* Database projects: Append name with name of parent database folder or device name
+* Set write flag for items copied from devices.
+* Database: Ask before updating items in database
+* Add project to database directly from workspace
+* Wpt: Simplyfy adding new waypoints
+
V 1.2.0
* TwoNav: prepend HTML file for waypoint comment with QMS_CMT
* Devices: Warn if there is a file/path with the same name, but different key
diff --git a/src/CMainWindow.cpp b/src/CMainWindow.cpp
index 9e1a7d2..5b981c1 100644
--- a/src/CMainWindow.cpp
+++ b/src/CMainWindow.cpp
@@ -107,9 +107,11 @@ CMainWindow::CMainWindow()
connect(actionVrtBuilder, SIGNAL(triggered()), this, SLOT(slotBuildVrt()));
connect(actionStoreView, SIGNAL(triggered()), this, SLOT(slotStoreView()));
connect(actionLoadView, SIGNAL(triggered()), this, SLOT(slotLoadView()));
+ connect(actionClose, SIGNAL(triggered()), this, SLOT(close()));
connect(tabWidget, SIGNAL(tabCloseRequested(int)), this, SLOT(slotTabCloseRequest(int)));
+
connect(tabWidget, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabCanvas(int)));
connect(tabMaps, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabMaps(int)));
connect(tabDem, SIGNAL(currentChanged(int)), this, SLOT(slotCurrentTabDem(int)));
@@ -775,3 +777,35 @@ bool CMainWindow::nativeEvent(const QByteArray & eventType, void * message, long
return QWidget::nativeEvent(eventType, message, result);
}
#endif // WIN32
+
+void CMainWindow::dragEnterEvent(QDragEnterEvent *event)
+{
+ if(event->mimeData()->hasUrls())
+ {
+ QList<QUrl> urls = event->mimeData()->urls();
+ QFileInfo fi(urls[0].path());
+ QString ext = fi.suffix().toUpper();
+
+ if ( (ext == "QMS") || (ext == "GPX"))
+ {
+ event->acceptProposedAction();
+ }
+ }
+}
+
+
+void CMainWindow::dropEvent(QDropEvent *event)
+{
+ QList<QUrl> urls = event->mimeData()->urls();
+ QUrl url;
+
+ QStringList filenames;
+ foreach(url, urls)
+ {
+ filenames << url.toLocalFile();
+ }
+
+ loadGISData(filenames);
+
+ event->acceptProposedAction();
+}
diff --git a/src/CMainWindow.h b/src/CMainWindow.h
index 3c611ee..0403bbb 100644
--- a/src/CMainWindow.h
+++ b/src/CMainWindow.h
@@ -72,6 +72,9 @@ public:
protected:
bool CMainWindow::nativeEvent(const QByteArray & eventType, void * message, long * result);
#endif // WIN32
+ void dragEnterEvent(QDragEnterEvent *event);
+ void dropEvent(QDropEvent *event);
+
private slots:
void slotAbout();
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 85b8348..86f6e11 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -126,12 +126,15 @@ set( SRCS
gis/db/CDBItem.cpp
gis/db/CDBProject.cpp
gis/db/CLostFoundProject.cpp
+ gis/db/CSelectSaveAction.cpp
+ gis/db/CSelectDBFolder.cpp
gis/search/CSearchGoogle.cpp
gis/wpt/CGisItemWpt.cpp
gis/wpt/CScrOptWpt.cpp
gis/wpt/CDetailsWpt.cpp
gis/wpt/CDetailsGeoCache.cpp
gis/wpt/CProjWpt.cpp
+ gis/wpt/CSetupNewWpt.cpp
gis/trk/CGisItemTrk.cpp
gis/trk/CScrOptTrk.cpp
gis/trk/CDetailsTrk.cpp
@@ -302,11 +305,14 @@ set( HDRS
gis/db/CDBItem.h
gis/db/CDBProject.h
gis/db/CLostFoundProject.h
+ gis/db/CSelectSaveAction.h
+ gis/db/CSelectDBFolder.h
gis/wpt/CGisItemWpt.h
gis/wpt/CScrOptWpt.h
gis/wpt/CDetailsWpt.h
gis/wpt/CDetailsGeoCache.h
gis/wpt/CProjWpt.h
+ gis/wpt/CSetupNewWpt.h
gis/trk/CGisItemTrk.h
gis/trk/CScrOptTrk.h
gis/trk/CDetailsTrk.h
@@ -399,10 +405,13 @@ set( UIS
gis/db/ISetupDatabase.ui
gis/db/ISetupWorkspace.ui
gis/db/ISetupFolder.ui
+ gis/db/ISelectSaveAction.ui
+ gis/db/ISelectDBFolder.ui
gis/wpt/IScrOptWpt.ui
gis/wpt/IDetailsWpt.ui
gis/wpt/IDetailsGeoCache.ui
gis/wpt/IProjWpt.ui
+ gis/wpt/ISetupNewWpt.ui
gis/trk/IScrOptTrk.ui
gis/trk/IDetailsTrk.ui
gis/trk/ICombineTrk.ui
diff --git a/src/IMainWindow.ui b/src/IMainWindow.ui
index 56309eb..d662a81 100644
--- a/src/IMainWindow.ui
+++ b/src/IMainWindow.ui
@@ -10,6 +10,9 @@
<height>600</height>
</rect>
</property>
+ <property name="acceptDrops">
+ <bool>true</bool>
+ </property>
<property name="windowTitle">
<string>QMapShack</string>
</property>
@@ -52,7 +55,7 @@
<x>0</x>
<y>0</y>
<width>800</width>
- <height>21</height>
+ <height>23</height>
</rect>
</property>
<widget class="QMenu" name="menuFile">
@@ -67,6 +70,8 @@
<addaction name="separator"/>
<addaction name="actionSetupMapPaths"/>
<addaction name="actionSetupDEMPaths"/>
+ <addaction name="separator"/>
+ <addaction name="actionClose"/>
</widget>
<widget class="QMenu" name="menuView">
<property name="title">
@@ -525,6 +530,15 @@
<string>Ctrl+E</string>
</property>
</action>
+ <action name="actionClose">
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/icons/32x32/Off.png</normaloff>:/icons/32x32/Off.png</iconset>
+ </property>
+ <property name="text">
+ <string>Close</string>
+ </property>
+ </action>
</widget>
<resources>
<include location="resources.qrc"/>
diff --git a/src/gis/CGisListDB.cpp b/src/gis/CGisListDB.cpp
index f4fb544..f3f7268 100644
--- a/src/gis/CGisListDB.cpp
+++ b/src/gis/CGisListDB.cpp
@@ -170,6 +170,34 @@ bool CGisListDB::event(QEvent * e)
e->accept();
return true;
}
+
+ case eEvtW2DCreate:
+ {
+ CEvtW2DCreate * evt = (CEvtW2DCreate*)e;
+ CDBFolderDatabase * db = getDataBase(evt->db);
+ if(db)
+ {
+ quint64 idChild = 0;
+ IDBFolder * folder = db->getFolder(evt->idParent);
+ if(folder)
+ {
+ idChild = folder->addFolder(evt->type, evt->name);
+ }
+ else
+ {
+ idChild = IDBFolder::addFolderToDb(evt->type, evt->name, evt->idParent, db->getDb());
+ }
+
+ if(idChild)
+ {
+ evt->idChild = idChild;
+ CEvtD2WShowFolder * evt1 = new CEvtD2WShowFolder(idChild, evt->db);
+ CGisWidget::self().postEventForWks(evt1);
+ }
+ }
+ e->accept();
+ return true;
+ }
}
return QTreeWidget::event(e);
@@ -272,7 +300,7 @@ void CGisListDB::slotAddFolder()
IDBFolder::type_e type = IDBFolder::eTypeProject;
QString name;
- CSetupFolder dlg(type, name, this);
+ CSetupFolder dlg(type, name, true, this);
if(dlg.exec() != QDialog::Accepted)
{
return;
diff --git a/src/gis/CGisListWks.cpp b/src/gis/CGisListWks.cpp
index a88374b..3474fe5 100644
--- a/src/gis/CGisListWks.cpp
+++ b/src/gis/CGisListWks.cpp
@@ -32,6 +32,8 @@
#include "gis/IGisItem.h"
#include "gis/db/CDBProject.h"
#include "gis/db/CLostFoundProject.h"
+#include "gis/db/CSelectDBFolder.h"
+#include "gis/db/CSetupFolder.h"
#include "gis/db/macros.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/ovl/CGisItemOvlArea.h"
@@ -113,19 +115,23 @@ CGisListWks::CGisListWks(QWidget *parent)
menuItemTrk = new QMenu(this);
actionEditDetails = menuItemTrk->addAction(QIcon("://icons/32x32/EditDetails.png"),tr("Edit..."), this, SLOT(slotEditItem()));
actionCopyItem = menuItemTrk->addAction(QIcon("://icons/32x32/Copy.png"),tr("Copy to..."), this, SLOT(slotCopyItem()));
+ menuItemTrk->addSeparator();
actionFocusTrk = menuItemTrk->addAction(QIcon("://icons/32x32/TrkProfile.png"),tr("Track Profile"));
actionFocusTrk->setCheckable(true);
actionRangeTrk = menuItemTrk->addAction(QIcon("://icons/32x32/SelectRange.png"),tr("Select Range"), this, SLOT(slotRangeTrk()));
actionEditTrk = menuItemTrk->addAction(QIcon("://icons/32x32/LineMove.png"),tr("Edit Track Points"), this, SLOT(slotEditTrk()));
actionReverseTrk = menuItemTrk->addAction(QIcon("://icons/32x32/Reverse.png"),tr("Reverse Track"), this, SLOT(slotReverseTrk()));
actionCombineTrk = menuItemTrk->addAction(QIcon("://icons/32x32/Combine.png"),tr("Combine Tracks"), this, SLOT(slotCombineTrk()));
+ menuItemTrk->addSeparator();
actionDelete = menuItemTrk->addAction(QIcon("://icons/32x32/DeleteOne.png"),tr("Delete"), this, SLOT(slotDeleteItem()));
menuItemWpt = new QMenu(this);
menuItemWpt->addAction(actionEditDetails);
menuItemWpt->addAction(actionCopyItem);
+ menuItemWpt->addSeparator();
actionMoveWpt = menuItemWpt->addAction(QIcon("://icons/32x32/WptMove.png"),tr("Move Waypoint"), this, SLOT(slotMoveWpt()));
actionProjWpt = menuItemWpt->addAction(QIcon("://icons/32x32/WptProj.png"),tr("Proj. Waypoint..."), this, SLOT(slotProjWpt()));
+ menuItemWpt->addSeparator();
menuItemWpt->addAction(actionDelete);
menuItemRte = new QMenu(this);
@@ -137,7 +143,9 @@ CGisListWks::CGisListWks(QWidget *parent)
menuItemOvl = new QMenu(this);
menuItemOvl->addAction(actionEditDetails);
menuItemOvl->addAction(actionCopyItem);
+ menuItemOvl->addSeparator();
actionEditArea = menuItemOvl->addAction(QIcon("://icons/32x32/AreaMove.png"),tr("Edit Area Points"), this, SLOT(slotEditArea()));
+ menuItemOvl->addSeparator();
menuItemOvl->addAction(actionDelete);
@@ -854,6 +862,7 @@ void CGisListWks::slotContextMenu(const QPoint& point)
if(gisItem != 0)
{
bool isOnDevice = gisItem->isOnDevice();
+
switch(gisItem->type())
{
case IGisItem::eTypeTrk:
@@ -1184,13 +1193,13 @@ void CGisListWks::slotEditArea()
void CGisListWks::slotAddEmptyProject()
{
- CGisListWksEditLock lock(true, IGisItem::mutexItems);
+ CGisListWksEditLock lock(false, IGisItem::mutexItems);
QString key, name;
CSelectProjectDialog::type_e type;
CSelectProjectDialog dlg(key, name, type, 0);
dlg.exec();
- if(name.isEmpty())
+ if(name.isEmpty() && (type != CSelectProjectDialog::eTypeDb))
{
return;
}
@@ -1203,6 +1212,27 @@ void CGisListWks::slotAddEmptyProject()
{
new CQmsProject(name, this);
}
+ else if(type == CSelectProjectDialog::eTypeDb)
+ {
+ quint64 idParent;
+ QString db;
+ IDBFolder::type_e type;
+
+ CSelectDBFolder dlg1(idParent, db, this);
+ if(dlg1.exec() == QDialog::Rejected)
+ {
+ return;
+ }
+
+ CSetupFolder dlg2(type, name, false, this);
+ if(dlg2.exec() == QDialog::Rejected)
+ {
+ return;
+ }
+
+ CEvtW2DCreate * evt = new CEvtW2DCreate(name, type, idParent, db);
+ CGisWidget::self().postEventForDb(evt);
+ }
}
diff --git a/src/gis/CGisWidget.cpp b/src/gis/CGisWidget.cpp
index adf7823..e940451 100644
--- a/src/gis/CGisWidget.cpp
+++ b/src/gis/CGisWidget.cpp
@@ -22,6 +22,8 @@
#include "gis/CGisWidget.h"
#include "gis/IGisItem.h"
#include "gis/db/CDBProject.h"
+#include "gis/db/CSelectDBFolder.h"
+#include "gis/db/CSetupFolder.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/ovl/CGisItemOvlArea.h"
#include "gis/prj/IGisProject.h"
@@ -170,6 +172,37 @@ IGisProject * CGisWidget::selectProject()
}
}
}
+ else if(type == CSelectProjectDialog::eTypeDb)
+ {
+ quint64 idParent;
+ QString db;
+ IDBFolder::type_e type;
+
+ CSelectDBFolder dlg1(idParent, db, this);
+ if(dlg1.exec() == QDialog::Rejected)
+ {
+ return 0;
+ }
+
+ CSetupFolder dlg2(type, name, false, this);
+ if(dlg2.exec() == QDialog::Rejected)
+ {
+ return 0;
+ }
+
+ QMutexLocker lock(&IGisItem::mutexItems);
+ CEvtW2DCreate evt(name, type, idParent, db);
+ QApplication::sendEvent(treeDB, &evt);
+
+ if(evt.idChild)
+ {
+ while(project == 0)
+ {
+ QApplication::processEvents(QEventLoop::WaitForMoreEvents|QEventLoop::ExcludeUserInputEvents, 100);
+ project = treeWks->getProjectById(evt.idChild, db);
+ }
+ }
+ }
else if(!name.isEmpty())
{
QMutexLocker lock(&IGisItem::mutexItems);
@@ -349,6 +382,11 @@ void CGisWidget::moveWptByKey(const IGisItem::key_t& key)
CGisItemWpt * wpt = dynamic_cast<CGisItemWpt*>(getItemByKey(key));
if(wpt != 0)
{
+ if(!wpt->setReadOnlyMode(false))
+ {
+ return;
+ }
+
CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
if(canvas != 0)
{
@@ -421,6 +459,11 @@ void CGisWidget::editTrkByKey(const IGisItem::key_t& key)
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(getItemByKey(key));
if(trk != 0)
{
+ if(!trk->setReadOnlyMode(false))
+ {
+ return;
+ }
+
CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
if(canvas != 0)
{
@@ -451,6 +494,11 @@ void CGisWidget::editAreaByKey(const IGisItem::key_t& key)
CGisItemOvlArea * area = dynamic_cast<CGisItemOvlArea*>(getItemByKey(key));
if(area != 0)
{
+ if(!area->setReadOnlyMode(false))
+ {
+ return;
+ }
+
CCanvas * canvas = CMainWindow::self().getVisibleCanvas();
if(canvas != 0)
{
diff --git a/src/gis/CGisWidget.h b/src/gis/CGisWidget.h
index a7fcc6b..21b3edc 100644
--- a/src/gis/CGisWidget.h
+++ b/src/gis/CGisWidget.h
@@ -39,6 +39,7 @@ enum event_types_e
,eEvtD2WUpdateLnF = QEvent::User + 6
,eEvtW2DAckInfo = QEvent::User + 100
+ ,eEvtW2DCreate = QEvent::User + 101
};
struct evt_item_t
@@ -132,6 +133,19 @@ public:
QString db;
};
+class CEvtW2DCreate : public QEvent
+{
+public:
+ CEvtW2DCreate(const QString& name, IDBFolder::type_e type, quint64 id, const QString& db) : QEvent(QEvent::Type(eEvtW2DCreate)), name(name), type(type), idParent(id), idChild(0), db(db)
+ {
+ }
+
+ QString name;
+ IDBFolder::type_e type;
+ quint64 idParent;
+ quint64 idChild;
+ QString db;
+};
class CGisWidget : public QWidget, private Ui::IGisWidget
diff --git a/src/gis/IGisItem.cpp b/src/gis/IGisItem.cpp
index a639c4f..46b3d98 100644
--- a/src/gis/IGisItem.cpp
+++ b/src/gis/IGisItem.cpp
@@ -398,25 +398,37 @@ bool IGisItem::isOnDevice() const
return project->isOnDevice();
}
-void IGisItem::setReadOnlyMode(bool readOnly)
+bool IGisItem::setReadOnlyMode(bool readOnly)
{
+ // if the item is on a device no change is allowed
if(isOnDevice())
{
- return;
+ return false;
+ }
+
+ // test if it is a change at all
+ if(isReadOnly() == readOnly)
+ {
+ return true;
}
+ // warn if item is external and read only
if(!(flags & (eFlagCreatedInQms|eFlagTainted)))
{
if(isReadOnly() && !readOnly)
{
+ QApplication::setOverrideCursor(Qt::ArrowCursor);
QString str = QObject::tr("This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press'Ok'.");
if(QMessageBox::warning(&CMainWindow::self(), QObject::tr("Read Only Mode..."), str, QMessageBox::Ok|QMessageBox::Abort, QMessageBox::Ok) != QMessageBox::Ok)
{
- return;
+ QApplication::restoreOverrideCursor();
+ return false;
}
+ QApplication::restoreOverrideCursor();
}
}
+ // finally change falg
if(readOnly)
{
flags &= ~eFlagWriteAllowed;
@@ -427,6 +439,7 @@ void IGisItem::setReadOnlyMode(bool readOnly)
}
updateHistory();
+ return true;
}
diff --git a/src/gis/IGisItem.h b/src/gis/IGisItem.h
index a37f89f..de5273c 100644
--- a/src/gis/IGisItem.h
+++ b/src/gis/IGisItem.h
@@ -269,6 +269,10 @@ public:
*/
bool isTainted() const;
+ /**
+ @brief Check if item is on a GPS device
+ @return True if the item is stored on a device
+ */
bool isOnDevice() const;
/**
@@ -278,8 +282,10 @@ public:
message box with a warning and ask the user to confirm.
@param readOnly set true to make item read only
+
+ @return Return true if the mode change has been accepted.
*/
- virtual void setReadOnlyMode(bool readOnly);
+ virtual bool setReadOnlyMode(bool readOnly);
virtual void drawItem(QPainter& p, const QPolygonF& viewport, QList<QRectF>& blockedAreas, CGisDraw * gis) = 0;
virtual void drawItem(QPainter& p, const QRectF& viewport, CGisDraw * gis)
@@ -336,13 +342,56 @@ public:
*/
void loadHistory(int idx);
+ /**
+ @brief Remove all history entries younger than the current selected one.
+ */
void cutHistory();
+ /**
+ @brief Remove all HTML tags from a string
+ @param str the string
+ @return A string without HTML tags
+ */
static QString removeHtml(const QString &str);
+ /**
+ @brief Create a HTML formated text with comment, description and link section.
+
+ Depending on the isReadOnly flag the section headers are links to trigger a function
+
+ @param isReadOnly true if the text should have no active links
+ @param cmt the comment string
+ @param desc the description string
+ @param links a list of links
+ @param key some key to be sent with the header links
+ @return The formated text ready to be used.
+ */
static QString createText(bool isReadOnly, const QString& cmt, const QString& desc, const QList<link_t>& links, const QString& key = "");
+ /**
+ @brief Create a HTML formated text with description and link section.
+
+ Depending on the isReadOnly flag the section headers are links to trigger a function
+
+ @param isReadOnly true if the text should have no active links
+ @param desc the description string
+ @param links a list of links
+ @param key some key to be sent with the header links
+ @return The formated text ready to be used.
+ */
static QString createText(bool isReadOnly, const QString& desc, const QList<link_t>& links, const QString& key = "");
+ /**
+ @brief Create a HTML formated text with a link.
+
+ Depending on the isReadOnly flag the section headers are links to trigger a function
+
+ @param isReadOnly true if the text should have no active links
+ @param href the link address
+ @param str the link's string
+ @param key some key to be sent with the link
+ @return The formated text ready to be used.
+ */
static QString toLink(bool isReadOnly, const QString& href, const QString& str, const QString& key);
+ /// a no key value that can be used to nullify references.
static QString noKey;
protected:
diff --git a/src/gis/db/CDBFolderDatabase.cpp b/src/gis/db/CDBFolderDatabase.cpp
index 7a185c8..a42360f 100644
--- a/src/gis/db/CDBFolderDatabase.cpp
+++ b/src/gis/db/CDBFolderDatabase.cpp
@@ -53,3 +53,4 @@ void CDBFolderDatabase::updateLostFound()
folderLostFound->update();
}
}
+
diff --git a/src/gis/db/CDBFolderDatabase.h b/src/gis/db/CDBFolderDatabase.h
index 0b1e092..f7bb4a0 100644
--- a/src/gis/db/CDBFolderDatabase.h
+++ b/src/gis/db/CDBFolderDatabase.h
@@ -36,6 +36,12 @@ public:
{
return filename;
}
+
+ QSqlDatabase& getDb()
+ {
+ return IDB::db;
+ }
+
private:
QString filename;
CDBFolderLostFound * folderLostFound;
diff --git a/src/gis/db/CDBProject.cpp b/src/gis/db/CDBProject.cpp
index fece4cd..31dafda 100644
--- a/src/gis/db/CDBProject.cpp
+++ b/src/gis/db/CDBProject.cpp
@@ -19,6 +19,7 @@
#include "CMainWindow.h"
#include "gis/CGisWidget.h"
#include "gis/db/CDBProject.h"
+#include "gis/db/CSelectSaveAction.h"
#include "gis/db/macros.h"
#include "gis/gpx/CGpxProject.h"
#include "gis/ovl/CGisItemOvlArea.h"
@@ -28,6 +29,7 @@
#include "gis/wpt/CGisItemWpt.h"
#include "helpers/CSettings.h"
+
#include <QtSql>
#include <QtWidgets>
CDBProject::CDBProject(CGisListWks * parent)
@@ -73,7 +75,7 @@ CDBProject::CDBProject(const QString& dbName, quint64 id, CGisListWks *parent)
filename = dbName;
}
- setText(CGisListWks::eColumnName, name);
+ setupName(name);
setToolTip(CGisListWks::eColumnName, getInfo());
updateItems();
valid = true;
@@ -101,6 +103,24 @@ void CDBProject::restoreDBLink()
}
}
+void CDBProject::setupName(const QString &defaultName)
+{
+ IGisProject::setupName(defaultName);
+
+ QSqlQuery query(db);
+ query.prepare("SELECT t1.name FROM folders AS t1 WHERE id=(SELECT parent FROM folder2folder WHERE child=:id) AND (t1.type=:type1 OR t1.type=:type2)");
+ query.bindValue(":id", id);
+ query.bindValue(":type1", IDBFolder::eTypeGroup);
+ query.bindValue(":type2", IDBFolder::eTypeProject);
+ QUERY_EXEC( );
+ if(query.next())
+ {
+ nameSuffix = query.value(0).toString();
+ }
+ setText(CGisListWks::eColumnName, getNameEx());
+}
+
+
void CDBProject::postStatus()
{
CEvtW2DAckInfo * info = new CEvtW2DAckInfo(true, getId(), db.connectionName());
@@ -153,12 +173,84 @@ bool CDBProject::saveAs()
return res;
}
+void CDBProject::updateItem(IGisItem * item, quint64 idItem)
+{
+ QSqlQuery query(db);
+
+ // serialize complete history of item
+ QByteArray data;
+ QDataStream in(&data, QIODevice::WriteOnly);
+ in.setByteOrder(QDataStream::LittleEndian);
+ in.setVersion(QDataStream::Qt_5_2);
+ in << item->getHistory();
+
+ // prepare icon to be saved
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadWrite);
+ QPixmap pixmap = item->getIcon();
+ pixmap.save(&buffer, "PNG");
+ buffer.seek(0);
+
+ query.prepare("UPDATE items SET type=:type, key=:key, icon=:icon, name=:name, comment=:comment, data=:data WHERE id=:id");
+ query.bindValue(":type", item->type());
+ query.bindValue(":key", item->getKey().item);
+ query.bindValue(":icon", buffer.data());
+ query.bindValue(":name", item->getName());
+ query.bindValue(":comment", item->getInfo());
+ query.bindValue(":data", data);
+ query.bindValue(":id", idItem);
+ QUERY_EXEC(throw -1);
+}
+
+quint64 CDBProject::insertItem(IGisItem * item)
+{
+ QSqlQuery query(db);
+
+ // serialize complete history of item
+ QByteArray data;
+ QDataStream in(&data, QIODevice::WriteOnly);
+ in.setByteOrder(QDataStream::LittleEndian);
+ in.setVersion(QDataStream::Qt_5_2);
+ in << item->getHistory();
+
+ // prepare icon to be saved
+ QBuffer buffer;
+ buffer.open(QIODevice::ReadWrite);
+ QPixmap pixmap = item->getIcon();
+ pixmap.save(&buffer, "PNG");
+ buffer.seek(0);
+
+ query.prepare("INSERT INTO items (type, key, icon, name, comment, data) VALUES (:type, :key, :icon, :name, :comment, :data)");
+ query.bindValue(":type", item->type());
+ query.bindValue(":key", item->getKey().item);
+ query.bindValue(":icon", buffer.data());
+ query.bindValue(":name", item->getName());
+ query.bindValue(":comment", item->getInfo());
+ query.bindValue(":data", data);
+ QUERY_EXEC(throw -1);
+
+ query.prepare("SELECT last_insert_rowid() from items");
+ QUERY_EXEC(throw -1);
+ query.next();
+ quint64 idItem = query.value(0).toULongLong();
+ if(idItem == 0)
+ {
+ qDebug() << "childId equals 0. bad.";
+ throw -1;
+ }
+
+ return idItem;
+}
+
bool CDBProject::save()
{
+ bool clearProjectChangeFlag = true;
+ int lastResult = CSelectSaveAction::eResultNone;
+
QSqlQuery query(db);
int N = childCount();
- QProgressDialog progress(QObject::tr("Save ..."), QObject::tr("Abort save"), 0, 100);
+ QProgressDialog progress(QObject::tr("Save ..."), QObject::tr("Abort save"), 0, 100, &CMainWindow::self());
progress.setWindowModality(Qt::WindowModal);
CEvtW2DAckInfo * info = new CEvtW2DAckInfo(true, getId(), db.connectionName());
@@ -180,78 +272,112 @@ bool CDBProject::save()
continue;
}
+ // skip unchanged items
if(item->text(CGisListWks::eColumnDecoration).isEmpty())
{
info->keysChildren << item->getKey().item;
continue;
}
- quint64 idItem = 0;
-
- // serialize complete history of item
- QByteArray data;
- QDataStream in(&data, QIODevice::WriteOnly);
- in.setByteOrder(QDataStream::LittleEndian);
- in.setVersion(QDataStream::Qt_5_2);
- in << item->getHistory();
-
// test if item exists in database
- query.prepare("SELECT id FROM items WHERE key=:key");
+ quint64 idItem = 0;
+ quint32 typeItem = 0;
+ query.prepare("SELECT id, type FROM items WHERE key=:key");
query.bindValue(":key", item->getKey().item);
QUERY_EXEC(throw -1);
- QBuffer buffer;
- buffer.open(QIODevice::ReadWrite);
- QPixmap pixmap = item->getIcon();
- pixmap.save(&buffer, "PNG");
- buffer.seek(0);
-
-
if(query.next())
{
- // item exits -> update item data in database
- idItem = query.value(0).toULongLong();
- query.prepare("UPDATE items SET type=:type, key=:key, icon=:icon, name=:name, comment=:comment, data=:data WHERE id=:id");
- query.bindValue(":type", item->type());
- query.bindValue(":key", item->getKey().item);
- query.bindValue(":icon", buffer.data());
- query.bindValue(":name", item->getName());
- query.bindValue(":comment", item->getInfo());
- query.bindValue(":data", data);
- query.bindValue(":id", idItem);
- QUERY_EXEC(throw -1);
- }
- else
- {
- // item is unknown to database -> create item in database
- query.prepare("INSERT INTO items (type, key, icon, name, comment, data) VALUES (:type, :key, :icon, :name, :comment, :data)");
- query.bindValue(":type", item->type());
- query.bindValue(":key", item->getKey().item);
- query.bindValue(":icon", buffer.data());
- query.bindValue(":name", item->getName());
- query.bindValue(":comment", item->getInfo());
- query.bindValue(":data", data);
- QUERY_EXEC(throw -1);
+ idItem = query.value(0).toULongLong();
+ typeItem = query.value(1).toUInt();
- query.prepare("SELECT last_insert_rowid() from items");
- QUERY_EXEC(throw -1);
- query.next();
- idItem = query.value(0).toULongLong();
- if(idItem == 0)
+ // check if relation already exists.
+ query.prepare("SELECT id FROM folder2item WHERE parent=:parent AND child=:child");
+ query.bindValue(":parent", id);
+ query.bindValue(":child", idItem);
+ QUERY_EXEC(; );
+
+ if(!query.next())
{
- qDebug() << "childId equals 0. bad.";
- throw -1;
+ // update dialog
+ int result = lastResult;
+
+ if(lastResult == CSelectSaveAction::eResultNone)
+ {
+ IGisItem * item1 = 0;
+
+ // load item from database for a compare
+ switch(typeItem)
+ {
+ case IGisItem::eTypeWpt:
+ item1 = new CGisItemWpt(idItem, db, 0);
+ break;
+
+ case IGisItem::eTypeTrk:
+ item1 = new CGisItemTrk(idItem, db, 0);
+ break;
+
+ case IGisItem::eTypeRte:
+ item1 = new CGisItemRte(idItem, db, 0);
+ break;
+
+ case IGisItem::eTypeOvl:
+ item1 = new CGisItemOvlArea(idItem, db, 0);
+ break;
+
+ default:;
+ }
+
+ if(item1 == 0)
+ {
+ qDebug() << "no item to compare!?.";
+ throw -1;
+ }
+
+ QApplication::setOverrideCursor(Qt::ArrowCursor);
+ CSelectSaveAction dlg(item, item1, &progress);
+ dlg.exec();
+ QApplication::restoreOverrideCursor();
+
+ result = dlg.getResult();
+ if(dlg.allOthersToo())
+ {
+ lastResult = result;
+ }
+ }
+ if(result == CSelectSaveAction::eResultNone)
+ {
+ // no decision by user, cancel operation.
+ // this is different to a skip as a skip will
+ // just skip saving the data, but the item to folder
+ // link will be still processed.
+ clearProjectChangeFlag = false;
+ continue;
+ }
+
+ // create relation
+ query.prepare("INSERT INTO folder2item (parent, child) VALUES (:parent, :child)");
+ query.bindValue(":parent", id);
+ query.bindValue(":child", idItem);
+ QUERY_EXEC(throw -1);
+
+ if(result == CSelectSaveAction::eResultSave)
+ {
+ // the item is in the database and has no relation to the folder -> update only if the user confirms.
+ updateItem(item, idItem);
+ }
+ }
+ else
+ {
+ // the item is in the database and has a relation to the folder -> simply update item
+ updateItem(item, idItem);
}
}
-
- // check if relation already exists.
- query.prepare("SELECT id FROM folder2item WHERE parent=:parent AND child=:child");
- query.bindValue(":parent", id);
- query.bindValue(":child", idItem);
- QUERY_EXEC(; );
-
- if(!query.next())
+ else
{
+ // the item is not in the database -> insert item and create relation to folder
+ idItem = insertItem(item);
+
// create relation
query.prepare("INSERT INTO folder2item (parent, child) VALUES (:parent, :child)");
query.bindValue(":parent", id);
@@ -280,7 +406,10 @@ bool CDBProject::save()
info->updateLostFound = true;
CGisWidget::self().postEventForDb(info);
- setText(CGisListWks::eColumnDecoration,"");
+ if(clearProjectChangeFlag)
+ {
+ setText(CGisListWks::eColumnDecoration,"");
+ }
}
catch(int n)
{
@@ -293,7 +422,6 @@ bool CDBProject::save()
info->updateLostFound = true;
CGisWidget::self().postEventForDb(info);
}
-
return false;
}
return true;
diff --git a/src/gis/db/CDBProject.h b/src/gis/db/CDBProject.h
index 6c60bf4..c3052a1 100644
--- a/src/gis/db/CDBProject.h
+++ b/src/gis/db/CDBProject.h
@@ -81,6 +81,10 @@ public:
void hideItems(CEvtD2WHideItems * evt);
protected:
+ void setupName(const QString &defaultName);
+ void updateItem(IGisItem * item, quint64 idItem);
+ quint64 insertItem(IGisItem * item);
+
QSqlDatabase db;
quint64 id;
};
diff --git a/src/gis/db/CSelectDBFolder.cpp b/src/gis/db/CSelectDBFolder.cpp
new file mode 100644
index 0000000..62213d6
--- /dev/null
+++ b/src/gis/db/CSelectDBFolder.cpp
@@ -0,0 +1,79 @@
+/**********************************************************************************************
+ Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "gis/db/CDBFolderDatabase.h"
+#include "gis/db/CSelectDBFolder.h"
+#include "helpers/CSettings.h"
+
+#include <QtWidgets>
+
+CSelectDBFolder::CSelectDBFolder(quint64 &id, QString &db, QWidget *parent)
+ : QDialog(parent)
+ , id(id)
+ , db(db)
+{
+ setupUi(this);
+
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+
+ SETTINGS;
+ QStringList names = cfg.value("Database/names").toStringList();
+ QStringList files = cfg.value("Database/files").toStringList();
+
+ const int N = names.count();
+ for(int i = 0; i < N; i++)
+ {
+ new CDBFolderDatabase(files[i], names[i], treeWidget);
+ }
+
+ connect(treeWidget, SIGNAL(itemExpanded(QTreeWidgetItem*)), this, SLOT(slotItemExpanded(QTreeWidgetItem*)));
+ connect(treeWidget, SIGNAL(itemSelectionChanged()), this, SLOT(slotItemSelectionChanged()));
+}
+
+CSelectDBFolder::~CSelectDBFolder()
+{
+}
+
+void CSelectDBFolder::slotItemExpanded(QTreeWidgetItem * item)
+{
+ IDBFolder * folder = dynamic_cast<IDBFolder*>(item);
+ if(folder == 0)
+ {
+ return;
+ }
+
+ folder->expanding();
+}
+
+
+void CSelectDBFolder::slotItemSelectionChanged()
+{
+ IDBFolder * folder = dynamic_cast<IDBFolder*>(treeWidget->currentItem());
+ if(folder)
+ {
+ id = folder->getId();
+ db = folder->getDBName();
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+ }
+ else
+ {
+ id = -1;
+ db.clear();
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+ }
+}
diff --git a/src/helpers/CPositionDialog.h b/src/gis/db/CSelectDBFolder.h
similarity index 71%
copy from src/helpers/CPositionDialog.h
copy to src/gis/db/CSelectDBFolder.h
index 59e1824..6f7a329 100644
--- a/src/helpers/CPositionDialog.h
+++ b/src/gis/db/CSelectDBFolder.h
@@ -16,30 +16,27 @@
**********************************************************************************************/
-#ifndef CPOSITIONDIALOG_H
-#define CPOSITIONDIALOG_H
+#ifndef CSELECTDBFOLDER_H
+#define CSELECTDBFOLDER_H
-#include "ui_IPositionDialog.h"
+#include "ui_ISelectDBFolder.h"
#include <QDialog>
-class QPointF;
-
-class CPositionDialog : public QDialog, private Ui::IPositionDialog
+class CSelectDBFolder : public QDialog, private Ui::ISelectDBFolder
{
Q_OBJECT
public:
- CPositionDialog(QWidget * parent, QPointF &pos);
- virtual ~CPositionDialog();
-
-public slots:
- void accept();
+ CSelectDBFolder(quint64& id, QString& db, QWidget * parent);
+ virtual ~CSelectDBFolder();
private slots:
- void slotEdit(const QString& str);
+ void slotItemExpanded(QTreeWidgetItem * item);
+ void slotItemSelectionChanged();
private:
- QPointF& pos;
+ quint64& id;
+ QString& db;
};
-#endif //CPOSITIONDIALOG_H
+#endif //CSELECTDBFOLDER_H
diff --git a/src/mouse/CScrOptRangeTrk.cpp b/src/gis/db/CSelectSaveAction.cpp
similarity index 53%
copy from src/mouse/CScrOptRangeTrk.cpp
copy to src/gis/db/CSelectSaveAction.cpp
index 0cd7f14..a010ccb 100644
--- a/src/mouse/CScrOptRangeTrk.cpp
+++ b/src/gis/db/CSelectSaveAction.cpp
@@ -16,37 +16,45 @@
**********************************************************************************************/
-#include "CMainWindow.h"
-#include "gis/trk/CGisItemTrk.h"
-#include "mouse/CScrOptRangeTrk.h"
+#include "gis/IGisItem.h"
+#include "gis/db/CSelectSaveAction.h"
-#include <QtWidgets>
-
-CScrOptRangeTrk::CScrOptRangeTrk(const QPointF &point, CGisItemTrk * trk, QWidget *parent)
- : IScrOpt(parent)
+CSelectSaveAction::CSelectSaveAction(const IGisItem *src, const IGisItem *tar, QWidget *parent)
+ : QDialog(parent)
+ , result(eResultNone)
{
setupUi(this);
- label->setFont(CMainWindow::self().getMapFont());
- label->setText(trk->getInfoRange());
- adjustSize();
- bool isReadOnly = trk->isReadOnly();
- toolHidePoints->setEnabled(!isReadOnly);
- toolShowPoints->setEnabled(!isReadOnly);
+ labelIcon1->setPixmap(src->getIcon());
+ labelInfo1->setText(src->getInfo());
+ labelIcon2->setPixmap(tar->getIcon());
+ labelInfo2->setText(tar->getInfo());
- setOrigin(point.toPoint());
+ adjustSize();
- qDebug() << point << (point.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
- move(point.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
- show();
+ connect(pushSave, SIGNAL(clicked()), this, SLOT(slotSelectResult()));
+ connect(pushSkip, SIGNAL(clicked()), this, SLOT(slotSelectResult()));
}
-CScrOptRangeTrk::~CScrOptRangeTrk()
+CSelectSaveAction::~CSelectSaveAction()
{
}
-void CScrOptRangeTrk::draw(QPainter& p)
+bool CSelectSaveAction::allOthersToo()
{
- drawBubble2(origin, p);
+ return checkAllOtherToo->isChecked();
}
+void CSelectSaveAction::slotSelectResult()
+{
+ if(sender() == pushSave)
+ {
+ result = eResultSave;
+ }
+ else if(sender() == pushSkip)
+ {
+ result = eResultSkip;
+ }
+
+ accept();
+}
diff --git a/src/helpers/CPositionDialog.h b/src/gis/db/CSelectSaveAction.h
similarity index 63%
copy from src/helpers/CPositionDialog.h
copy to src/gis/db/CSelectSaveAction.h
index 59e1824..834fb4e 100644
--- a/src/helpers/CPositionDialog.h
+++ b/src/gis/db/CSelectSaveAction.h
@@ -16,30 +16,40 @@
**********************************************************************************************/
-#ifndef CPOSITIONDIALOG_H
-#define CPOSITIONDIALOG_H
+#ifndef CSELECTSAVEACTION_H
+#define CSELECTSAVEACTION_H
-#include "ui_IPositionDialog.h"
+#include "ui_ISelectSaveAction.h"
#include <QDialog>
-class QPointF;
+class IGisItem;
-class CPositionDialog : public QDialog, private Ui::IPositionDialog
+class CSelectSaveAction : public QDialog, private Ui::ISelectSaveAction
{
Q_OBJECT
public:
- CPositionDialog(QWidget * parent, QPointF &pos);
- virtual ~CPositionDialog();
-
-public slots:
- void accept();
+ CSelectSaveAction(const IGisItem * src, const IGisItem * tar, QWidget * parent);
+ virtual ~CSelectSaveAction();
+
+ enum result_e
+ {
+ eResultNone,
+ eResultSave,
+ eResultSkip,
+ };
+
+ result_e getResult()
+ {
+ return result;
+ }
+ bool allOthersToo();
private slots:
- void slotEdit(const QString& str);
+ void slotSelectResult();
private:
- QPointF& pos;
+ result_e result;
};
-#endif //CPOSITIONDIALOG_H
+#endif //CSELECTSAVEACTION_H
diff --git a/src/gis/db/CSetupFolder.cpp b/src/gis/db/CSetupFolder.cpp
index 17b9b58..9918e18 100644
--- a/src/gis/db/CSetupFolder.cpp
+++ b/src/gis/db/CSetupFolder.cpp
@@ -20,7 +20,7 @@
#include <QtWidgets>
-CSetupFolder::CSetupFolder(IDBFolder::type_e& type, QString &name, QWidget *parent)
+CSetupFolder::CSetupFolder(IDBFolder::type_e& type, QString &name, bool groupAllowed, QWidget *parent)
: QDialog(parent)
, type(type)
, name(name)
@@ -47,6 +47,8 @@ CSetupFolder::CSetupFolder(IDBFolder::type_e& type, QString &name, QWidget *pare
default:;
}
+ radioGroup->setEnabled(groupAllowed);
+
slotNameChanged(name);
}
diff --git a/src/gis/db/CSetupFolder.h b/src/gis/db/CSetupFolder.h
index ef29dc6..eee07e5 100644
--- a/src/gis/db/CSetupFolder.h
+++ b/src/gis/db/CSetupFolder.h
@@ -27,7 +27,7 @@ class CSetupFolder : public QDialog, private Ui::ISetupFolder
{
Q_OBJECT
public:
- CSetupFolder(IDBFolder::type_e& type, QString& name, QWidget * parent);
+ CSetupFolder(IDBFolder::type_e& type, QString& name, bool groupAllowed, QWidget * parent);
virtual ~CSetupFolder();
public slots:
diff --git a/src/gis/db/IDB.cpp b/src/gis/db/IDB.cpp
index 1033cd8..8ff7eb0 100644
--- a/src/gis/db/IDB.cpp
+++ b/src/gis/db/IDB.cpp
@@ -21,25 +21,38 @@
#include <QtSql>
+QMap<QString,int> IDB::references;
+
IDB::IDB()
{
}
IDB::~IDB()
{
- if(db.isOpen())
+ references[db.connectionName()]--;
+ if(references[db.connectionName()] == 0 && db.isOpen())
{
+ qDebug() << "close database" << db.connectionName();
db.close();
}
}
bool IDB::setupDB(const QString& filename, const QString& connectionName)
{
- db = QSqlDatabase::addDatabase("QSQLITE", connectionName);
- db.setDatabaseName(filename);
- if(!db.open())
+ references[connectionName]++;
+
+ if(!QSqlDatabase::contains(connectionName))
+ {
+ db = QSqlDatabase::addDatabase("QSQLITE", connectionName);
+ db.setDatabaseName(filename);
+ if(!db.open())
+ {
+ qDebug() << "failed to open database" << db.lastError();
+ }
+ }
+ else
{
- qDebug() << "failed to open database" << db.lastError();
+ db = QSqlDatabase::database(connectionName);
}
QSqlQuery query(db);
diff --git a/src/gis/db/IDB.h b/src/gis/db/IDB.h
index 459f082..8c0e487 100644
--- a/src/gis/db/IDB.h
+++ b/src/gis/db/IDB.h
@@ -19,6 +19,7 @@
#ifndef IDB_H
#define IDB_H
+#include <QMap>
#include <QSqlDatabase>
class IDB
@@ -33,6 +34,8 @@ protected:
bool migrateDB(int version);
QSqlDatabase db;
+
+ static QMap<QString,int> references;
};
#endif //IDB_H
diff --git a/src/gis/db/IDBFolder.cpp b/src/gis/db/IDBFolder.cpp
index 828cc1c..fe4edf7 100644
--- a/src/gis/db/IDBFolder.cpp
+++ b/src/gis/db/IDBFolder.cpp
@@ -99,30 +99,67 @@ CDBFolderDatabase * IDBFolder::getDBFolder()
return 0;
}
-void IDBFolder::addFolder(type_e type, const QString& name)
+IDBFolder * IDBFolder::getFolder(quint64 idFolder)
+{
+ if(id == idFolder)
+ {
+ return this;
+ }
+
+ const int N = childCount();
+ for(int n = 0; n < N; n++)
+ {
+ IDBFolder * folder1 = dynamic_cast<IDBFolder*>(child(n));
+ if(folder1 == 0)
+ {
+ return 0;
+ }
+
+ IDBFolder * folder2 = folder1->getFolder(idFolder);
+ if(folder2)
+ {
+ return folder2;
+ }
+ }
+
+ return 0;
+}
+
+quint64 IDBFolder::addFolder(type_e type, const QString& name)
+{
+ quint64 idChild = IDBFolder::addFolderToDb(type, name, id, db);
+ if(idChild != 0)
+ {
+ IDBFolder::createFolderByType(db, type, idChild, this);
+ expanding();
+ }
+ return idChild;
+}
+
+quint64 IDBFolder::addFolderToDb(type_e type, const QString& name, quint64 idParent, QSqlDatabase& db)
{
QSqlQuery query(db);
query.prepare("INSERT INTO folders (name, type) VALUES (:name, :type)");
query.bindValue(":name", name);
query.bindValue(":type", type);
- QUERY_EXEC(return );
+ QUERY_EXEC(return 0);
query.prepare("SELECT last_insert_rowid() from folders");
- QUERY_EXEC(return );
+ QUERY_EXEC(return 0);
query.next();
quint64 idChild = query.value(0).toULongLong();
if(idChild == 0)
{
qDebug() << "CGisListDB::slotAddFolder(): childId equals 0. bad.";
- return;
+ return 0;
}
query.prepare("INSERT INTO folder2folder (parent, child) VALUES (:parent, :child)");
- query.bindValue(":parent", id);
+ query.bindValue(":parent", idParent);
query.bindValue(":child", idChild);
- QUERY_EXEC(return );
+ QUERY_EXEC(return 0);
- IDBFolder::createFolderByType(db, type, idChild, this);
+ return idChild;
}
void IDBFolder::expanding()
@@ -303,7 +340,7 @@ void IDBFolder::addChildren(const QSet<QString>& activeChildren)
IDBFolder::createFolderByType(db, typeChild, idChild, this);
}
- sortChildren(1, Qt::AscendingOrder);
+ sortChildren(CGisListDB::eColumnName, Qt::AscendingOrder);
// tracks 2nd
query.prepare("SELECT t1.child FROM folder2item AS t1, items AS t2 WHERE t1.parent = :id AND t2.id = t1.child AND t2.type=:type ORDER BY t2.id");
diff --git a/src/gis/db/IDBFolder.h b/src/gis/db/IDBFolder.h
index e8bb862..ff3b3db 100644
--- a/src/gis/db/IDBFolder.h
+++ b/src/gis/db/IDBFolder.h
@@ -49,14 +49,16 @@ public:
}
QString getDBName();
CDBFolderDatabase * getDBFolder();
+ IDBFolder * getFolder(quint64 idFolder);
- virtual void addFolder(type_e type, const QString &name);
+ virtual quint64 addFolder(type_e type, const QString &name);
virtual void expanding();
virtual void update(CEvtW2DAckInfo * info);
virtual void toggle();
virtual void remove();
static IDBFolder * createFolderByType(QSqlDatabase &db, int type, quint64 id, QTreeWidgetItem *parent);
+ static quint64 addFolderToDb(type_e type, const QString& name, quint64 idParent, QSqlDatabase& db);
bool operator<(const QTreeWidgetItem &other) const;
diff --git a/src/gis/db/ISelectDBFolder.ui b/src/gis/db/ISelectDBFolder.ui
new file mode 100644
index 0000000..0386ec8
--- /dev/null
+++ b/src/gis/db/ISelectDBFolder.ui
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISelectDBFolder</class>
+ <widget class="QDialog" name="ISelectDBFolder">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>300</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Select Parent Folder...</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QTreeWidget" name="treeWidget">
+ <column>
+ <property name="text">
+ <string/>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>ISelectDBFolder</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>ISelectDBFolder</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/src/gis/db/ISelectSaveAction.ui b/src/gis/db/ISelectSaveAction.ui
new file mode 100644
index 0000000..391583f
--- /dev/null
+++ b/src/gis/db/ISelectSaveAction.ui
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISelectSaveAction</class>
+ <widget class="QDialog" name="ISelectSaveAction">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>471</width>
+ <height>253</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Copy item...</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <property name="fieldGrowthPolicy">
+ <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+ </property>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="pushSave">
+ <property name="text">
+ <string>Replace existing item</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Replace with:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelIcon1">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="labelInfo1">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0" colspan="2">
+ <widget class="Line" name="line">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QPushButton" name="pushSkip">
+ <property name="text">
+ <string>Do not replace item</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Use item:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="labelIcon2">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLabel" name="labelInfo2">
+ <property name="text">
+ <string>TextLabel</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="0" colspan="2">
+ <widget class="Line" name="line_2">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QCheckBox" name="checkAllOtherToo">
+ <property name="text">
+ <string>And for all other items, too.</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/src/gis/db/ISetupFolder.ui b/src/gis/db/ISetupFolder.ui
index e0d2d1a..85832ec 100644
--- a/src/gis/db/ISetupFolder.ui
+++ b/src/gis/db/ISetupFolder.ui
@@ -7,26 +7,22 @@
<x>0</x>
<y>0</y>
<width>400</width>
- <height>168</height>
+ <height>170</height>
</rect>
</property>
<property name="windowTitle">
- <string>Folder...</string>
+ <string>Database Folder...</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Name</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="lineName"/>
- </item>
- </layout>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Folder name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="lineName"/>
</item>
<item>
<widget class="QRadioButton" name="radioGroup">
diff --git a/src/gis/ovl/CGisItemOvlArea.cpp b/src/gis/ovl/CGisItemOvlArea.cpp
index 714b6d8..a4a2e43 100644
--- a/src/gis/ovl/CGisItemOvlArea.cpp
+++ b/src/gis/ovl/CGisItemOvlArea.cpp
@@ -144,6 +144,21 @@ CGisItemOvlArea::CGisItemOvlArea(const CGisItemOvlArea& parentArea, IGisProject
history.events.clear();
}
+ if(parentArea.isOnDevice())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else if(!parentArea.isReadOnly())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else
+ {
+ flags &= ~eFlagWriteAllowed;
+ }
+
+
+
setupHistory();
updateDecoration(eMarkChanged, eMarkNone);
}
diff --git a/src/gis/ovl/CScrOptOvlArea.cpp b/src/gis/ovl/CScrOptOvlArea.cpp
index 594b7a0..0b49e39 100644
--- a/src/gis/ovl/CScrOptOvlArea.cpp
+++ b/src/gis/ovl/CScrOptOvlArea.cpp
@@ -34,8 +34,6 @@ CScrOptOvlArea::CScrOptOvlArea(CGisItemOvlArea *area, const QPoint &point, IMous
label->setText(area->getInfo());
adjustSize();
- toolEdit->setDisabled(area->isReadOnly());
-
anchor = area->getPointCloseBy(point);
move(anchor.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
show();
diff --git a/src/gis/ovl/IDetailsOvlArea.ui b/src/gis/ovl/IDetailsOvlArea.ui
index c5b5e7a..ee487ba 100644
--- a/src/gis/ovl/IDetailsOvlArea.ui
+++ b/src/gis/ovl/IDetailsOvlArea.ui
@@ -65,6 +65,9 @@
<height>25</height>
</size>
</property>
+ <property name="toolTip">
+ <string><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></string>
+ </property>
<property name="text">
<string/>
</property>
@@ -78,6 +81,9 @@
</item>
<item>
<widget class="QToolButton" name="toolLock">
+ <property name="toolTip">
+ <string>Toggle read only mode. You have to open the lock to edit the item.</string>
+ </property>
<property name="text">
<string>...</string>
</property>
diff --git a/src/gis/prj/CDetailsPrj.cpp b/src/gis/prj/CDetailsPrj.cpp
index 3e46fde..97ccd04 100644
--- a/src/gis/prj/CDetailsPrj.cpp
+++ b/src/gis/prj/CDetailsPrj.cpp
@@ -182,7 +182,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
fmtCharHeader.setForeground(Qt::white);
- bool isReadOnly = printable;
+ bool isReadOnly = printable || prj.isOnDevice();
setWindowTitle(prj.getName());
@@ -202,7 +202,7 @@ void CDetailsPrj::draw(QTextDocument& doc, bool printable)
doc.rootFrame()->setFrameFormat(fmtFrameRoot);
QTextCursor cursor = doc.rootFrame()->firstCursorPosition();
- cursor.insertHtml(IGisItem::toLink(isReadOnly, "name", QString("<h1>%1</h1>").arg(prj.getName()), ""));
+ cursor.insertHtml(IGisItem::toLink(isReadOnly, "name", QString("<h1>%1</h1>").arg(prj.getNameEx()), ""));
QTextFrame * diaryFrame = cursor.insertFrame(fmtFrameStandard);
diff --git a/src/gis/prj/IGisProject.cpp b/src/gis/prj/IGisProject.cpp
index 4cf94c6..bee8973 100644
--- a/src/gis/prj/IGisProject.cpp
+++ b/src/gis/prj/IGisProject.cpp
@@ -50,6 +50,8 @@ IGisProject::IGisProject(type_e type, const QString &filename, IDevice *parent)
, sorting(eSortNone)
{
setCheckState(CGisListWks::eColumnDecoration, Qt::Checked);
+
+ nameSuffix = parent->getName();
}
IGisProject::~IGisProject()
@@ -63,11 +65,13 @@ bool IGisProject::askBeforClose()
int res = QMessageBox::Ok;
if(isChanged())
{
+ QApplication::setOverrideCursor(Qt::ArrowCursor);
res = QMessageBox::question(&CMainWindow::self(), QObject::tr("Save project?"), QObject::tr("The project \"%1\" was changed. Save befor closing it?").arg(getName()), QMessageBox::Save|QMessageBox::No|QMessageBox::Abort, QMessageBox::Save);
if(res == QMessageBox::Save)
{
save();
}
+ QApplication::restoreOverrideCursor();
}
return res == QMessageBox::Abort;
@@ -137,7 +141,7 @@ void IGisProject::edit()
void IGisProject::setName(const QString& str)
{
metadata.name = str;
- setText(CGisListWks::eColumnName, str);
+ setText(CGisListWks::eColumnName, getNameEx());
setChanged();
}
@@ -188,13 +192,9 @@ void IGisProject::setupName(const QString &defaultName)
{
if(metadata.name.isEmpty())
{
- setText(CGisListWks::eColumnName, defaultName);
metadata.name = defaultName;
}
- else
- {
- setText(CGisListWks::eColumnName,metadata.name);
- }
+ setText(CGisListWks::eColumnName, getNameEx());
}
void IGisProject::markAsSaved()
@@ -213,13 +213,19 @@ void IGisProject::markAsSaved()
QString IGisProject::getName() const
{
- IDevice * device = dynamic_cast<IDevice*>(parent());
- if(device == 0)
+ return metadata.name;
+}
+
+QString IGisProject::getNameEx() const
+{
+ if(nameSuffix.isEmpty())
{
return metadata.name;
}
-
- return metadata.name + " @ " + device->getName();
+ else
+ {
+ return metadata.name + " @ " + nameSuffix;
+ }
}
diff --git a/src/gis/prj/IGisProject.h b/src/gis/prj/IGisProject.h
index e35608d..f762f48 100644
--- a/src/gis/prj/IGisProject.h
+++ b/src/gis/prj/IGisProject.h
@@ -87,6 +87,13 @@ public:
IGisProject(type_e type, const QString &filename, IDevice *parent);
virtual ~IGisProject();
+ /**
+ @brief Ask to save the project befor it is closed.
+
+ If the project is closed, the user is asked if the project should be saved and saved on user request.
+
+ @return True if the operation is aborted. False on "save" and "no".
+ */
bool askBeforClose();
IGisProject& operator=(const IGisProject& p)
@@ -96,6 +103,9 @@ public:
return *this;
}
+ /**
+ @brief Summon the project details dialog.
+ */
void edit();
/**
@@ -111,11 +121,20 @@ public:
{
filename = fn;
}
+
virtual QString getFilename() const
{
return filename;
}
+ /**
+ @brief Get the project type enumeration.
+
+ @Note: usually dynamic_cast should be used to get a pointer of correct type.
+ However if the project is serialized, a type id is needed.
+
+ @return One of type_e
+ */
type_e getType() const
{
return type;
@@ -139,7 +158,16 @@ public:
QPixmap getIcon() const;
+ /**
+ @brief Get the project's name
+ @return The name from metadata.name
+ */
QString getName() const;
+ /**
+ @brief Get the project's name extended with the parent's name.
+ @return The name from metadata.nam appended with either the device name or the database parent folder's name.
+ */
+ QString getNameEx() const;
const QDateTime& getTime() const
{
@@ -158,6 +186,10 @@ public:
return metadata.links;
}
+ /**
+ @brief Get the sorting mode
+ @return One of sorting_e
+ */
sorting_e getSorting() const
{
return sorting;
@@ -172,6 +204,13 @@ public:
*/
void setChanged();
+ /**
+ @brief Set the sorting mode_t
+
+ This will mark the project as changed.
+
+ @param s the mode
+ */
void setSorting(sorting_e s);
/**
@@ -309,7 +348,7 @@ public:
protected:
void genKey();
- void setupName(const QString& defaultName);
+ virtual void setupName(const QString& defaultName);
void markAsSaved();
void readMetadata(const QDomNode& xml, metadata_t& metadata);
void updateItems();
@@ -333,6 +372,7 @@ protected:
bool valid;
metadata_t metadata;
+ QString nameSuffix;
QPointer<CDetailsPrj> dlgDetails;
diff --git a/src/gis/rte/CGisItemRte.cpp b/src/gis/rte/CGisItemRte.cpp
index 0dc2c8e..f266eda 100644
--- a/src/gis/rte/CGisItemRte.cpp
+++ b/src/gis/rte/CGisItemRte.cpp
@@ -47,6 +47,21 @@ CGisItemRte::CGisItemRte(const CGisItemRte& parentRte, IGisProject * project, in
history.events.clear();
}
+ if(parentRte.isOnDevice())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else if(!parentRte.isReadOnly())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else
+ {
+ flags &= ~eFlagWriteAllowed;
+ }
+
+
+
setupHistory();
updateDecoration(eMarkChanged, eMarkNone);
}
diff --git a/src/gis/trk/CGisItemTrk.cpp b/src/gis/trk/CGisItemTrk.cpp
index 4925e1d..19f0e1a 100644
--- a/src/gis/trk/CGisItemTrk.cpp
+++ b/src/gis/trk/CGisItemTrk.cpp
@@ -186,6 +186,20 @@ CGisItemTrk::CGisItemTrk(const CGisItemTrk& parentTrk, IGisProject *project, int
history.events.clear();
}
+ if(parentTrk.isOnDevice())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else if(!parentTrk.isReadOnly())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else
+ {
+ flags &= ~eFlagWriteAllowed;
+ }
+
+
deriveSecondaryData();
setupHistory();
updateDecoration(eMarkChanged, eMarkNone);
@@ -1002,6 +1016,11 @@ void CGisItemTrk::findWaypointsCloseBy()
}
}
+ if(line.isEmpty())
+ {
+ return;
+ }
+
// convert coodinates of all waypoints into meter coordinates relative to the first track point
point3D pt0 = line[0];
QList<trkwpt_t> trkwpts;
@@ -1031,11 +1050,6 @@ void CGisItemTrk::findWaypointsCloseBy()
trkwpts << trkwpt;
}
- if(line.isEmpty())
- {
- return;
- }
-
// convert all coordinates into meter relative to the first track point.
for(int i = 0; i < line.size(); i++)
{
@@ -1313,17 +1327,37 @@ void CGisItemTrk::hideSelectedPoints()
idx2++;
}
- // iterate over all segments and delete points between idx1 and idx2
- for(int s = 0; s < trk.segs.size(); s++)
+ // special case for a single point
+ if(idx1 == idx2)
{
- trkseg_t& seg = trk.segs[s];
- for(int i = 0; i < seg.pts.size(); i++)
+ for(int s = 0; s < trk.segs.size(); s++)
{
- trkpt_t& trkpt = seg.pts[i];
+ trkseg_t& seg = trk.segs[s];
+ for(int i = 0; i < seg.pts.size(); i++)
+ {
+ trkpt_t& trkpt = seg.pts[i];
- if((idx1 < trkpt.idxTotal) && (trkpt.idxTotal < idx2))
+ if((idx1 == trkpt.idxTotal))
+ {
+ trkpt.flags |= trkpt_t::eHidden;
+ }
+ }
+ }
+ }
+ else
+ {
+ // iterate over all segments and delete points between idx1 and idx2
+ for(int s = 0; s < trk.segs.size(); s++)
+ {
+ trkseg_t& seg = trk.segs[s];
+ for(int i = 0; i < seg.pts.size(); i++)
{
- trkpt.flags |= trkpt_t::eHidden;
+ trkpt_t& trkpt = seg.pts[i];
+
+ if((idx1 < trkpt.idxTotal) && (trkpt.idxTotal < idx2))
+ {
+ trkpt.flags |= trkpt_t::eHidden;
+ }
}
}
}
@@ -1349,16 +1383,16 @@ void CGisItemTrk::showSelectedPoints()
qSwap(idx1,idx2);
}
- // if first index is the first point adjust index to hide it, too
- if(isTrkPtFirstVisible(idx1))
- {
- idx1--;
- }
- // if second index is the last point adjust index to hide it, too
- if(isTrkPtLastVisible(idx2))
- {
- idx2++;
- }
+// // if first index is the first point adjust index to hide it, too
+// if(isTrkPtFirstVisible(idx1))
+// {
+// idx1--;
+// }
+// // if second index is the last point adjust index to hide it, too
+// if(isTrkPtLastVisible(idx2))
+// {
+// idx2++;
+// }
for(int s = 0; s < trk.segs.size(); s++)
{
diff --git a/src/gis/trk/CGisItemTrk.h b/src/gis/trk/CGisItemTrk.h
index d7cd4e8..e8c324b 100644
--- a/src/gis/trk/CGisItemTrk.h
+++ b/src/gis/trk/CGisItemTrk.h
@@ -32,6 +32,7 @@ class CDetailsTrk;
class CScrOptTrk;
class QSqlDatabase;
class CQlgtTrack;
+class IQlgtOverlay;
class QDir;
#define TRK_N_COLORS 17
@@ -112,6 +113,8 @@ public:
*/
CGisItemTrk(const QString& filename, IGisProject * project);
+ CGisItemTrk(const IQlgtOverlay& ovl);
+
virtual ~CGisItemTrk();
/**
diff --git a/src/gis/trk/CScrOptTrk.cpp b/src/gis/trk/CScrOptTrk.cpp
index 64a1e55..73fa23b 100644
--- a/src/gis/trk/CScrOptTrk.cpp
+++ b/src/gis/trk/CScrOptTrk.cpp
@@ -42,7 +42,7 @@ CScrOptTrk::CScrOptTrk(CGisItemTrk * trk, const QPoint& point, IMouse *parent)
bool isOnDevice = trk->isOnDevice();
toolCut->setDisabled(isOnDevice);
- toolEdit->setDisabled(trk->isReadOnly());
+ toolEdit->setDisabled(isOnDevice);
toolReverse->setDisabled(isOnDevice);
toolCombine->setDisabled(isOnDevice);
toolRange->setDisabled(isOnDevice);
diff --git a/src/gis/trk/IDetailsTrk.ui b/src/gis/trk/IDetailsTrk.ui
index 0515287..e661d66 100644
--- a/src/gis/trk/IDetailsTrk.ui
+++ b/src/gis/trk/IDetailsTrk.ui
@@ -270,6 +270,9 @@
</property>
<item>
<widget class="QToolButton" name="toolLock">
+ <property name="toolTip">
+ <string>Toggle read only mode. You have to open the lock to edit the item.</string>
+ </property>
<property name="text">
<string>...</string>
</property>
@@ -300,6 +303,9 @@
<height>25</height>
</size>
</property>
+ <property name="toolTip">
+ <string><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></string>
+ </property>
<property name="text">
<string/>
</property>
@@ -573,6 +579,11 @@
</widget>
<customwidgets>
<customwidget>
+ <class>CHistoryListWidget</class>
+ <extends>QListWidget</extends>
+ <header>helpers/CHistoryListWidget.h</header>
+ </customwidget>
+ <customwidget>
<class>CPlotTrack</class>
<extends>QWidget</extends>
<header>plot/CPlotTrack.h</header>
@@ -596,11 +607,6 @@
<header>plot/CPlotSpeed.h</header>
<container>1</container>
</customwidget>
- <customwidget>
- <class>CHistoryListWidget</class>
- <extends>QListWidget</extends>
- <header>helpers/CHistoryListWidget.h</header>
- </customwidget>
</customwidgets>
<resources>
<include location="../../resources.qrc"/>
diff --git a/src/gis/wpt/CDetailsWpt.cpp b/src/gis/wpt/CDetailsWpt.cpp
index 60895d9..cbca8d5 100644
--- a/src/gis/wpt/CDetailsWpt.cpp
+++ b/src/gis/wpt/CDetailsWpt.cpp
@@ -49,7 +49,7 @@ CDetailsWpt::CDetailsWpt(CGisItemWpt &wpt, QWidget *parent)
}
connect(labelName, SIGNAL(linkActivated(QString)), this, SLOT(slotLinkActivated(QString)));
- connect(labelPositon, SIGNAL(linkActivated(QString)), this, SLOT(slotLinkActivated(QString)));
+ connect(labelPosition, SIGNAL(linkActivated(QString)), this, SLOT(slotLinkActivated(QString)));
connect(labelElevation, SIGNAL(linkActivated(QString)), this, SLOT(slotLinkActivated(QString)));
connect(labelProximity, SIGNAL(linkActivated(QString)), this, SLOT(slotLinkActivated(QString)));
connect(textCmtDesc, SIGNAL(anchorClicked(QUrl)), this, SLOT(slotLinkActivated(QUrl)));
@@ -88,7 +88,7 @@ void CDetailsWpt::setupGui()
toolIcon->setIcon(wpt.getIcon());
toolIcon->setObjectName(wpt.getIconName());
labelName->setText(IGisItem::toLink(isReadOnly, "name", wpt.getName(), ""));
- labelPositon->setText(IGisItem::toLink(isReadOnly, "position", strPos, ""));
+ labelPosition->setText(IGisItem::toLink(isReadOnly, "position", strPos, ""));
if(wpt.isTainted())
{
diff --git a/src/gis/wpt/CGisItemWpt.cpp b/src/gis/wpt/CGisItemWpt.cpp
index ca2cb0f..ed7521e 100644
--- a/src/gis/wpt/CGisItemWpt.cpp
+++ b/src/gis/wpt/CGisItemWpt.cpp
@@ -27,8 +27,7 @@
#include "gis/wpt/CDetailsWpt.h"
#include "gis/wpt/CGisItemWpt.h"
#include "gis/wpt/CScrOptWpt.h"
-#include "helpers/CPositionDialog.h"
-#include "helpers/CWptIconDialog.h"
+#include "gis/wpt/CSetupNewWpt.h"
#include "mouse/IMouse.h"
#include "units/IUnit.h"
@@ -104,6 +103,19 @@ CGisItemWpt::CGisItemWpt(const CGisItemWpt &parentWpt, IGisProject *project, int
history.events.clear();
}
+ if(parentWpt.isOnDevice())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else if(!parentWpt.isReadOnly())
+ {
+ flags |= eFlagWriteAllowed;
+ }
+ else
+ {
+ flags &= ~eFlagWriteAllowed;
+ }
+
setupHistory();
updateDecoration(eMarkChanged, eMarkNone);
}
@@ -163,8 +175,7 @@ void CGisItemWpt::setSymbol()
setIcon();
}
-
-const QString& CGisItemWpt::getNewName()
+bool CGisItemWpt::getNewWptData(QPointF& pt, QString& icon, QString& name)
{
const int s = lastName.size();
if(s != 0)
@@ -187,30 +198,21 @@ const QString& CGisItemWpt::getNewName()
lastName = lastName.left(idx) + QString::number(lastName.mid(idx).toInt() + 1);
}
}
- lastName = QInputDialog::getText(&CMainWindow::self(), QObject::tr("Edit name..."), QObject::tr("Enter new waypoint name."), QLineEdit::Normal, lastName);
- return lastName;
-}
-const QString& CGisItemWpt::getNewIcon()
-{
- QToolButton but;
- but.setObjectName(lastIcon);
- CWptIconDialog dlg(&but);
- dlg.exec();
- lastIcon = but.objectName();
+ name = lastName;
+ icon = lastIcon;
- return lastIcon;
-}
-
-void CGisItemWpt::getNewPosition(QPointF& pos)
-{
- CPositionDialog dlg(&CMainWindow::self(), pos);
- if(dlg.exec() == QDialog::Rejected)
+ CSetupNewWpt dlg(pt, icon, name, &CMainWindow::self());
+ if(dlg.exec() != QDialog::Accepted)
{
- pos = NOPOINTF;
+ return false;
}
-}
+ lastName = name;
+ lastIcon = icon;
+
+ return true;
+}
QString CGisItemWpt::getInfo(bool allowEdit) const
{
diff --git a/src/gis/wpt/CGisItemWpt.h b/src/gis/wpt/CGisItemWpt.h
index 5999c6f..1b0075d 100644
--- a/src/gis/wpt/CGisItemWpt.h
+++ b/src/gis/wpt/CGisItemWpt.h
@@ -287,9 +287,7 @@ public:
*/
void removeLinksByType(const QString& type);
- static const QString &getNewName();
- static const QString &getNewIcon();
- static void getNewPosition(QPointF &pos);
+ static bool getNewWptData(QPointF& pt, QString& icon, QString& name);
private:
diff --git a/src/gis/wpt/CScrOptWpt.cpp b/src/gis/wpt/CScrOptWpt.cpp
index 579f583..765baa4 100644
--- a/src/gis/wpt/CScrOptWpt.cpp
+++ b/src/gis/wpt/CScrOptWpt.cpp
@@ -38,8 +38,9 @@ CScrOptWpt::CScrOptWpt(CGisItemWpt *wpt, const QPoint& point, IMouse *parent)
label->setText(wpt->getInfo());
adjustSize();
- toolMove->setDisabled(wpt->isReadOnly());
+
toolProj->setDisabled(wpt->isGeocache() || wpt->isOnDevice());
+ toolMove->setDisabled(wpt->isGeocache() || wpt->isOnDevice());
photoAlbum->reload(wpt->getImages());
anchor = wpt->getPointCloseBy(point);
diff --git a/src/gis/wpt/CSetupNewWpt.cpp b/src/gis/wpt/CSetupNewWpt.cpp
new file mode 100644
index 0000000..368fbcb
--- /dev/null
+++ b/src/gis/wpt/CSetupNewWpt.cpp
@@ -0,0 +1,132 @@
+/**********************************************************************************************
+ Copyright (C) 2014 Oliver Eichler oliver.eichler at gmx.de
+
+ 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 3 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, see <http://www.gnu.org/licenses/>.
+
+**********************************************************************************************/
+
+#include "GeoMath.h"
+#include "gis/WptIcons.h"
+#include "gis/wpt/CSetupNewWpt.h"
+#include "helpers/CPositionDialog.h"
+#include "helpers/CWptIconDialog.h"
+#include "units/IUnit.h"
+
+#include <QtWidgets>
+
+
+CSetupNewWpt::CSetupNewWpt(QPointF &pt, QString &icon, QString &name, QWidget *parent)
+ : QDialog(parent)
+ , pt(pt)
+ , icon(icon)
+ , name(name)
+{
+ qDebug() << pt << icon << name;
+
+ QPointF focus;
+
+ setupUi(this);
+ toolIcon->setObjectName(icon);
+ toolIcon->setIcon(getWptIconByName(icon, focus));
+
+ QString pos;
+ GPS_Math_Deg_To_Str(pt.x(), pt.y(), pos);
+ linePosition->setText(pos);
+ labelWarning->hide();
+
+ lineName->setText(name);
+
+ connect(linePosition, SIGNAL(textEdited(QString)), this, SLOT(slotEditPosition(QString)));
+ connect(lineName, SIGNAL(textEdited(QString)), this, SLOT(slotEditName(QString)));
+ connect(toolIcon, SIGNAL(clicked()), this, SLOT(slotChangeIcon()));
+
+ checkInput();
+}
+
+CSetupNewWpt::~CSetupNewWpt()
+{
+}
+
+
+void CSetupNewWpt::accept()
+{
+ CPositionDialog::getPosition(pt, linePosition->text());
+ icon = toolIcon->objectName();
+ name = lineName->text();
+
+ QDialog::accept();
+}
+
+void CSetupNewWpt::reject()
+{
+ pt = NOPOINTF;
+ name.clear();
+ icon.clear();
+
+ QDialog::reject();
+}
+
+void CSetupNewWpt::slotEditPosition(const QString& str)
+{
+ if(CPositionDialog::reCoord1.exactMatch(str))
+ {
+ labelWarning->hide();
+ }
+ else if(CPositionDialog::reCoord2.exactMatch(str))
+ {
+ labelWarning->hide();
+ }
+ else if(CPositionDialog::reCoord3.exactMatch(str))
+ {
+ labelWarning->hide();
+ }
+ else if(CPositionDialog::reCoord4.exactMatch(str))
+ {
+ labelWarning->hide();
+ }
+ else if(CPositionDialog::reCoord5.exactMatch(str))
+ {
+ labelWarning->hide();
+ }
+ else
+ {
+ labelWarning->show();
+ }
+
+ checkInput();
+}
+
+void CSetupNewWpt::slotEditName(const QString& str)
+{
+ checkInput();
+}
+
+void CSetupNewWpt::slotChangeIcon()
+{
+ CWptIconDialog dlg(toolIcon);
+ dlg.exec();
+}
+
+
+void CSetupNewWpt::checkInput()
+{
+ if(labelWarning->isHidden() && !lineName->text().isEmpty())
+ {
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
+ }
+ else
+ {
+ buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+ }
+}
diff --git a/src/helpers/CPositionDialog.h b/src/gis/wpt/CSetupNewWpt.h
similarity index 67%
copy from src/helpers/CPositionDialog.h
copy to src/gis/wpt/CSetupNewWpt.h
index 59e1824..2ced1bd 100644
--- a/src/helpers/CPositionDialog.h
+++ b/src/gis/wpt/CSetupNewWpt.h
@@ -16,30 +16,35 @@
**********************************************************************************************/
-#ifndef CPOSITIONDIALOG_H
-#define CPOSITIONDIALOG_H
+#ifndef CSETUPNEWWPT_H
+#define CSETUPNEWWPT_H
-#include "ui_IPositionDialog.h"
-#include <QDialog>
-class QPointF;
+#include "ui_ISetupNewWpt.h"
+#include <QDialog>
-class CPositionDialog : public QDialog, private Ui::IPositionDialog
+class CSetupNewWpt : public QDialog, private Ui::ISetupNewWpt
{
Q_OBJECT
public:
- CPositionDialog(QWidget * parent, QPointF &pos);
- virtual ~CPositionDialog();
+ CSetupNewWpt(QPointF& pt, QString& icon, QString& name, QWidget * parent);
+ virtual ~CSetupNewWpt();
public slots:
void accept();
+ void reject();
private slots:
- void slotEdit(const QString& str);
+ void slotEditPosition(const QString& str);
+ void slotEditName(const QString& str);
+ void slotChangeIcon();
private:
- QPointF& pos;
+ void checkInput();
+ QPointF &pt;
+ QString &icon;
+ QString &name;
};
-#endif //CPOSITIONDIALOG_H
+#endif //CSETUPNEWWPT_H
diff --git a/src/gis/wpt/IDetailsWpt.ui b/src/gis/wpt/IDetailsWpt.ui
index 5e3c2e9..1ef48ad 100644
--- a/src/gis/wpt/IDetailsWpt.ui
+++ b/src/gis/wpt/IDetailsWpt.ui
@@ -54,7 +54,7 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="labelPositon">
+ <widget class="QLabel" name="labelPosition">
<property name="text">
<string>-</string>
</property>
@@ -201,7 +201,7 @@
<item>
<widget class="QToolButton" name="toolLock">
<property name="toolTip">
- <string><html><head/><body><p>Read Only Mode</p></body></html></string>
+ <string>Toggle read only mode. You have to open the lock to edit the item.</string>
</property>
<property name="text">
<string>...</string>
diff --git a/src/gis/wpt/IScrOptWpt.ui b/src/gis/wpt/IScrOptWpt.ui
index ca88da2..e5e46a4 100644
--- a/src/gis/wpt/IScrOptWpt.ui
+++ b/src/gis/wpt/IScrOptWpt.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>500</width>
- <height>153</height>
+ <height>155</height>
</rect>
</property>
<property name="sizePolicy">
diff --git a/src/gis/wpt/ISetupNewWpt.ui b/src/gis/wpt/ISetupNewWpt.ui
new file mode 100644
index 0000000..9dbf3e6
--- /dev/null
+++ b/src/gis/wpt/ISetupNewWpt.ui
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>ISetupNewWpt</class>
+ <widget class="QDialog" name="ISetupNewWpt">
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>400</width>
+ <height>196</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>New Waypoint...</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Symbol</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QToolButton" name="toolIcon">
+ <property name="text">
+ <string>...</string>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Position</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="linePosition"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="lineName"/>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLabel" name="labelWarning">
+ <property name="text">
+ <string>Bad position format. Must be:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>ISetupNewWpt</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>ISetupNewWpt</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
diff --git a/src/helpers/CFileExt.h b/src/helpers/CFileExt.h
index 3aef855..0a147ca 100644
--- a/src/helpers/CFileExt.h
+++ b/src/helpers/CFileExt.h
@@ -41,12 +41,20 @@ public:
// data access function
const char *data(qint64 offset, qint64 s)
{
- if(!mapped)
+ mapped = map(offset, s);
+ mappedSections << mapped;
+ return (const char*)mapped;
+ }
+
+ void free()
+ {
+ foreach(uchar * p, mappedSections)
{
- mapped = reinterpret_cast<const char*>(map(0, size()));
+ unmap(p);
}
- return mapped + offset;
+ mappedSections.clear();
}
+
#else
// data access function
const char *data(qint64 offset, qint64 s)
@@ -59,8 +67,8 @@ public:
private:
static int cnt;
- const char *mapped;
-
+ uchar *mapped;
+ QSet<uchar*> mappedSections;
};
diff --git a/src/helpers/CPositionDialog.cpp b/src/helpers/CPositionDialog.cpp
index 2e28102..8ff3b63 100644
--- a/src/helpers/CPositionDialog.cpp
+++ b/src/helpers/CPositionDialog.cpp
@@ -21,15 +21,15 @@
#include <QtWidgets>
-QRegExp reCoord1("^\\s*([N|S]){1}\\W*([0-9]+)\\W*([0-9]+\\.[0-9]+)\\s+([E|W|O]){1}\\W*([0-9]+)\\W*([0-9]+\\.[0-9]+)\\s*$");
+QRegExp CPositionDialog::reCoord1("^\\s*([N|S]){1}\\W*([0-9]+)\\W*([0-9]+\\.[0-9]+)\\s+([E|W|O]){1}\\W*([0-9]+)\\W*([0-9]+\\.[0-9]+)\\s*$");
-QRegExp reCoord2("^\\s*([N|S]){1}\\s*([0-9]+\\.[0-9]+)\\W*\\s+([E|W|O]){1}\\s*([0-9]+\\.[0-9]+)\\W*\\s*$");
+QRegExp CPositionDialog::reCoord2("^\\s*([N|S]){1}\\s*([0-9]+\\.[0-9]+)\\W*\\s+([E|W|O]){1}\\s*([0-9]+\\.[0-9]+)\\W*\\s*$");
-QRegExp reCoord3("^\\s*([-0-9]+\\.[0-9]+)\\s+([-0-9]+\\.[0-9]+)\\s*$");
+QRegExp CPositionDialog::reCoord3("^\\s*([-0-9]+\\.[0-9]+)\\s+([-0-9]+\\.[0-9]+)\\s*$");
-QRegExp reCoord4("^\\s*([N|S]){1}\\s*([0-9]+)\\W+([0-9]+)\\W+([0-9]+)\\W*([E|W|O]){1}\\W*([0-9]+)\\W+([0-9]+)\\W+([0-9]+)\\W*\\s*$");
+QRegExp CPositionDialog::reCoord4("^\\s*([N|S]){1}\\s*([0-9]+)\\W+([0-9]+)\\W+([0-9]+)\\W*([E|W|O]){1}\\W*([0-9]+)\\W+([0-9]+)\\W+([0-9]+)\\W*\\s*$");
-QRegExp reCoord5("^\\s*([-0-9]+\\.[0-9]+)([N|S])\\s+([-0-9]+\\.[0-9]+)([W|E])\\s*$");
+QRegExp CPositionDialog::reCoord5("^\\s*([-0-9]+\\.[0-9]+)([N|S])\\s+([-0-9]+\\.[0-9]+)([W|E])\\s*$");
CPositionDialog::CPositionDialog(QWidget * parent, QPointF &pos)
@@ -52,60 +52,65 @@ CPositionDialog::~CPositionDialog()
void CPositionDialog::accept()
{
+ getPosition(pos, lineEdit->text());
+ QDialog::accept();
+}
+
+void CPositionDialog::getPosition(QPointF& pt, const QString& str)
+{
qreal lon, lat;
- QString str = lineEdit->text();
- if(reCoord2.exactMatch(str))
+ if(CPositionDialog::reCoord2.exactMatch(str))
{
- bool signLat = reCoord2.cap(1) == "S";
- qreal absLat = reCoord2.cap(2).toDouble();
+ bool signLat = CPositionDialog::reCoord2.cap(1) == "S";
+ qreal absLat = CPositionDialog::reCoord2.cap(2).toDouble();
lat = signLat ? -absLat : absLat;
- bool signLon = reCoord2.cap(3) == "W";
- qreal absLon = reCoord2.cap(4).toDouble();
+ bool signLon = CPositionDialog::reCoord2.cap(3) == "W";
+ qreal absLon = CPositionDialog::reCoord2.cap(4).toDouble();
lon = signLon ? -absLon : absLon;
}
- else if(reCoord1.exactMatch(str))
+ else if(CPositionDialog::reCoord1.exactMatch(str))
{
- bool signLat = reCoord1.cap(1) == "S";
- int degLat = reCoord1.cap(2).toInt();
- qreal minLat = reCoord1.cap(3).toDouble();
+ bool signLat = CPositionDialog::reCoord1.cap(1) == "S";
+ int degLat = CPositionDialog::reCoord1.cap(2).toInt();
+ qreal minLat = CPositionDialog::reCoord1.cap(3).toDouble();
GPS_Math_DegMin_To_Deg(signLat, degLat, minLat, lat);
- bool signLon = reCoord1.cap(4) == "W";
- int degLon = reCoord1.cap(5).toInt();
- qreal minLon = reCoord1.cap(6).toDouble();
+ bool signLon = CPositionDialog::reCoord1.cap(4) == "W";
+ int degLon = CPositionDialog::reCoord1.cap(5).toInt();
+ qreal minLon = CPositionDialog::reCoord1.cap(6).toDouble();
GPS_Math_DegMin_To_Deg(signLon, degLon, minLon, lon);
}
- else if(reCoord3.exactMatch(str))
+ else if(CPositionDialog::reCoord3.exactMatch(str))
{
- lat = reCoord3.cap(1).toDouble();
- lon = reCoord3.cap(2).toDouble();
+ lat = CPositionDialog::reCoord3.cap(1).toDouble();
+ lon = CPositionDialog::reCoord3.cap(2).toDouble();
}
- else if(reCoord4.exactMatch(str))
+ else if(CPositionDialog::reCoord4.exactMatch(str))
{
- bool signLat = reCoord4.cap(1) == "S";
- int degLat = reCoord4.cap(2).toInt();
- int minLat = reCoord4.cap(3).toInt();
- int secLat = reCoord4.cap(4).toInt();
+ bool signLat = CPositionDialog::reCoord4.cap(1) == "S";
+ int degLat = CPositionDialog::reCoord4.cap(2).toInt();
+ int minLat = CPositionDialog::reCoord4.cap(3).toInt();
+ int secLat = CPositionDialog::reCoord4.cap(4).toInt();
GPS_Math_DegMinSec_To_Deg(signLat, degLat, minLat, secLat, lat);
- bool signLon = reCoord4.cap(5) == "W";
- int degLon = reCoord4.cap(6).toInt();
- int minLon = reCoord4.cap(7).toInt();
- int secLon = reCoord4.cap(8).toInt();
+ bool signLon = CPositionDialog::reCoord4.cap(5) == "W";
+ int degLon = CPositionDialog::reCoord4.cap(6).toInt();
+ int minLon = CPositionDialog::reCoord4.cap(7).toInt();
+ int secLon = CPositionDialog::reCoord4.cap(8).toInt();
GPS_Math_DegMinSec_To_Deg(signLon, degLon, minLon, secLon, lon);
}
- else if(reCoord5.exactMatch(str))
+ else if(CPositionDialog::reCoord5.exactMatch(str))
{
- bool signLon = reCoord4.cap(4) == "W";
- bool signLat = reCoord4.cap(2) == "S";
- lat = reCoord5.cap(1).toDouble();
- lon = reCoord5.cap(3).toDouble();
+ bool signLon = CPositionDialog::reCoord5.cap(4) == "W";
+ bool signLat = CPositionDialog::reCoord5.cap(2) == "S";
+ lat = CPositionDialog::reCoord5.cap(1).toDouble();
+ lon = CPositionDialog::reCoord5.cap(3).toDouble();
if(signLon)
{
@@ -121,12 +126,12 @@ void CPositionDialog::accept()
return;
}
- pos.rx() = lon;
- pos.ry() = lat;
-
- QDialog::accept();
+ pt.rx() = lon;
+ pt.ry() = lat;
}
+
+
void CPositionDialog::slotEdit(const QString& str)
{
if(reCoord1.exactMatch(str))
diff --git a/src/helpers/CPositionDialog.h b/src/helpers/CPositionDialog.h
index 59e1824..f2aaeb9 100644
--- a/src/helpers/CPositionDialog.h
+++ b/src/helpers/CPositionDialog.h
@@ -31,6 +31,14 @@ public:
CPositionDialog(QWidget * parent, QPointF &pos);
virtual ~CPositionDialog();
+ static QRegExp reCoord1;
+ static QRegExp reCoord2;
+ static QRegExp reCoord3;
+ static QRegExp reCoord4;
+ static QRegExp reCoord5;
+
+ static void getPosition(QPointF& pt, const QString &str);
+
public slots:
void accept();
diff --git a/src/helpers/CSelectProjectDialog.cpp b/src/helpers/CSelectProjectDialog.cpp
index c1b80e2..589b8c3 100644
--- a/src/helpers/CSelectProjectDialog.cpp
+++ b/src/helpers/CSelectProjectDialog.cpp
@@ -45,11 +45,13 @@ CSelectProjectDialog::CSelectProjectDialog(QString &key, QString &name, type_e&
QListWidgetItem * item = new QListWidgetItem(project->icon(CGisListWks::eColumnIcon), project->text(CGisListWks::eColumnName),listWidget);
item->setData(Qt::UserRole, project->getKey());
}
+// radioDatabase->hide();
}
else
{
listWidget->hide();
label1->hide();
+// radioDatabase->show();
}
frameType->setEnabled(listWidget->count() == 0);
@@ -78,6 +80,7 @@ CSelectProjectDialog::CSelectProjectDialog(QString &key, QString &name, type_e&
connect(lineEdit, SIGNAL(textEdited(QString)), this, SLOT(slotProjectEdited(QString)));
connect(radioQms, SIGNAL(clicked()), this, SLOT(slotTypeChanged()));
connect(radioGpx, SIGNAL(clicked()), this, SLOT(slotTypeChanged()));
+ connect(radioDatabase, SIGNAL(toggled(bool)), this, SLOT(slotDatabase()));
adjustSize();
}
@@ -136,3 +139,9 @@ void CSelectProjectDialog::slotTypeChanged()
type = eTypeGpx;
}
}
+
+void CSelectProjectDialog::slotDatabase()
+{
+ type = eTypeDb;
+ QDialog::accept();
+}
diff --git a/src/helpers/CSelectProjectDialog.h b/src/helpers/CSelectProjectDialog.h
index 8d95a67..c8a2f13 100644
--- a/src/helpers/CSelectProjectDialog.h
+++ b/src/helpers/CSelectProjectDialog.h
@@ -33,6 +33,7 @@ public:
eTypeNone
,eTypeQms
,eTypeGpx
+ ,eTypeDb
};
CSelectProjectDialog(QString& key, QString& name, type_e& type, QTreeWidget *parent);
@@ -47,6 +48,7 @@ private slots:
void slotProjectChanged(const QString& text);
void slotProjectEdited(const QString& text);
void slotTypeChanged();
+ void slotDatabase();
private:
QString& key;
diff --git a/src/helpers/ISelectProjectDialog.ui b/src/helpers/ISelectProjectDialog.ui
index ffb09bc..be64fe7 100644
--- a/src/helpers/ISelectProjectDialog.ui
+++ b/src/helpers/ISelectProjectDialog.ui
@@ -28,6 +28,13 @@
<widget class="QListWidget" name="listWidget"/>
</item>
<item>
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>New project's name</string>
+ </property>
+ </widget>
+ </item>
+ <item>
<widget class="QLineEdit" name="lineEdit"/>
</item>
<item>
@@ -38,54 +45,78 @@
</widget>
</item>
<item>
- <widget class="QFrame" name="frameType">
- <property name="enabled">
- <bool>true</bool>
- </property>
- <property name="frameShape">
- <enum>QFrame::NoFrame</enum>
- </property>
- <property name="frameShadow">
- <enum>QFrame::Plain</enum>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>0</number>
- </property>
- <property name="leftMargin">
- <number>0</number>
- </property>
- <property name="topMargin">
- <number>0</number>
- </property>
- <property name="rightMargin">
- <number>0</number>
- </property>
- <property name="bottomMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QRadioButton" name="radioQms">
- <property name="enabled">
- <bool>true</bool>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QFrame" name="frameType">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="frameShape">
+ <enum>QFrame::NoFrame</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>QFrame::Plain</enum>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <property name="spacing">
+ <number>0</number>
</property>
- <property name="text">
- <string>*.qms</string>
+ <property name="leftMargin">
+ <number>0</number>
</property>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="radioGpx">
- <property name="enabled">
- <bool>true</bool>
+ <property name="topMargin">
+ <number>0</number>
</property>
- <property name="text">
- <string>*.gpx</string>
+ <property name="rightMargin">
+ <number>0</number>
</property>
- </widget>
- </item>
- </layout>
- </widget>
+ <property name="bottomMargin">
+ <number>0</number>
+ </property>
+ <item>
+ <widget class="QRadioButton" name="radioQms">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>*.qms</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioGpx">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>*.gpx</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_2">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Maximum" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QRadioButton" name="radioDatabase">
+ <property name="text">
+ <string>Database</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
diff --git a/src/locale/qmapshack_cs.ts b/src/locale/qmapshack_cs.ts
index adc1fca..f6a7233 100644
--- a/src/locale/qmapshack_cs.ts
+++ b/src/locale/qmapshack_cs.ts
@@ -362,38 +362,38 @@
<translation>Prázdný</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Remove database...</source>
<translation>Odstranit databázi...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Do you realy want to remove '%1' from the list?</source>
<translation>Opravdu chcete '%1' odstranit ze seznamu?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Delete database folder...</source>
<translation>Smazat složku s databází...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Are you sure you want to delete "%1" from the database?</source>
<translation>Opravdu chcete "%1" odstranit z databáze?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Remove items...</source>
<translation>Odstranit prvky...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Opravdu chcete smazat všechny prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Opravdu chcete smazat všechny vybrané prvky ze ztracených a nalezených? Tím budou trvale odstraněny.</translation>
</message>
@@ -401,17 +401,17 @@
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="93"/>
+ <location filename="../gis/CGisListWks.cpp" line="95"/>
<source>Save As...</source>
<translation>Uložit jako...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="94"/>
+ <location filename="../gis/CGisListWks.cpp" line="96"/>
<source>Save</source>
<translation>Uložit</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="92"/>
+ <location filename="../gis/CGisListWks.cpp" line="94"/>
<source>Edit..</source>
<translation>Upravit...</translation>
</message>
@@ -420,100 +420,100 @@
<translation type="vanished">Aktualizovat projekt na zařízeních</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="96"/>
+ <location filename="../gis/CGisListWks.cpp" line="98"/>
<source>Close</source>
<translation>Zavřít</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Update Project on Device</source>
<translation>Aktualizovat projekt na zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Edit...</source>
<translation>Upravit...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Copy to...</source>
<translation>Kopírovat do...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="127"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Move Waypoint</source>
<translation>Přesunout cestovní bod</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="128"/>
+ <location filename="../gis/CGisListWks.cpp" line="133"/>
<source>Proj. Waypoint...</source>
<translation>Promítnutí cestovního bodu...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="586"/>
- <location filename="../gis/CGisListWks.cpp" line="1253"/>
- <location filename="../gis/CGisListWks.cpp" line="1292"/>
+ <location filename="../gis/CGisListWks.cpp" line="594"/>
+ <location filename="../gis/CGisListWks.cpp" line="1283"/>
+ <location filename="../gis/CGisListWks.cpp" line="1322"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Aktualizovat zařízení</b><p>Aktualizovat %1<br/>Počkejte, prosím...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Track Profile</source>
<translation>Profil stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="95"/>
+ <location filename="../gis/CGisListWks.cpp" line="97"/>
<source>Send to Devices</source>
<translation>Poslat do zařízení</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="121"/>
<source>Select Range</source>
<translation>Vybrat rozsah</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Edit Track Points</source>
<translation>Upravit body stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Reverse Track</source>
<translation>Obrátit stopu</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="124"/>
<source>Combine Tracks</source>
<translation>Spojit stopy</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="140"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Edit Area Points</source>
<translation>Upravit body oblasti</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="103"/>
- <location filename="../gis/CGisListWks.cpp" line="122"/>
+ <location filename="../gis/CGisListWks.cpp" line="105"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Delete</source>
<translation>Smazat</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="686"/>
+ <location filename="../gis/CGisListWks.cpp" line="694"/>
<source>Saving workspace. Please wait.</source>
<translation>Ukládá se pohled. Počkejte, prosím.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="727"/>
+ <location filename="../gis/CGisListWks.cpp" line="735"/>
<source>Loading workspace. Please wait.</source>
<translation>Nahrává se pohled. Počkejte, prosím.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>Close all projects...</source>
<translation>Zavřít všechny projekty...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>This will remove all projects from the workspace.</source>
<translation>Tímto budou všechny projekty odstraněny z pohledu.</translation>
</message>
@@ -521,12 +521,12 @@
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Cut Track...</source>
<translation>Rozkrajet stopu...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Do you want to delete the original track?</source>
<translation>Opravdu chcete smazat původní stopu?</translation>
</message>
@@ -577,22 +577,22 @@
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="485"/>
+ <location filename="../CMainWindow.cpp" line="487"/>
<source>Ele: %1%2</source>
<translation>Výška: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="611"/>
+ <location filename="../CMainWindow.cpp" line="613"/>
<source>Load GIS Data...</source>
<translation>Nahrát data GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="645"/>
+ <location filename="../CMainWindow.cpp" line="647"/>
<source>Select output file</source>
<translation>Vybrat výstupní soubor</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="671"/>
+ <location filename="../CMainWindow.cpp" line="673"/>
<source>Select file to load</source>
<translation>Vybrat soubor k nahrání</translation>
</message>
@@ -1204,26 +1204,26 @@
<translation>Soubor obsahuje zamknutá/zašifrovaná data. Garmin nechce, aby byl tento soubor použit s jiným programem než dodaným Garminem.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2494"/>
- <location filename="../map/CMapIMG.cpp" line="2502"/>
- <location filename="../map/CMapIMG.cpp" line="2506"/>
- <location filename="../map/CMapIMG.cpp" line="2511"/>
- <location filename="../map/CMapIMG.cpp" line="2557"/>
- <location filename="../map/CMapIMG.cpp" line="2565"/>
- <location filename="../map/CMapIMG.cpp" line="2569"/>
- <location filename="../map/CMapIMG.cpp" line="2574"/>
+ <location filename="../map/CMapIMG.cpp" line="2496"/>
+ <location filename="../map/CMapIMG.cpp" line="2504"/>
+ <location filename="../map/CMapIMG.cpp" line="2508"/>
+ <location filename="../map/CMapIMG.cpp" line="2513"/>
+ <location filename="../map/CMapIMG.cpp" line="2559"/>
+ <location filename="../map/CMapIMG.cpp" line="2567"/>
+ <location filename="../map/CMapIMG.cpp" line="2571"/>
+ <location filename="../map/CMapIMG.cpp" line="2576"/>
<source>Point of Interest</source>
<translation>Podivuhodnost</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2701"/>
+ <location filename="../map/CMapIMG.cpp" line="2703"/>
<source>Unknown</source>
<translation>Neznámý</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2747"/>
- <location filename="../map/CMapIMG.cpp" line="2755"/>
- <location filename="../map/CMapIMG.cpp" line="2762"/>
+ <location filename="../map/CMapIMG.cpp" line="2749"/>
+ <location filename="../map/CMapIMG.cpp" line="2757"/>
+ <location filename="../map/CMapIMG.cpp" line="2764"/>
<source>Area</source>
<translation>Oblast</translation>
</message>
@@ -1488,22 +1488,22 @@ Neznámá stavba.</translation>
<context>
<name>CMouseNormal</name>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Waypoint</source>
<translation>Přidat cestovní bod</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Track</source>
<translation>Přidat stopu</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="44"/>
<source>Add Area</source>
<translation>Přidat oblast</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="46"/>
<source>Copy position</source>
<translation>Kopírovat polohu</translation>
</message>
@@ -1677,9 +1677,13 @@ není platným vymezením soustavy souřadnic
<translation>Cestovní body: %1</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
<source>Overlays: %1 (only area overlays will be converted to QMapShack)</source>
- <translation>Překrytí: %1 (pouze překrytí oblasti budou převedena do QMapShack)</translation>
+ <translation type="vanished">Překrytí: %1 (pouze překrytí oblasti budou převedena do QMapShack)</translation>
+ </message>
+ <message>
+ <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
+ <source>Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="581"/>
@@ -1743,7 +1747,7 @@ není platným vymezením soustavy souřadnic
<translation>Zavést složky...</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="748"/>
+ <location filename="../qlgt/CQlgtDb.cpp" line="758"/>
<source>Overlay of type '%1' cant be converted</source>
<translation>Překrytí typu '%1' nelze převést</translation>
</message>
@@ -2166,42 +2170,52 @@ není platným vymezením soustavy souřadnic
<translation>-</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="82"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="69"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>Cestovní bod byl zaveden do QMapShacku a byl změněn. Už neukazuje původní data. Prohlédněte si, prosím, historii kvůli změnám. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="85"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="88"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="112"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="118"/>
<source>Color</source>
<translation>Barva</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="133"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="139"/>
<source>Border width</source>
<translation>Šířka okraje</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="147"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="153"/>
<source>Style</source>
<translation>Styl</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="166"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="172"/>
<source>Opacity</source>
<translation>Neprůhlednost</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="186"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="192"/>
<source>Points</source>
<translation>Body</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="213"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="219"/>
<source>Position</source>
<translation>Poloha</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="222"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="228"/>
<source>Hist.</source>
<translation>Hist.</translation>
</message>
@@ -2285,7 +2299,7 @@ není platným vymezením soustavy souřadnic
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="231"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="467"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
<source>Speed</source>
<translation>Rychlost</translation>
</message>
@@ -2301,71 +2315,81 @@ není platným vymezením soustavy souřadnic
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="274"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="399"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="307"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>Cestovní bod byl zaveden do QMapShacku a byl změněn. Už neukazuje původní data. Prohlédněte si, prosím, historii kvůli změnám. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="405"/>
<source>Points</source>
<translation>Body</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="447"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="453"/>
<source>Time</source>
<translation>Čas</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="452"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="458"/>
<source>Ele.</source>
<translation>Výška</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="457"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="463"/>
<source>Delta</source>
<translation>Rozdíl</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="462"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="468"/>
<source>Dist.</source>
<translation>Vzdál.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="472"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="478"/>
<source>Slope</source>
<translation>Sklon</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="477"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
<source>Ascend</source>
<translation>Stoupání</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="482"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="488"/>
<source>Descend</source>
<translation>Klesání</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="487"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="493"/>
<source>Position</source>
<translation>Poloha</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="371"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
<source>Info</source>
<translation>Informace</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="329"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="335"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="496"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="502"/>
<source>Filter</source>
<translation>Filtr</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="533"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="539"/>
<source>Hist.</source>
<translation>Hist.</translation>
</message>
@@ -2378,6 +2402,11 @@ není platným vymezením soustavy souřadnic
<translation>Dialog</translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="207"/>
<location filename="../gis/wpt/IDetailsWpt.ui" line="236"/>
<location filename="../gis/wpt/IDetailsWpt.ui" line="273"/>
@@ -2415,9 +2444,8 @@ není platným vymezením soustavy souřadnic
<translation><html><head/><body><p>Cestovní bod byl zaveden do QMapShacku a byl změněn. Už neukazuje původní data. Prohlédněte si, prosím, historii kvůli změnám. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
<source><html><head/><body><p>Read Only Mode</p></body></html></source>
- <translation><html><head/><body><p>Režim pouze pro čtení</p></body></html></translation>
+ <translation type="vanished"><html><head/><body><p>Režim pouze pro čtení</p></body></html></translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="270"/>
@@ -2854,52 +2882,52 @@ není platným vymezením soustavy souřadnic
<context>
<name>IMainWindow</name>
<message>
- <location filename="../IMainWindow.ui" line="14"/>
+ <location filename="../IMainWindow.ui" line="17"/>
<source>QMapShack</source>
<translation>QMapShack</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="60"/>
+ <location filename="../IMainWindow.ui" line="63"/>
<source>File</source>
<translation>Soubor</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="73"/>
+ <location filename="../IMainWindow.ui" line="78"/>
<source>View</source>
<translation>Pohled</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="93"/>
+ <location filename="../IMainWindow.ui" line="98"/>
<source>Window</source>
<translation>Okno</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="98"/>
+ <location filename="../IMainWindow.ui" line="103"/>
<source>?</source>
<translation>Nápověda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="105"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="115"/>
+ <location filename="../IMainWindow.ui" line="120"/>
<source>Tool</source>
<translation>Nástroj</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="133"/>
+ <location filename="../IMainWindow.ui" line="138"/>
<source>Maps</source>
<translation>Mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="170"/>
+ <location filename="../IMainWindow.ui" line="175"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Digitální výškový model (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="203"/>
+ <location filename="../IMainWindow.ui" line="208"/>
<source>Data</source>
<translation>Data</translation>
</message>
@@ -2908,78 +2936,78 @@ není platným vymezením soustavy souřadnic
<translation type="obsolete">Přidat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="222"/>
+ <location filename="../IMainWindow.ui" line="227"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Show Scale</source>
<translation>Ukázat měřítko</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="243"/>
+ <location filename="../IMainWindow.ui" line="248"/>
<source>Setup Map Font</source>
<translation>Nastavit písmo mapy</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="255"/>
+ <location filename="../IMainWindow.ui" line="260"/>
<source>Show Grid</source>
<translation>Ukázat mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="258"/>
+ <location filename="../IMainWindow.ui" line="263"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="267"/>
+ <location filename="../IMainWindow.ui" line="272"/>
<source>Setup Grid</source>
<translation>Nastavit mřížku</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="270"/>
+ <location filename="../IMainWindow.ui" line="275"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="282"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Flip Mouse Wheel</source>
<translation>Obrátit kolečko myši</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="291"/>
- <location filename="../IMainWindow.ui" line="294"/>
+ <location filename="../IMainWindow.ui" line="296"/>
+ <location filename="../IMainWindow.ui" line="299"/>
<source>Setup Map Paths</source>
<translation>Nastavit cesty k mapám</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="306"/>
+ <location filename="../IMainWindow.ui" line="311"/>
<source>POI Text</source>
<translation>Text POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="318"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Night / Day</source>
<translation>Noc/Den</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="330"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Map Tool Tip</source>
<translation>Rada k nástroji pro mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="339"/>
+ <location filename="../IMainWindow.ui" line="344"/>
<source>Setup DEM Paths</source>
<translation>Nastavit cesty k DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="348"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>About</source>
<translation>O programu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="357"/>
+ <location filename="../IMainWindow.ui" line="362"/>
<source>Help</source>
<translation>Nápověda</translation>
</message>
@@ -2988,138 +3016,143 @@ není platným vymezením soustavy souřadnic
<translation type="obsolete">Nastavit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="216"/>
- <location filename="../IMainWindow.ui" line="219"/>
+ <location filename="../IMainWindow.ui" line="221"/>
+ <location filename="../IMainWindow.ui" line="224"/>
<source>Add Map View</source>
<translation>Přidat pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="366"/>
- <location filename="../IMainWindow.ui" line="369"/>
+ <location filename="../IMainWindow.ui" line="371"/>
+ <location filename="../IMainWindow.ui" line="374"/>
<source>Setup Map View</source>
<translation>Nastavit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="378"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Load GIS Data</source>
<translation>Nahrát data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="386"/>
<source>Load projects from file</source>
<translation>Nahrát projekty ze souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="384"/>
+ <location filename="../IMainWindow.ui" line="389"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="393"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Save All GIS Data</source>
<translation>Uložit všechna data GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="396"/>
+ <location filename="../IMainWindow.ui" line="401"/>
<source>Save all projects in the workspace</source>
<translation>Uložit všechny projekty na pracovním místě</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="399"/>
+ <location filename="../IMainWindow.ui" line="404"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="408"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>Setup Time Zone</source>
<translation>Nastavit časové pásmo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="417"/>
+ <location filename="../IMainWindow.ui" line="422"/>
<source>Add empty project</source>
<translation>Přidat prázdný projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="429"/>
+ <location filename="../IMainWindow.ui" line="434"/>
<source>Search Google</source>
<translation>Hledat pomocí Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="438"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Close all projects</source>
<translation>Zavřít všechny projekty</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="441"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>F8</source>
<translation>F8</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="450"/>
+ <location filename="../IMainWindow.ui" line="455"/>
<source>Setup Units</source>
<translation>Nastavit jednotky</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="459"/>
+ <location filename="../IMainWindow.ui" line="464"/>
<source>Setup Workspace</source>
<translation>Nastavit pohled</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="462"/>
+ <location filename="../IMainWindow.ui" line="467"/>
<source>Setup save on exit.</source>
<translation>Nastavit uložení při ukončení.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="471"/>
+ <location filename="../IMainWindow.ui" line="476"/>
<source>Import Database from QLandkarte</source>
<translation>Zavést databázi z QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="474"/>
+ <location filename="../IMainWindow.ui" line="479"/>
<source>Import QLandkarte GT database</source>
<translation>Zavést databázi GT QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="488"/>
<source>VRT Builder</source>
<translation>Sestavovač VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="486"/>
+ <location filename="../IMainWindow.ui" line="491"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Rozhraní pro gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="495"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Store Map View</source>
<translation>Uložit pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="498"/>
+ <location filename="../IMainWindow.ui" line="503"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Zapsat nynější činnou mapu a seznam DEM včetně vlastností do souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="507"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load Map View</source>
<translation>Nahrát pohled na mapu</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="510"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Obnovit pohled s činnou mapou a seznam DEM včetně vlastností ze souboru</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="522"/>
+ <location filename="../IMainWindow.ui" line="527"/>
<source>Ext. Profile</source>
<translation>Ext. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="525"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
+ <location filename="../IMainWindow.ui" line="539"/>
+ <source>Close</source>
+ <translation type="unfinished">Zavřít</translation>
+ </message>
+ <message>
<source>Setup Database</source>
<translation type="obsolete">Nastavit databázi</translation>
</message>
@@ -3832,6 +3865,19 @@ nebo
</message>
</context>
<context>
+ <name>ISelectDBFolder</name>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
+ <source>Select Parent Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
+ <source>Name</source>
+ <translation type="unfinished">Název</translation>
+ </message>
+</context>
+<context>
<name>ISelectProjectDialog</name>
<message>
<source>Dialog</source>
@@ -3848,20 +3894,71 @@ nebo
<translation>Vybrat projekt ze seznamu nebo zadat nový název projektu.</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="36"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
+ <source>New project's name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
<source>New project is created as:</source>
<translation>Nový projekt je vytvořen jako:</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="73"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="82"/>
<source>*.qms</source>
<translation>*.qms</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="83"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="92"/>
<source>*.gpx</source>
<translation>*.gpx</translation>
</message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="115"/>
+ <source>Database</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ISelectSaveAction</name>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="14"/>
+ <source>Copy item...</source>
+ <translation type="unfinished">Kopírovat prvek...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="23"/>
+ <source>Replace existing item</source>
+ <translation type="unfinished">Nahradit stávající prvek</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="30"/>
+ <source>Replace with:</source>
+ <translation type="unfinished">Nahradit:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="37"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="47"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="81"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="91"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Textový štítek</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="67"/>
+ <source>Do not replace item</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="74"/>
+ <source>Use item:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="111"/>
+ <source>And for all other items, too.</source>
+ <translation type="unfinished">A také pro všechny další prvky.</translation>
+ </message>
</context>
<context>
<name>ISetupDB</name>
@@ -3932,32 +4029,79 @@ nebo
<context>
<name>ISetupFolder</name>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="14"/>
<source>Folder...</source>
- <translation>Složka...</translation>
+ <translation type="vanished">Složka...</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="22"/>
<source>Name</source>
- <translation>Název</translation>
+ <translation type="vanished">Název</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="34"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="14"/>
+ <source>Database Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="20"/>
+ <source>Folder name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="30"/>
<source>Group</source>
<translation>Skupina</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="45"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="41"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="59"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="55"/>
<source>Other</source>
<translation>Jiné</translation>
</message>
</context>
<context>
+ <name>ISetupNewWpt</name>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
+ <source>New Waypoint...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
+ <source>Symbol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
+ <source>Position</source>
+ <translation type="unfinished">Poloha</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
+ <source>Name</source>
+ <translation type="unfinished">Název</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
+ <source>Bad position format. Must be:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+ <translation type="unfinished">Špatný polohový formát. Musí být:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+nebo
+"[N|S] ddd.ddd [W|E] ddd.ddd"</translation>
+ </message>
+</context>
+<context>
<name>ISetupWorkspace</name>
<message>
<source>Setup database...</source>
@@ -4255,55 +4399,55 @@ Areas: %1</source>
Oblasti: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>The project "%1" was changed. Save befor closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="255"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="261"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Název souboru: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="272"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="278"/>
<source>Waypoints: %1</source>
<translation>Cestovní body: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="276"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="282"/>
<source>Tracks: %1</source>
<translation>Stopy: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="280"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="286"/>
<source>Routes: %1</source>
<translation>Cesty: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="284"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="290"/>
<source>Areas: %1</source>
<translation>Oblasti: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="345"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="351"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Jste si jistý, že chcete smazat '%1' z projektu '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="407"/>
+ <location filename="../gis/CGisListDB.cpp" line="435"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Jste si jistý, že chcete smazat '%1' ze složky '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="408"/>
- <location filename="../gis/prj/IGisProject.cpp" line="346"/>
+ <location filename="../gis/CGisListDB.cpp" line="436"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="352"/>
<source>Delete...</source>
<translation>Smazat...</translation>
</message>
@@ -4322,7 +4466,7 @@ Název souboru: %1</translation>
<translation>Nepodařilo se otevřít %1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="129"/>
+ <location filename="../gis/db/CDBProject.cpp" line="149"/>
<location filename="../gis/gpx/CGpxProject.cpp" line="216"/>
<location filename="../gis/qms/CQmsProject.cpp" line="94"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
@@ -4330,12 +4474,12 @@ Název souboru: %1</translation>
<translation>Uložit data GIS do...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Save ...</source>
<translation>Uložit...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Abort save</source>
<translation>Zrušit ukládání</translation>
</message>
@@ -4370,143 +4514,143 @@ Název souboru: %1</translation>
<translation>Počáteční verze.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="412"/>
+ <location filename="../gis/IGisItem.cpp" line="421"/>
<source>This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press'Ok'.</source>
<translation>Tento prvek je pravděpodobně pouze pro čtení, protože nebyl vytvořen v programu QMapShack. Obvykle nemáte zájem měnit zavedená data. Ale pokud si myslíte, že je to tentokrát na místě, stiskněte OK.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="413"/>
+ <location filename="../gis/IGisItem.cpp" line="422"/>
<source>Read Only Mode...</source>
<translation>Režim pouze pro čtení...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="632"/>
+ <location filename="../gis/IGisItem.cpp" line="645"/>
<source><h4>Comment:</h4></source>
<translation><h4>Poznámka:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="635"/>
+ <location filename="../gis/IGisItem.cpp" line="648"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- žádná poznámka ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="618"/>
- <location filename="../gis/IGisItem.cpp" line="677"/>
+ <location filename="../gis/IGisItem.cpp" line="631"/>
+ <location filename="../gis/IGisItem.cpp" line="690"/>
<source><h4>Description:</h4></source>
<translation><h4>Popis:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="621"/>
- <location filename="../gis/IGisItem.cpp" line="680"/>
+ <location filename="../gis/IGisItem.cpp" line="634"/>
+ <location filename="../gis/IGisItem.cpp" line="693"/>
<source><p>--- no description ---</p></source>
<translation><p>--- žádný popis ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="646"/>
- <location filename="../gis/IGisItem.cpp" line="691"/>
+ <location filename="../gis/IGisItem.cpp" line="659"/>
+ <location filename="../gis/IGisItem.cpp" line="704"/>
<source><h4>Links:</h4></source>
<translation><h4>Odkazy:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="649"/>
- <location filename="../gis/IGisItem.cpp" line="694"/>
+ <location filename="../gis/IGisItem.cpp" line="662"/>
+ <location filename="../gis/IGisItem.cpp" line="707"/>
<source><p>--- no links ---</p></source>
<translation><p>--- žádné odkazy ---</p></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="402"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
<source>Length: %1 %2</source>
<translation>Délka: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="409"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
<source>Time: %1</source>
<translation>Čas: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="420"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="430"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
<source>, Speed: %1 %2</source>
<translation>, Rychlost: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
<source>Moving: %1</source>
<translation>Pohyb: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="436"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="450"/>
<source>Start: %1</source>
<translation>Začátek: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="455"/>
<source>End: %1</source>
<translation>Konec: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="459"/>
<source>Points: %1 (%2)</source>
<translation>Body: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="577"/>
<source>Ele.: %1 %2</source>
<translation>Výška: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="566"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source> slope: %1%3 (%2%)</source>
<translation> sklon: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="651"/>
<source>Ascend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="642"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="659"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="654"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="668"/>
<source> Descend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="664"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
<source>Descend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="670"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>Dist.: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="675"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1334"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1368"/>
<source>Hide points.</source>
<translation>Skrýt body.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1414"/>
<source>Show points.</source>
<translation>Ukázat body.</translation>
</message>
@@ -4515,37 +4659,37 @@ Název souboru: %1</translation>
<translation type="obsolete"> sklon: %1°(%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="571"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="585"/>
<source> speed: %1%2</source>
<translation> rychlost: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="583"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Stoupání: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
<source>Ascend: - (-)</source>
<translation>Stoupání: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="611"/>
<source> Descend: - (-) </source>
<translation> Klesání: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="632"/>
<source> Moving: - (-) </source>
<translation> Pohyb: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="607"/>
<source> Descend: %1%2 (%3%)</source>
<translation> Klesání: %1%2 (%3%) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="326"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
<source>Changed trackpoints, sacrificed all previous data.</source>
<translation>Změněny body stop. Obětována veškerá předchozí data.</translation>
</message>
@@ -4554,17 +4698,17 @@ Název souboru: %1</translation>
<translation type="obsolete"> sklon: %1° (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
<source>Dist.: %1%2 (%3%)</source>
<translation>Vzdálenost: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="608"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Dist.: - (-)</source>
<translation>Vzdálenost: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="614"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="628"/>
<source> Moving: %1%2 (%3%)</source>
<translation> Pohyb: %1%2 (%3%) </translation>
</message>
@@ -4592,138 +4736,136 @@ Název souboru: %1</translation>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="142"/>
<location filename="../gis/rte/CGisItemRte.cpp" line="45"/>
<location filename="../gis/trk/CGisItemTrk.cpp" line="184"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="101"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="418"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="433"/>
<source>Area: %1%2</source>
<translation>Oblast: %1%2</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="476"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
<source>Changed area shape.</source>
<translation>Změněn tvar oblasti.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="484"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="499"/>
<source>Changed name.</source>
<translation>Změněn název.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="490"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="505"/>
<source>Changed border width.</source>
<translation>Změněna šířka okraje.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="496"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="511"/>
<source>Changed fill pattern.</source>
<translation>Změněn vzor výplně.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="517"/>
<source>Changed opacity.</source>
<translation>Změněna neprůhlednost.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="508"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="523"/>
<source>Changed comment.</source>
<translation>Změněna poznámka.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="514"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="529"/>
<source>Changed description.</source>
<translation>Změněn popis.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="520"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="139"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1739"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="376"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="535"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="154"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1773"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="378"/>
<source>Changed links</source>
<translation>Změněné odkazy</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="532"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1751"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="547"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1785"/>
<source>Changed color</source>
<translation>Změněná barva</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="242"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="244"/>
<source>Elevation: %1 %2</source>
<translation>Výška: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="253"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="255"/>
<source>Proximity: %1 %2</source>
<translation>Blízkost: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1721"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="326"/>
<source>Changed name</source>
<translation>Změněný název</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Edit name...</source>
<translation>Upravit název...</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
<source>Enter new waypoint name.</source>
- <translation>Zadat nový název pro cestovní bod.</translation>
+ <translation type="vanished">Zadat nový název pro cestovní bod.</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="334"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="336"/>
<source>Changed position</source>
<translation>Změněná poloha</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="340"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="342"/>
<source>Changed elevation</source>
<translation>Změněná výška</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="346"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="348"/>
<source>Changed proximity</source>
<translation>Změněná blízkost</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="360"/>
<source>Changed icon</source>
<translation>Změněná ikona</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="382"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
<source>Changed images</source>
<translation>Změněné obrázky</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="390"/>
<source>Add image</source>
<translation>Přidat obrázek</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="127"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1727"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="364"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="142"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1761"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="366"/>
<source>Changed comment</source>
<translation>Změněná poznámka</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="133"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1733"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="370"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="148"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1767"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="372"/>
<source>Changed description</source>
<translation>Změněný popis</translation>
</message>
@@ -4759,11 +4901,11 @@ Název souboru: %1</translation>
<translation>Toto je souborový typ s neznámým druhem čáry. Nahlašte to, prosím!</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Enter new track name.</source>
<translation>Zadat název nové stopy.</translation>
@@ -4870,12 +5012,12 @@ Název souboru: %1</translation>
<translation>Rychlost změněna na %1%2.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Delete project...</source>
<translation>Smazat projekt...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Do you really want to delete %1?</source>
<translation>Opravdu chcete smazat %1?</translation>
</message>
diff --git a/src/locale/qmapshack_de.ts b/src/locale/qmapshack_de.ts
index 3717682..bbc501d 100644
--- a/src/locale/qmapshack_de.ts
+++ b/src/locale/qmapshack_de.ts
@@ -390,38 +390,38 @@
<translation>Leer</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Remove database...</source>
<translation>Datenbank entfernen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Do you realy want to remove '%1' from the list?</source>
<translation>Wollen Sie '%1' wirklich aus der Liste entfernen?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Delete database folder...</source>
<translation>Datenbankordner löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Are you sure you want to delete "%1" from the database?</source>
<translation>Sind Sie sicher, dass Sie "%1" aus der Datenbank löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Remove items...</source>
<translation>Element entfernen...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Sind Sie sicher, dass Sie alle Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaftentfernt.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Sind Sie sicher, dass Sie alle ausgewählten Elemente in Verloren & Gefunden löschen wollen? Sie werden dauerhaft entfernt.</translation>
</message>
@@ -429,17 +429,17 @@
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="94"/>
+ <location filename="../gis/CGisListWks.cpp" line="96"/>
<source>Save</source>
<translation>Speichern</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="93"/>
+ <location filename="../gis/CGisListWks.cpp" line="95"/>
<source>Save As...</source>
<translation>Speichern unter...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="92"/>
+ <location filename="../gis/CGisListWks.cpp" line="94"/>
<source>Edit..</source>
<translation>Bearbeiten..</translation>
</message>
@@ -448,34 +448,34 @@
<translation>Aktualisiere das Projekt auf allen Geräten </translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="96"/>
+ <location filename="../gis/CGisListWks.cpp" line="98"/>
<source>Close</source>
<translation>Schließen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Update Project on Device</source>
<translation>Aktualisiere das Projekt auf dem Gerät</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Edit...</source>
<translation>Bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Copy to...</source>
<translation>Kopieren nach...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="127"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Move Waypoint</source>
<translation>Wegpunkt verschieben</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="586"/>
- <location filename="../gis/CGisListWks.cpp" line="1253"/>
- <location filename="../gis/CGisListWks.cpp" line="1292"/>
+ <location filename="../gis/CGisListWks.cpp" line="594"/>
+ <location filename="../gis/CGisListWks.cpp" line="1283"/>
+ <location filename="../gis/CGisListWks.cpp" line="1322"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Aktualisieren der Geräte</b><p>Aktualisiere %1<br/>Bitte warten...</p></translation>
</message>
@@ -484,68 +484,72 @@
<translation type="obsolete">Wegpunkt verschieben...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="128"/>
+ <location filename="../gis/CGisListWks.cpp" line="133"/>
<source>Proj. Waypoint...</source>
<translation>Wegpunkt Projektion...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Track Profile</source>
<translation>Trackprofil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="95"/>
+ <location filename="../gis/CGisListWks.cpp" line="97"/>
<source>Send to Devices</source>
<translation>Ans Gerät senden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <source>Lock/Unlock</source>
+ <translation>Sperren/Entsperren</translation>
+ </message>
+ <message>
+ <location filename="../gis/CGisListWks.cpp" line="121"/>
<source>Select Range</source>
<translation>Bereich wählen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Edit Track Points</source>
<translation>Trackpunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Reverse Track</source>
<translation>Track umkehren</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="124"/>
<source>Combine Tracks</source>
<translation>Tracks verbinden</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="140"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Edit Area Points</source>
<translation>Gebietspunkte bearbeiten</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="103"/>
- <location filename="../gis/CGisListWks.cpp" line="122"/>
+ <location filename="../gis/CGisListWks.cpp" line="105"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Delete</source>
<translation>Löschen</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="686"/>
+ <location filename="../gis/CGisListWks.cpp" line="694"/>
<source>Saving workspace. Please wait.</source>
<translation>Ansicht speichern. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="727"/>
+ <location filename="../gis/CGisListWks.cpp" line="735"/>
<source>Loading workspace. Please wait.</source>
<translation>Ansicht laden. Bitte warten.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>Close all projects...</source>
<translation>Alle Projekte schließen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>This will remove all projects from the workspace.</source>
<translation>Dies wird alle Projekte aus der Ansicht entfernen.</translation>
</message>
@@ -561,12 +565,12 @@
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Cut Track...</source>
<translation>Track teilen...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Do you want to delete the original track?</source>
<translation>Wollen Sie den ursprünglichen Track löschen?</translation>
</message>
@@ -625,22 +629,22 @@
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="485"/>
+ <location filename="../CMainWindow.cpp" line="487"/>
<source>Ele: %1%2</source>
<translation>Höhe: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="611"/>
+ <location filename="../CMainWindow.cpp" line="613"/>
<source>Load GIS Data...</source>
<translation>GIS Daten laden...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="645"/>
+ <location filename="../CMainWindow.cpp" line="647"/>
<source>Select output file</source>
<translation>Ausgabedatei auswählen</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="671"/>
+ <location filename="../CMainWindow.cpp" line="673"/>
<source>Select file to load</source>
<translation>Zu ladende Datei auswählen</translation>
</message>
@@ -1253,26 +1257,26 @@
<translation>Die Datei enthält verschlüsselte Daten. Garmin möchte nicht dass diese Datei mit einer anderen Software, als der von Garmin bereitgestellten, benutzt wird.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2494"/>
- <location filename="../map/CMapIMG.cpp" line="2502"/>
- <location filename="../map/CMapIMG.cpp" line="2506"/>
- <location filename="../map/CMapIMG.cpp" line="2511"/>
- <location filename="../map/CMapIMG.cpp" line="2557"/>
- <location filename="../map/CMapIMG.cpp" line="2565"/>
- <location filename="../map/CMapIMG.cpp" line="2569"/>
- <location filename="../map/CMapIMG.cpp" line="2574"/>
+ <location filename="../map/CMapIMG.cpp" line="2496"/>
+ <location filename="../map/CMapIMG.cpp" line="2504"/>
+ <location filename="../map/CMapIMG.cpp" line="2508"/>
+ <location filename="../map/CMapIMG.cpp" line="2513"/>
+ <location filename="../map/CMapIMG.cpp" line="2559"/>
+ <location filename="../map/CMapIMG.cpp" line="2567"/>
+ <location filename="../map/CMapIMG.cpp" line="2571"/>
+ <location filename="../map/CMapIMG.cpp" line="2576"/>
<source>Point of Interest</source>
<translation>Ort von Interesse</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2701"/>
+ <location filename="../map/CMapIMG.cpp" line="2703"/>
<source>Unknown</source>
<translation>Unbekannt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2747"/>
- <location filename="../map/CMapIMG.cpp" line="2755"/>
- <location filename="../map/CMapIMG.cpp" line="2762"/>
+ <location filename="../map/CMapIMG.cpp" line="2749"/>
+ <location filename="../map/CMapIMG.cpp" line="2757"/>
+ <location filename="../map/CMapIMG.cpp" line="2764"/>
<source>Area</source>
<translation>Gebiet</translation>
</message>
@@ -1567,22 +1571,22 @@ Unbekannte Struktur.</translation>
<context>
<name>CMouseNormal</name>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Waypoint</source>
<translation>Wegpunkt hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Track</source>
<translation>Track hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="44"/>
<source>Add Area</source>
<translation>Gebiet hinzufügen</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="46"/>
<source>Copy position</source>
<translation>Position kopieren</translation>
</message>
@@ -1760,11 +1764,15 @@ ist keine gültige Koordinatensystemdefinition:
<translation>Wegpunkte: %1</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
<source>Overlays: %1 (only area overlays will be converted to QMapShack)</source>
<translation>Overlays: %1 (Es werden nur Gebietsoverlays nach QMapShack konvertiert)</translation>
</message>
<message>
+ <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
+ <source>Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
+ <translation>Overlays: %1 (Flächen werden als Flächen übernommen, Distanzlinien werden als Tracks übernommen, alle anderen Overlays gehen verloren)</translation>
+ </message>
+ <message>
<location filename="../qlgt/CQlgtDb.cpp" line="581"/>
<source>Diaries: %1</source>
<translation>Tagebücher: %1</translation>
@@ -1826,7 +1834,7 @@ ist keine gültige Koordinatensystemdefinition:
<translation>Importiere Ordner...</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="748"/>
+ <location filename="../qlgt/CQlgtDb.cpp" line="758"/>
<source>Overlay of type '%1' cant be converted</source>
<translation>Das Overlay vom Typ '%1' kann nicht konvertiert werden</translation>
</message>
@@ -2249,42 +2257,52 @@ ist keine gültige Koordinatensystemdefinition:
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="82"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="69"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation><html><head/><body><p>Der Wegpunkt wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="85"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="88"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="112"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="118"/>
<source>Color</source>
<translation>Farbe</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="133"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="139"/>
<source>Border width</source>
<translation>Rahmenbreite</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="147"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="153"/>
<source>Style</source>
<translation>Stil</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="166"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="172"/>
<source>Opacity</source>
<translation>Deckkraft</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="186"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="192"/>
<source>Points</source>
<translation>Punkte</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="213"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="219"/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="222"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="228"/>
<source>Hist.</source>
<translation>History</translation>
</message>
@@ -2367,7 +2385,7 @@ ist keine gültige Koordinatensystemdefinition:
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="231"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="467"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
<source>Speed</source>
<translation>Geschw.</translation>
</message>
@@ -2383,71 +2401,81 @@ ist keine gültige Koordinatensystemdefinition:
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="274"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="399"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="307"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation><html><head/><body><p>Der Wegpunkt wurde in QMapShack importiert und geändert. Die ursprünglichen Daten werden nicht mehr angezeigt. Näheres siehe Änderungshistorie.</p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="405"/>
<source>Points</source>
<translation>Punkte</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="447"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="453"/>
<source>Time</source>
<translation>Zeit</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="452"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="458"/>
<source>Ele.</source>
<translation>Höhe</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="457"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="463"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="462"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="468"/>
<source>Dist.</source>
<translation>Entf.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="472"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="478"/>
<source>Slope</source>
<translation>Steigung</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="477"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
<source>Ascend</source>
<translation>Anstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="482"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="488"/>
<source>Descend</source>
<translation>Abstieg</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="487"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="493"/>
<source>Position</source>
<translation>Position</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="371"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="329"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="335"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="496"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="502"/>
<source>Filter</source>
<translation>Filter</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="533"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="539"/>
<source>Hist.</source>
<translation>History</translation>
</message>
@@ -2510,6 +2538,10 @@ ist keine gültige Koordinatensystemdefinition:
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
<source><html><head/><body><p>Read Only Mode</p></body></html></source>
<translation><html><head/><body><p>Schreibschutz</p></body></html></translation>
</message>
@@ -2948,52 +2980,52 @@ ist keine gültige Koordinatensystemdefinition:
<context>
<name>IMainWindow</name>
<message>
- <location filename="../IMainWindow.ui" line="14"/>
+ <location filename="../IMainWindow.ui" line="17"/>
<source>QMapShack</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="60"/>
+ <location filename="../IMainWindow.ui" line="63"/>
<source>File</source>
<translation>Datei</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="73"/>
+ <location filename="../IMainWindow.ui" line="78"/>
<source>View</source>
<translation>Ansicht</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="93"/>
+ <location filename="../IMainWindow.ui" line="98"/>
<source>Window</source>
<translation>Fenster</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="98"/>
+ <location filename="../IMainWindow.ui" line="103"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="105"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="115"/>
+ <location filename="../IMainWindow.ui" line="120"/>
<source>Tool</source>
<translation>Werkzeug</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="133"/>
+ <location filename="../IMainWindow.ui" line="138"/>
<source>Maps</source>
<translation>Karten</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="170"/>
+ <location filename="../IMainWindow.ui" line="175"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Dig. Höhenmodell (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="203"/>
+ <location filename="../IMainWindow.ui" line="208"/>
<source>Data</source>
<translation>Daten</translation>
</message>
@@ -3002,209 +3034,214 @@ ist keine gültige Koordinatensystemdefinition:
<translation type="obsolete">Ansicht hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="216"/>
- <location filename="../IMainWindow.ui" line="219"/>
+ <location filename="../IMainWindow.ui" line="221"/>
+ <location filename="../IMainWindow.ui" line="224"/>
<source>Add Map View</source>
<translation>Kartenansicht hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="222"/>
+ <location filename="../IMainWindow.ui" line="227"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Show Scale</source>
<translation>Maßstab</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="243"/>
+ <location filename="../IMainWindow.ui" line="248"/>
<source>Setup Map Font</source>
<translation>Kartenfont einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="255"/>
+ <location filename="../IMainWindow.ui" line="260"/>
<source>Show Grid</source>
<translation>Gitter</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="258"/>
+ <location filename="../IMainWindow.ui" line="263"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="267"/>
+ <location filename="../IMainWindow.ui" line="272"/>
<source>Setup Grid</source>
<translation>Gitter einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="270"/>
+ <location filename="../IMainWindow.ui" line="275"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="282"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Flip Mouse Wheel</source>
<translation>Mausrad umdrehen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="291"/>
- <location filename="../IMainWindow.ui" line="294"/>
+ <location filename="../IMainWindow.ui" line="296"/>
+ <location filename="../IMainWindow.ui" line="299"/>
<source>Setup Map Paths</source>
<translation>Kartenverzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="306"/>
+ <location filename="../IMainWindow.ui" line="311"/>
<source>POI Text</source>
<translation>POI Text</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="318"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Night / Day</source>
<translation>Nacht / Tag</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="330"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Map Tool Tip</source>
<translation>Kartentooltip</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="339"/>
+ <location filename="../IMainWindow.ui" line="344"/>
<source>Setup DEM Paths</source>
<translation>DEM Verzeichnisse angeben</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="348"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>About</source>
<translation>Über</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="357"/>
+ <location filename="../IMainWindow.ui" line="362"/>
<source>Help</source>
<translation>Hilfe</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="366"/>
- <location filename="../IMainWindow.ui" line="369"/>
+ <location filename="../IMainWindow.ui" line="371"/>
+ <location filename="../IMainWindow.ui" line="374"/>
<source>Setup Map View</source>
<translation>Kartenansicht einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="488"/>
<source>VRT Builder</source>
<translation>VRT Builder</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="486"/>
+ <location filename="../IMainWindow.ui" line="491"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Eine graphische Benutzerschnittstelle zu gdalbuildvrt </translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="495"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Store Map View</source>
<translation>Kartenansicht speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="498"/>
+ <location filename="../IMainWindow.ui" line="503"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation>Speichert die aktive Karten und DEM Dateien inklusive der Eigenschaften in einer Datei</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="507"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load Map View</source>
<translation>Kartenansicht laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="510"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation>Stellt die aktive Karten und DEM Dateien inklusive der Eigenschaften aus einer Datei wieder her</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="522"/>
+ <location filename="../IMainWindow.ui" line="527"/>
<source>Ext. Profile</source>
<translation>Erw. Profil</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="525"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Ctrl+E</source>
<translation></translation>
</message>
<message>
+ <location filename="../IMainWindow.ui" line="539"/>
+ <source>Close</source>
+ <translation>Schließen</translation>
+ </message>
+ <message>
<source>Setup Map Workspace</source>
<translation type="obsolete">Arbeitsplatz einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="378"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Load GIS Data</source>
<translation>GIS Daten laden</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="386"/>
<source>Load projects from file</source>
<translation>Lade Datei als Projekt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="384"/>
+ <location filename="../IMainWindow.ui" line="389"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="393"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Save All GIS Data</source>
<translation>Alle GIS Daten speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="396"/>
+ <location filename="../IMainWindow.ui" line="401"/>
<source>Save all projects in the workspace</source>
<translation>Alle Projekte im Arbeitsplatz speichern</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="399"/>
+ <location filename="../IMainWindow.ui" line="404"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="408"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>Setup Time Zone</source>
<translation>Zeitzone einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="417"/>
+ <location filename="../IMainWindow.ui" line="422"/>
<source>Add empty project</source>
<translation>Leeres Projekt hinzufügen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="429"/>
+ <location filename="../IMainWindow.ui" line="434"/>
<source>Search Google</source>
<translation>Mit Google suchen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="438"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Close all projects</source>
<translation>Alle Projekte schließen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="441"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="450"/>
+ <location filename="../IMainWindow.ui" line="455"/>
<source>Setup Units</source>
<translation>Einheiten einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="459"/>
+ <location filename="../IMainWindow.ui" line="464"/>
<source>Setup Workspace</source>
<translation>Arbeitsplatz einstellen</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="462"/>
+ <location filename="../IMainWindow.ui" line="467"/>
<source>Setup save on exit.</source>
<translation>Speichert Einstellungen beim Beenden.</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="471"/>
+ <location filename="../IMainWindow.ui" line="476"/>
<source>Import Database from QLandkarte</source>
<translation>Datenbankimport aus QLandkarte</translation>
</message>
@@ -3217,7 +3254,7 @@ ist keine gültige Koordinatensystemdefinition:
<translation type="obsolete">Datenbank importieren</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="474"/>
+ <location filename="../IMainWindow.ui" line="479"/>
<source>Import QLandkarte GT database</source>
<translation>QLandkarte GT Datenbank importieren</translation>
</message>
@@ -3612,6 +3649,10 @@ sein</translation>
<translation>Gebiet in ein anderes Projekt kopieren.</translation>
</message>
<message>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
<location filename="../gis/ovl/IScrOptOvlArea.ui" line="112"/>
<source>TextLabel</source>
<translation>Bezeichnung</translation>
@@ -3754,6 +3795,10 @@ sein</translation>
<translation><html><head/><body><p>Löschen</p></body></html></translation>
</message>
<message>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
<location filename="../gis/rte/IScrOptRte.ui" line="85"/>
<source>TextLabel</source>
<translation>Bezeichnung</translation>
@@ -3797,6 +3842,10 @@ sein</translation>
<translation>Position von Trackpunkten bearbeiten.</translation>
</message>
<message>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
<location filename="../gis/trk/IScrOptTrk.ui" line="106"/>
<source>Select a range of points.</source>
<translation>Wähle einen Punktebereich.</translation>
@@ -3886,6 +3935,10 @@ sein</translation>
<translation><html><head/><body><p>Löschen</p></body></html></translation>
</message>
<message>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation>Den Schreibschutz ändern. Das Schloss muss offen sein um das Element zu bearbeiten.</translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IScrOptWpt.ui" line="98"/>
<source><html><head/><body><p>Move waypoint to a new location.</p></body></html></source>
<translation><html><head/><body><p>Wegpunkt verschieben.</p></body></html></translation>
@@ -3961,6 +4014,19 @@ sein</translation>
</message>
</context>
<context>
+ <name>ISelectDBFolder</name>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
+ <source>Select Parent Folder...</source>
+ <translation>Übergeordneten Ordner auswählen...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
+ <source>Name</source>
+ <translation>Name</translation>
+ </message>
+</context>
+<context>
<name>ISelectProjectDialog</name>
<message>
<source>Dialog</source>
@@ -3969,7 +4035,7 @@ sein</translation>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
<source>Select a project...</source>
- <translation>Ein Projekt wählen...</translation>
+ <translation>Ein Projekt auswählen...</translation>
</message>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="20"/>
@@ -3977,20 +4043,71 @@ sein</translation>
<translation>Wähle ein Projekt aus der Liste oder gib einen neuen Projektnamen ein.</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="36"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
+ <source>New project's name</source>
+ <translation>Neuer Projektname</translation>
+ </message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
<source>New project is created as:</source>
<translation>Das neue Projekt wird erstellt als:</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="73"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="82"/>
<source>*.qms</source>
<translation></translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="83"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="92"/>
<source>*.gpx</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="115"/>
+ <source>Database</source>
+ <translation>Datenbank</translation>
+ </message>
+</context>
+<context>
+ <name>ISelectSaveAction</name>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="14"/>
+ <source>Copy item...</source>
+ <translation>Element kopieren...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="23"/>
+ <source>Replace existing item</source>
+ <translation>Ersetzt vorhandenes Element</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="30"/>
+ <source>Replace with:</source>
+ <translation>Ersetzen mit:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="37"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="47"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="81"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="91"/>
+ <source>TextLabel</source>
+ <translation>Bezeichnung</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="67"/>
+ <source>Do not replace item</source>
+ <translation>Das Element nicht ersetzen</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="74"/>
+ <source>Use item:</source>
+ <translation>Element verwenden:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="111"/>
+ <source>And for all other items, too.</source>
+ <translation>Auch für alle anderen Elemente anwenden.</translation>
+ </message>
</context>
<context>
<name>ISetupDB</name>
@@ -4053,32 +4170,80 @@ sein</translation>
<context>
<name>ISetupFolder</name>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="14"/>
<source>Folder...</source>
<translation>Ordner...</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="22"/>
<source>Name</source>
<translation>Name</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="34"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="14"/>
+ <source>Database Folder...</source>
+ <translation>Datenbankordner...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="20"/>
+ <source>Folder name</source>
+ <translation>Ordnername</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="30"/>
<source>Group</source>
<translation>Gruppe</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="45"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="41"/>
<source>Project</source>
<translation>Projekt</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="59"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="55"/>
<source>Other</source>
<translation>Sonstige</translation>
</message>
</context>
<context>
+ <name>ISetupNewWpt</name>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
+ <source>New Waypoint...</source>
+ <translation>Neuer Wegpunkt...</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
+ <source>Symbol</source>
+ <translation>Symbol</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
+ <source>...</source>
+ <translation></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
+ <source>Position</source>
+ <translation>Position</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
+ <source>Name</source>
+ <translation>Name</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
+ <source>Bad position format. Must be:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+ <translation>Falsches Positionsformat. Muss entweder
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+oder
+"[N|S] ddd.ddd [W|E] ddd.ddd"
+sein</translation>
+ </message>
+</context>
+<context>
<name>ISetupWorkspace</name>
<message>
<source>Setup database...</source>
@@ -4367,55 +4532,55 @@ Areas: %1</source>
<translation type="obsolete">Fläche: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>Save project?</source>
<translation>Projekt speichern?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>The project "%1" was changed. Save befor closing it?</source>
<translation>Das Projekt "%1" wurde geändert. Speichern bevor es geschlossen wird?</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="255"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="261"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Dateiname: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="272"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="278"/>
<source>Waypoints: %1</source>
<translation>Wegpunkte: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="276"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="282"/>
<source>Tracks: %1</source>
<translation>Tracks: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="280"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="286"/>
<source>Routes: %1</source>
<translation>Routen: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="284"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="290"/>
<source>Areas: %1</source>
<translation>Gebiete: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="345"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="351"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Sind Sie sicher, dass Sie '%1' aus dem Projekt '%2' löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="407"/>
+ <location filename="../gis/CGisListDB.cpp" line="435"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Sind Sie sicher, dass Sie '%1' aus dem Ordner '%2' löschen wollen? </translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="408"/>
- <location filename="../gis/prj/IGisProject.cpp" line="346"/>
+ <location filename="../gis/CGisListDB.cpp" line="436"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="352"/>
<source>Delete...</source>
<translation>Löschen...</translation>
</message>
@@ -4434,7 +4599,7 @@ Dateiname: %1</translation>
<translation>Öffnen fehlgeschlagen: %1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="129"/>
+ <location filename="../gis/db/CDBProject.cpp" line="149"/>
<location filename="../gis/gpx/CGpxProject.cpp" line="216"/>
<location filename="../gis/qms/CQmsProject.cpp" line="94"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
@@ -4442,12 +4607,12 @@ Dateiname: %1</translation>
<translation>GIS Daten speichern in...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Save ...</source>
<translation>Speichern ...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Abort save</source>
<translation>Speichern abbrechen</translation>
</message>
@@ -4477,94 +4642,94 @@ Dateiname: %1</translation>
<translation>Datei %1' konnte nicht gespeichert werden</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="326"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
<source>Changed trackpoints, sacrificed all previous data.</source>
<translation>Wegpunkte geändert, alle vorherigen Daten sind verloren.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="402"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
<source>Length: %1 %2</source>
<translation>Länge: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="409"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
<source>Time: %1</source>
<translation>Gesamtzeit: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="420"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="430"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
<source>, Speed: %1 %2</source>
<translation>, Geschw.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
<source>Moving: %1</source>
<translation>Zeit in Bew.: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="436"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="450"/>
<source>Start: %1</source>
<translation>Beginn: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="455"/>
<source>End: %1</source>
<translation>Ende: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="459"/>
<source>Points: %1 (%2)</source>
<translation>Punkte: %1 von %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="577"/>
<source>Ele.: %1 %2</source>
<translation>Höhe: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="566"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source> slope: %1%3 (%2%)</source>
<translation>, Steigung: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="651"/>
<source>Ascend: %1%2</source>
<translation>Anstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="642"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="659"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
<source>, %1%2</source>
<translation>, %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation>Anstieg: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="654"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="668"/>
<source> Descend: %1%2</source>
<translation> Abstieg: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="664"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
<source>Descend: -</source>
<translation>Abstieg: -</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="670"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>Dist.: %1%2</source>
<translation>Entf.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="675"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source> Time: %1%2</source>
<translation> Zeit: %1 %2</translation>
</message>
@@ -4573,12 +4738,12 @@ Dateiname: %1</translation>
<translation type="obsolete"> Neigung: %1° (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1334"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1368"/>
<source>Hide points.</source>
<translation>Punkte ausblenden.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1414"/>
<source>Show points.</source>
<translation>Punkte einblenden.</translation>
</message>
@@ -4587,47 +4752,47 @@ Dateiname: %1</translation>
<translation type="obsolete">Neigung: %1°(%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="571"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="585"/>
<source> speed: %1%2</source>
<translation>, Geschw.: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="583"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Anstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
<source>Ascend: - (-)</source>
<translation>Anstieg: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="607"/>
<source> Descend: %1%2 (%3%)</source>
<translation>, Abstieg: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="611"/>
<source> Descend: - (-) </source>
<translation>, Abstieg: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
<source>Dist.: %1%2 (%3%)</source>
<translation>Entf.: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="608"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Dist.: - (-)</source>
<translation>Entf.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="614"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="628"/>
<source> Moving: %1%2 (%3%)</source>
<translation>, Zeit in Bew.: %1 %2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="632"/>
<source> Moving: - (-) </source>
<translation>, Zeit in Bew.: - (-) </translation>
</message>
@@ -4655,138 +4820,136 @@ Dateiname: %1</translation>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="142"/>
<location filename="../gis/rte/CGisItemRte.cpp" line="45"/>
<location filename="../gis/trk/CGisItemTrk.cpp" line="184"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="101"/>
<source>_Clone</source>
<translation>_Klon</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="418"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="433"/>
<source>Area: %1%2</source>
<translation>Gebiet: %1 %2</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="476"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
<source>Changed area shape.</source>
<translation>Gebietsform geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="484"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="499"/>
<source>Changed name.</source>
<translation>Name geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="490"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="505"/>
<source>Changed border width.</source>
<translation>Umrandungsbreite geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="496"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="511"/>
<source>Changed fill pattern.</source>
<translation>Füllung geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="517"/>
<source>Changed opacity.</source>
<translation>Durchsichtigkeit geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="508"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="523"/>
<source>Changed comment.</source>
<translation>Kommentar geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="514"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="529"/>
<source>Changed description.</source>
<translation>Beschreibung geändert.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="520"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="139"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1739"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="376"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="535"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="154"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1773"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="378"/>
<source>Changed links</source>
<translation>Geänderte Verknüpfungen</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="532"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1751"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="547"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1785"/>
<source>Changed color</source>
<translation>Farbe geändert</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Edit name...</source>
<translation>Name bearbeiten...</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
<source>Enter new waypoint name.</source>
<translation>Geben Sie einen neuen Namen für den Wegpunkt ein.</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="242"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="244"/>
<source>Elevation: %1 %2</source>
<translation>Höhe: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="253"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="255"/>
<source>Proximity: %1 %2</source>
<translation>Abstand: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1721"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="326"/>
<source>Changed name</source>
<translation>Name geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="334"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="336"/>
<source>Changed position</source>
<translation>Position geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="340"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="342"/>
<source>Changed elevation</source>
<translation>Höhe geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="346"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="348"/>
<source>Changed proximity</source>
<translation>Abstandsalarm geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="360"/>
<source>Changed icon</source>
<translation>Symbol geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="382"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
<source>Changed images</source>
<translation>Bilder geändert</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="390"/>
<source>Add image</source>
<translation>Bild hinzufügen</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="127"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1727"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="364"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="142"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1761"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="366"/>
<source>Changed comment</source>
<translation>Kommentar geändert</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="133"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1733"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="370"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="148"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1767"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="372"/>
<source>Changed description</source>
<translation>Beschreibung geändert</translation>
</message>
@@ -4827,55 +4990,55 @@ Dateiname: %1</translation>
<translation>Erstversion.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="412"/>
+ <location filename="../gis/IGisItem.cpp" line="421"/>
<source>This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press'Ok'.</source>
<translation>Diese Element ist vermutlich schreibgeschützt, da nicht mit QMapShack erstellt. Normalerweise sollten importierte Daten nicht geändert werden. Wenn doch, drücken Sie 'OK'.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="413"/>
+ <location filename="../gis/IGisItem.cpp" line="422"/>
<source>Read Only Mode...</source>
<translation>Schreibgeschützt...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="632"/>
+ <location filename="../gis/IGisItem.cpp" line="645"/>
<source><h4>Comment:</h4></source>
<translation><h4>Kommentar:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="635"/>
+ <location filename="../gis/IGisItem.cpp" line="648"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- kein ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="618"/>
- <location filename="../gis/IGisItem.cpp" line="677"/>
+ <location filename="../gis/IGisItem.cpp" line="631"/>
+ <location filename="../gis/IGisItem.cpp" line="690"/>
<source><h4>Description:</h4></source>
<translation><h4>Beschreibung:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="621"/>
- <location filename="../gis/IGisItem.cpp" line="680"/>
+ <location filename="../gis/IGisItem.cpp" line="634"/>
+ <location filename="../gis/IGisItem.cpp" line="693"/>
<source><p>--- no description ---</p></source>
<translation><p>--- keine ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="646"/>
- <location filename="../gis/IGisItem.cpp" line="691"/>
+ <location filename="../gis/IGisItem.cpp" line="659"/>
+ <location filename="../gis/IGisItem.cpp" line="704"/>
<source><h4>Links:</h4></source>
<translation><h4>Verknüpfungen:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="649"/>
- <location filename="../gis/IGisItem.cpp" line="694"/>
+ <location filename="../gis/IGisItem.cpp" line="662"/>
+ <location filename="../gis/IGisItem.cpp" line="707"/>
<source><p>--- no links ---</p></source>
<translation><p>--- keine ---</p></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Enter new track name.</source>
<translation>Geben Sie einen neuen Namen für den Track ein.</translation>
@@ -4986,12 +5149,12 @@ Dateiname: %1</translation>
<translation>Geschwindigkeit auf %1 %2 geändert.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Delete project...</source>
<translation>Projekt löschen...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Do you really want to delete %1?</source>
<translation>Sind Sie sicher, dass sie %1? löschen wollen?</translation>
</message>
diff --git a/src/locale/qmapshack_es.ts b/src/locale/qmapshack_es.ts
index 505999e..4c09e92 100644
--- a/src/locale/qmapshack_es.ts
+++ b/src/locale/qmapshack_es.ts
@@ -358,38 +358,38 @@
<translation>Vacío</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Remove database...</source>
<translation>Quitar Base de Datos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Do you realy want to remove '%1' from the list?</source>
<translation>¿Desea realmente quitar '%1' de la lista?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Delete database folder...</source>
<translation>Eliminar Carpeta de la Base de Datos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Are you sure you want to delete "%1" from the database?</source>
<translation>¿Desea realmente eliminar '%1' de la Base de Datos?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Remove items...</source>
<translation>Eliminar elementos...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>¿Desea realmente eliminar todos los elementos de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>¿Desea realmente eliminar todos los elementos.seleccionados de 'Objetos Perdidos'? Se eliminarán definitivamente.</translation>
</message>
@@ -397,17 +397,17 @@
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="94"/>
+ <location filename="../gis/CGisListWks.cpp" line="96"/>
<source>Save</source>
<translation>Guardar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="93"/>
+ <location filename="../gis/CGisListWks.cpp" line="95"/>
<source>Save As...</source>
<translation>Guardar Como...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="92"/>
+ <location filename="../gis/CGisListWks.cpp" line="94"/>
<source>Edit..</source>
<translation>Editar..</translation>
</message>
@@ -416,100 +416,100 @@
<translation type="vanished">Actualizar Proyecto en Dispositivos</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="96"/>
+ <location filename="../gis/CGisListWks.cpp" line="98"/>
<source>Close</source>
<translation>Cerrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Update Project on Device</source>
<translation>Actualizar Proyecto en Dsipositivo</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Edit...</source>
<translation>Editar...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Copy to...</source>
<translation>Copiar a...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="127"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Move Waypoint</source>
<translation>Mover Waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="128"/>
+ <location filename="../gis/CGisListWks.cpp" line="133"/>
<source>Proj. Waypoint...</source>
<translation>Proyectar Waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="586"/>
- <location filename="../gis/CGisListWks.cpp" line="1253"/>
- <location filename="../gis/CGisListWks.cpp" line="1292"/>
+ <location filename="../gis/CGisListWks.cpp" line="594"/>
+ <location filename="../gis/CGisListWks.cpp" line="1283"/>
+ <location filename="../gis/CGisListWks.cpp" line="1322"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation type="unfinished"><b>Actualizar dispositivos</b><p>Actualizar %1<br/>Por favor espere...</p></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Track Profile</source>
<translation>Perfil del Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="95"/>
+ <location filename="../gis/CGisListWks.cpp" line="97"/>
<source>Send to Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="121"/>
<source>Select Range</source>
<translation>Seleccionar Rango</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Edit Track Points</source>
<translation>Editar Puntos del Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Reverse Track</source>
<translation>Invertir Track</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="124"/>
<source>Combine Tracks</source>
<translation>Combinar Tracks</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="140"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Edit Area Points</source>
<translation>Editar Puntos del Área</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="103"/>
- <location filename="../gis/CGisListWks.cpp" line="122"/>
+ <location filename="../gis/CGisListWks.cpp" line="105"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Delete</source>
<translation>Borrar</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="686"/>
+ <location filename="../gis/CGisListWks.cpp" line="694"/>
<source>Saving workspace. Please wait.</source>
<translation>Guardando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="727"/>
+ <location filename="../gis/CGisListWks.cpp" line="735"/>
<source>Loading workspace. Please wait.</source>
<translation>Cargando espacio de trabajo. Por favor espere.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>Close all projects...</source>
<translation>Cerrar todos los proyectos...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>This will remove all projects from the workspace.</source>
<translation>Esto quitará.todos los proyectos.del espacio de trabajo.</translation>
</message>
@@ -517,12 +517,12 @@
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Cut Track...</source>
<translation>Partir Track...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Do you want to delete the original track?</source>
<translation>¿Desea borrar el track original?</translation>
</message>
@@ -573,22 +573,22 @@
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="485"/>
+ <location filename="../CMainWindow.cpp" line="487"/>
<source>Ele: %1%2</source>
<translation>Alt: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="611"/>
+ <location filename="../CMainWindow.cpp" line="613"/>
<source>Load GIS Data...</source>
<translation>Cargar Datos GIS...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="645"/>
+ <location filename="../CMainWindow.cpp" line="647"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="671"/>
+ <location filename="../CMainWindow.cpp" line="673"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
@@ -1200,26 +1200,26 @@
<translation>El archivo contiene datos bloqueados/cifrados. Garmin no quiere que use este archivo con otros programas distintos a los que ellos proporcionan.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2494"/>
- <location filename="../map/CMapIMG.cpp" line="2502"/>
- <location filename="../map/CMapIMG.cpp" line="2506"/>
- <location filename="../map/CMapIMG.cpp" line="2511"/>
- <location filename="../map/CMapIMG.cpp" line="2557"/>
- <location filename="../map/CMapIMG.cpp" line="2565"/>
- <location filename="../map/CMapIMG.cpp" line="2569"/>
- <location filename="../map/CMapIMG.cpp" line="2574"/>
+ <location filename="../map/CMapIMG.cpp" line="2496"/>
+ <location filename="../map/CMapIMG.cpp" line="2504"/>
+ <location filename="../map/CMapIMG.cpp" line="2508"/>
+ <location filename="../map/CMapIMG.cpp" line="2513"/>
+ <location filename="../map/CMapIMG.cpp" line="2559"/>
+ <location filename="../map/CMapIMG.cpp" line="2567"/>
+ <location filename="../map/CMapIMG.cpp" line="2571"/>
+ <location filename="../map/CMapIMG.cpp" line="2576"/>
<source>Point of Interest</source>
<translation>Punto de Interés</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2701"/>
+ <location filename="../map/CMapIMG.cpp" line="2703"/>
<source>Unknown</source>
<translation>Desconocido</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2747"/>
- <location filename="../map/CMapIMG.cpp" line="2755"/>
- <location filename="../map/CMapIMG.cpp" line="2762"/>
+ <location filename="../map/CMapIMG.cpp" line="2749"/>
+ <location filename="../map/CMapIMG.cpp" line="2757"/>
+ <location filename="../map/CMapIMG.cpp" line="2764"/>
<source>Area</source>
<translation>Área</translation>
</message>
@@ -1479,22 +1479,22 @@ Estructura desconocida.</translation>
<context>
<name>CMouseNormal</name>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Waypoint</source>
<translation>Añadir Waypoint</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Track</source>
<translation>Añadir Track</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="44"/>
<source>Add Area</source>
<translation>Añadir Área</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="46"/>
<source>Copy position</source>
<translation>Copiar posición</translation>
</message>
@@ -1668,9 +1668,13 @@ no es una definición de sistema de coordenadas válido:
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
<source>Overlays: %1 (only area overlays will be converted to QMapShack)</source>
- <translation>Superposiciones: %1 (solo las superposiciones de área se copiaran a QMapShack)</translation>
+ <translation type="vanished">Superposiciones: %1 (solo las superposiciones de área se copiaran a QMapShack)</translation>
+ </message>
+ <message>
+ <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
+ <source>Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="581"/>
@@ -1734,7 +1738,7 @@ no es una definición de sistema de coordenadas válido:
<translation>Importar carpetas...</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="748"/>
+ <location filename="../qlgt/CQlgtDb.cpp" line="758"/>
<source>Overlay of type '%1' cant be converted</source>
<translation>No puede convertirse superposición del tipo '%1' </translation>
</message>
@@ -2157,42 +2161,52 @@ no es una definición de sistema de coordenadas válido:
<translation>-</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="82"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="69"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>El waypoint se importó en QMapShack y ha sido modificado, por lo que ya no muestra los datos originales. Por favor consulte los cambios en el histórico. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="85"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="88"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="112"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="118"/>
<source>Color</source>
<translation>Color</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="133"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="139"/>
<source>Border width</source>
<translation>Ancho del borde</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="147"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="153"/>
<source>Style</source>
<translation>Estilo</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="166"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="172"/>
<source>Opacity</source>
<translation>Opacidad</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="186"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="192"/>
<source>Points</source>
<translation>Puntos</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="213"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="219"/>
<source>Position</source>
<translation>Posición</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="222"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="228"/>
<source>Hist.</source>
<translation>Historial</translation>
</message>
@@ -2276,7 +2290,7 @@ no es una definición de sistema de coordenadas válido:
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="231"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="467"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
<source>Speed</source>
<translation>Velocidad</translation>
</message>
@@ -2292,71 +2306,81 @@ no es una definición de sistema de coordenadas válido:
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="274"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
<source>...</source>
<translation>...</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="399"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="307"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>El waypoint se importó en QMapShack y ha sido modificado, por lo que ya no muestra los datos originales. Por favor consulte los cambios en el histórico. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="405"/>
<source>Points</source>
<translation>Puntos</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="447"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="453"/>
<source>Time</source>
<translation>Tiempo</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="452"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="458"/>
<source>Ele.</source>
<translation>Altitud</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="457"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="463"/>
<source>Delta</source>
<translation>Delta</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="462"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="468"/>
<source>Dist.</source>
<translation>Distancia</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="472"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="478"/>
<source>Slope</source>
<translation>Pendiente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="477"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
<source>Ascend</source>
<translation>Ascenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="482"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="488"/>
<source>Descend</source>
<translation>Descenso</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="487"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="493"/>
<source>Position</source>
<translation>Posición</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="371"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
<source>Info</source>
<translation>Información</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="329"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="335"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="496"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="502"/>
<source>Filter</source>
<translation>Filtro</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="533"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="539"/>
<source>Hist.</source>
<translation>Historial</translation>
</message>
@@ -2369,6 +2393,11 @@ no es una definición de sistema de coordenadas válido:
<translation type="unfinished"></translation>
</message>
<message>
+ <location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="207"/>
<location filename="../gis/wpt/IDetailsWpt.ui" line="236"/>
<location filename="../gis/wpt/IDetailsWpt.ui" line="273"/>
@@ -2406,9 +2435,8 @@ no es una definición de sistema de coordenadas válido:
<translation><html><head/><body><p>El waypoint se importó en QMapShack y ha sido modificado, por lo que ya no muestra los datos originales. Por favor consulte los cambios en el histórico. </p></body></html></translation>
</message>
<message>
- <location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
<source><html><head/><body><p>Read Only Mode</p></body></html></source>
- <translation><html><head/><body><p>Modo Sólo Lectura</p></body></html></translation>
+ <translation type="vanished"><html><head/><body><p>Modo Sólo Lectura</p></body></html></translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="270"/>
@@ -2841,52 +2869,52 @@ no es una definición de sistema de coordenadas válido:
<context>
<name>IMainWindow</name>
<message>
- <location filename="../IMainWindow.ui" line="14"/>
+ <location filename="../IMainWindow.ui" line="17"/>
<source>QMapShack</source>
<translation>QMapShack</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="60"/>
+ <location filename="../IMainWindow.ui" line="63"/>
<source>File</source>
<translation>Archivo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="73"/>
+ <location filename="../IMainWindow.ui" line="78"/>
<source>View</source>
<translation>Ver</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="93"/>
+ <location filename="../IMainWindow.ui" line="98"/>
<source>Window</source>
<translation>Ventana</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="98"/>
+ <location filename="../IMainWindow.ui" line="103"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="105"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>Project</source>
<translation>Proyecto</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="115"/>
+ <location filename="../IMainWindow.ui" line="120"/>
<source>Tool</source>
<translation>Herramientas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="133"/>
+ <location filename="../IMainWindow.ui" line="138"/>
<source>Maps</source>
<translation>Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="170"/>
+ <location filename="../IMainWindow.ui" line="175"/>
<source>Dig. Elev. Model (DEM)</source>
<translation>Modelo Digital del Terreno (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="203"/>
+ <location filename="../IMainWindow.ui" line="208"/>
<source>Data</source>
<translation>Datos</translation>
</message>
@@ -2895,214 +2923,219 @@ no es una definición de sistema de coordenadas válido:
<translation type="obsolete">Añadir Espacio de Trabajo de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="216"/>
- <location filename="../IMainWindow.ui" line="219"/>
+ <location filename="../IMainWindow.ui" line="221"/>
+ <location filename="../IMainWindow.ui" line="224"/>
<source>Add Map View</source>
<translation>Añadir Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="222"/>
+ <location filename="../IMainWindow.ui" line="227"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Show Scale</source>
<translation>Mostrar Escala</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="243"/>
+ <location filename="../IMainWindow.ui" line="248"/>
<source>Setup Map Font</source>
<translation>Configurar Fuente del Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="255"/>
+ <location filename="../IMainWindow.ui" line="260"/>
<source>Show Grid</source>
<translation>Mostrar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="258"/>
+ <location filename="../IMainWindow.ui" line="263"/>
<source>Ctrl+G</source>
<translation>Ctrl+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="267"/>
+ <location filename="../IMainWindow.ui" line="272"/>
<source>Setup Grid</source>
<translation>Configurar Malla</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="270"/>
+ <location filename="../IMainWindow.ui" line="275"/>
<source>Ctrl+Alt+G</source>
<translation>Ctrl+Alt+G</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="282"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Flip Mouse Wheel</source>
<translation>Invertir la Rueda del Ratón</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="291"/>
- <location filename="../IMainWindow.ui" line="294"/>
+ <location filename="../IMainWindow.ui" line="296"/>
+ <location filename="../IMainWindow.ui" line="299"/>
<source>Setup Map Paths</source>
<translation>Configurar Rutas de Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="306"/>
+ <location filename="../IMainWindow.ui" line="311"/>
<source>POI Text</source>
<translation>Texto del POI</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="318"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Night / Day</source>
<translation>Noche / Día</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="330"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Map Tool Tip</source>
<translation>Mostrar Tooltips en los Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="339"/>
+ <location filename="../IMainWindow.ui" line="344"/>
<source>Setup DEM Paths</source>
<translation>Configurar Rutas a los DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="348"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>About</source>
<translation>Acerca de</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="357"/>
+ <location filename="../IMainWindow.ui" line="362"/>
<source>Help</source>
<translation>Ayuda</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="366"/>
- <location filename="../IMainWindow.ui" line="369"/>
+ <location filename="../IMainWindow.ui" line="371"/>
+ <location filename="../IMainWindow.ui" line="374"/>
<source>Setup Map View</source>
<translation>Configurar Vista de Mapa</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="488"/>
<source>VRT Builder</source>
<translation>Asistente VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="486"/>
+ <location filename="../IMainWindow.ui" line="491"/>
<source>GUI front end to gdalbuildvrt</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="495"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Store Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="498"/>
+ <location filename="../IMainWindow.ui" line="503"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="507"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="510"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="522"/>
+ <location filename="../IMainWindow.ui" line="527"/>
<source>Ext. Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="525"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Ctrl+E</source>
<translation type="unfinished">Ctrl+E</translation>
</message>
<message>
+ <location filename="../IMainWindow.ui" line="539"/>
+ <source>Close</source>
+ <translation type="unfinished">Cerrar</translation>
+ </message>
+ <message>
<source>Setup Map Workspace</source>
<translation type="obsolete">Configurar Espacio de Trabajo de Mapas</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="378"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Load GIS Data</source>
<translation>Cargar Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="386"/>
<source>Load projects from file</source>
<translation>Cargar proyectos desde archivo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="384"/>
+ <location filename="../IMainWindow.ui" line="389"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="393"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Save All GIS Data</source>
<translation>Guardar Todos los Datos GIS</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="396"/>
+ <location filename="../IMainWindow.ui" line="401"/>
<source>Save all projects in the workspace</source>
<translation>Guardar todos los proyectos del espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="399"/>
+ <location filename="../IMainWindow.ui" line="404"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="408"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>Setup Time Zone</source>
<translation>Configurar Zona Horaria</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="417"/>
+ <location filename="../IMainWindow.ui" line="422"/>
<source>Add empty project</source>
<translation>Añadir proyecto vacío</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="429"/>
+ <location filename="../IMainWindow.ui" line="434"/>
<source>Search Google</source>
<translation>Buscar en Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="438"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Close all projects</source>
<translation>Cerrar todos los proyectos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="441"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>F8</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="450"/>
+ <location filename="../IMainWindow.ui" line="455"/>
<source>Setup Units</source>
<translation>Configurar Unidades</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="459"/>
+ <location filename="../IMainWindow.ui" line="464"/>
<source>Setup Workspace</source>
<translation>Configurar Espacio de trabajo</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="462"/>
+ <location filename="../IMainWindow.ui" line="467"/>
<source>Setup save on exit.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="471"/>
+ <location filename="../IMainWindow.ui" line="476"/>
<source>Import Database from QLandkarte</source>
<translation>Importar base de datos de Qlandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="474"/>
+ <location filename="../IMainWindow.ui" line="479"/>
<source>Import QLandkarte GT database</source>
<translation type="unfinished"></translation>
</message>
@@ -3807,6 +3840,19 @@ o
</message>
</context>
<context>
+ <name>ISelectDBFolder</name>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
+ <source>Select Parent Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
+ <source>Name</source>
+ <translation type="unfinished">Nombre</translation>
+ </message>
+</context>
+<context>
<name>ISelectProjectDialog</name>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -3819,20 +3865,71 @@ o
<translation>Seleccione un proyecto de la lista, o introduzca un nuevo nombre de proyecto.</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="36"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
+ <source>New project's name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
<source>New project is created as:</source>
<translation>El nuevo proyecto se creó como:</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="73"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="82"/>
<source>*.qms</source>
<translation>*.qms</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="83"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="92"/>
<source>*.gpx</source>
<translation>*.gpx</translation>
</message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="115"/>
+ <source>Database</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ISelectSaveAction</name>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="14"/>
+ <source>Copy item...</source>
+ <translation type="unfinished">Copiar elemento...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="23"/>
+ <source>Replace existing item</source>
+ <translation type="unfinished">Sustituir el elemento existente</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="30"/>
+ <source>Replace with:</source>
+ <translation type="unfinished">Sustituir por:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="37"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="47"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="81"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="91"/>
+ <source>TextLabel</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="67"/>
+ <source>Do not replace item</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="74"/>
+ <source>Use item:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="111"/>
+ <source>And for all other items, too.</source>
+ <translation type="unfinished">Hacer igual para todos los elementos.</translation>
+ </message>
</context>
<context>
<name>ISetupDB</name>
@@ -3903,32 +4000,79 @@ o
<context>
<name>ISetupFolder</name>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="14"/>
<source>Folder...</source>
- <translation>Carpeta...</translation>
+ <translation type="vanished">Carpeta...</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="22"/>
<source>Name</source>
- <translation>Nombre</translation>
+ <translation type="vanished">Nombre</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="34"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="14"/>
+ <source>Database Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="20"/>
+ <source>Folder name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="30"/>
<source>Group</source>
<translation>Grupo</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="45"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="41"/>
<source>Project</source>
<translation>Proyecto</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="59"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="55"/>
<source>Other</source>
<translation>Otros</translation>
</message>
</context>
<context>
+ <name>ISetupNewWpt</name>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
+ <source>New Waypoint...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
+ <source>Symbol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
+ <source>Position</source>
+ <translation type="unfinished">Posición</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
+ <source>Name</source>
+ <translation type="unfinished">Nombre</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
+ <source>Bad position format. Must be:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+ <translation type="unfinished">Formato de posición incorrecto. Debe ser:
+"[N|S] ggg mm.sss [W|E] ggg mm.sss"
+o
+"[N|S] ggg.ggg [W|E] ggg.ggg"</translation>
+ </message>
+</context>
+<context>
<name>ISetupWorkspace</name>
<message>
<source>Setup database...</source>
@@ -4222,54 +4366,54 @@ Areas: %1</source>
Áreas: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>The project "%1" was changed. Save befor closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="255"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="261"/>
<source><br/>
Filename: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="272"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="278"/>
<source>Waypoints: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="276"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="282"/>
<source>Tracks: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="280"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="286"/>
<source>Routes: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="284"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="290"/>
<source>Areas: %1</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="345"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="351"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>¿Desea realmente eleiminar '%1' del proyecto '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="407"/>
+ <location filename="../gis/CGisListDB.cpp" line="435"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>¿Desea realmente eleiminar '%1' de la carpeta '%2'?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="408"/>
- <location filename="../gis/prj/IGisProject.cpp" line="346"/>
+ <location filename="../gis/CGisListDB.cpp" line="436"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="352"/>
<source>Delete...</source>
<translation>Borrar...</translation>
</message>
@@ -4288,7 +4432,7 @@ Filename: %1</source>
<translation>Fallo al abrir %1</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="129"/>
+ <location filename="../gis/db/CDBProject.cpp" line="149"/>
<location filename="../gis/gpx/CGpxProject.cpp" line="216"/>
<location filename="../gis/qms/CQmsProject.cpp" line="94"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
@@ -4296,12 +4440,12 @@ Filename: %1</source>
<translation>Guardar los datos GIS en...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Save ...</source>
<translation>Guardar...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Abort save</source>
<translation>Cancelar guardar</translation>
</message>
@@ -4331,149 +4475,149 @@ Filename: %1</source>
<translation>Fallo al escribir en el archivo '%1'</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="402"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
<source>Length: %1 %2</source>
<translation>Longitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="409"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation>, %1%2 %3, %4%5 %6</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
<source>Time: %1</source>
<translation>Tiempo: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="420"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="430"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
<source>, Speed: %1 %2</source>
<translation>, Velocidad: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
<source>Moving: %1</source>
<translation>En movimiento: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="436"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="450"/>
<source>Start: %1</source>
<translation>Comienzo: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="455"/>
<source>End: %1</source>
<translation>Final: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="459"/>
<source>Points: %1 (%2)</source>
<translation>Puntos: %1 (%2)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="577"/>
<source>Ele.: %1 %2</source>
<translation>Altitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="566"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source> slope: %1%3 (%2%)</source>
<translation> pendiente: %1%3 (%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="571"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="585"/>
<source> speed: %1%2</source>
<translation> velocidad: %1%2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="583"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Ascenso: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
<source>Ascend: - (-)</source>
<translation>Ascenso: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="611"/>
<source> Descend: - (-) </source>
<translation> Descenso: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="632"/>
<source> Moving: - (-) </source>
<translation> En movimiento: - (-) </translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="651"/>
<source>Ascend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="642"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="659"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="654"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="668"/>
<source> Descend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="664"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
<source>Descend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="670"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>Dist.: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="675"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1334"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1368"/>
<source>Hide points.</source>
<translation>Ocultar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1414"/>
<source>Show points.</source>
<translation>Mostrar puntos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="607"/>
<source> Descend: %1%2 (%3%)</source>
<translation> Descenso: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="326"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
<source>Changed trackpoints, sacrificed all previous data.</source>
<translation>Se cambiaron los puntos del track, y descartados todos los datos previos.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
<source>Dist.: %1%2 (%3%)</source>
<translation>Distancia: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="608"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Dist.: - (-)</source>
<translation>Dist.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="614"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="628"/>
<source> Moving: %1%2 (%3%)</source>
<translation> En movimiento: %1%2 (%3%)</translation>
</message>
@@ -4501,138 +4645,136 @@ Filename: %1</source>
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="142"/>
<location filename="../gis/rte/CGisItemRte.cpp" line="45"/>
<location filename="../gis/trk/CGisItemTrk.cpp" line="184"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="101"/>
<source>_Clone</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="418"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="433"/>
<source>Area: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="476"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
<source>Changed area shape.</source>
<translation>Se cambió la forma del área.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="484"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="499"/>
<source>Changed name.</source>
<translation>Se cambió el nombre.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="490"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="505"/>
<source>Changed border width.</source>
<translation>Se cambió la anchura del borde.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="496"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="511"/>
<source>Changed fill pattern.</source>
<translation>Se cambió el patró de relleno.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="517"/>
<source>Changed opacity.</source>
<translation>Se cambió la opacidad.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="508"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="523"/>
<source>Changed comment.</source>
<translation>Se cambió el comentario.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="514"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="529"/>
<source>Changed description.</source>
<translation>Se cambió la descripción.</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="520"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="139"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1739"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="376"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="535"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="154"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1773"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="378"/>
<source>Changed links</source>
<translation>Se cambió el enlace</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="532"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1751"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="547"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1785"/>
<source>Changed color</source>
<translation>Se cambió el color</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="242"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="244"/>
<source>Elevation: %1 %2</source>
<translation>Altitud: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="253"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="255"/>
<source>Proximity: %1 %2</source>
<translation>Proximidad: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1721"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="326"/>
<source>Changed name</source>
<translation>Se cambió el nombre</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Edit name...</source>
<translation>Editar nombre...</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
<source>Enter new waypoint name.</source>
- <translation>Introduzca el nuevo nombre del waypoint.</translation>
+ <translation type="vanished">Introduzca el nuevo nombre del waypoint.</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="334"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="336"/>
<source>Changed position</source>
<translation>Se cambió la posición</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="340"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="342"/>
<source>Changed elevation</source>
<translation>Se cambió la altitud</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="346"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="348"/>
<source>Changed proximity</source>
<translation>Se cambió la proximidad</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="360"/>
<source>Changed icon</source>
<translation>Se cambió el icono</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="382"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
<source>Changed images</source>
<translation>Se cambió la imagen</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="390"/>
<source>Add image</source>
<translation>Añadir Imagen</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="127"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1727"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="364"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="142"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1761"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="366"/>
<source>Changed comment</source>
<translation>Se cambió el comentario</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="133"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1733"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="370"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="148"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1767"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="372"/>
<source>Changed description</source>
<translation>Se cambió la descripción</translation>
</message>
@@ -4673,55 +4815,55 @@ Filename: %1</source>
<translation>Versión inicial</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="412"/>
+ <location filename="../gis/IGisItem.cpp" line="421"/>
<source>This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press'Ok'.</source>
<translation>Este elemento probablemente sea de sólo lectura por no haber sido creado por QMapShack. Habitualmente no deseará cambiar los datos importados. De lo contrario, es correcto pulsar 'OK'.</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="413"/>
+ <location filename="../gis/IGisItem.cpp" line="422"/>
<source>Read Only Mode...</source>
<translation>Modo Sólo Lectura...</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="632"/>
+ <location filename="../gis/IGisItem.cpp" line="645"/>
<source><h4>Comment:</h4></source>
<translation><h4>Comentario:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="635"/>
+ <location filename="../gis/IGisItem.cpp" line="648"/>
<source><p>--- no comment ---</p></source>
<translation><p>---sin comentario---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="618"/>
- <location filename="../gis/IGisItem.cpp" line="677"/>
+ <location filename="../gis/IGisItem.cpp" line="631"/>
+ <location filename="../gis/IGisItem.cpp" line="690"/>
<source><h4>Description:</h4></source>
<translation><h4>Descripción:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="621"/>
- <location filename="../gis/IGisItem.cpp" line="680"/>
+ <location filename="../gis/IGisItem.cpp" line="634"/>
+ <location filename="../gis/IGisItem.cpp" line="693"/>
<source><p>--- no description ---</p></source>
<translation><p>---sin descripción---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="646"/>
- <location filename="../gis/IGisItem.cpp" line="691"/>
+ <location filename="../gis/IGisItem.cpp" line="659"/>
+ <location filename="../gis/IGisItem.cpp" line="704"/>
<source><h4>Links:</h4></source>
<translation></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="649"/>
- <location filename="../gis/IGisItem.cpp" line="694"/>
+ <location filename="../gis/IGisItem.cpp" line="662"/>
+ <location filename="../gis/IGisItem.cpp" line="707"/>
<source><p>--- no links ---</p></source>
<translation><p>--- sin links ---</p></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Enter new track name.</source>
<translation>Introduzca el nombre del nuevo track.</translation>
@@ -4828,12 +4970,12 @@ Filename: %1</source>
<translation>Velocidad modificada a %1%2.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Delete project...</source>
<translation>Eliminar Proyecto...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Do you really want to delete %1?</source>
<translation>¿Desea realmente eliminar %1?</translation>
</message>
diff --git a/src/locale/qmapshack_fr.ts b/src/locale/qmapshack_fr.ts
index 6f54592..db44333 100644
--- a/src/locale/qmapshack_fr.ts
+++ b/src/locale/qmapshack_fr.ts
@@ -307,38 +307,38 @@
<translation>Vider</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Remove database...</source>
<translation>Enlever la base de données</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="252"/>
+ <location filename="../gis/CGisListDB.cpp" line="280"/>
<source>Do you realy want to remove '%1' from the list?</source>
<translation>Êtes-vous sûr de vouloir enlever '%1' de la liste ?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Delete database folder...</source>
<translation>Supprimer la base de données...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="293"/>
+ <location filename="../gis/CGisListDB.cpp" line="321"/>
<source>Are you sure you want to delete "%1" from the database?</source>
<translation>Êtes-vous sûr de vouloir enlever '%1' de la liste ?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Remove items...</source>
<translation>Supprimer les éléments...</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="319"/>
+ <location filename="../gis/CGisListDB.cpp" line="347"/>
<source>Are you sure you want to delete all items from Lost&Found? This will remove them permanently.</source>
<translation>Êtes-vous sûr de vouloir supprimer tous les éléments dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="334"/>
+ <location filename="../gis/CGisListDB.cpp" line="362"/>
<source>Are you sure you want to delete all selected items from Lost&Found? This will remove them permanently.</source>
<translation>Êtes-vous sûr de vouloir supprimer les éléments sélectionnés dans Perdu & Trouvé ? Les éléments seront supprimés définitivement.</translation>
</message>
@@ -346,17 +346,17 @@
<context>
<name>CGisListWks</name>
<message>
- <location filename="../gis/CGisListWks.cpp" line="92"/>
+ <location filename="../gis/CGisListWks.cpp" line="94"/>
<source>Edit..</source>
<translation>Éditer..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="93"/>
+ <location filename="../gis/CGisListWks.cpp" line="95"/>
<source>Save As...</source>
<translation>Enregistrer sous...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="94"/>
+ <location filename="../gis/CGisListWks.cpp" line="96"/>
<source>Save</source>
<translation>Enregistrer</translation>
</message>
@@ -365,100 +365,100 @@
<translation type="vanished">Mettre à jour le projet sur tous les appareils</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="95"/>
+ <location filename="../gis/CGisListWks.cpp" line="97"/>
<source>Send to Devices</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="96"/>
+ <location filename="../gis/CGisListWks.cpp" line="98"/>
<source>Close</source>
<translation>Fermer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="102"/>
+ <location filename="../gis/CGisListWks.cpp" line="104"/>
<source>Update Project on Device</source>
<translation>Mettre à jour le projet sur l'appareil</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="103"/>
- <location filename="../gis/CGisListWks.cpp" line="122"/>
+ <location filename="../gis/CGisListWks.cpp" line="105"/>
+ <location filename="../gis/CGisListWks.cpp" line="126"/>
<source>Delete</source>
<translation>Supprimer</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="114"/>
+ <location filename="../gis/CGisListWks.cpp" line="116"/>
<source>Edit...</source>
<translation>Éditer..</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="115"/>
+ <location filename="../gis/CGisListWks.cpp" line="117"/>
<source>Copy to...</source>
<translation>Copier vers...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="116"/>
+ <location filename="../gis/CGisListWks.cpp" line="119"/>
<source>Track Profile</source>
<translation>Profile de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="118"/>
+ <location filename="../gis/CGisListWks.cpp" line="121"/>
<source>Select Range</source>
<translation>Sélectionner des points</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="119"/>
+ <location filename="../gis/CGisListWks.cpp" line="122"/>
<source>Edit Track Points</source>
<translation>Éditer les points de la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="120"/>
+ <location filename="../gis/CGisListWks.cpp" line="123"/>
<source>Reverse Track</source>
<translation>Inverser la trace</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="121"/>
+ <location filename="../gis/CGisListWks.cpp" line="124"/>
<source>Combine Tracks</source>
<translation>Joindre des traces</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="127"/>
+ <location filename="../gis/CGisListWks.cpp" line="132"/>
<source>Move Waypoint</source>
<translation>Déplacer le waypoint</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="128"/>
+ <location filename="../gis/CGisListWks.cpp" line="133"/>
<source>Proj. Waypoint...</source>
<translation>Projection du waypoint...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="140"/>
+ <location filename="../gis/CGisListWks.cpp" line="147"/>
<source>Edit Area Points</source>
<translation>Éditer les points de la surface</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="686"/>
+ <location filename="../gis/CGisListWks.cpp" line="694"/>
<source>Saving workspace. Please wait.</source>
<translation>Sauvegarde de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="727"/>
+ <location filename="../gis/CGisListWks.cpp" line="735"/>
<source>Loading workspace. Please wait.</source>
<translation>Chargement de l'espace de travail. Patientez.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>Close all projects...</source>
<translation>Fermer tous les projets...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="909"/>
+ <location filename="../gis/CGisListWks.cpp" line="918"/>
<source>This will remove all projects from the workspace.</source>
<translation>Ceci enlevera tous les projets de l'espace de travail.</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="586"/>
- <location filename="../gis/CGisListWks.cpp" line="1253"/>
- <location filename="../gis/CGisListWks.cpp" line="1292"/>
+ <location filename="../gis/CGisListWks.cpp" line="594"/>
+ <location filename="../gis/CGisListWks.cpp" line="1283"/>
+ <location filename="../gis/CGisListWks.cpp" line="1322"/>
<source><b>Update devices</b><p>Update %1<br/>Please wait...</p></source>
<translation><b>Mise à jour des appareils</b><p>Mise à jour de %1<br/>Patientez...</p></translation>
</message>
@@ -466,12 +466,12 @@
<context>
<name>CGisWidget</name>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Cut Track...</source>
<translation>Couper la trace...</translation>
</message>
<message>
- <location filename="../gis/CGisWidget.cpp" line="381"/>
+ <location filename="../gis/CGisWidget.cpp" line="419"/>
<source>Do you want to delete the original track?</source>
<translation>Voulez-vous garder la trace originale ?</translation>
</message>
@@ -518,22 +518,22 @@
<context>
<name>CMainWindow</name>
<message>
- <location filename="../CMainWindow.cpp" line="485"/>
+ <location filename="../CMainWindow.cpp" line="487"/>
<source>Ele: %1%2</source>
<translation>Altitude: %1%2</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="611"/>
+ <location filename="../CMainWindow.cpp" line="613"/>
<source>Load GIS Data...</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="645"/>
+ <location filename="../CMainWindow.cpp" line="647"/>
<source>Select output file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../CMainWindow.cpp" line="671"/>
+ <location filename="../CMainWindow.cpp" line="673"/>
<source>Select file to load</source>
<translation type="unfinished"></translation>
</message>
@@ -1145,26 +1145,26 @@
<translation>Le fichier contient des données verrouillées / cryptées. Garmin ne vous autorise pas d'utiliser ce fichier avec un logiciel non fourni par Garmin.</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2494"/>
- <location filename="../map/CMapIMG.cpp" line="2502"/>
- <location filename="../map/CMapIMG.cpp" line="2506"/>
- <location filename="../map/CMapIMG.cpp" line="2511"/>
- <location filename="../map/CMapIMG.cpp" line="2557"/>
- <location filename="../map/CMapIMG.cpp" line="2565"/>
- <location filename="../map/CMapIMG.cpp" line="2569"/>
- <location filename="../map/CMapIMG.cpp" line="2574"/>
+ <location filename="../map/CMapIMG.cpp" line="2496"/>
+ <location filename="../map/CMapIMG.cpp" line="2504"/>
+ <location filename="../map/CMapIMG.cpp" line="2508"/>
+ <location filename="../map/CMapIMG.cpp" line="2513"/>
+ <location filename="../map/CMapIMG.cpp" line="2559"/>
+ <location filename="../map/CMapIMG.cpp" line="2567"/>
+ <location filename="../map/CMapIMG.cpp" line="2571"/>
+ <location filename="../map/CMapIMG.cpp" line="2576"/>
<source>Point of Interest</source>
<translation>Point d'intérêt</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2701"/>
+ <location filename="../map/CMapIMG.cpp" line="2703"/>
<source>Unknown</source>
<translation>Inconnu</translation>
</message>
<message>
- <location filename="../map/CMapIMG.cpp" line="2747"/>
- <location filename="../map/CMapIMG.cpp" line="2755"/>
- <location filename="../map/CMapIMG.cpp" line="2762"/>
+ <location filename="../map/CMapIMG.cpp" line="2749"/>
+ <location filename="../map/CMapIMG.cpp" line="2757"/>
+ <location filename="../map/CMapIMG.cpp" line="2764"/>
<source>Area</source>
<translation>Surface</translation>
</message>
@@ -1424,22 +1424,22 @@ Structure inconnue.</translation>
<context>
<name>CMouseNormal</name>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="43"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="42"/>
<source>Add Waypoint</source>
<translation>Ajouter un waypoint</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="44"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="43"/>
<source>Add Track</source>
<translation>Ajouter une trace</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="45"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="44"/>
<source>Add Area</source>
<translation>Ajouter une surface</translation>
</message>
<message>
- <location filename="../mouse/CMouseNormal.cpp" line="47"/>
+ <location filename="../mouse/CMouseNormal.cpp" line="46"/>
<source>Copy position</source>
<translation>Copier la position</translation>
</message>
@@ -1609,9 +1609,13 @@ n'est pas une définition de système de coordonnées:
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
<source>Overlays: %1 (only area overlays will be converted to QMapShack)</source>
- <translation>Overlays: %1 (Seulements les overlays de type surface seront convertis vers QMapShack)</translation>
+ <translation type="vanished">Overlays: %1 (Seulements les overlays de type surface seront convertis vers QMapShack)</translation>
+ </message>
+ <message>
+ <location filename="../qlgt/CQlgtDb.cpp" line="574"/>
+ <source>Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)</source>
+ <translation type="unfinished"></translation>
</message>
<message>
<location filename="../qlgt/CQlgtDb.cpp" line="581"/>
@@ -1675,7 +1679,7 @@ n'est pas une définition de système de coordonnées:
<translation>Importer les dossiers...</translation>
</message>
<message>
- <location filename="../qlgt/CQlgtDb.cpp" line="748"/>
+ <location filename="../qlgt/CQlgtDb.cpp" line="758"/>
<source>Overlay of type '%1' cant be converted</source>
<translation>Overlay de type '%1' ne peut pas être converti</translation>
</message>
@@ -2079,42 +2083,52 @@ n'est pas une définition de système de coordonnées:
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="82"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="69"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>Le waypoint a été importé dans QMapShack et a été modifié. Il ne représente plus les données originales. Veuillez consulter l'historique pour voir les modifications. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="85"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="88"/>
<source>...</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="112"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="118"/>
<source>Color</source>
<translation>Couleur</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="133"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="139"/>
<source>Border width</source>
<translation>Largeur de la bordure</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="147"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="153"/>
<source>Style</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="166"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="172"/>
<source>Opacity</source>
<translation>Opacité</translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="186"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="192"/>
<source>Points</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="213"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="219"/>
<source>Position</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/IDetailsOvlArea.ui" line="222"/>
+ <location filename="../gis/ovl/IDetailsOvlArea.ui" line="228"/>
<source>Hist.</source>
<translation></translation>
</message>
@@ -2186,12 +2200,12 @@ n'est pas une définition de système de coordonnées:
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="371"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="377"/>
<source>Info</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="274"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="277"/>
<source>...</source>
<translation></translation>
</message>
@@ -2207,7 +2221,7 @@ n'est pas une définition de système de coordonnées:
</message>
<message>
<location filename="../gis/trk/IDetailsTrk.ui" line="231"/>
- <location filename="../gis/trk/IDetailsTrk.ui" line="467"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="473"/>
<source>Speed</source>
<translation>Vitesse</translation>
</message>
@@ -2222,62 +2236,72 @@ n'est pas une définition de système de coordonnées:
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="329"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="274"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="307"/>
+ <source><html><head/><body><p>The waypoint was imported to QMapShack and was changed. It does not show the original data anymore. Please see history for changes. </p></body></html></source>
+ <translation type="unfinished"><html><head/><body><p>Le waypoint a été importé dans QMapShack et a été modifié. Il ne représente plus les données originales. Veuillez consulter l'historique pour voir les modifications. </p></body></html></translation>
+ </message>
+ <message>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="335"/>
<source>-</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="399"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="405"/>
<source>Points</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="447"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="453"/>
<source>Time</source>
<translation>Durée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="452"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="458"/>
<source>Ele.</source>
<translation>Alt.</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="457"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="463"/>
<source>Delta</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="462"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="468"/>
<source>Dist.</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="472"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="478"/>
<source>Slope</source>
<translation>Pente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="477"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="483"/>
<source>Ascend</source>
<translation>Montée</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="482"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="488"/>
<source>Descend</source>
<translation>Descente</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="487"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="493"/>
<source>Position</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="496"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="502"/>
<source>Filter</source>
<translation>Filtre</translation>
</message>
<message>
- <location filename="../gis/trk/IDetailsTrk.ui" line="533"/>
+ <location filename="../gis/trk/IDetailsTrk.ui" line="539"/>
<source>Hist.</source>
<translation></translation>
</message>
@@ -2325,8 +2349,12 @@ n'est pas une définition de système de coordonnées:
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="204"/>
+ <source>Toggle read only mode. You have to open the lock to edit the item.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
<source><html><head/><body><p>Read Only Mode</p></body></html></source>
- <translation><html><head/><body><p>Mode lecture seule</p></body></html></translation>
+ <translation type="vanished"><html><head/><body><p>Mode lecture seule</p></body></html></translation>
</message>
<message>
<location filename="../gis/wpt/IDetailsWpt.ui" line="207"/>
@@ -2762,263 +2790,268 @@ n'est pas une définition de système de coordonnées:
<context>
<name>IMainWindow</name>
<message>
- <location filename="../IMainWindow.ui" line="14"/>
+ <location filename="../IMainWindow.ui" line="17"/>
<source>QMapShack</source>
<translation>QMapShack</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="60"/>
+ <location filename="../IMainWindow.ui" line="63"/>
<source>File</source>
<translation>Fichier</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="73"/>
+ <location filename="../IMainWindow.ui" line="78"/>
<source>View</source>
<translation>Vue</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="93"/>
+ <location filename="../IMainWindow.ui" line="98"/>
<source>Window</source>
<translation>Fenêtre</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="98"/>
+ <location filename="../IMainWindow.ui" line="103"/>
<source>?</source>
<translation>?</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="105"/>
+ <location filename="../IMainWindow.ui" line="110"/>
<source>Project</source>
<translation>Projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="115"/>
+ <location filename="../IMainWindow.ui" line="120"/>
<source>Tool</source>
<translation>Outils</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="133"/>
+ <location filename="../IMainWindow.ui" line="138"/>
<source>Maps</source>
<translation>Cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="170"/>
+ <location filename="../IMainWindow.ui" line="175"/>
<source>Dig. Elev. Model (DEM)</source>
<translation type="unfinished">Modèle numérique de terrain (DEM)</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="203"/>
+ <location filename="../IMainWindow.ui" line="208"/>
<source>Data</source>
<translation>Données</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="216"/>
- <location filename="../IMainWindow.ui" line="219"/>
+ <location filename="../IMainWindow.ui" line="221"/>
+ <location filename="../IMainWindow.ui" line="224"/>
<source>Add Map View</source>
<translation>Ajouter une vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="222"/>
+ <location filename="../IMainWindow.ui" line="227"/>
<source>Ctrl+T</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="234"/>
+ <location filename="../IMainWindow.ui" line="239"/>
<source>Show Scale</source>
<translation>Afficher l'échelle</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="243"/>
+ <location filename="../IMainWindow.ui" line="248"/>
<source>Setup Map Font</source>
<translation>Configurer la police de la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="255"/>
+ <location filename="../IMainWindow.ui" line="260"/>
<source>Show Grid</source>
<translation>Afficher la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="258"/>
+ <location filename="../IMainWindow.ui" line="263"/>
<source>Ctrl+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="267"/>
+ <location filename="../IMainWindow.ui" line="272"/>
<source>Setup Grid</source>
<translation>Configurer la grille</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="270"/>
+ <location filename="../IMainWindow.ui" line="275"/>
<source>Ctrl+Alt+G</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="282"/>
+ <location filename="../IMainWindow.ui" line="287"/>
<source>Flip Mouse Wheel</source>
<translation>Inverser le sens de la molette de souris</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="291"/>
- <location filename="../IMainWindow.ui" line="294"/>
+ <location filename="../IMainWindow.ui" line="296"/>
+ <location filename="../IMainWindow.ui" line="299"/>
<source>Setup Map Paths</source>
<translation>Configurer les répertoires des cartes</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="306"/>
+ <location filename="../IMainWindow.ui" line="311"/>
<source>POI Text</source>
<translation>Libellés des points d'interêt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="318"/>
+ <location filename="../IMainWindow.ui" line="323"/>
<source>Night / Day</source>
<translation>Jour / Nuit</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="330"/>
+ <location filename="../IMainWindow.ui" line="335"/>
<source>Map Tool Tip</source>
<translation>Infobulles sur la carte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="339"/>
+ <location filename="../IMainWindow.ui" line="344"/>
<source>Setup DEM Paths</source>
<translation>Configurer les répertoires DEM</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="348"/>
+ <location filename="../IMainWindow.ui" line="353"/>
<source>About</source>
<translation>À propos</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="357"/>
+ <location filename="../IMainWindow.ui" line="362"/>
<source>Help</source>
<translation>Aide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="366"/>
- <location filename="../IMainWindow.ui" line="369"/>
+ <location filename="../IMainWindow.ui" line="371"/>
+ <location filename="../IMainWindow.ui" line="374"/>
<source>Setup Map View</source>
<translation>Configurer la vue cartographique</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="378"/>
+ <location filename="../IMainWindow.ui" line="383"/>
<source>Load GIS Data</source>
<translation>Charger des données SIG...</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="381"/>
+ <location filename="../IMainWindow.ui" line="386"/>
<source>Load projects from file</source>
<translation>Charger un fichier projet</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="384"/>
+ <location filename="../IMainWindow.ui" line="389"/>
<source>Ctrl+L</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="393"/>
+ <location filename="../IMainWindow.ui" line="398"/>
<source>Save All GIS Data</source>
<translation>Enregistrer toutes les données SIG</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="396"/>
+ <location filename="../IMainWindow.ui" line="401"/>
<source>Save all projects in the workspace</source>
<translation>Enregistrer tous les projets de l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="399"/>
+ <location filename="../IMainWindow.ui" line="404"/>
<source>Ctrl+S</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="408"/>
+ <location filename="../IMainWindow.ui" line="413"/>
<source>Setup Time Zone</source>
<translation>Configurer le fuseau horaire</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="417"/>
+ <location filename="../IMainWindow.ui" line="422"/>
<source>Add empty project</source>
<translation>Ajouter un projet vide</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="429"/>
+ <location filename="../IMainWindow.ui" line="434"/>
<source>Search Google</source>
<translation>Recherche Google</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="438"/>
+ <location filename="../IMainWindow.ui" line="443"/>
<source>Close all projects</source>
<translation>Fermer tous les projets</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="441"/>
+ <location filename="../IMainWindow.ui" line="446"/>
<source>F8</source>
<translation></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="450"/>
+ <location filename="../IMainWindow.ui" line="455"/>
<source>Setup Units</source>
<translation>Configurer les unités</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="459"/>
+ <location filename="../IMainWindow.ui" line="464"/>
<source>Setup Workspace</source>
<translation>Configurer l'espace de travail</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="462"/>
+ <location filename="../IMainWindow.ui" line="467"/>
<source>Setup save on exit.</source>
<translation>Sauvegarde de la configuration en quittant</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="471"/>
+ <location filename="../IMainWindow.ui" line="476"/>
<source>Import Database from QLandkarte</source>
<translation>Importer une base de données QLandkarte</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="474"/>
+ <location filename="../IMainWindow.ui" line="479"/>
<source>Import QLandkarte GT database</source>
<translation>Importer une base de données QLandkarte GT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="483"/>
+ <location filename="../IMainWindow.ui" line="488"/>
<source>VRT Builder</source>
<translation>Générateur de VRT</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="486"/>
+ <location filename="../IMainWindow.ui" line="491"/>
<source>GUI front end to gdalbuildvrt</source>
<translation>Interface utilisateur pour gdalbuildvrt</translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="495"/>
+ <location filename="../IMainWindow.ui" line="500"/>
<source>Store Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="498"/>
+ <location filename="../IMainWindow.ui" line="503"/>
<source>Write current active map and DEM list including the properties to a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="507"/>
+ <location filename="../IMainWindow.ui" line="512"/>
<source>Load Map View</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="510"/>
+ <location filename="../IMainWindow.ui" line="515"/>
<source>Restore view with active map and DEM list including the properties from a file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="522"/>
+ <location filename="../IMainWindow.ui" line="527"/>
<source>Ext. Profile</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../IMainWindow.ui" line="525"/>
+ <location filename="../IMainWindow.ui" line="530"/>
<source>Ctrl+E</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../IMainWindow.ui" line="539"/>
+ <source>Close</source>
+ <translation type="unfinished">Fermer</translation>
+ </message>
</context>
<context>
<name>IMapList</name>
@@ -3713,6 +3746,19 @@ or
</message>
</context>
<context>
+ <name>ISelectDBFolder</name>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="14"/>
+ <source>Select Parent Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectDBFolder.ui" line="26"/>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+</context>
+<context>
<name>ISelectProjectDialog</name>
<message>
<location filename="../helpers/ISelectProjectDialog.ui" line="14"/>
@@ -3725,20 +3771,71 @@ or
<translation>Choisissez le projet dans la liste ou entrez un nouveau nom de projet.</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="36"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="33"/>
+ <source>New project's name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="43"/>
<source>New project is created as:</source>
<translation>Le nouveau projet sera de type:</translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="73"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="82"/>
<source>*.qms</source>
<translation></translation>
</message>
<message>
- <location filename="../helpers/ISelectProjectDialog.ui" line="83"/>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="92"/>
<source>*.gpx</source>
<translation></translation>
</message>
+ <message>
+ <location filename="../helpers/ISelectProjectDialog.ui" line="115"/>
+ <source>Database</source>
+ <translation type="unfinished"></translation>
+ </message>
+</context>
+<context>
+ <name>ISelectSaveAction</name>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="14"/>
+ <source>Copy item...</source>
+ <translation type="unfinished">Copier un élément...</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="23"/>
+ <source>Replace existing item</source>
+ <translation type="unfinished">Remplacer l'élément existant</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="30"/>
+ <source>Replace with:</source>
+ <translation type="unfinished">Remplacer par:</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="37"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="47"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="81"/>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="91"/>
+ <source>TextLabel</source>
+ <translation type="unfinished">Libellé</translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="67"/>
+ <source>Do not replace item</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="74"/>
+ <source>Use item:</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISelectSaveAction.ui" line="111"/>
+ <source>And for all other items, too.</source>
+ <translation type="unfinished">et pour tous les autres éléments</translation>
+ </message>
</context>
<context>
<name>ISetupDatabase</name>
@@ -3782,32 +3879,76 @@ or
<context>
<name>ISetupFolder</name>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="14"/>
<source>Folder...</source>
- <translation>Dossier...</translation>
+ <translation type="vanished">Dossier...</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="22"/>
<source>Name</source>
- <translation>Nom</translation>
+ <translation type="vanished">Nom</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="34"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="14"/>
+ <source>Database Folder...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="20"/>
+ <source>Folder name</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/db/ISetupFolder.ui" line="30"/>
<source>Group</source>
<translation>Groupe</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="45"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="41"/>
<source>Project</source>
<translation>Projet</translation>
</message>
<message>
- <location filename="../gis/db/ISetupFolder.ui" line="59"/>
+ <location filename="../gis/db/ISetupFolder.ui" line="55"/>
<source>Other</source>
<translation>Autre</translation>
</message>
</context>
<context>
+ <name>ISetupNewWpt</name>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="14"/>
+ <source>New Waypoint...</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="22"/>
+ <source>Symbol</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="29"/>
+ <source>...</source>
+ <translation type="unfinished">...</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="39"/>
+ <source>Position</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="49"/>
+ <source>Name</source>
+ <translation type="unfinished">Nom</translation>
+ </message>
+ <message>
+ <location filename="../gis/wpt/ISetupNewWpt.ui" line="59"/>
+ <source>Bad position format. Must be:
+"[N|S] ddd mm.sss [W|E] ddd mm.sss"
+or
+"[N|S] ddd.ddd [W|E] ddd.ddd"</source>
+ <translation type="unfinished">Mauvais format de position. Formats valides: "[N|S] ddd mm.sss [W|E] ddd mm.sss" ou "[N|S] ddd.ddd [W|E] ddd.ddd" </translation>
+ </message>
+</context>
+<context>
<name>ISetupWorkspace</name>
<message>
<location filename="../gis/db/ISetupWorkspace.ui" line="14"/>
@@ -4048,23 +4189,23 @@ or
<translation>Valeurs de la position hors de la plage autorisée.</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="407"/>
+ <location filename="../gis/CGisListDB.cpp" line="435"/>
<source>Are you sure you want to delete '%1' from folder '%2'?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1 du dossier %2?</translation>
</message>
<message>
- <location filename="../gis/CGisListDB.cpp" line="408"/>
- <location filename="../gis/prj/IGisProject.cpp" line="346"/>
+ <location filename="../gis/CGisListDB.cpp" line="436"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="352"/>
<source>Delete...</source>
<translation>Supprimer...</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Delete project...</source>
<translation>Supprimer le projet</translation>
</message>
<message>
- <location filename="../gis/CGisListWks.cpp" line="944"/>
+ <location filename="../gis/CGisListWks.cpp" line="953"/>
<source>Do you really want to delete %1?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1?</translation>
</message>
@@ -4086,7 +4227,7 @@ or
<translation>Perdu & Trouvé</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="129"/>
+ <location filename="../gis/db/CDBProject.cpp" line="149"/>
<location filename="../gis/gpx/CGpxProject.cpp" line="216"/>
<location filename="../gis/qms/CQmsProject.cpp" line="94"/>
<location filename="../gis/tnv/CTwoNavProject.cpp" line="159"/>
@@ -4094,12 +4235,12 @@ or
<translation>Enregistrer les données SIG dans...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Save ...</source>
<translation>Enregistrer...</translation>
</message>
<message>
- <location filename="../gis/db/CDBProject.cpp" line="161"/>
+ <location filename="../gis/db/CDBProject.cpp" line="253"/>
<source>Abort save</source>
<translation>Annuler l'enregistrement</translation>
</message>
@@ -4183,46 +4324,46 @@ ligne %2, colonne %3:
<translation>Version initiale</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="412"/>
+ <location filename="../gis/IGisItem.cpp" line="421"/>
<source>This element is probably read-only because it was not created within QMapShack. Usually you should not want to change imported data. But if you think that is ok press'Ok'.</source>
<translation>Cet élément est probablement en lecture seule parce qu'il n'a pas été créé avec QMapShack. Normelement, vous ne devriez pas modifier des données importées. Mais si vous êtes sûr de ce que vous faites, cliquez sur 'OK'</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="413"/>
+ <location filename="../gis/IGisItem.cpp" line="422"/>
<source>Read Only Mode...</source>
<translation>Mode lecture seule</translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="632"/>
+ <location filename="../gis/IGisItem.cpp" line="645"/>
<source><h4>Comment:</h4></source>
<translation><h4>Commentaire:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="635"/>
+ <location filename="../gis/IGisItem.cpp" line="648"/>
<source><p>--- no comment ---</p></source>
<translation><p>--- pas de commentaire ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="618"/>
- <location filename="../gis/IGisItem.cpp" line="677"/>
+ <location filename="../gis/IGisItem.cpp" line="631"/>
+ <location filename="../gis/IGisItem.cpp" line="690"/>
<source><h4>Description:</h4></source>
<translation></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="621"/>
- <location filename="../gis/IGisItem.cpp" line="680"/>
+ <location filename="../gis/IGisItem.cpp" line="634"/>
+ <location filename="../gis/IGisItem.cpp" line="693"/>
<source><p>--- no description ---</p></source>
<translation><p>--- pas de description ---</p></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="646"/>
- <location filename="../gis/IGisItem.cpp" line="691"/>
+ <location filename="../gis/IGisItem.cpp" line="659"/>
+ <location filename="../gis/IGisItem.cpp" line="704"/>
<source><h4>Links:</h4></source>
<translation><h4>Liens:</h4></translation>
</message>
<message>
- <location filename="../gis/IGisItem.cpp" line="649"/>
- <location filename="../gis/IGisItem.cpp" line="694"/>
+ <location filename="../gis/IGisItem.cpp" line="662"/>
+ <location filename="../gis/IGisItem.cpp" line="707"/>
<source><p>--- no links ---</p></source>
<translation><p>--- pas de liens ---</p></translation>
</message>
@@ -4250,117 +4391,117 @@ ligne %2, colonne %3:
<location filename="../gis/ovl/CGisItemOvlArea.cpp" line="142"/>
<location filename="../gis/rte/CGisItemRte.cpp" line="45"/>
<location filename="../gis/trk/CGisItemTrk.cpp" line="184"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="102"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="101"/>
<source>_Clone</source>
<translation>_Clone</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="418"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="433"/>
<source>Area: %1%2</source>
<translation>Surface: %1%2</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="476"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="491"/>
<source>Changed area shape.</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="484"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="499"/>
<source>Changed name.</source>
<translation>Nom modifié...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="490"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="505"/>
<source>Changed border width.</source>
<translation>Largeur de la bordure modifiée...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="496"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="511"/>
<source>Changed fill pattern.</source>
<translation>Remplissage modifié...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="502"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="517"/>
<source>Changed opacity.</source>
<translation>Opacité modifiée...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="508"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="523"/>
<source>Changed comment.</source>
<translation>Commentaire modifié...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="514"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="529"/>
<source>Changed description.</source>
<translation>Description modifiée...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="520"/>
- <location filename="../gis/rte/CGisItemRte.cpp" line="139"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1739"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="376"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="535"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="154"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1773"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="378"/>
<source>Changed links</source>
<translation>Liens modifiés...</translation>
</message>
<message>
- <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="532"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1751"/>
+ <location filename="../gis/ovl/CGisItemOvlArea.cpp" line="547"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1785"/>
<source>Changed color</source>
<translation>Couleur modifiée...</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>Save project?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="66"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="69"/>
<source>The project "%1" was changed. Save befor closing it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="255"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="261"/>
<source><br/>
Filename: %1</source>
<translation><br/>
Nom de fichier: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="272"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="278"/>
<source>Waypoints: %1</source>
<translation>Waypoints: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="276"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="282"/>
<source>Tracks: %1</source>
<translation>Traces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="280"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="286"/>
<source>Routes: %1</source>
<translation>Routes: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="284"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="290"/>
<source>Areas: %1</source>
<translation>Surfaces: %1</translation>
</message>
<message>
- <location filename="../gis/prj/IGisProject.cpp" line="345"/>
+ <location filename="../gis/prj/IGisProject.cpp" line="351"/>
<source>Are you sure you want to delete '%1' from project '%2'?</source>
<translation>Êtes-vous sûr de vouloir supprimer %1 du projet '%2'?</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="127"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1727"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="364"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="142"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1761"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="366"/>
<source>Changed comment</source>
<translation>Commentaire modifié</translation>
</message>
<message>
- <location filename="../gis/rte/CGisItemRte.cpp" line="133"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1733"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="370"/>
+ <location filename="../gis/rte/CGisItemRte.cpp" line="148"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1767"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="372"/>
<source>Changed description</source>
<translation>Description modifiée</translation>
</message>
@@ -4407,177 +4548,176 @@ Nom de fichier: %1</translation>
<translation>Impossible de lire les données.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="326"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="340"/>
<source>Changed trackpoints, sacrificed all previous data.</source>
<translation>Points de la trace modifiés, Les données antérieures sont perdues.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="402"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="416"/>
<source>Length: %1 %2</source>
<translation>Longueur: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="409"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="423"/>
<source>, %1%2 %3, %4%5 %6</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="417"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="431"/>
<source>Time: %1</source>
<translation>Durée: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="420"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="430"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="434"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="444"/>
<source>, Speed: %1 %2</source>
<translation>, vitesse %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="427"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
<source>Moving: %1</source>
<translation>Déplacement: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="436"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="450"/>
<source>Start: %1</source>
<translation>Début: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="441"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="455"/>
<source>End: %1</source>
<translation>Fin: %1</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="445"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="459"/>
<source>Points: %1 (%2)</source>
<translation></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="563"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="577"/>
<source>Ele.: %1 %2</source>
<translation>Altitude: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="566"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="580"/>
<source> slope: %1%3 (%2%)</source>
<translation> Pente: %1%3(%2%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="571"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="585"/>
<source> speed: %1%2</source>
<translation> Vitesse: %1 %2</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="583"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
<source>Ascend: %1%2 (%3%)</source>
<translation>Montée: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="587"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="601"/>
<source>Ascend: - (-)</source>
<translation>Montées: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="593"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="607"/>
<source> Descend: %1%2 (%3%)</source>
<translation> Descente: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="597"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="611"/>
<source> Descend: - (-) </source>
<translation>Descente: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="604"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
<source>Dist.: %1%2 (%3%)</source>
<translation>Dist.: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="608"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="622"/>
<source>Dist.: - (-)</source>
<translation>Dist.: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="614"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="628"/>
<source> Moving: %1%2 (%3%)</source>
<translation> En mouvement: %1%2 (%3%)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="618"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="632"/>
<source> Moving: - (-) </source>
<translation>En mouvement: - (-)</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="637"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="651"/>
<source>Ascend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="642"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="659"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="656"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="673"/>
<source>, %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="647"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="661"/>
<source>Ascend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="654"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="668"/>
<source> Descend: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="664"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="678"/>
<source>Descend: -</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="670"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="684"/>
<source>Dist.: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="675"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="689"/>
<source> Time: %1%2</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditArea.cpp" line="100"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Edit name...</source>
<translation>Éditer le nom...</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1152"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1167"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1186"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1245"/>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1405"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1166"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1181"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1200"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1259"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1439"/>
<location filename="../mouse/CMouseEditTrk.cpp" line="104"/>
<source>Enter new track name.</source>
<translation>Saisir le nouveau nom de la trace.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1334"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1368"/>
<source>Hide points.</source>
<translation>Cacher des points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1380"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1414"/>
<source>Show points.</source>
<translation>Afficher les points.</translation>
</message>
<message>
- <location filename="../gis/trk/CGisItemTrk.cpp" line="1721"/>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="324"/>
+ <location filename="../gis/trk/CGisItemTrk.cpp" line="1755"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="326"/>
<source>Changed name</source>
<translation>Nom modifié</translation>
</message>
@@ -4632,47 +4772,46 @@ Nom de fichier: %1</translation>
<translation>Vitesse modifiée à %1%2.</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="190"/>
<source>Enter new waypoint name.</source>
- <translation>Saisir le nouveau nom du waypoint.</translation>
+ <translation type="vanished">Saisir le nouveau nom du waypoint.</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="242"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="244"/>
<source>Elevation: %1 %2</source>
<translation>Altitude: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="253"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="255"/>
<source>Proximity: %1 %2</source>
<translation>Proximité: %1 %2</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="334"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="336"/>
<source>Changed position</source>
<translation>Position modifiée</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="340"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="342"/>
<source>Changed elevation</source>
<translation>Altitude modifiée</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="346"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="348"/>
<source>Changed proximity</source>
<translation>Rayon de proximité modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="358"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="360"/>
<source>Changed icon</source>
<translation>Icône modifié</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="382"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="384"/>
<source>Changed images</source>
<translation>Images modifiées</translation>
</message>
<message>
- <location filename="../gis/wpt/CGisItemWpt.cpp" line="388"/>
+ <location filename="../gis/wpt/CGisItemWpt.cpp" line="390"/>
<source>Add image</source>
<translation>Ajouter une image</translation>
</message>
diff --git a/src/map/CMapIMG.cpp b/src/map/CMapIMG.cpp
index 01026c6..61efc62 100644
--- a/src/map/CMapIMG.cpp
+++ b/src/map/CMapIMG.cpp
@@ -1430,6 +1430,8 @@ void CMapIMG::loadVisibleData(bool fast, polytype_t& polygons, polytype_t& polyl
#ifdef Q_OS_WIN32
file.close();
+#else
+ file.free();
#endif
}
diff --git a/src/map/CMapPathSetup.cpp b/src/map/CMapPathSetup.cpp
index 83c4daa..5d3db32 100644
--- a/src/map/CMapPathSetup.cpp
+++ b/src/map/CMapPathSetup.cpp
@@ -18,8 +18,8 @@
#include "CMainWindow.h"
#include "map/CMapDraw.h"
-#include "map/CMapPathSetup.h"
#include "map/CMapList.h"
+#include "map/CMapPathSetup.h"
#include <QtWidgets>
diff --git a/src/mouse/CMouseNormal.cpp b/src/mouse/CMouseNormal.cpp
index 0570e28..01bbeb5 100644
--- a/src/mouse/CMouseNormal.cpp
+++ b/src/mouse/CMouseNormal.cpp
@@ -20,7 +20,6 @@
#include "canvas/CCanvas.h"
#include "gis/CGisDraw.h"
#include "gis/CGisWidget.h"
-#include "gis/CGisWidget.h"
#include "gis/prj/IGisProject.h"
#include "gis/rte/CGisItemRte.h"
#include "gis/trk/CGisItemTrk.h"
@@ -314,24 +313,13 @@ void CMouseNormal::draw(QPainter& p, bool needsRedraw, const QRect &rect)
void CMouseNormal::slotAddWpt()
{
+ QString name;
+ QString icon;
QPointF pt = point;
gis->convertPx2Rad(pt);
pt *= RAD_TO_DEG;
- CGisItemWpt::getNewPosition(pt);
- if(pt == NOPOINTF)
- {
- return;
- }
-
- QString name = CGisItemWpt::getNewName();
- if(name.isEmpty())
- {
- return;
- }
-
- QString icon = CGisItemWpt::getNewIcon();
- if(icon.isEmpty())
+ if(!CGisItemWpt::getNewWptData(pt, icon, name))
{
return;
}
diff --git a/src/mouse/CMouseRangeTrk.cpp b/src/mouse/CMouseRangeTrk.cpp
index 1516180..eb100a7 100644
--- a/src/mouse/CMouseRangeTrk.cpp
+++ b/src/mouse/CMouseRangeTrk.cpp
@@ -217,6 +217,10 @@ void CMouseRangeTrk::slotHidePoints()
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
if(trk != 0)
{
+ if(!trk->setReadOnlyMode(false))
+ {
+ return;
+ }
trk->hideSelectedPoints();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
}
@@ -230,6 +234,11 @@ void CMouseRangeTrk::slotShowPoints()
CGisItemTrk * trk = dynamic_cast<CGisItemTrk*>(CGisWidget::self().getItemByKey(key));
if(trk != 0)
{
+ if(!trk->setReadOnlyMode(false))
+ {
+ return;
+ }
+
trk->showSelectedPoints();
canvas->slotTriggerCompleteUpdate(CCanvas::eRedrawGis);
}
diff --git a/src/mouse/CScrOptRangeTrk.cpp b/src/mouse/CScrOptRangeTrk.cpp
index 0cd7f14..27574df 100644
--- a/src/mouse/CScrOptRangeTrk.cpp
+++ b/src/mouse/CScrOptRangeTrk.cpp
@@ -30,13 +30,8 @@ CScrOptRangeTrk::CScrOptRangeTrk(const QPointF &point, CGisItemTrk * trk, QWidge
label->setText(trk->getInfoRange());
adjustSize();
- bool isReadOnly = trk->isReadOnly();
- toolHidePoints->setEnabled(!isReadOnly);
- toolShowPoints->setEnabled(!isReadOnly);
-
setOrigin(point.toPoint());
- qDebug() << point << (point.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
move(point.toPoint() + QPoint(-width()/2,SCR_OPT_OFFSET));
show();
}
diff --git a/src/mouse/IMouseEditLine.cpp b/src/mouse/IMouseEditLine.cpp
index ff7fdf8..04dd51d 100644
--- a/src/mouse/IMouseEditLine.cpp
+++ b/src/mouse/IMouseEditLine.cpp
@@ -244,7 +244,7 @@ void IMouseEditLine::draw(QPainter& p, bool needsRedraw, const QRect &rect)
drawPointOfFocus(p);
break;
- case eStateRangeSelected:
+ case eStateRangeSelected:
drawLine(line, p);
drawArrows(line, p);
drawHighlight2(p);
@@ -252,7 +252,7 @@ void IMouseEditLine::draw(QPainter& p, bool needsRedraw, const QRect &rect)
drawPointOfFocus(p);
break;
- case eStateMovePoint:
+ case eStateMovePoint:
drawLine(line, p);
drawArrows(line, p);
drawBullets(line, p);
@@ -270,7 +270,7 @@ void IMouseEditLine::draw(QPainter& p, bool needsRedraw, const QRect &rect)
{
l = line.mid(0, idxStart) + newLine.mid(0, newLine.size() - 2) + subLinePixel + line.mid(idxStop, -1);
}
- drawLeadLine(leadLinePixel, p);
+ drawLeadLine(leadLinePixel, p);
drawLine(l, p);
drawArrows(l, p);
drawBullets(l, p);
@@ -288,7 +288,7 @@ void IMouseEditLine::draw(QPainter& p, bool needsRedraw, const QRect &rect)
{
l = line.mid(0, idxStart + 1) + subLinePixel + newLine.mid(2, -1) + line.mid(idxStop + 1, -1);
}
- drawLeadLine(leadLinePixel, p);
+ drawLeadLine(leadLinePixel, p);
drawLine(l, p);
drawArrows(l, p);
drawBullets(l, p);
diff --git a/src/qlgt/CQlgtDb.cpp b/src/qlgt/CQlgtDb.cpp
index 4f9e4c1..3cbbee7 100644
--- a/src/qlgt/CQlgtDb.cpp
+++ b/src/qlgt/CQlgtDb.cpp
@@ -571,7 +571,7 @@ void CQlgtDb::printStatistic()
if(query.next())
{
nItems += query.value(0).toInt();
- gui->stdErr(tr("Overlays: %1 (only area overlays will be converted to QMapShack)").arg(query.value(0).toInt()));
+ gui->stdErr(tr("Overlays: %1 (areas will be converted as areas, distance lines will be converted to tracks, all other overlay items will be lost)").arg(query.value(0).toInt()));
}
query.prepare("SELECT COUNT() FROM diarys");
query.bindValue(":type", eDry);
@@ -743,13 +743,24 @@ void CQlgtDb::xferItem(quint64 id)
{
IQlgtOverlay ovl1(id, 0);
stream >> ovl1;
- if(ovl1.type != "Area")
+ if(ovl1.type == "Area")
+ {
+ dbQms->addArea(ovl1);
+ nOvl++;
+ }
+ else if(ovl1.type == "Distance")
+ {
+ dbQms->addTrk(ovl1);
+ nTrk++;
+ }
+ else
{
gui->stdErr(tr("Overlay of type '%1' cant be converted").arg(ovl1.type));
+ nOvl++;
break;
}
- dbQms->addArea(ovl1);
- nOvl++;
+
+
break;
}
}
diff --git a/src/qlgt/CQmsDb.cpp b/src/qlgt/CQmsDb.cpp
index 7f97502..6ac3f3f 100644
--- a/src/qlgt/CQmsDb.cpp
+++ b/src/qlgt/CQmsDb.cpp
@@ -211,6 +211,16 @@ void CQmsDb::addTrk(CQlgtTrack &trk1)
}
}
+void CQmsDb::addTrk(IQlgtOverlay &trk1)
+{
+ CGisItemTrk trk(trk1);
+ quint64 id = store(trk);
+ if(id != 0)
+ {
+ mapItemIDs[trk1.id] = id;
+ }
+}
+
void CQmsDb::addRte(CQlgtRoute& rte1)
{
CGisItemRte rte(rte1);
diff --git a/src/qlgt/CQmsDb.h b/src/qlgt/CQmsDb.h
index 950173d..6310971 100644
--- a/src/qlgt/CQmsDb.h
+++ b/src/qlgt/CQmsDb.h
@@ -43,6 +43,7 @@ public:
void addFolder(CQlgtFolder &folder);
void addWpt(CQlgtWpt &wpt1);
void addTrk(CQlgtTrack &trk1);
+ void addTrk(IQlgtOverlay &trk1);
void addRte(CQlgtRoute& rte1);
void addArea(IQlgtOverlay& ovl1);
diff --git a/src/qlgt/IQlgtOverlay.cpp b/src/qlgt/IQlgtOverlay.cpp
index d44a216..31327b5 100644
--- a/src/qlgt/IQlgtOverlay.cpp
+++ b/src/qlgt/IQlgtOverlay.cpp
@@ -87,19 +87,16 @@ QDataStream& operator >>(QDataStream& s, IQlgtOverlay& ovl)
}
else if(ovl.type == "Distance")
{
- float speed;
- QString name;
- QString comment;
- QString parentWpt;
int size, idx = 0;
IQlgtOverlay::pt_t pt;
- s1 >> name >> comment >> size;
+ s1 >> ovl.name >> ovl.comment >> size;
for(int i = 0; i < size; ++i)
{
s1 >> pt.u >> pt.v;
pt.idx = idx++;
+ ovl.points << pt;
}
- s1 >> speed >> ovl.key >> parentWpt;
+ s1 >> ovl.speed >> ovl.key >> ovl.parentWpt;
}
else if(ovl.type == "Area")
{
@@ -188,6 +185,7 @@ QDataStream& operator <<(QDataStream& s, IQlgtOverlay& ovl)
IQlgtOverlay::IQlgtOverlay(quint64 id, QObject *parent)
: IItem(id)
+ , speed(0)
{
}
diff --git a/src/qlgt/IQlgtOverlay.h b/src/qlgt/IQlgtOverlay.h
index 9fa4e2d..b6c40d8 100644
--- a/src/qlgt/IQlgtOverlay.h
+++ b/src/qlgt/IQlgtOverlay.h
@@ -43,6 +43,7 @@ public:
qint32 style;
quint32 width;
quint8 opacity;
+ float speed;
};
QDataStream& operator >>(QDataStream& s, IQlgtOverlay& ovl);
diff --git a/src/qlgt/converter.cpp b/src/qlgt/converter.cpp
index 83a0c40..e3ae610 100644
--- a/src/qlgt/converter.cpp
+++ b/src/qlgt/converter.cpp
@@ -208,6 +208,38 @@ CGisItemTrk::CGisItemTrk(const CQlgtTrack &trk1)
}
}
+CGisItemTrk::CGisItemTrk(const IQlgtOverlay& ovl)
+ : IGisItem(0, eTypeTrk, NOIDX)
+{
+ trk.name = ovl.name;
+ trk.cmt = ovl.comment;
+ trk.desc = ovl.description;
+ trk.color = ovl.color.name();
+
+ trkseg_t seg;
+ foreach(const IQlgtOverlay::pt_t& pt1, ovl.points)
+ {
+ trkpt_t pt;
+ pt.lon = pt1.u * RAD_TO_DEG;
+ pt.lat = pt1.v * RAD_TO_DEG;
+
+ seg.pts << pt;
+ }
+ trk.segs << seg;
+ setColor(str2color(trk.color));
+ deriveSecondaryData();
+
+ filterReplaceElevation();
+ if(ovl.speed != 0)
+ {
+ filterSpeed(ovl.speed);
+ }
+
+ genKey();
+ setupHistory();
+}
+
+
CGisItemOvlArea::CGisItemOvlArea(const IQlgtOverlay& ovl)
: IGisItem(0, eTypeOvl, NOIDX)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/qmapshack.git
More information about the Pkg-grass-devel
mailing list