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

List:       kde-commits
Subject:    =?utf-8?q?=5Bmarble=5D_src=3A_Changes=3A_Set_graphics_system_to_?=
From:       Torsten Rahn <Torsten.Rahn () basyskom ! de>
Date:       2011-04-14 16:08:26
Message-ID: 20110414160826.66215A609B () git ! kde ! org
[Download RAW message or body]

Git commit 1e25495b01851a8752af9f4a8dd849a546b92c19 by Torsten Rahn.
Committed on 14/04/2011 at 14:43.
Pushed by rahn into branch 'master'.

Changes: Set graphics system to raster by default

RevBy: Dennis Nienhüser

M  +1    -1    src/kdemain.cpp     
M  +2    -2    src/lib/QtMarbleConfigDialog.cpp     
M  +1    -1    src/marble.kcfg     
M  +1    -1    src/qtmain.cpp     

http://commits.kde.org/marble/1e25495b01851a8752af9f4a8dd849a546b92c19

diff --git a/src/kdemain.cpp b/src/kdemain.cpp
index 9ac242f..9eeee4c 100644
--- a/src/kdemain.cpp
+++ b/src/kdemain.cpp
@@ -44,7 +44,7 @@ QString readGraphicsSystem( int argc, char *argv[], const KAboutData& aboutData
     KComponentData componentData( aboutData, KComponentData::SkipMainComponentRegistration );
 
     KConfigGroup viewGroup( componentData.config(), "View" );
-    QString graphicsSystem = viewGroup.readEntry( "graphicsSystem", "NativeGraphics" );
+    QString graphicsSystem = viewGroup.readEntry( "graphicsSystem", "RasterGraphics" );
 
     QString graphicsString( "native" );
     if ( graphicsSystem == QString( "RasterGraphics" ) ) {
diff --git a/src/lib/QtMarbleConfigDialog.cpp b/src/lib/QtMarbleConfigDialog.cpp
index b318281..7a0c041 100644
--- a/src/lib/QtMarbleConfigDialog.cpp
+++ b/src/lib/QtMarbleConfigDialog.cpp
@@ -556,12 +556,12 @@ QFont QtMarbleConfigDialog::mapFont() const
 
 Marble::GraphicsSystem QtMarbleConfigDialog::graphicsSystem() const
 {
-    QString graphicsSystemString = d->m_settings->value( "View/graphicsSystem", "native" ).toString();
+    QString graphicsSystemString = d->m_settings->value( "View/graphicsSystem", "raster" ).toString();
 
     if ( graphicsSystemString == "raster" ) return Marble::RasterGraphics;
     if ( graphicsSystemString == "opengl" ) return Marble::OpenGLGraphics;
 
-    // default case:  graphicsSystemString == "native"
+    // default case:  graphicsSystemString == "raster"
     return Marble::NativeGraphics;
 }
 
diff --git a/src/marble.kcfg b/src/marble.kcfg
index 827eca8..9738205 100644
--- a/src/marble.kcfg
+++ b/src/marble.kcfg
@@ -126,7 +126,7 @@
     <choice name="RasterGraphics"/>
     <choice name="OpenGLGraphics"/>
    </choices>
-   <default>Marble::NativeGraphics</default>
+   <default>Marble::RasterGraphics</default>
   </entry>
   <entry key="labelLocalization" type="Enum" >
    <label>The localization of the labels.</label>
diff --git a/src/qtmain.cpp b/src/qtmain.cpp
index 4e96d47..4bd18ec 100644
--- a/src/qtmain.cpp
+++ b/src/qtmain.cpp
@@ -43,7 +43,7 @@ int main(int argc, char *argv[])
     // QApplication. Therefore we need to parse the current setting 
     // in this unusual place :-/
     QSettings * graphicsSettings = new QSettings("kde.org", "Marble Desktop Globe");
-    QString graphicsString = graphicsSettings->value("View/graphicsSystem", "native").toString();
+    QString graphicsString = graphicsSettings->value("View/graphicsSystem", "raster").toString();
     delete graphicsSettings;
     QApplication::setGraphicsSystem( graphicsString );
 

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