rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Code Issues Releases Activity

More minor new map user control updates

Browse Source 
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@810 ebee16cc-31ac-478f-84a7-5cbb03baadba
This commit is contained in:
pip 2010-06-18 10:40:30 +00:00 committed by pip
parent c0ed4515f8
commit 3b3c582799
4 changed files with 42 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
ground/src/plugins/opmap/images/minus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1006 B

BIN
ground/src/plugins/opmap/images/plus.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

2
ground/src/plugins/opmap/opmap.qrc
View File

@ -3,5 +3,7 @@
<file>images/gcs.png</file>
<file>images/uav.png</file>
<file>images/waypoint.png</file>
<file>images/minus.png</file>
<file>images/plus.png</file>
</qresource>
</RCC>

74
ground/src/plugins/opmap/opmapgadgetwidget.cpp
View File

@ -380,47 +380,53 @@ QPushButton * OPMapGadgetWidget::createTransparentButton(QWidget *parent, QStrin
void OPMapGadgetWidget::createMapOverlayUserControls()
{
QPushButton *zoomin = createTransparentButton(map, "", QString::fromUtf8(":/core/images/plus.png"));
zoomin->setStyleSheet("");
// QPushButton *zoomin = new QPushButton("");
zoomin->setFixedSize(24, 24);
QPushButton *zoomout = new QPushButton("");
zoomout->setFlat(true);
zoomout->setToolTip(tr("Zoom out"));
zoomout->setCursor(Qt::OpenHandCursor);
zoomout->setIcon(QIcon(QString::fromUtf8(":/opmap/images/minus.png")));
// zoomout->setIconSize(QSize(12, 12));
zoomout->setIconSize(QSize(32, 32));
zoomout->setFixedSize(32, 32);
// zoomout->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
// zoomout->setWindowOpacity(0.7);
// zoomout->setBackgroundRole(QPalette(QColor(0, 0, 0, 0)));
connect(zoomout, SIGNAL(clicked(bool)), this, SLOT(zoomOut()));
// QPushButton *zoomin = createTransparentButton(map, "", QString::fromUtf8(":/core/images/plus.png"));
// zoomin->setStyleSheet("");
QPushButton *zoomin = new QPushButton("");
zoomin->setFlat(true);
zoomin->setToolTip(tr("Zoom in"));
zoomin->setCursor(Qt::OpenHandCursor);
// zoomin->setIcon(QIcon(QString::fromUtf8(":/core/images/plus.png")));
zoomin->setIconSize(QSize(12, 12));
zoomin->setIcon(QIcon(QString::fromUtf8(":/opmap/images/plus.png")));
// zoomin->setIconSize(QSize(12, 12));
zoomin->setIconSize(QSize(32, 32));
zoomin->setFixedSize(32, 32);
// zoomin->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum);
connect(zoomin, SIGNAL(clicked(bool)), this, SLOT(zoomIn()));
QPushButton *zoomout = new QPushButton("");
zoomout->setFixedSize(24, 24);
zoomout->setToolTip(tr("Zoom out"));
zoomout->setCursor(Qt::OpenHandCursor);
zoomout->setIcon(QIcon(QString::fromUtf8(":/core/images/minus.png")));
zoomout->setIconSize(QSize(12, 12));
// zoomout->setWindowOpacity(0.7);
// zoomout->setBackgroundRole(QPalette(QColor(0, 0, 0, 0)));
connect(zoomout, SIGNAL(clicked(bool)), this, SLOT(zoomOut()));
// add zoom buttons to the layout of the MapControl
QVBoxLayout* overlay_layout_v1 = new QVBoxLayout;
overlay_layout_v1->setMargin(4);
overlay_layout_v1->setSpacing(4);
overlay_layout_v1->addSpacing(10);
// add zoom buttons to the layout of the MapControl
QVBoxLayout* overlay_layout_v1 = new QVBoxLayout;
overlay_layout_v1->setMargin(4);
overlay_layout_v1->setSpacing(4);
overlay_layout_v1->addSpacing(10);
QHBoxLayout* overlay_layout_h1 = new QHBoxLayout;
overlay_layout_h1->setMargin(0);
overlay_layout_h1->setSpacing(4);
overlay_layout_h1->addSpacing(10);
// overlay_layout_h1->addWidget(gcsButton);
// overlay_layout_h1->addWidget(uavButton);
// overlay_layout_h1->addSpacing(10);
overlay_layout_h1->addWidget(zoomout);
overlay_layout_h1->addWidget(zoomin);
overlay_layout_h1->addStretch(0);
QHBoxLayout* overlay_layout_h1 = new QHBoxLayout;
overlay_layout_h1->setMargin(0);
overlay_layout_h1->setSpacing(4);
overlay_layout_h1->addSpacing(10);
// overlay_layout_h1->addWidget(gcsButton);
// overlay_layout_h1->addWidget(uavButton);
// overlay_layout_h1->addSpacing(10);
overlay_layout_h1->addWidget(zoomout);
overlay_layout_h1->addWidget(zoomin);
overlay_layout_h1->addStretch(0);
overlay_layout_v1->addLayout(overlay_layout_h1);
overlay_layout_v1->addStretch(0);
overlay_layout_v1->addLayout(overlay_layout_h1);
overlay_layout_v1->addStretch(0);
map->setLayout(overlay_layout_v1);
map->setLayout(overlay_layout_v1);
}
// *************************************************************************************