mirror of
https://github.com/tumic0/GPXSee.git
synced 2024-11-24 11:45:53 +01:00
Merge branch 'master' of https://github.com/tumic0/GPXSee
This commit is contained in:
commit
f2d32b30d3
@ -12,7 +12,6 @@
|
|||||||
#include <QRadioButton>
|
#include <QRadioButton>
|
||||||
#include <QLabel>
|
#include <QLabel>
|
||||||
#include <QSysInfo>
|
#include <QSysInfo>
|
||||||
#include <QInputDialog>
|
|
||||||
#include "map/pcs.h"
|
#include "map/pcs.h"
|
||||||
#include "icons.h"
|
#include "icons.h"
|
||||||
#include "colorbox.h"
|
#include "colorbox.h"
|
||||||
@ -35,7 +34,7 @@ static QFrame *line()
|
|||||||
|
|
||||||
return l;
|
return l;
|
||||||
}
|
}
|
||||||
#endif
|
#endif // Q_OS_MAC
|
||||||
|
|
||||||
QWidget *OptionsDialog::createMapPage()
|
QWidget *OptionsDialog::createMapPage()
|
||||||
{
|
{
|
||||||
|
@ -86,9 +86,6 @@ public slots:
|
|||||||
public:
|
public:
|
||||||
OptionsDialog(Options *options, QWidget *parent = 0);
|
OptionsDialog(Options *options, QWidget *parent = 0);
|
||||||
|
|
||||||
//private slots:
|
|
||||||
// void projectionChanged(int index);
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QWidget *createMapPage();
|
QWidget *createMapPage();
|
||||||
QWidget *createAppearancePage();
|
QWidget *createAppearancePage();
|
||||||
|
@ -1,6 +1,5 @@
|
|||||||
#include <QLineF>
|
#include <QLineF>
|
||||||
#include "map.h"
|
#include "map.h"
|
||||||
#include "pcs.h"
|
|
||||||
|
|
||||||
qreal Map::resolution(const QRectF &rect)
|
qreal Map::resolution(const QRectF &rect)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user