mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-12-05 00:39:09 +01:00
Compare commits
No commits in common. "69e1198efa9b50c89b6669da4d382a14a665803c" and "b1655c63488b1efd891db987b2ec30c4b7fc49b9" have entirely different histories.
69e1198efa
...
b1655c6348
@ -414,7 +414,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="272"/>
|
<location filename="../src/GUI/gui.cpp" line="272"/>
|
||||||
<source>Clear list</source>
|
<source>Clear list</source>
|
||||||
<translation>Borrar la lista</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="284"/>
|
<location filename="../src/GUI/gui.cpp" line="284"/>
|
||||||
@ -701,7 +701,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="631"/>
|
<location filename="../src/GUI/gui.cpp" line="631"/>
|
||||||
<source>Open recent</source>
|
<source>Open recent</source>
|
||||||
<translation>Abierto reciente</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="655"/>
|
<location filename="../src/GUI/gui.cpp" line="655"/>
|
||||||
@ -1042,7 +1042,6 @@
|
|||||||
<translation>
|
<translation>
|
||||||
<numerusform>%n archivo</numerusform>
|
<numerusform>%n archivo</numerusform>
|
||||||
<numerusform>%n archivos</numerusform>
|
<numerusform>%n archivos</numerusform>
|
||||||
<numerusform>%n archivos</numerusform>
|
|
||||||
</translation>
|
</translation>
|
||||||
</message>
|
</message>
|
||||||
</context>
|
</context>
|
||||||
|
@ -414,7 +414,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="272"/>
|
<location filename="../src/GUI/gui.cpp" line="272"/>
|
||||||
<source>Clear list</source>
|
<source>Clear list</source>
|
||||||
<translation>Lista törlése</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="284"/>
|
<location filename="../src/GUI/gui.cpp" line="284"/>
|
||||||
@ -701,7 +701,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="631"/>
|
<location filename="../src/GUI/gui.cpp" line="631"/>
|
||||||
<source>Open recent</source>
|
<source>Open recent</source>
|
||||||
<translation>Legutóbbiak megnyitása</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="655"/>
|
<location filename="../src/GUI/gui.cpp" line="655"/>
|
||||||
|
@ -172,7 +172,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/data/data.cpp" line="180"/>
|
<location filename="../src/data/data.cpp" line="180"/>
|
||||||
<source>GPSDump files</source>
|
<source>GPSDump files</source>
|
||||||
<translation>GPSDump-filer</translation>
|
<translation>GPS-dumpfiler</translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/data/data.cpp" line="181"/>
|
<location filename="../src/data/data.cpp" line="181"/>
|
||||||
|
@ -172,7 +172,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/data/data.cpp" line="180"/>
|
<location filename="../src/data/data.cpp" line="180"/>
|
||||||
<source>GPSDump files</source>
|
<source>GPSDump files</source>
|
||||||
<translation>GPSDump 文件</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/data/data.cpp" line="181"/>
|
<location filename="../src/data/data.cpp" line="181"/>
|
||||||
@ -414,7 +414,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="272"/>
|
<location filename="../src/GUI/gui.cpp" line="272"/>
|
||||||
<source>Clear list</source>
|
<source>Clear list</source>
|
||||||
<translation>清空列表</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="284"/>
|
<location filename="../src/GUI/gui.cpp" line="284"/>
|
||||||
@ -701,7 +701,7 @@
|
|||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="631"/>
|
<location filename="../src/GUI/gui.cpp" line="631"/>
|
||||||
<source>Open recent</source>
|
<source>Open recent</source>
|
||||||
<translation>最近打开文件</translation>
|
<translation type="unfinished"></translation>
|
||||||
</message>
|
</message>
|
||||||
<message>
|
<message>
|
||||||
<location filename="../src/GUI/gui.cpp" line="655"/>
|
<location filename="../src/GUI/gui.cpp" line="655"/>
|
||||||
|
@ -631,7 +631,6 @@ void GUI::createMenus()
|
|||||||
_recentFilesMenu = fileMenu->addMenu(tr("Open recent"));
|
_recentFilesMenu = fileMenu->addMenu(tr("Open recent"));
|
||||||
_recentFilesMenu->setIcon(QIcon::fromTheme(OPEN_RECENT_NAME,
|
_recentFilesMenu->setIcon(QIcon::fromTheme(OPEN_RECENT_NAME,
|
||||||
QIcon(OPEN_RECENT_ICON)));
|
QIcon(OPEN_RECENT_ICON)));
|
||||||
_recentFilesMenu->menuAction()->setMenuRole(QAction::NoRole);
|
|
||||||
_recentFilesMenu->setEnabled(false);
|
_recentFilesMenu->setEnabled(false);
|
||||||
_recentFilesEnd = _recentFilesMenu->addSeparator();
|
_recentFilesEnd = _recentFilesMenu->addSeparator();
|
||||||
_recentFilesMenu->addAction(_clearRecentFilesAction);
|
_recentFilesMenu->addAction(_clearRecentFilesAction);
|
||||||
@ -681,7 +680,6 @@ void GUI::createMenus()
|
|||||||
dataMenu->addAction(_showRouteWaypointsAction);
|
dataMenu->addAction(_showRouteWaypointsAction);
|
||||||
dataMenu->addAction(_showTicksAction);
|
dataMenu->addAction(_showTicksAction);
|
||||||
QMenu *markerMenu = dataMenu->addMenu(tr("Position info"));
|
QMenu *markerMenu = dataMenu->addMenu(tr("Position info"));
|
||||||
markerMenu->menuAction()->setMenuRole(QAction::NoRole);
|
|
||||||
markerMenu->addAction(_hideMarkersAction);
|
markerMenu->addAction(_hideMarkersAction);
|
||||||
markerMenu->addAction(_showMarkersAction);
|
markerMenu->addAction(_showMarkersAction);
|
||||||
markerMenu->addAction(_showMarkerDateAction);
|
markerMenu->addAction(_showMarkerDateAction);
|
||||||
@ -719,16 +717,13 @@ void GUI::createMenus()
|
|||||||
|
|
||||||
QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
|
QMenu *settingsMenu = menuBar()->addMenu(tr("&Settings"));
|
||||||
QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
|
QMenu *timeMenu = settingsMenu->addMenu(tr("Time"));
|
||||||
timeMenu->menuAction()->setMenuRole(QAction::NoRole);
|
|
||||||
timeMenu->addAction(_totalTimeAction);
|
timeMenu->addAction(_totalTimeAction);
|
||||||
timeMenu->addAction(_movingTimeAction);
|
timeMenu->addAction(_movingTimeAction);
|
||||||
QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
|
QMenu *unitsMenu = settingsMenu->addMenu(tr("Units"));
|
||||||
unitsMenu->menuAction()->setMenuRole(QAction::NoRole);
|
|
||||||
unitsMenu->addAction(_metricUnitsAction);
|
unitsMenu->addAction(_metricUnitsAction);
|
||||||
unitsMenu->addAction(_imperialUnitsAction);
|
unitsMenu->addAction(_imperialUnitsAction);
|
||||||
unitsMenu->addAction(_nauticalUnitsAction);
|
unitsMenu->addAction(_nauticalUnitsAction);
|
||||||
QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
|
QMenu *coordinatesMenu = settingsMenu->addMenu(tr("Coordinates format"));
|
||||||
coordinatesMenu->menuAction()->setMenuRole(QAction::NoRole);
|
|
||||||
coordinatesMenu->addAction(_decimalDegreesAction);
|
coordinatesMenu->addAction(_decimalDegreesAction);
|
||||||
coordinatesMenu->addAction(_degreesMinutesAction);
|
coordinatesMenu->addAction(_degreesMinutesAction);
|
||||||
coordinatesMenu->addAction(_dmsAction);
|
coordinatesMenu->addAction(_dmsAction);
|
||||||
|
@ -23,7 +23,7 @@ public:
|
|||||||
|
|
||||||
const QPoint &xy() const {return _xy;}
|
const QPoint &xy() const {return _xy;}
|
||||||
const QString &key() const {return _key;}
|
const QString &key() const {return _key;}
|
||||||
const QPixmap &pixmap() const {return _pixmap;}
|
QPixmap pixmap() const {return QPixmap::fromImage(_image);}
|
||||||
|
|
||||||
void load() {
|
void load() {
|
||||||
QByteArray z(QString::number(_zoom).toLatin1());
|
QByteArray z(QString::number(_zoom).toLatin1());
|
||||||
@ -32,7 +32,7 @@ public:
|
|||||||
QImageReader reader(&buffer, z);
|
QImageReader reader(&buffer, z);
|
||||||
if (_scaledSize)
|
if (_scaledSize)
|
||||||
reader.setScaledSize(QSize(_scaledSize, _scaledSize));
|
reader.setScaledSize(QSize(_scaledSize, _scaledSize));
|
||||||
_pixmap = QPixmap::fromImage(reader.read());
|
reader.read(&_image);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
@ -41,7 +41,7 @@ private:
|
|||||||
QPoint _xy;
|
QPoint _xy;
|
||||||
QByteArray _data;
|
QByteArray _data;
|
||||||
QString _key;
|
QString _key;
|
||||||
QPixmap _pixmap;
|
QImage _image;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user