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

List:       kde-commits
Subject:    KDE/kdeedu/marble
From:       Torsten Rahn <tackat () kde ! org>
Date:       2008-05-18 21:26:51
Message-ID: 1211146011.795225.30760.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 809415 by rahn:

- Minor cleanup in MarbleDirs.cpp
- Disabling the relief and icelayer in the temperature maps ...



 M  +4 -12     data/maps/earth/temp-dec/temp-dec.dgml  
 M  +4 -12     data/maps/earth/temp-july/temp-july.dgml  
 M  +2 -12     src/lib/MarbleDirs.cpp  


--- trunk/KDE/kdeedu/marble/data/maps/earth/temp-dec/temp-dec.dgml #809414:809415
@@ -167,12 +167,12 @@
             </group>
             <group name="Surface">
                 <property name="ice">
-                    <value>true</value>
-                    <available>true</available>
+                    <value>false</value>
+                    <available>false</available>
                 </property>
                 <property name="relief">
-                    <value>true</value>
-                    <available>true</available>
+                    <value>false</value>
+                    <available>false</available>
                 </property>
             </group>
 
@@ -322,14 +322,6 @@
                 </item>
             </section>
 
-            <section name="ice" checkable="true" connect="ice" spacing="12">
-                <heading>Ice &amp; Glaciers</heading>
-            </section>
-
-            <section name="relief" checkable="true" connect="relief" spacing="12">
-                <heading>Relief</heading>
-            </section>
-
             <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
                 <heading>Coordinate Grid</heading>
             </section>
--- trunk/KDE/kdeedu/marble/data/maps/earth/temp-july/temp-july.dgml #809414:809415
@@ -167,12 +167,12 @@
             </group>
             <group name="Surface">
                 <property name="ice">
-                    <value>true</value>
-                    <available>true</available>
+                    <value>false</value>
+                    <available>false</available>
                 </property>
                 <property name="relief">
-                    <value>true</value>
-                    <available>true</available>
+                    <value>false</value>
+                    <available>false</available>
                 </property>
             </group>
 
@@ -322,14 +322,6 @@
                 </item>
             </section>
 
-            <section name="ice" checkable="true" connect="ice" spacing="12">
-                <heading>Ice &amp; Glaciers</heading>
-            </section>
-
-            <section name="relief" checkable="true" connect="relief" spacing="12">
-                <heading>Relief</heading>
-            </section>
-
             <section name="coordinate-grid" checkable="true" connect="coordinate-grid" spacing="12">
                 <heading>Coordinate Grid</heading>
             </section>
--- trunk/KDE/kdeedu/marble/src/lib/MarbleDirs.cpp #809414:809415
@@ -38,16 +38,13 @@
 QString MarbleDirs::path( const QString& relativePath )
 { 
     QString  localpath = localPath() + QDir::separator() + relativePath;	// local path
-//    qDebug( "localpath: %s", qPrintable( localpath ) );
     QString  systempath  = systemPath() + QDir::separator() + relativePath;	// system path
-//    qDebug( "systempath: %s", qPrintable( systempath ) );
 
 
     QString fullpath = systempath;
     if ( QFile::exists( localpath ) ) {
         fullpath = localpath;
     }
-//    qDebug( "Using path: %s", qPrintable( fullpath ) );
 
     return QDir( fullpath ).canonicalPath(); 
 }
@@ -95,14 +92,7 @@
     {
       systempath = myPath + "/Contents/Resources/data";
     }
-/*
-    // tackat: If I understood tim correctly this should
-    //         now be obsolete, right?
-    else //must be running from a non .app bundle
-    {
-      systempath = QApplication::applicationDirPath()+"/../share/data";
-    }
-*/
+
     if ( QFile::exists( systempath ) ){ 
       return systempath;
     }
@@ -115,7 +105,7 @@
 #ifdef MARBLE_DATA_PATH
     //MARBLE_DATA_PATH is a compiler define set by cmake
     QString compileTimeMarbleDataPath(MARBLE_DATA_PATH);
-//    qDebug( "%s <-- marble data path", qPrintable( compileTimeMarbleDataPath ) );
+
     if(QDir(compileTimeMarbleDataPath).exists())
         return compileTimeMarbleDataPath;
 #endif  // MARBLE_DATA_PATH
[prev in list] [next in list] [prev in thread] [next in thread]