diff --git a/Map/MapView.cpp b/Map/MapView.cpp index 3d533f67..f848893c 100644 --- a/Map/MapView.cpp +++ b/Map/MapView.cpp @@ -1,237 +1,272 @@ /* 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 +namespace { +const QString FLOATER_VISIBLE_CONFIG_PREFIX = QStringLiteral( "MarbleFloaterVisible " ); +} + 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); + // KPA's control buttons + + QWidget* kpaButtons = new QWidget; + QHBoxLayout* kpaButtonsLayout = new QHBoxLayout( kpaButtons ); + controlLayout->addWidget( kpaButtons ); + QPushButton *saveButton = new QPushButton; + saveButton->setFlat(true); saveButton->setIcon(QPixmap(SmallIcon(QString::fromUtf8("media-floppy")))); saveButton->setToolTip(i18n("Save the current map settings")); - controlLayout->addWidget( saveButton ); + kpaButtonsLayout->addWidget(saveButton); connect(saveButton, &QPushButton::clicked, this, &MapView::saveSettings); m_setLastCenterButton = new QPushButton; + m_setLastCenterButton->setFlat(true); m_setLastCenterButton->setIcon( QPixmap( SmallIcon( QString::fromUtf8( "go-first" ) ) ) ); m_setLastCenterButton->setToolTip(i18n("Go to last map position")); - controlLayout->addWidget( m_setLastCenterButton ); + kpaButtonsLayout->addWidget(m_setLastCenterButton); connect(m_setLastCenterButton, &QPushButton::clicked, this, &MapView::setLastCenter); + // Marble floater control buttons + + m_floaters = new QWidget; + QHBoxLayout *floatersLayout = new QHBoxLayout(m_floaters); controlLayout->addStretch(); + controlLayout->addWidget(m_floaters); + + KSharedConfigPtr config = KSharedConfig::openConfig(); + KConfigGroup group = config->group(QStringLiteral("MapView")); for (const Marble::RenderPlugin *plugin : m_mapWidget->renderPlugins()) { if (plugin->renderType() != Marble::RenderPlugin::PanelRenderType) { continue; } QPushButton *button = new QPushButton; button->setCheckable(true); + button->setFlat(true); button->setChecked(plugin->action()->isChecked()); button->setToolTip(plugin->description()); + const QString name = plugin->name(); + button->setProperty("floater", name); 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 ); + floatersLayout->addWidget(button); + + const QString value = group.readEntry( FLOATER_VISIBLE_CONFIG_PREFIX + name ); + if (! value.isEmpty()) { + button->setChecked(value == QStringLiteral("true") ? true : false); + } } } 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()"; + KSharedConfigPtr config = KSharedConfig::openConfig(); + KConfigGroup group = config->group(QStringLiteral("MapView")); + for (const QPushButton *button : m_floaters->findChildren()) { + group.writeEntry( FLOATER_VISIBLE_CONFIG_PREFIX + button->property( "floater" ).toString(), + button->isChecked() ); + } + config->sync(); + QMessageBox::information(this, i18n("Map view"), i18n("Settings saved!")); } 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: diff --git a/Map/MapView.h b/Map/MapView.h index 9c542a92..c7d5186c 100644 --- a/Map/MapView.h +++ b/Map/MapView.h @@ -1,136 +1,137 @@ /* 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. */ #ifndef MAPVIEW_H #define MAPVIEW_H // Local includes #include "GeoCoordinates.h" #include "DB/ImageInfo.h" #include "DB/ImageInfoPtr.h" // Qt includes #include // Marble classes namespace Marble { class MarbleWidget; } // Local includes #include #include #include "GeoCoordinates.h" // Qt classes class QLabel; class QPushButton; namespace Map { class MapView : public QWidget { Q_OBJECT public: /** * UsageType: determines whether the widget is used as a standalone widget * or within another widget (e.g. the AnnotationDialog). * @see Viewer::ViewerWidget::UsageType */ enum UsageType { InlineMapView, MapViewWindow }; /** * MapStatus: determines the visibility and text of the status label and the visibility of the * map, depending on the availability of coordinates of the image(s) that are displayed. */ enum MapStatus { Loading, ImageHasCoordinates, ImageHasNoCoordinates, NoImagesHaveNoCoordinates, SomeImagesHaveNoCoordinates, SearchCoordinates }; explicit MapView(QWidget *parent = 0, UsageType type = InlineMapView); ~MapView() override; /** * Removes all images from the map. */ void clear(); /** * Add an image to the map. */ void addImage(const DB::ImageInfo &image); void addImage(const DB::ImageInfoPtr image); /** * Sets the map's zoom so that all images on the map are visible. * If no images have been added, the zoom is not altered. */ void zoomToMarkers(); /** * Sets the state of the "Show Thumbnails" button on the map's control widget. */ void setShowThumbnails(bool state); /** * This sets the status label text and it's visibility, as well as the visibilty of the map * itself to the state indicated by the given MapStatus. */ void displayStatus(MapStatus status); GeoCoordinates::Pair getRegionSelection() const; bool regionSelected() const; Q_SIGNALS: void signalRegionSelectionChanged(); void displayStatusChanged(MapStatus); public slots: /** * Centers the map on the coordinates of the given image. */ void setCenter(const DB::ImageInfo &image); void setCenter(const DB::ImageInfoPtr image); private slots: void saveSettings(); void setLastCenter(); private: // Variables Marble::MarbleWidget *m_mapWidget; QLabel *m_statusLabel; QPushButton *m_setLastCenterButton; GeoCoordinates m_lastCenter; + QWidget *m_floaters; }; } #endif // MAPVIEW_H // vi:expandtab:tabstop=4 shiftwidth=4: