Differential D894 Diff 2170 src/apps/marble-qt/QtMainWindow.cpp

Changeset View

Standalone View

View Options

src/apps/marble-qt/QtMainWindow.cpp

Context not available.
65#include "NewBookmarkFolderDialog.h" 65​#include "NewBookmarkFolderDialog.h"
66#include "GeoSceneDocument.h" 66​#include "GeoSceneDocument.h"
67#include "GeoSceneHead.h" 67​#include "GeoSceneHead.h"
68​#include "GeoSceneMap.h"
69​
68#include "GeoDataCoordinates.h" 70​#include "GeoDataCoordinates.h"
69#include "GeoDataDocument.h" 71​#include "GeoDataDocument.h"
70#include "GeoDataFolder.h" 72​#include "GeoDataFolder.h"
Context not available.
219 this, SLOT(updateMapEditButtonVisibility(QString)) ); 221​ this, SLOT(updateMapEditButtonVisibility(QString)) );
220 connect(m_controlView->marbleModel(), SIGNAL(themeChanged(QString)), 222​ connect(m_controlView->marbleModel(), SIGNAL(themeChanged(QString)),
221 this, SLOT(updateApplicationTitle(QString))); 223​ this, SLOT(updateApplicationTitle(QString)));
224​ connect(m_controlView->marbleModel(), SIGNAL(themeChanged(QString)),
225​ this, SLOT(updateCenterFromTheme()));
226​
222 connect( m_controlView, SIGNAL(showMapWizard()), this, SLOT(showMapWizard()) ); 227​ connect( m_controlView, SIGNAL(showMapWizard()), this, SLOT(showMapWizard()) );
223 connect( m_controlView, SIGNAL(mapThemeDeleted()), this, SLOT(fallBackToDefaultTheme()) ); 228​ connect( m_controlView, SIGNAL(mapThemeDeleted()), this, SLOT(fallBackToDefaultTheme()) );
224 229​
Context not available.
1626 } 1631​ }
1627} 1632​}
1628 1633​
1634​void MainWindow::updateCenterFromTheme()
nienhueserUnsubmitted
Not Done

Can we move this method to ControlView (shared between the Qt and KDE applications) to avoid the code duplication?

nienhueser: Can we move this method to ControlView (shared between the Qt and KDE applications) to avoid…
1635​{
1636​ //A scene provider may provide only a subset of the globe, use scene properties read from a dgml as a starting point
1637​ GeoSceneDocument * theme = m_controlView->marbleModel()->mapTheme();
1638​ if (theme) {
1639​ const GeoSceneMap* map = theme->map();
1640​ if (map) {
1641​ const QVariantList lonLat = map->center();
1642​ if (! lonLat.empty()) {
1643​ qDebug() << __FUNCTION__ << " lonlat:" << QString::number(lonLat.at(0).toDouble()) << "," << QString::number(lonLat.at(1).toDouble()) ;
1644​ m_controlView->marbleWidget()->centerOn( lonLat.at(0).toDouble(), lonLat.at(1).toDouble() );
1645​ }
1646​ }
1647​ }
1648​}
1649​
1629void MainWindow::showMapWizard() 1650​void MainWindow::showMapWizard()
1630{ 1651​{
1631 QPointer<MapWizard> mapWizard = new MapWizard(); 1652​ QPointer<MapWizard> mapWizard = new MapWizard();
Context not available.
1686 m_savedSize.setHeight( -1 ); 1707​ m_savedSize.setHeight( -1 );
1687 } 1708​ }
1688} 1709​}
1689 ​
1690#include "moc_QtMainWindow.cpp" 1710​#include "moc_QtMainWindow.cpp"
Context not available.