[Marble-commits] KDE/kdeedu/marble

[Torsten Rahn]

SVN commit 1070134 by rahn:

- Choose localized HandBook in the Marble Qt Version
- Don't build OSM Annotation test (since the OSM Annotation plugin is
  not ready for the release).



 M  +8 -1      src/QtMainWindow.cpp  
 M  +15 -15    tests/CMakeLists.txt  


--- trunk/KDE/kdeedu/marble/src/QtMainWindow.cpp #1070133:1070134
@@ -529,7 +529,14 @@
 
 void MainWindow::handbook()
 {
-    if( !QDesktopServices::openUrl( QUrl( "http://docs.kde.org/stable/en/kdeedu/marble/index.html" ) ) ) 
+    const QString code = MarbleLocale::languageCode();
+
+    QUrl handbookLocation( "http://docs.kde.org/stable/" + code + "/kdeedu/marble/index.html" );
+
+    if ( handbookLocation.isEmpty() )
+        handbookLocation = QUrl("http://docs.kde.org/stable/en/kdeedu/marble/index.html");
+
+    if( !QDesktopServices::openUrl( handbookLocation ) )
     qDebug() << "URL not opened";
 }
 
--- trunk/KDE/kdeedu/marble/tests/CMakeLists.txt #1070133:1070134
@@ -53,20 +53,20 @@
 # Add extra Libs for testing Plugins
 #############################################################
 #FIXME: Find a better way to do this!
-set(osmannotate_SRCS
-    ../src/plugins/render/osmannotate/TextAnnotation.cpp
-    ../src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp
-    ../src/plugins/render/osmannotate/GeoWidgetBubble.cpp
-    ../src/plugins/render/osmannotate/TmpGraphicsItem.cpp
-    ../src/plugins/render/osmannotate/TextEditor.cpp )
+#set(osmannotate_SRCS
+#    ../src/plugins/render/osmannotate/TextAnnotation.cpp
+#    ../src/plugins/render/osmannotate/PlacemarkTextAnnotation.cpp
+#    ../src/plugins/render/osmannotate/GeoWidgetBubble.cpp
+#    ../src/plugins/render/osmannotate/TmpGraphicsItem.cpp
+#    ../src/plugins/render/osmannotate/TextEditor.cpp )
 
-add_library(OsmAnnotatePluginTestLib SHARED ${osmannotate_SRCS} )
-target_link_libraries( OsmAnnotatePluginTestLib
-                            ${QT_QTGUI_LIBRARY}
-                            ${QT_QTMAIN_LIBRARY}
-                            ${QT_QTCORE_LIBRARY}
-                            marblewidget )
-
+#add_library(OsmAnnotatePluginTestLib SHARED ${osmannotate_SRCS} )
+#target_link_libraries( OsmAnnotatePluginTestLib
+#                            ${QT_QTGUI_LIBRARY}
+#                            ${QT_QTMAIN_LIBRARY}
+#                            ${QT_QTCORE_LIBRARY}
+#                            marblewidget )
+#
 #############################################################
 
 # MarbleWidget test
@@ -95,7 +95,7 @@
 endif (QTONLY)
 
 #FIXME: this stuff should actually be done only once and in the main CMake File!
-include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins/render/osmannotate )
+# include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/../src/plugins/render/osmannotate )
 
 
 ############################
@@ -114,5 +114,5 @@
 add_definitions( -DCITIES_PATH="\\\"${CMAKE_CURRENT_SOURCE_DIR}/../../../data/placemarks/cityplacemarks.kml\\\"" )
 marble_add_test( KMLTest )
 
-marble_add_test( TestOsmAnnotation )
+# marble_add_test( TestOsmAnnotation )
 marble_add_test( TestGeoDataGeometry )