diff --git a/Map/MapView.cpp b/Map/MapView.cpp index 472dcfd6..3d533f67 100644 --- a/Map/MapView.cpp +++ b/Map/MapView.cpp @@ -1,239 +1,237 @@ /* Copyright (C) 2014-2018 Tobias Leupold This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program; see the file COPYING. If not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ // Local includes #include "MapView.h" #include "Logging.h" // Marble includes #include +#include // Qt includes #include #include #include #include #include #include +#include // KDE includes #include #include #include #include #include Map::MapView::MapView(QWidget *parent, UsageType type) : QWidget(parent) { if (type == MapViewWindow) { setWindowFlags(Qt::Window); setAttribute(Qt::WA_DeleteOnClose); } QVBoxLayout *layout = new QVBoxLayout(this); m_statusLabel = new QLabel; m_statusLabel->setAlignment(Qt::AlignCenter); m_statusLabel->setSizePolicy( QSizePolicy::Minimum, QSizePolicy::Minimum ); m_statusLabel->hide(); layout->addWidget(m_statusLabel); m_mapWidget = new Marble::MarbleWidget; m_mapWidget->setProjection(Marble::Mercator); m_mapWidget->setMapThemeId( QString::fromUtf8( "earth/openstreetmap/openstreetmap.dgml" ) ); layout->addWidget(m_mapWidget); m_mapWidget->show(); QHBoxLayout *controlLayout = new QHBoxLayout; layout->addLayout(controlLayout); QPushButton *saveButton = new QPushButton; saveButton->setIcon(QPixmap(SmallIcon(QString::fromUtf8("media-floppy")))); saveButton->setToolTip(i18n("Save the current map settings")); controlLayout->addWidget( saveButton ); connect(saveButton, &QPushButton::clicked, this, &MapView::saveSettings); - QPushButton* showOverviewMap = new QPushButton; - showOverviewMap->setIcon( QPixmap( SmallIcon( QString::fromUtf8( "view-preview" ) ) ) ); - showOverviewMap->setToolTip( i18n( "Show the overview map" ) ); - showOverviewMap->setCheckable( true ); - showOverviewMap->setChecked( true ); - controlLayout->addWidget( showOverviewMap ); - connect( showOverviewMap, &QPushButton::clicked, - m_mapWidget, &Marble::MarbleWidget::setShowOverviewMap ); - - QPushButton* showCompass = new QPushButton; - showCompass->setIcon( QPixmap( SmallIcon( QString::fromUtf8( "compass" ) ) ) ); - showCompass->setToolTip( i18n( "Show the compass" ) ); - showCompass->setCheckable( true ); - showCompass->setChecked( true ); - controlLayout->addWidget( showCompass ); - connect( showCompass, &QPushButton::clicked, m_mapWidget, &Marble::MarbleWidget::setShowCompass ); - - QPushButton* showScaleBar = new QPushButton; - showScaleBar->setIcon( QPixmap( SmallIcon( QString::fromUtf8( "insert-horizontal-rule" ) ) ) ); - showScaleBar->setToolTip( i18n( "Show the scale bar" ) ); - showScaleBar->setCheckable( true ); - showScaleBar->setChecked( true ); - controlLayout->addWidget( showScaleBar ); - connect( showScaleBar, &QPushButton::clicked, - m_mapWidget, &Marble::MarbleWidget::setShowScaleBar ); - m_setLastCenterButton = new QPushButton; m_setLastCenterButton->setIcon( QPixmap( SmallIcon( QString::fromUtf8( "go-first" ) ) ) ); m_setLastCenterButton->setToolTip(i18n("Go to last map position")); controlLayout->addWidget( m_setLastCenterButton ); connect(m_setLastCenterButton, &QPushButton::clicked, this, &MapView::setLastCenter); controlLayout->addStretch(); + + for (const Marble::RenderPlugin *plugin : m_mapWidget->renderPlugins()) { + if (plugin->renderType() != Marble::RenderPlugin::PanelRenderType) { + continue; + } + + QPushButton *button = new QPushButton; + button->setCheckable(true); + button->setChecked(plugin->action()->isChecked()); + button->setToolTip(plugin->description()); + + QPixmap icon = plugin->action()->icon().pixmap(QSize(20, 20)); + if (icon.isNull()) { + icon = QPixmap(20, 20); + icon.fill(Qt::white); + } + button->setIcon(icon); + + connect(plugin->action(), &QAction::toggled, button, &QPushButton::setChecked); + connect(button, &QPushButton::toggled, plugin->action(), &QAction::setChecked); + controlLayout->addWidget( button ); + } } Map::MapView::~MapView() { } void Map::MapView::clear() { qDebug() << ">>> Implement me! Map::MapView::clear()"; } void Map::MapView::addImage(const DB::ImageInfo &image) { Q_UNUSED( image ); qDebug() << ">>> Implement me! Map::MapView::addImage(const DB::ImageInfo& image)"; } void Map::MapView::addImage( const DB::ImageInfoPtr image ) { Q_UNUSED( image ) qDebug() << ">>> Implement me! Map::MapView::addImage(const DB::ImageInfoPtr image)"; } void Map::MapView::zoomToMarkers() { qDebug() << ">>> Implement me! Map::MapView::zoomToMarkers()"; } void Map::MapView::setCenter(const DB::ImageInfo &image) { m_lastCenter = image.coordinates(); qDebug() << ">>> Implement me! Map::MapView::setCenter(const DB::ImageInfo &image)"; } void Map::MapView::setCenter(const DB::ImageInfoPtr image) { m_lastCenter = image->coordinates(); qDebug() << ">>> Implement me! Map::MapView::setCenter(const DB::ImageInfoPtr image)"; } void Map::MapView::saveSettings() { qDebug() << ">>> Implement me! Map::MapView::saveSettings()"; } void Map::MapView::setShowThumbnails(bool state) { Q_UNUSED( state ); qDebug() << ">>> Implement me! Map::MapView::setShowThumbnails(bool state)"; } void Map::MapView::displayStatus(MapStatus status) { switch (status) { case MapStatus::Loading: m_statusLabel->setText(i18n("Loading coordinates from the images ...")); m_statusLabel->show(); m_mapWidget->hide(); //m_mapWidget->clearRegionSelection(); m_setLastCenterButton->setEnabled(false); break; case MapStatus::ImageHasCoordinates: m_statusLabel->hide(); //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan); //m_mapWidget->setVisibleMouseModes(0); //m_mapWidget->setMouseMode(KGeoMap::MouseModePan); //m_mapWidget->clearRegionSelection(); m_mapWidget->show(); m_setLastCenterButton->show(); m_setLastCenterButton->setEnabled(true); break; case MapStatus::ImageHasNoCoordinates: m_statusLabel->setText(i18n("This image does not contain geographic coordinates.")); m_statusLabel->show(); m_mapWidget->hide(); m_setLastCenterButton->show(); m_setLastCenterButton->setEnabled(false); break; case MapStatus::SomeImagesHaveNoCoordinates: m_statusLabel->setText(i18n("Some of the selected images do not contain geographic " "coordinates.")); m_statusLabel->show(); //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan); //m_mapWidget->setVisibleMouseModes(0); //m_mapWidget->setMouseMode(KGeoMap::MouseModePan); //m_mapWidget->clearRegionSelection(); m_mapWidget->show(); m_setLastCenterButton->show(); m_setLastCenterButton->setEnabled(true); break; case MapStatus::SearchCoordinates: m_statusLabel->setText(i18n("Search for geographic coordinates.")); m_statusLabel->show(); //m_mapWidget->setAvailableMouseModes(KGeoMap::MouseModePan // | KGeoMap::MouseModeRegionSelectionFromIcon // | KGeoMap::MouseModeRegionSelection); //m_mapWidget->setVisibleMouseModes(KGeoMap::MouseModePan // | KGeoMap::MouseModeRegionSelectionFromIcon // | KGeoMap::MouseModeRegionSelection); //m_mapWidget->setMouseMode(KGeoMap::MouseModeRegionSelectionFromIcon); m_mapWidget->show(); //m_mapWidget->setCenter(KGeoMap::GeoCoordinates()); m_setLastCenterButton->hide(); break; case MapStatus::NoImagesHaveNoCoordinates: m_statusLabel->setText(i18n("None of the selected images contain geographic " "coordinates.")); m_statusLabel->show(); m_mapWidget->hide(); m_setLastCenterButton->show(); m_setLastCenterButton->setEnabled(false); break; } emit displayStatusChanged(status); } void Map::MapView::setLastCenter() { qDebug() << ">>> Implement me! Map::MapView::setLastCenter()"; } Map::GeoCoordinates::Pair Map::MapView::getRegionSelection() const { qDebug() << ">>> Implement me! Map::MapView::getRegionSelection()"; return GeoCoordinates::makePair( 0, 0, 0, 0 ); } bool Map::MapView::regionSelected() const { qDebug() << ">>> Implement me! Map::MapView::regionSelected()"; return false; } // vi:expandtab:tabstop=4 shiftwidth=4: