[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/marble/src
From:       Dennis Nienhüser <earthwings () gentoo ! org>
Date:       2010-12-22 13:50:09
Message-ID: 20101222135009.7A9EBAC8B2 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1208607 by nienhueser:

Make Mercator the default projection on Maemo.

 M  +3 -1      QtMainWindow.cpp  
 M  +1 -1      lib/ViewportParams.cpp  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1208606:1208607
@@ -906,8 +906,10 @@
          QString mapThemeId = settings.value("mapTheme", \
m_controlView->defaultMapThemeId() ).toString();  qDebug() << "ReadSettings: \
mapThemeId: " << mapThemeId;  m_controlView->marbleWidget()->setMapThemeId( \
mapThemeId ); +         bool const smallScreen = \
MarbleGlobal::getInstance()->profiles() & MarbleGlobal::SmallScreen; +         int \
const defaultProjection = smallScreen ? Mercator : Spherical;  \
                m_controlView->marbleWidget()->setProjection(
-            (Projection)(settings.value("projection", 0 ).toInt())
+            (Projection)(settings.value("projection", defaultProjection ).toInt())
          );
 
          // Last location on quit
--- trunk/KDE/kdeedu/marble/src/lib/ViewportParams.cpp #1208606:1208607
@@ -61,7 +61,7 @@
 };
 
 ViewportParamsPrivate::ViewportParamsPrivate()
-    : m_projection( Spherical ),                    // Default projection
+    : m_projection( MarbleGlobal::getInstance()->profiles() & \
MarbleGlobal::SmallScreen ? Mercator : Spherical ), // Default projection  \
m_currentProjection( &s_sphericalProjection ),  m_planetAxis(),
       m_planetAxisMatrix(),


[prev in list] [next in list] [prev in thread] [next in thread]