diff --git a/CMakeLists.txt b/CMakeLists.txt index ae8d42c6b..836ace867 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,384 +1,384 @@ cmake_minimum_required(VERSION 3.5) # Set minimum OS X target set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9) project(marble) #################################################### # CMake Settings SET(CMAKE_COLOR_MAKEFILE ON) # SET(CMAKE_SKIP_RPATH ON) set(CMAKE_POSITION_INDEPENDENT_CODE ON) # Let CMake find the correct library dir instead of # relying on the obsolete LIB_SUFFIX parameter include(GNUInstallDirs) # Taken from KDECompilerSettings.cmake: # Pick sensible versions of the C and C++ standards. # Note that MSVC does not have equivalent flags; the features are either # supported or they are not. if ("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang") # We use the C89 standard because that is what is common to all our # compilers (in particular, MSVC 2010 does not support C99) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=iso9899:1990") endif() if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel" AND NOT WIN32) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") endif() # Default to hidden visibility for symbols set(CMAKE_C_VISIBILITY_PRESET hidden) set(CMAKE_CXX_VISIBILITY_PRESET hidden) set(CMAKE_VISIBILITY_INLINES_HIDDEN 1) if (POLICY CMP0063) cmake_policy(SET CMP0063 NEW) endif() # RPATH/RUNPATH settings if (UNIX) # Add CMAKE_INSTALL_FULL_LIBDIR to the RPATH to be used when installing, # but only if it isn't a standard system directory. list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemLibDir) list(FIND CMAKE_CXX_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemCxxLibDir) list(FIND CMAKE_C_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemCLibDir) if("${isSystemLibDir}" STREQUAL "-1" AND "${isSystemCxxLibDir}" STREQUAL "-1" AND "${isSystemCLibDir}" STREQUAL "-1") set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}") endif() # Add directories which are in the linker search path (but outside the project) # to the RPATH to be used when installing set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) # no libs or plugins are designed to be used from the build dir, so directly link with install rpath set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) endif (UNIX) #################################################### # Where to look first for cmake modules, # before ${CMAKE_ROOT}/Modules/ is checked set ( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src ${CMAKE_CURRENT_SOURCE_DIR}/cmake_find_rules ${CMAKE_CURRENT_SOURCE_DIR}/cmake_scripts ${CMAKE_MODULE_PATH} ) # add cmake macros include(GenerateExportHeader) include( MarbleMacros ) #################################################### # Generate the tiles with the tilecreator at compile time # if this option is set, srtm.jpg will not be installed but the generated tiles instead option(MOBILE "Create a Marble version optimized for handheld devices") #################################################### # Build a D-Bus interface for the Marble widget # This is disabled by default for all win32, apple and Android if(WIN32 OR APPLE OR CMAKE_SYSTEM_NAME STREQUAL Android) option(BUILD_WITH_DBUS "Build the D-Bus interface for the Marble widget" OFF) else() option(BUILD_WITH_DBUS "Build the D-Bus interface for the Marble widget" ON) endif() ####################################################### # Specific options for building for different platforms if(CMAKE_SYSTEM_NAME STREQUAL Android) add_definitions(-DANDROID) endif() ####################################################### # Find Qt dependencies if(CMAKE_SYSTEM_NAME STREQUAL Android) set(REQUIRED_QT_VERSION 5.7.0) # TODO: still needed with ECM toolchain? SET(QT_QMAKE_EXECUTABLE "$ENV{Qt5_android}/bin/qmake") else() set(REQUIRED_QT_VERSION 5.7.0) endif() find_package(Qt5 ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Xml Network Test Widgets Svg Sql Concurrent Quick PrintSupport ) if(CMAKE_SYSTEM_NAME STREQUAL Android) find_package(Qt5Positioning ${REQUIRED_QT_VERSION} REQUIRED) find_package(Qt5Multimedia ${REQUIRED_QT_VERSION} REQUIRED) set ( MARBLE_NO_WEBKITWIDGETS TRUE ) else() find_package(Qt5WebEngine ${REQUIRED_QT_VERSION}) find_package(Qt5WebEngineWidgets ${REQUIRED_QT_VERSION}) if ( NOT Qt5WebEngineWidgets_FOUND ) set ( MARBLE_NO_WEBKITWIDGETS TRUE ) endif() endif() if (BUILD_WITH_DBUS) find_package(Qt5DBus ${REQUIRED_QT_VERSION}) if (NOT Qt5DBus_FOUND) set(MARBLE_NO_DBUS TRUE) endif() else() set(MARBLE_NO_DBUS TRUE) endif() SET(CMAKE_AUTOMOC TRUE) # Use M_PI under Windows if( WIN32 ) add_definitions( -D_USE_MATH_DEFINES ) endif( WIN32 ) #################################################### # build unit tests INCLUDE (CTest) ENABLE_TESTING() option( BUILD_MARBLE_TESTS "Build unit tests" ON ) add_feature_info("Unit tests" BUILD_MARBLE_TESTS "Build unit tests. Toggle with BUILD_MARBLE_TESTS=YES/NO. 'make test' will run all.") if( BUILD_MARBLE_TESTS ) # SET (TEST_DATA_DIR "${CMAKE_CURRENT_SOURCE_DIR}/src/tests/test_data") #where unit test binaries should be installed to and run from # SET (MARBLE_TEST_DIR ${CMAKE_CURRENT_BINARY_DIR}/tests) endif( BUILD_MARBLE_TESTS ) #################################################### set (PEDANTIC FALSE CACHE BOOL "Determines if we should compile with -Wall -Werror.") set (WITH_DESIGNER_PLUGIN TRUE CACHE BOOL "Build plugins for Qt Designer") add_feature_info("Qt Designer plugins" WITH_DESIGNER_PLUGIN "Marble widget support in Qt Designer. Toggle with WITH_DESIGNER_PLUGIN=YES/NO") set(EXEC_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX} CACHE PATH "Base directory for executables and libraries" FORCE) if (NOT QT_PLUGINS_DIR) set(QT_PLUGINS_DIR ${CMAKE_INSTALL_LIBDIR}/plugins) endif() #################################################### # Detect default for the user configurable MARBLE_DATA_PATH option if(WIN32) set(data_dir data) set(locale_dir "${data_dir}/locale") set(plugin_dir plugins) elseif(APPLE) # needed for finding bundle path in e.g. katlasdir.h FIND_LIBRARY(APP_SERVICES_LIBRARY ApplicationServices ) MARK_AS_ADVANCED (APP_SERVICES_LIBRARY) SET(MAC_EXTRA_LIBS ${APP_SERVICES_LIBRARY}) # for Mac OS X, everything is put inside an application bundle SET (CMAKE_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}/) # path for library references SET (CMAKE_INSTALL_NAME_DIR @executable_path/lib) # install the Info.plist file install(FILES src/mac/Info.plist DESTINATION ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents) #SET (lib_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/lib) SET (data_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/data) set(locale_dir "${data_dir}/locale") SET (plugin_dir ${CMAKE_INSTALL_PREFIX}/Marble.app/Contents/MacOS/resources/plugins) elseif(CMAKE_SYSTEM_NAME STREQUAL Android) set(plugin_dir "${CMAKE_INSTALL_PREFIX}/assets/plugins") set(data_dir "${CMAKE_INSTALL_PREFIX}/assets/data") set(locale_dir "${data_dir}/locale") else() # Linux / bsd etc... set(data_dir ${CMAKE_INSTALL_FULL_DATAROOTDIR}/marble/data) set(locale_dir "${CMAKE_INSTALL_FULL_DATAROOTDIR}/locale") set(plugin_dir ${CMAKE_INSTALL_FULL_LIBDIR}/marble/plugins) endif() if(NOT ICON_INSTALL_DIR) set(ICON_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/icons) endif(NOT ICON_INSTALL_DIR) if(NOT APPS_INSTALL_DIR) set(APPS_INSTALL_DIR ${CMAKE_INSTALL_FULL_DATAROOTDIR}/applications) endif(NOT APPS_INSTALL_DIR) if(NOT INCLUDE_INSTALL_DIR) set(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include") endif() if (NOT MARBLE_DATA_PATH) set (MARBLE_DATA_PATH ${data_dir}) endif (NOT MARBLE_DATA_PATH) if (NOT MARBLE_PLUGIN_PATH) set (MARBLE_PLUGIN_PATH ${plugin_dir}) endif (NOT MARBLE_PLUGIN_PATH) if (NOT MARBLE_DATA_INSTALL_PATH) set (MARBLE_DATA_INSTALL_PATH ${MARBLE_DATA_PATH}) endif (NOT MARBLE_DATA_INSTALL_PATH) if (NOT MARBLE_PLUGIN_INSTALL_PATH) set (MARBLE_PLUGIN_INSTALL_PATH ${MARBLE_PLUGIN_PATH}) endif (NOT MARBLE_PLUGIN_INSTALL_PATH) #MESSAGE( STATUS, "MARBLE_PLUGIN_INSTALL_PATH: ${MARBLE_PLUGIN_INSTALL_PATH}" ) if(WIN32) set (STATIC_BUILD FALSE CACHE BOOL "Link to static Qt libs (win32 only)?") endif(WIN32) add_definitions( -DQT_USE_QSTRINGBUILDER -DQT_NO_SIGNALS_SLOTS_KEYWORDS -DQT_NO_URL_CAST_FROM_STRING -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_BYTEARRAY -DQT_STRICT_ITERATORS -DQT_DISABLE_DEPRECATED_BEFORE=0x050700 ) #################################################### # Options for static build if(STATIC_BUILD) add_definitions(-DSTATIC_BUILD=1) endif(STATIC_BUILD) ############################################################# if (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") # Its good programming practice to build with no warnings... add_definitions( -Wall -Wextra -Wundef -Wnon-virtual-dtor -Woverloaded-virtual -Wno-long-long -Wchar-subscripts -Wcast-align -Wpointer-arith -Wformat-security ) # In pedantic mode, treat warnings as errors if (PEDANTIC) add_definitions( -Werror ) endif (PEDANTIC) endif (CMAKE_COMPILER_IS_GNUCXX OR CMAKE_C_COMPILER MATCHES "icc") ############################################################# # Add a compiler def so that we can conditionally compile # code in debug mode only (e.g. extra console messages) IF (CMAKE_BUILD_TYPE MATCHES Debug) IF(NOT MINGW) ADD_DEFINITIONS(-DDEBUG) ELSE(NOT MINGW) REMOVE_DEFINITIONS( -DQT_NO_DEBUG ) ENDIF(NOT MINGW) ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) #################################################### # on Win32 set the debug postfix if(WIN32) # distinguish between debug and release plugin SET(CMAKE_DEBUG_POSTFIX "d") endif(WIN32) #################################################### #################################################### # Add global ECM & KF5 settings set(REQUIRED_ECM_VERSION 1.7.0) set(KDE_INSTALL_DIRS_NO_DEPRECATED TRUE) set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled") set(REQUIRED_KF5_MIN_VERSION 5.7.0) #################################################### # Add the include directories include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/projections ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/data ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/graphicsitem ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/handlers/dgml ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/parser ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/writer ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/geodata/scene ${CMAKE_CURRENT_SOURCE_DIR}/src/lib/marble/graphicsview ${CMAKE_CURRENT_BINARY_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/src/lib/marble ) #################################################### # Descend into subdirectories add_subdirectory(doc) add_subdirectory(src) add_subdirectory(data) include(DistTarget) add_subdirectory(tests) option(BUILD_MARBLE_TOOLS "Build various tools related to Marble" OFF) add_feature_info("Marble tools" BUILD_MARBLE_TOOLS "Build various Marble tools for e.g. file format conversion. Toggle with BUILD_MARBLE_TOOLS=YES/NO.") if(BUILD_MARBLE_TOOLS) add_subdirectory(tools) endif() option(BUILD_MARBLE_EXAMPLES "Build C++ examples showing how to use the Marble library" OFF) add_feature_info("Marble library C++ examples" BUILD_MARBLE_EXAMPLES "Build C++ examples showing how to use the Marble library. Toggle with BUILD_MARBLE_EXAMPLES=YES/NO.") if(BUILD_MARBLE_EXAMPLES) add_subdirectory(examples/cpp) endif() #################################################### # Handle translation catalogs of KDE Application release tarball of marble # (for custom bundle translation handling see data/lang/README) # KDE Application release tarballs have the respective po files added on tarball creation, # which are otherwise stored and edited separately on the KDE svn servers. # Toplevel subdir "poqm/" holds all the po files which should be processed and installed as qm files marble_install_po_files_as_qm(poqm) # Toplevel subdir "po/" holds all the po files which should be processed and installed as mo files # Those are used by app and plugin code building against KI18n. # So the respective macro ki18n_install can be used. # Likewise, it contains the translated user documentation, which is handled by kdoctools_install. # Just, the macros are not available here in the toplevel CMakeLists.txt file. # As a temporary hack (your task to improve it, dear reader :) ) the macros # are called only from src/apps/marble-kde/CMakeLists.txt. # That should catch 99.9 % cases of builds from released tarball, where all the -# KF5-dependant apps and plugins will be built and installed together. +# KF5-dependent apps and plugins will be built and installed together. # Currently these are: # src/apps/marble-kde # src/plasmarunner # src/plasma/applets/worldclock # src/plasma/wallpapers/worldmap # # Let releaseme know about this: # SKIP_PO_INSTALL #################################################### # Install extra files install(FILES LICENSE.txt DESTINATION ${MARBLE_DATA_INSTALL_PATH}) ############################################################ # Uninstall stuff CONFIGURE_FILE( "${CMAKE_CURRENT_SOURCE_DIR}/cmake/templates/cmake_uninstall.cmake.in" "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake" IMMEDIATE @ONLY) ADD_CUSTOM_TARGET(uninstall "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake") include(MarbleCPackOptions) marble_feature_summary(WHAT ALL INCLUDE_QUIET_PACKAGES) diff --git a/examples/qml/data-layers/EarthquakesModel.qml b/examples/qml/data-layers/EarthquakesModel.qml index f518e11a5..3c276a43a 100644 --- a/examples/qml/data-layers/EarthquakesModel.qml +++ b/examples/qml/data-layers/EarthquakesModel.qml @@ -1,36 +1,36 @@ // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2012 Dennis Nienhüser import QtQuick 1.1 XmlListModel { property real north property real south property real east property real west function update() { - source = "http://ws.geonames.org/earthquakes?username=marble&style=full" + source = "http://api.geonames.org/earthquakes?username=marble&style=full" + "&north=" + north + "&south=" + south + "&east=" + east + "&west=" + west } query: "/geonames/earthquake" XmlRole { name: "lat"; query: "lat/number()" } XmlRole { name: "lon"; query: "lng/number()" } XmlRole { name: "magnitude"; query: "magnitude/number()" } // You can also activate those properties: // XmlRole { name: "source"; query: "src/string()" } // XmlRole { name: "eqid"; query: "eqid/string()" } // XmlRole { name: "datetime"; query: "datetime/string()" } // XmlRole { name: "depth"; query: "depth/number()" } } diff --git a/examples/qml/data-layers/SevenWondersOfTheAncientWorldModel.qml b/examples/qml/data-layers/SevenWondersOfTheAncientWorldModel.qml index 6811b56bb..92ca3af89 100644 --- a/examples/qml/data-layers/SevenWondersOfTheAncientWorldModel.qml +++ b/examples/qml/data-layers/SevenWondersOfTheAncientWorldModel.qml @@ -1,47 +1,47 @@ // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2012 Dennis Nienhüser import QtQuick 1.1 ListModel { ListElement{ name: "Hanging Gardens of Babylon" - picture: "http://upload.wikimedia.org/wikipedia/commons/a/ae/Hanging_Gardens_of_Babylon.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/a/ae/Hanging_Gardens_of_Babylon.jpg" lon: 44.4275; lat: 32.5355 } ListElement{ name: "Colossus of Rhodes" - picture: "http://upload.wikimedia.org/wikipedia/commons/8/84/Colossus_of_Rhodes.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/8/84/Colossus_of_Rhodes.jpg" lon: 28.227778; lat: 36.451111 } ListElement{ name: "Great Pyramid of Giza" - picture: "http://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/Kheops-Pyramid.jpg/320px-Kheops-Pyramid.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/thumb/e/e3/Kheops-Pyramid.jpg/320px-Kheops-Pyramid.jpg" lon: 31.134358; lat: 29.979175 } ListElement{ name: "Lighthouse of Alexandria" - picture: "http://upload.wikimedia.org/wikipedia/commons/b/b0/PHAROS2006.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/b/b0/PHAROS2006.jpg" lon: 29.885661; lat: 31.213931 } ListElement{ name: "Mausoleum at Halicarnassus" - picture: "http://upload.wikimedia.org/wikipedia/commons/thumb/d/d2/The_maussolleion_model_dsc02711-miniaturk_nevit.jpg/180px-The_maussolleion_model_dsc02711-miniaturk_nevit.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/thumb/d/d2/The_maussolleion_model_dsc02711-miniaturk_nevit.jpg/180px-The_maussolleion_model_dsc02711-miniaturk_nevit.jpg" lon: 27.424056; lat: 37.037944 } ListElement{ name: "Temple of Artemis" - picture: "http://upload.wikimedia.org/wikipedia/commons/thumb/1/1d/Miniaturk_009.jpg/320px-Miniaturk_009.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/thumb/1/1d/Miniaturk_009.jpg/320px-Miniaturk_009.jpg" lon: 27.363889; lat: 37.949722 } ListElement{ name: "Statue of Zeus at Olympia" - picture: "http://upload.wikimedia.org/wikipedia/commons/c/c6/Statue_of_Zeus.jpg" + picture: "https://upload.wikimedia.org/wikipedia/commons/c/c6/Statue_of_Zeus.jpg" lon: 21.63; lat: 37.637861 } } diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index af0a716a3..61eef8bce 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1,81 +1,81 @@ # before add_subdirectory() ! if(MSVC) add_definitions(-D_USE_MATH_DEFINES=1) endif(MSVC) if(NOT MARBLE_NO_DBUS) add_definitions(-DMARBLE_DBUS) endif() # disabled for now: # no public Marble QML plugins are installed, libmarbledeclarative is only a shared lib if (FALSE) if( Qt5Quick_FOUND ) OPTION(IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS "Install Marble Qt Declarative plugins to QT_IMPORTS_DIR even if that is out of the CMAKE_INSTALL_PREFIX") IF(QT_IMPORTS_DIR) SET(MARBLE_QT_IMPORTS_DIR ${QT_IMPORTS_DIR}) ELSE() # Fallback when FindQt.cmake (part of cmake) does not define QT_IMPORTS_DIR. Get it from qmake instead. EXEC_PROGRAM( qmake ARGS "-query QT_INSTALL_QML" OUTPUT_VARIABLE MARBLE_QT_IMPORTS_DIR ) ENDIF() STRING(LENGTH "${CMAKE_INSTALL_PREFIX}" _MARBLE_CMAKE_INSTALL_PREFIX_LEN) STRING(LENGTH "${MARBLE_QT_IMPORTS_DIR}" _MARBLE_QT_IMPORTS_DIR_LEN) IF(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL /usr/local) IF(NOT ${_MARBLE_QT_IMPORTS_DIR_LEN} LESS ${_MARBLE_CMAKE_INSTALL_PREFIX_LEN}) STRING(SUBSTRING ${MARBLE_QT_IMPORTS_DIR} 0 ${_MARBLE_CMAKE_INSTALL_PREFIX_LEN} _MARBLE_QT_IMPORTS_DIR_START) IF(NOT ${CMAKE_INSTALL_PREFIX} STREQUAL ${_MARBLE_QT_IMPORTS_DIR_START}) IF(NOT ${IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS}) MESSAGE(STATUS "Please include ${MARBLE_PLUGIN_INSTALL_PATH} in the QML_IMPORT_PATH environment variable to use Marble's Qt declarative plugins.") MESSAGE(STATUS "Note: Marble Desktop does not make use of declarative plugins. Ignore the message above if you only intend to use the Desktop version.") SET(MARBLE_QT_IMPORTS_DIR ${MARBLE_PLUGIN_INSTALL_PATH}) ENDIF() ENDIF() ELSE() IF(NOT ${IGNORE_CMAKE_INSTALL_PREFIX_FOR_DECLARATIVE_PLUGINS}) MESSAGE(STATUS "Please include ${MARBLE_PLUGIN_INSTALL_PATH} in the QML_IMPORT_PATH environment variable to use Marble's Qt declarative plugins.") MESSAGE(STATUS "Note: Marble Desktop does not make use of declarative plugins. Ignore the message above if you only intend to use the Desktop version.") SET(MARBLE_QT_IMPORTS_DIR ${MARBLE_PLUGIN_INSTALL_PATH}) ENDIF() ENDIF() ENDIF() ENDIF() endif() macro_optional_find_package(ZLIB QUIET) marble_set_package_properties(ZLIB PROPERTIES DESCRIPTION "general-purpose lossless data-compression library") -marble_set_package_properties(ZLIB PROPERTIES URL "http://www.zlib.net/") +marble_set_package_properties(ZLIB PROPERTIES URL "https://www.zlib.net/") marble_set_package_properties(ZLIB PROPERTIES TYPE OPTIONAL PURPOSE "When found, system zlib is used. When not found, a Marble internal zlib is used.") if(NOT ZLIB_FOUND) add_subdirectory( 3rdparty/zlib ) set(ZLIB_LIBRARIES zlibstatic) set(ZLIB_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/zlib" "${CMAKE_CURRENT_BINARY_DIR}/3rdparty/zlib") endif() add_subdirectory( 3rdparty/o5mreader ) add_subdirectory( 3rdparty/sgp4 ) add_subdirectory( lib/marble ) add_subdirectory( lib/astro ) add_subdirectory( lib/marble/declarative ) add_subdirectory( plugins ) option(BUILD_MARBLE_APPS "Build Marble Desktop/Mobile applications" ON) add_feature_info("Marble Desktop/Mobile applications" BUILD_MARBLE_APPS "Build Marble Desktop/Mobile applications. Toggle with BUILD_MARBLE_APPS=YES/NO.") if(BUILD_MARBLE_APPS) add_subdirectory( apps ) endif() add_subdirectory( bindings ) configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/config-marble.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-marble.h ) if(APPLE) add_subdirectory( mac ) endif(APPLE) add_subdirectory( plasma ) add_subdirectory( plasmarunner ) add_subdirectory( thumbnailer ) diff --git a/src/apps/behaim/Legend.qml b/src/apps/behaim/Legend.qml index 594c6bd44..abcf62315 100644 --- a/src/apps/behaim/Legend.qml +++ b/src/apps/behaim/Legend.qml @@ -1,228 +1,228 @@ // // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2015 Dennis Nienhüser // import QtQuick 2.3 import QtQuick.Controls 1.3 import QtQuick.Window 2.2 import QtQuick.Layouts 1.1 import QtGraphicalEffects 1.0 Item { id: root Rectangle { id: background anchors.fill: parent color: palette.base } DropShadow { anchors.fill: root horizontalOffset: landscape ? 4 : 0 verticalOffset: landscape ? 0 : -4 radius: 4.0 samples: 16 color: "#666" cached: true fast: true source: background transparentBorder: true } TabView { id: tabView anchors.fill: parent tabPosition: Qt.BottomEdge Tab { id: infoTab anchors.margins: Screen.pixelDensity * 2 //: Tab title for a tab with information about the app title: qsTr("Info") Flickable { anchors.fill: parent contentWidth: infoText.width contentHeight: infoText.height flickableDirection: Flickable.VerticalFlick clip: true Text { id: infoText text: qsTr("

Martin Behaim's Erdapfel

\

The oldest existent globe of the Earth.\ Martin Behaim and collaborators created the globe around 1492 at the time of \ Columbus' first sea travel to the west.\ Hence the American continent is missing on this globe.\ Also note the detailed inscriptions in early modern German.

\

Please see Wikipedia: Erdapfel \ for further information about the Behaim globe.") width: infoTab.width wrapMode: Text.WordWrap onLinkActivated: Qt.openUrlExternally(link) } } } Tab { id: variantsTab anchors.margins: Screen.pixelDensity * 2 //: Tab title for a tab with globe variant configuration title: qsTr("Variants") Flickable { anchors.fill: parent contentWidth: themeColumn.width contentHeight: themeColumn.height flickableDirection: Flickable.VerticalFlick clip: true Column { id: themeColumn width: variantsTab.width anchors { margins: Screen.pixelDensity * 2 topMargin: Screen.pixelDensity * 14 } Text { wrapMode: Text.Wrap text: qsTr("

Globe Variant

") } ExclusiveGroup { id: layerGroup onCurrentChanged: current.apply() } RadioButton { text: qsTr("Original (1492)") checked: true exclusiveGroup: layerGroup property string description: qsTr("Digital imagery taken directly from the original Behaim globe.") function apply() { marbleMaps.setPropertyEnabled("ravenstein", false) marbleMaps.setPropertyEnabled("ghillany", false) } } RadioButton { text: qsTr("Ghillany (1853)") property string description: qsTr("A (rough) facsimile created by Friedrich Wilhelm Ghillany in 1853.") exclusiveGroup: layerGroup function apply() { marbleMaps.setPropertyEnabled("ravenstein", false) marbleMaps.setPropertyEnabled("ghillany", true) } } RadioButton { text: qsTr("Ravenstein (1908)") property string description: qsTr("A (rough) facsimile created by Ernest George Ravenstein in 1908.") exclusiveGroup: layerGroup function apply() { marbleMaps.setPropertyEnabled("ghillany", false) marbleMaps.setPropertyEnabled("ravenstein", true) } } Item { width: 1; height: Screen.pixelDensity * 2; } Text { text: layerGroup.current.description width: parent.width wrapMode: Text.Wrap } } } } Tab { anchors.margins: Screen.pixelDensity * 2 //: Tab title for a tab with app settings title: qsTr("Settings") Flickable { anchors.fill: parent contentWidth: settingsColumn.width contentHeight: settingsColumn.height flickableDirection: Flickable.VerticalFlick clip: true Column { id: settingsColumn anchors { margins: Screen.pixelDensity * 2 topMargin: Screen.pixelDensity * 14 } Text { wrapMode: Text.Wrap text: qsTr("

Globe Settings

") } CheckBox { text: qsTr("Show Behaim places") onCheckedChanged: marbleMaps.setPropertyEnabled("cities", checked) } CheckBox { text: qsTr("Show texts and illustrations") onCheckedChanged: marbleMaps.setPropertyEnabled("otherplaces", checked) } CheckBox { text: qsTr("Show the accurate coastline") onCheckedChanged: marbleMaps.setPropertyEnabled("coastlines", checked) } } } } Tab { id: aboutTab anchors.margins: Screen.pixelDensity * 2 //: Tab title for a tab with information about the app creators and content sources title: qsTr("About") Flickable { anchors.fill: parent contentWidth: aboutText.width contentHeight: aboutText.height flickableDirection: Flickable.VerticalFlick clip: true Text { id: aboutText anchors { margins: Screen.pixelDensity * 2 topMargin: Screen.pixelDensity * 14 } text: qsTr("

Germanisches Nationalmuseum

\

The original Behaim globe can be visited in the - Germanisches Nationalmuseum in Nuremberg, Germany.

\ + Germanisches Nationalmuseum in Nuremberg, Germany.

\

KDE Marble

\ -

This app is part of the Marble project.\ +

This app is part of the Marble project.\ The Marble community works on maps and virtual globes with the goal to produce visually appealing, easy-to-use Free Software.

\

Map Content

\

Digitized map based on orthophotographic gores by TU Vienna, 1990. Germanisches Nationalmuseum and\ Friedrich-Alexander-Universität Erlangen-Nürnberg, CC BY-SA 3.0.\ Ghillany map based on two planiglobes which are provided as a map supplement\ to F.W. Ghillany's \"Geschichte des Seefahrers Ritter Martin Behaim nach den ältesten vorhandenen Urkunden\",\ Nuremberg 1853. CC BY-SA 3.0.

") width: aboutTab.width wrapMode: Text.WordWrap onLinkActivated: Qt.openUrlExternally(link) } } } } } diff --git a/src/apps/behaim/MainScreen.qml b/src/apps/behaim/MainScreen.qml index 428e3ba55..6d02aa840 100644 --- a/src/apps/behaim/MainScreen.qml +++ b/src/apps/behaim/MainScreen.qml @@ -1,290 +1,290 @@ // // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2015 Dennis Nienhüser // import QtQuick 2.3 import QtQuick.Controls 1.3 import QtQuick.Window 2.2 import QtQuick.Layouts 1.1 import org.kde.kirigami 2.0 as Kirigami import org.kde.marble 0.20 Kirigami.ApplicationWindow { id: root Layout.fillWidth: true SystemPalette { id: palette colorGroup: SystemPalette.Active } globalDrawer: Kirigami.GlobalDrawer { id: drawer title: "Settings" handleVisible: !aboutDrawer.drawerOpen && !infoDrawer.drawerOpen topContent: [ CheckBox { text: qsTr("Show Behaim places") onCheckedChanged: marbleMaps.setPropertyEnabled("cities", checked) }, CheckBox { text: qsTr("Show texts and illustrations") onCheckedChanged: marbleMaps.setPropertyEnabled("otherplaces", checked) }, CheckBox { text: qsTr("Show the accurate coastline") onCheckedChanged: marbleMaps.setPropertyEnabled("coastlines", checked) }, Label { wrapMode: Text.WordWrap text: qsTr("

Globe Variant

") Layout.fillWidth: true }, ExclusiveGroup { id: layerGroup onCurrentChanged: current.apply() }, RadioButton { text: qsTr("Original (1492)") checked: true exclusiveGroup: layerGroup property string description: qsTr("Digital imagery taken directly from the original Behaim globe.") function apply() { marbleMaps.setPropertyEnabled("ravenstein", false) marbleMaps.setPropertyEnabled("ghillany", false) } }, RadioButton { text: qsTr("Ghillany (1853)") property string description: qsTr("A (rough) facsimile created by Friedrich Wilhelm Ghillany in 1853.") exclusiveGroup: layerGroup function apply() { marbleMaps.setPropertyEnabled("ravenstein", false) marbleMaps.setPropertyEnabled("ghillany", true) } }, RadioButton { text: qsTr("Ravenstein (1908)") property string description: qsTr("A (rough) facsimile created by Ernest George Ravenstein in 1908.") exclusiveGroup: layerGroup function apply() { marbleMaps.setPropertyEnabled("ghillany", false) marbleMaps.setPropertyEnabled("ravenstein", true) } }, Item { width: 1; height: Screen.pixelDensity * 2; } ] actions: [ Kirigami.Action { text: qsTr("Information") onTriggered: { infoDrawer.open() if(aboutDrawer.drawerOpen){ aboutDrawer.close() } } }, Kirigami.Action { text: qsTr("About") iconSource: "menu.png" onTriggered: { aboutDrawer.open() if(infoDrawer.drawerOpen){ infoDrawer.close() } } } ] } Kirigami.Page { id: page property alias marbleMaps: mainLayout.marbleMaps anchors.fill: parent title: qsTr("Behaim Globe") visible: true property bool landscape: root.width > root.height Rectangle { id: background anchors.fill: parent color: palette.base } Grid { anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter id: mainLayout property alias marbleMaps: mapItem.marbleMaps columns: root.landscape ? 2 : 1 columnSpacing: 0 rows: root.landscape ? 1 : 2 rowSpacing: 0 layoutDirection: root.landscape ? Qt.RightToLeft : Qt.LeftToRight Item { id: mapItem property alias marbleMaps: pinchArea.marbleItem width: root.width height: root.height Rectangle { color: "black" anchors.fill: parent } PinchArea { id: pinchArea anchors.fill: parent enabled: true property alias marbleItem: marbleMaps onPinchStarted: marbleMaps.handlePinchStarted(pinch.center) onPinchFinished: marbleMaps.handlePinchFinished(pinch.center) onPinchUpdated: marbleMaps.handlePinchUpdated(pinch.center, pinch.scale); MarbleItem { id: marbleMaps anchors.fill: parent focus: true zoom: 1150 inertialGlobeRotation: true // Theme settings. projection: MarbleItem.Spherical mapThemeId: "earth/behaim1492/behaim1492.dgml" // Visibility of layers/plugins. showFrameRate: false showAtmosphere: true showCompass: false showClouds: false showCrosshairs: false showGrid: false showOverviewMap: false showOtherPlaces: false showScaleBar: false showBackground: true showPositionMarker: false Component.onCompleted: { setPluginSetting("stars", "renderConstellationLines", "false"); setPluginSetting("stars", "renderConstellationLabels", "false"); setPluginSetting("stars", "renderDsoLabels", "false"); setPluginSetting("stars", "viewSolarSystemLabel", "false"); setPluginSetting("stars", "zoomSunMoon", "false"); setPluginSetting("stars", "renderEcliptic", "false"); setPluginSetting("stars", "renderCelestialEquator", "false"); setPluginSetting("stars", "renderCelestialPole", "false"); marbleMaps.forceActiveFocus() } } } } } Kirigami.OverlayDrawer { id: infoDrawer edge: Qt.BottomEdge contentItem: Item { Layout.fillWidth: true implicitHeight: columnLayoutInfo.text.height + Kirigami.Units.gridUnit ColumnLayout { id: columnLayoutInfo property alias text: flickableInfo.text anchors.fill: parent Flickable { id: flickableInfo property alias text: infoText anchors.fill: parent contentWidth: infoText.width contentHeight: infoText.height flickableDirection: Flickable.VerticalFlick clip: true Text { id: infoText text: qsTr("

Martin Behaim's Erdapfel

\

The oldest existent globe of the Earth.\ Martin Behaim and collaborators created the globe around 1492 at the time of \ Columbus' first sea travel to the west.\ Hence the American continent is missing on this globe.\ Also note the detailed inscriptions in early modern German.

\

Please see Wikipedia: Erdapfel \ for further information about the Behaim globe.") width: columnLayoutInfo.width wrapMode: Text.WordWrap onLinkActivated: Qt.openUrlExternally(link) } } Item { Layout.minimumHeight: Kirigami.Units.gridUnit * 4 } } } } Kirigami.OverlayDrawer { id: aboutDrawer edge: Qt.BottomEdge contentItem: Item { Layout.fillWidth: true implicitHeight: columnLayoutInfo.text.height + Kirigami.Units.gridUnit ColumnLayout { id: columnLayoutAbout property alias text: flickableAbout.text anchors.fill: parent Flickable { id: flickableAbout property alias text: aboutText anchors.fill: parent contentWidth: aboutText.width contentHeight: aboutText.height flickableDirection: Flickable.VerticalFlick clip: true Text { id: aboutText anchors { margins: Screen.pixelDensity * 2 topMargin: Screen.pixelDensity * 14 } text: qsTr("

Germanisches Nationalmuseum

\

The original Behaim globe can be visited in the - Germanisches Nationalmuseum in Nuremberg, Germany.

\ + Germanisches Nationalmuseum in Nuremberg, Germany.

\

KDE Marble

\ -

This app is part of the Marble project.\ +

This app is part of the Marble project.\ The Marble community works on maps and virtual globes with the goal to produce visually appealing, easy-to-use Free Software.

\

Map Content

\

Digitized map based on orthophotographic gores by TU Vienna, 1990. Germanisches Nationalmuseum and\ Friedrich-Alexander-Universität Erlangen-Nürnberg, CC BY-SA 3.0.\ Ghillany map based on two planiglobes which are provided as a map supplement\ to F.W. Ghillany's \"Geschichte des Seefahrers Ritter Martin Behaim nach den ältesten vorhandenen Urkunden\",\ Nuremberg 1853. CC BY-SA 3.0.

") width: columnLayoutAbout.width wrapMode: Text.WordWrap onLinkActivated: Qt.openUrlExternally(link) } } } } } } } diff --git a/src/apps/marble-maps/AboutDialog.qml b/src/apps/marble-maps/AboutDialog.qml index 2424577d8..63155f59c 100644 --- a/src/apps/marble-maps/AboutDialog.qml +++ b/src/apps/marble-maps/AboutDialog.qml @@ -1,149 +1,149 @@ // // This file is part of the Marble Virtual Globe. // // This program is free software licensed under the GNU LGPL. You can // find a copy of this license in LICENSE.txt in the top directory of // the source code. // // Copyright 2016 Dennis Nienhüser // import QtQuick 2.3 import QtQuick.Controls 2.0 import QtQuick.Window 2.2 import QtQuick.Layouts 1.1 import org.kde.kirigami 2.0 as Kirigami import org.kde.marble 0.20 Kirigami.Page { Item { id: root anchors.fill: parent height: Screen.pixelDensity * 2 + Math.max(marbleText.height, devText.height) SystemPalette { id: palette colorGroup: SystemPalette.Active } SwipeView { id: tabView currentIndex: pageIndicator.currentIndex anchors.fill: parent spacing: 100 Item { id: marbleItem Text { id: marbleText anchors.left: parent.left anchors.right: parent.right anchors.margins: Screen.pixelDensity * 1 wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: qsTr("

Marble Maps

Find your way! Marble Maps brings the highly detailed OpenStreetMap to your mobile devices. It features a crisp, beautiful map with an intuitive user interface. It's open source, entirely based on free data and open standards and respects your privacy.

") onLinkActivated: Qt.openUrlExternally(link) } Image { id: marbleLogo anchors.right: parent.right anchors.bottom: parent.bottom anchors.margins: Screen.pixelDensity height: marbleText.height fillMode: Image.PreserveAspectFit source: "qrc:/konqi/globe.png" } } Item { id: supportItem Text { id: groupText anchors.left: parent.left anchors.right: parent.right anchors.margins: Screen.pixelDensity * 1 wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: qsTr("

Support

Do you have a question? Want to file a suggestion for improvement? Please use the Marble forum to get in touch with fellow Marble users and developers. Further support channels are listed at marble.kde.org. We are looking forward to your feedback!

") onLinkActivated: Qt.openUrlExternally(link) } Image { id: groupKonqi anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: Screen.pixelDensity * 3 anchors.rightMargin: Screen.pixelDensity * 2 height: groupText.height fillMode: Image.PreserveAspectFit source: "qrc:/konqi/group.png" } } Item { id: devItem Text { id: devText anchors.left: parent.left anchors.right: parent.right anchors.margins: Screen.pixelDensity * 1 wrapMode: Text.WrapAtWordBoundaryOrAnywhere text: qsTr("

Development Team

The main developers of this app are Dennis Nienhüser, Torsten Rahn, Sanjiban Bairagya, Friedrich W. H. Kossebau, Gábor Péterffy and Mikhail Ivchenko. They are part of more than 200 developers who already contributed to the Marble project.
Contact us via marble-devel@kde.org.

") onLinkActivated: Qt.openUrlExternally(link) } Image { id: devKonqi anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: Screen.pixelDensity * 3 anchors.rightMargin: Screen.pixelDensity * 2 height: devText.height fillMode: Image.PreserveAspectFit source: "qrc:/konqi/app-dev.png" } } Item { id: attributionItem Text { id: attributionText anchors.left: parent.left anchors.right: parent.right anchors.margins: Screen.pixelDensity * 1 anchors.leftMargin: Screen.pixelDensity * 2 wrapMode: Text.WrapAtWordBoundaryOrAnywhere width: parent.width - text: qsTr("

Attribution

The map is based on data from the OpenStreetMap project, available under the Open Database License. Additionally public domain data from the Natural Earth project is used. The map style is influenced by and uses icons from OpenStreetMap Carto (CC0 Public Domain).

") + text: qsTr("

Attribution

The map is based on data from the OpenStreetMap project, available under the Open Database License. Additionally public domain data from the Natural Earth project is used. The map style is influenced by and uses icons from OpenStreetMap Carto (CC0 Public Domain).

") onLinkActivated: Qt.openUrlExternally(link) } Image { id: devQtKonqi anchors.right: parent.right anchors.bottom: parent.bottom anchors.bottomMargin: Screen.pixelDensity * 3 anchors.rightMargin: Screen.pixelDensity * 2 height: attributionText.height fillMode: Image.PreserveAspectFit source: "qrc:/konqi/dev-qt.png" } } } PageIndicator { id: pageIndicator interactive: true count: tabView.count currentIndex: tabView.currentIndex anchors.bottom: parent.bottom anchors.horizontalCenter: parent.horizontalCenter } } } diff --git a/src/bindings/CMakeLists.txt b/src/bindings/CMakeLists.txt index 353b9f31d..b36ef37cd 100644 --- a/src/bindings/CMakeLists.txt +++ b/src/bindings/CMakeLists.txt @@ -1,68 +1,68 @@ if(EXPERIMENTAL_PYTHON_BINDINGS) MESSAGE(WARNING "Marble's Python bindings lack a maintainer and therefore had to be disabled. Do you need them? Please contact us at https://marble.kde.org/support.php") return() endif() find_package(ECM ${REQUIRED_ECM_VERSION} QUIET) if(NOT ECM_FOUND) return() endif() set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) include(KDEInstallDirs) macro_optional_find_package(KF5 ${REQUIRED_KF5_MIN_VERSION} QUIET COMPONENTS Wallet NewStuff Parts) if(NOT KF5_FOUND) return() endif() #### Python support #### set(PythonSupport_FOUND FALSE) set_package_properties(EXPERIMENTAL_PYTHON_BINDINGS PROPERTIES - URL "http://techbase.kde.org/Development/Languages/Python" + URL "https://techbase.kde.org/Development/Languages/Python" TYPE OPTIONAL PURPOSE "Experimental Python binding support for the Marble library. To activate it pass -DEXPERIMENTAL_PYTHON_BINDINGS=TRUE to cmake." ) if(EXPERIMENTAL_PYTHON_BINDINGS) macro_optional_find_package(PythonLibrary) macro_optional_find_package(SIP) if(SIP_FOUND AND SIP_VERSION STRLESS "040c02") message(STATUS "The version of SIP found is too old. 4.12.2 or later is needed.") set(SIP_FOUND) endif(SIP_FOUND AND SIP_VERSION STRLESS "040c02") include(SIPMacros) macro_optional_find_package(PyQt4) if(PYQT4BUILD AND PYQT4_VERSION STRLESS "040804") message(STATUS "The version of PyQt found is too old. 4.8.4 or later is required.") set(PYQT4BUILD) endif(PYQT4BUILD AND PYQT4_VERSION STRLESS "040804") set_package_properties(PYTHONQT4BUILD PROPERTIES - URL "http://www.riverbankcomputing.co.uk/software/pyqt/intro" + URL "https://riverbankcomputing.com/software/pyqt/intro" TYPE OPTIONAL PURPOSE "PyQt4" ) if (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4BUILD) set(PythonSupport_FOUND TRUE) endif (PYTHONLIBRARY_FOUND AND SIP_FOUND AND PYQT4BUILD) set_package_properties(PythonSupport_FOUND PROPERTIES - URL "http://techbase.kde.org/Development/Languages/Python" + URL "https://techbase.kde.org/Development/Languages/Python" TYPE OPTIONAL PURPOSE "Needed for Python bindings to the marble widget." ) endif(EXPERIMENTAL_PYTHON_BINDINGS) #### End Python support #### if(PythonSupport_FOUND) macro_optional_add_subdirectory(python) endif(PythonSupport_FOUND) diff --git a/src/lib/marble/GoToDialog.ui b/src/lib/marble/GoToDialog.ui index 447056235..54f212cd8 100644 --- a/src/lib/marble/GoToDialog.ui +++ b/src/lib/marble/GoToDialog.ui @@ -1,149 +1,149 @@ GoTo 0 0 368 269 Go To... 0 0 32 32 32 32 false true false true Qt::Vertical QDialogButtonBox::Close - Enter a search term and press Enter. <a href="http://userbase.kde.org/Marble/Search">Details...</a> + Enter a search term and press Enter. <a href="https://userbase.kde.org/Marble/Search">Details...</a> true true Browse true Search buttonBox accepted() GoTo accept() 248 254 157 274 buttonBox rejected() GoTo reject() 316 260 286 274 diff --git a/src/lib/marble/MapWizard.ui b/src/lib/marble/MapWizard.ui index 73e55ab69..047d9d1b8 100644 --- a/src/lib/marble/MapWizard.ui +++ b/src/lib/marble/MapWizard.ui @@ -1,633 +1,633 @@ MapWizard 0 0 600 392 600 392 Map Theme Creation Wizard QWizard::ClassicStyle 0 QFormLayout::ExpandingFieldsGrow <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Welcome to the Map Creation Wizard!</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">We will guide you through the process of creating a map theme for Marble. In the end you will have your own map that you can view in Marble.</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please choose the source that you want to use for the data of your map theme:</p> <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true Connects to a server on the Internet. The map data is queried via the WMS protocol. Web Map Service (WMS) true You need to provide a bitmap image of a world map that is stored on disk. A single image showing the whole world Connects to a server on the Internet. The map data is queried via a static URL. Online map providing indexed tiles (e.g. Open Street Map) <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">WMS Server</span></p> -<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please choose a <a href="http://en.wikipedia.org/wiki/Web_Map_Service"><span style=" text-decoration: underline; color:#0057ae;">WMS</span></a> server or enter a custom server URL.</p></body></html> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please choose a <a href="https://en.wikipedia.org/wiki/Web_Map_Service"><span style=" text-decoration: underline; color:#0057ae;">WMS</span></a> server or enter a custom server URL.</p></body></html> true Qt::Vertical 20 40 WMS Server: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter Custom URL: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - http:// + https:// Qt::Vertical 20 40 Available Maps: Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">World Map Bitmap Image</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-weight:600;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please choose the location of a world map that is stored in a single image file (JPG, PNG, etc.). It needs to be provided in <a href="http://en.wikipedia.org/wiki/Equirectangular_projection"><span style=" text-decoration: underline; color:#0057ae;">Equirectangular projection</span></a>, so the shape should look like this (size ratio: 2:1):</p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please choose the location of a world map that is stored in a single image file (JPG, PNG, etc.). It needs to be provided in <a href="https://en.wikipedia.org/wiki/Equirectangular_projection"><span style=" text-decoration: underline; color:#0057ae;">Equirectangular projection</span></a>, so the shape should look like this (size ratio: 2:1):</p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><img src=":/data/svg/worldmap.svg" width="150" /></p></body></html> true Source Image: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter lineEditSource ... Qt::Vertical 20 40 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-weight:600;">URL Scheme for Indexed Tiles</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Please enter the URL used for downloading individual tiles. Use the placeholders </span><span style=" font-family:'Sans Serif'; font-style:italic;">{x}</span><span style=" font-family:'Sans Serif';">, </span><span style=" font-family:'Sans Serif'; font-style:italic;">{y}</span><span style=" font-family:'Sans Serif';">, and </span><span style=" font-family:'Sans Serif'; font-style:italic;">{zoomLevel}</span><span style=" font-family:'Sans Serif';"> to reference a tile from the index.</span></p></body></html> true Qt::Vertical QSizePolicy::Fixed 20 5 QFormLayout::ExpandingFieldsGrow URL Scheme: 0 0 true Qt::Vertical 20 40 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Bitstream Vera Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-weight:600;">General Information</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif';">Please specify a title, a name and an icon for your new map. Add a description to let users know what your map is about. </span></p></body></html> true Map Title: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter lineEditTitle A short concise name for your map theme. Map Name: Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter The lowercase map theme id. The folder name of your new theme. Description: Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing textEditDesc A short description of your map theme. Here you can provide information about the purpose, origin, copyright and license of the data used in your map theme. It will appear in a tool tip and may contain HTML formatting. Preview Image: Qt::AlignRight|Qt::AlignTop|Qt::AlignTrailing 0 0 128 128 preview image Change... Qt::Horizontal 354 20 Legend Image: ... Places of Interest Populated Places Terrain Coordinate Grid Border Lines <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Summary</span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Congratulations! You have entered all the data that is necessary to create your map theme. Check the summary below carefully and press the &quot;Finish&quot; button to create the theme. </p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Please consider contributing the map theme back to the Marble community if the license and the terms of use allow for it.</p> <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"></p></body></html> true 75 true Map Name: Map name goes here. 75 true Map Theme: Map theme goes here. 75 true Preview Image: Thumbnail image goes here. Qt::AlignCenter Preview Map diff --git a/src/lib/marble/MarbleAboutDialog.ui b/src/lib/marble/MarbleAboutDialog.ui index 17c4c8cd2..7c3c8ef7c 100644 --- a/src/lib/marble/MarbleAboutDialog.ui +++ b/src/lib/marble/MarbleAboutDialog.ui @@ -1,241 +1,241 @@ MarbleAboutDialog 0 0 466 402 About Marble 9 9 Qt::Vertical QSizePolicy::Fixed 20 5 <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Marble Virtual Globe</span></p></body></html> Version Unknown Qt::Vertical QSizePolicy::Fixed 20 5 0 &About 6 9 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"></p> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">(c) 2007, The Marble Project</span></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt; font-style:italic;"></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">http://edu.kde.org/marble</span></p></body></html> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:9pt;">https://edu.kde.org/marble</span></p></body></html> true A&uthors 6 9 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"></p></body></html> true &Data 6 9 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:9pt;"></p></body></html> true &License Agreement 6 9 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p></body></html> Qt::Horizontal QDialogButtonBox::Close buttonBox accepted() MarbleAboutDialog accept() 248 254 157 274 buttonBox rejected() MarbleAboutDialog reject() 316 260 286 274 diff --git a/src/lib/marble/SunControlWidget.ui b/src/lib/marble/SunControlWidget.ui index 389329397..840e696f3 100644 --- a/src/lib/marble/SunControlWidget.ui +++ b/src/lib/marble/SunControlWidget.ui @@ -1,301 +1,301 @@ SunControlWidget 0 0 333 399 0 0 Sun Control S&un Shading true false Sha&dow true &Night Map Subsolar Point false - Display <a href="http://en.wikipedia.org/wiki/Subsolar_point">Subsolar Point</a> icon + Display <a href="https://en.wikipedia.org/wiki/Subsolar_point">Subsolar Point</a> icon true subSolarIconCheckBox Qt::Horizontal 125 20 - <b>Lock</b> map view to <a href="http://en.wikipedia.org/wiki/Subsolar_point">Subsolar Point</a>. + <b>Lock</b> map view to <a href="https://en.wikipedia.org/wiki/Subsolar_point">Subsolar Point</a>. true lockToSubSolarPointCheckBox Qt::Horizontal 75 20 Qt::Vertical QSizePolicy::Fixed 10 10 Qt::Horizontal QSizePolicy::Fixed 25 10 true 0 0 QLabel { background-color : #e85752; color : white; }" <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Attention: Panning the map is disabled now! </span></p> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Uncheck the &quot;Lock map view to Subsolar Point&quot; option to allow for viewing a different place on the globe again.</p></body></html> true 7 Qt::Horizontal QSizePolicy::Fixed 10 65 Qt::Vertical QSizePolicy::Fixed 20 5 Qt::Vertical QSizePolicy::Expanding 10 10 QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok lockToSubSolarPointCheckBox toggled(bool) lockWarningLabel setVisible(bool) 26 152 98 234 diff --git a/src/plasmarunner/plasma-runner-marble.desktop b/src/plasmarunner/plasma-runner-marble.desktop index 3e50a432b..a930e0625 100644 --- a/src/plasmarunner/plasma-runner-marble.desktop +++ b/src/plasmarunner/plasma-runner-marble.desktop @@ -1,101 +1,101 @@ [Desktop Entry] Name=OpenStreetMap with Marble Name[bg]=OpenStreetMap с Marble Name[bs]=OpenStreetMap sa Marble Name[ca]=OpenStreetMap amb el Marble Name[ca@valencia]=OpenStreetMap amb el Marble Name[cs]=OpenStreetMap v Marble Name[da]=OpenStreetMap med Marble Name[de]=OpenStreetMap mit Marble Name[el]=OpenStreetMap με το Marble Name[en_GB]=OpenStreetMap with Marble Name[eo]=OpenStreetMap per Marble Name[es]=OpenStreetMap con Marble Name[et]=OpenStreetMap Marbles Name[fi]=OpenStreetMap Marblessa Name[fr]=OpenStreetMap avec Marble Name[ga]=OpenStreetMap le Marble Name[gl]=OpenStreetMap con Marble Name[hu]=OpenStreetMap Marble-lel Name[it]=OpenStreetMap con Marble Name[kk]=Marble бен OpenStreetMap Name[km]=OpenStreetMap ដែល​មាន​ថ្ម​ម៉ាប Name[ko]=Marble에서 OpenStreetMap 사용 Name[lt]=OpenStreetMap su Marble Name[lv]=OpenStreetMap ar Marble Name[mr]=मार्बल बरोबर ओपनस्ट्रीटमेप Name[nb]=OpenStreetMap med Marble Name[nds]=OpenStreetMap mit Marble Name[nl]=OpenStreetMap met Marble Name[nn]=OpenStreetMap med Marble Name[pa]=ਮਾਰਬਲ ਨਾਲ ਓਪਨਸਟਰੀਟਮੈਪ Name[pl]=OpenStreetMap przy użyciu Marble Name[pt]=OpenStreetMap com o Marble Name[pt_BR]=OpenStreetMap com o Marble Name[ru]=OpenStreetMap с Marble Name[sk]=OpenStreetMap s Marble Name[sl]=OpenStreetMap z Marble Name[sv]=OpenStreetMap med Marble Name[tr]=OpenStreetMap ile Marble Name[uk]=OpenStreetMap за допомогою Marble Name[x-test]=xxOpenStreetMap with Marblexx Name[zh_CN]=Marble 的 OpenStreetMap Name[zh_TW]=Marble 的 OpenStreetMap 支援 Comment=Lookup places in OpenStreetMap with Marble Comment[bg]=Търсене по карта OpenStreetMap с Marble Comment[bs]=Traženje mjesta u OpenStreetMap sa Marble Comment[ca]=Cerca llocs de l'OpenStreetMaps amb el Marble Comment[ca@valencia]=Cerca llocs de l'OpenStreetMaps amb el Marble Comment[cs]=Vyhledávat místa v OpenStreetMap pomocí Marble Comment[da]=Slå steder op i OpenStreetMap med Marble Comment[de]=Orte in OpenStreetMap mit Marble nachschlagen Comment[el]=Αναζήτηση τοποθεσιών στο OpenStreetMap με το Marble Comment[en_GB]=Lookup places in OpenStreetMap with Marble Comment[eo]=Serĉi lokojn en OpenStreetMap per Marble Comment[es]=Buscar lugares en OpenStreetMap con Marble Comment[et]=Kohtade otsimine OpenStreetMapis Marblega Comment[fi]=Paikkojen etsiminen OpenStreetMapista Marblella Comment[fr]=Cherche des lieux sur OpenStreetMap avec Marble Comment[ga]=Aimsigh áiteanna in OpenStreetMap le Marble Comment[gl]=Consultar lugares en OpenStreetMap con Marble Comment[hu]=Helyek keresése az OpenStreetMapen a Marble-lel Comment[it]=Cerca località in OpenStreetMap con Marble Comment[kk]=Marble бен OpenStreetMap-та жерлерді қарау Comment[km]=រក​មើល​ខ្ទង់​នៅ​ក្នុង OpenStreetMap ដែល​មាន​ថ្ម​ម៉ាប Comment[ko]=Marble에서 OpenStreetMap으로 장소 검색 Comment[lt]=Ieškoti vietų OpenStreetMap su Marble Comment[lv]=Atrast vietas OpenStreetMap kartēs ar Marble Comment[mr]=मार्बल बरोबर ओपनस्ट्रीटमेप मध्ये जागा बघा Comment[nb]=Slå opp steder i OpenStreetMap med Marble Comment[nds]=Steden binnen OpenStreetMap mit Marble nakieken Comment[nl]=Plaatsen in OpenStreetMap met Marble opzoeken Comment[nn]=Slå opp stadar i OpenStreetMap med Marble Comment[pa]=ਮਾਰਬਲ ਨਾਲ ਓਪਨਸਟਰੀਟਮੈਪ ਵਿੱਚ ਥਾਵਾਂ ਲੱਭੋ Comment[pl]=Oglądaj miejsca w OpenStreetMap przy użyciu Marble Comment[pt]=Procurar locais no OpenStreetMap com o Marble Comment[pt_BR]=Procura locais no OpenStreetMap com o Marble Comment[ru]=Поиск мест на картах OpenStreetMap с помощью Marble Comment[sk]=Hľadať miesta v OpenStreetMap s Marble Comment[sl]=Z Marble si oglejte mesta na OpenStreetMap Comment[sv]=Slå upp platser i OpenStreetMap med Marble Comment[tr]=Marble ile konumları OpenStreetMap içinde arayın Comment[uk]=Пошук місць на картах OpenStreetMap за допомогою Marble Comment[x-test]=xxLookup places in OpenStreetMap with Marblexx Comment[zh_CN]=在 Marble 中搜索 OpenStreetMap 中的位置 Comment[zh_TW]=使用 Marble 在 OpenStreetMap 上尋找地方 Icon=marble Type=Service X-KDE-ServiceTypes=Plasma/Runner X-KDE-Library=plasma_runner_marble X-KDE-PluginInfo-Author=Friedrich W. H. Kossebau X-KDE-PluginInfo-Email=kossebau@kde.org X-KDE-PluginInfo-Name=marble X-KDE-PluginInfo-Version=0.1 -X-KDE-PluginInfo-Website=http://edu.kde.org/marble +X-KDE-PluginInfo-Website=https://edu.kde.org/marble X-KDE-PluginInfo-Depends= X-KDE-PluginInfo-License=LGPL X-KDE-PluginInfo-EnabledByDefault=true X-Plasma-AdvertiseSingleRunnerQueryMode=true diff --git a/src/plugins/positionprovider/CMakeLists.txt b/src/plugins/positionprovider/CMakeLists.txt index df66854b1..85591098e 100644 --- a/src/plugins/positionprovider/CMakeLists.txt +++ b/src/plugins/positionprovider/CMakeLists.txt @@ -1,32 +1,32 @@ ADD_SUBDIRECTORY( flightgear ) macro_optional_find_package(libgps) marble_set_package_properties( libgps PROPERTIES DESCRIPTION "communicating with the GPS daemon" ) -marble_set_package_properties( libgps PROPERTIES URL "http://catb.org/gpsd/" ) +marble_set_package_properties( libgps PROPERTIES URL "https://gpsd.gitlab.io/gpsd/index.html" ) marble_set_package_properties( libgps PROPERTIES TYPE OPTIONAL PURPOSE "position information via gpsd" ) IF(LIBGPS_FOUND) ADD_SUBDIRECTORY( gpsd ) ENDIF(LIBGPS_FOUND) find_package(Qt5 ${REQUIRED_QT_VERSION} COMPONENTS Positioning ) marble_set_package_properties( Qt5Positioning PROPERTIES DESCRIPTION "a collection of APIs and frameworks" ) -marble_set_package_properties( Qt5Positioning PROPERTIES URL "http://qt.digia.com/" ) +marble_set_package_properties( Qt5Positioning PROPERTIES URL "https://www.qt.io/developers/" ) marble_set_package_properties( Qt5Positioning PROPERTIES TYPE OPTIONAL PURPOSE "position information via Qt5Positioning" ) if(Qt5Positioning_FOUND) ADD_SUBDIRECTORY( qtpositioning ) endif() macro_optional_find_package(libwlocate) marble_set_package_properties( libwlocate PROPERTIES DESCRIPTION "WLAN-based geolocation" ) -marble_set_package_properties( libwlocate PROPERTIES URL "http://www.openwlanmap.org/" ) +marble_set_package_properties( libwlocate PROPERTIES URL "https://sourceforge.net/p/libwlocate/wiki/Home/" ) marble_set_package_properties( libwlocate PROPERTIES TYPE OPTIONAL PURPOSE "Position information based on neighboring WLAN networks" ) IF(LIBWLOCATE_FOUND) ADD_SUBDIRECTORY( wlocate ) ENDIF() # experimental implementation # ADD_SUBDIRECTORY( geoclue ) diff --git a/src/plugins/render/CMakeLists.txt b/src/plugins/render/CMakeLists.txt index 0da9208d3..cb559bcd6 100644 --- a/src/plugins/render/CMakeLists.txt +++ b/src/plugins/render/CMakeLists.txt @@ -1,54 +1,54 @@ # Example # add_subdirectory( test ) # Display a control or a screen box add_subdirectory( compass ) add_subdirectory( elevationprofilefloatitem ) # add_subdirectory( fileview ) add_subdirectory( gpsinfo ) add_subdirectory( license ) add_subdirectory( mapscale ) add_subdirectory( navigation ) add_subdirectory( overviewmap ) add_subdirectory( progress ) add_subdirectory( routing ) add_subdirectory( speedometer ) # Display geographical information on the map add_subdirectory( annotate ) add_subdirectory( crosshairs ) add_subdirectory( eclipses ) add_subdirectory( elevationprofilemarker ) add_subdirectory( graticule ) add_subdirectory( measure ) add_subdirectory( positionmarker ) add_subdirectory( atmosphere ) add_subdirectory( stars ) add_subdirectory( sun ) add_subdirectory( notes ) # Display online information add_subdirectory( earthquake ) add_subdirectory(foursquare) # Disabled for now until legal issues wrt to the API # and terms of service of opencaching are cleared up. #add_subdirectory( opencaching ) if(NOT MARBLE_NO_WEBKITWIDGETS) add_subdirectory( opendesktop ) add_subdirectory( photo ) endif() # add_subdirectory( panoramio ) add_subdirectory( postalcode ) add_subdirectory( satellites ) # add_subdirectory ( twitter ) if(NOT MARBLE_NO_WEBKITWIDGETS) add_subdirectory( wikipedia ) add_subdirectory( weather ) endif() find_package( Perl ) -marble_set_package_properties( Perl PROPERTIES URL "http://www.perl.org" ) +marble_set_package_properties( Perl PROPERTIES URL "https://www.perl.org" ) marble_set_package_properties( Perl PROPERTIES TYPE OPTIONAL PURPOSE "generation of sources in the APRS plugin" ) if( PERL_FOUND AND NOT CMAKE_SYSTEM_NAME STREQUAL Android) add_subdirectory( aprs ) endif() diff --git a/src/plugins/render/routing/RoutingConfigDialog.ui b/src/plugins/render/routing/RoutingConfigDialog.ui index 090660d59..45b85fa41 100644 --- a/src/plugins/render/routing/RoutingConfigDialog.ui +++ b/src/plugins/render/routing/RoutingConfigDialog.ui @@ -1,209 +1,209 @@ RoutingConfigDialog 0 0 332 139 Routing Configuration Audible Turn Instructions true Qt::Horizontal QSizePolicy::Fixed 30 20 Play a sound true Use this speaker false 0 0 - <a href="http://userbase.kde.org/Marble/CustomSpeakers">Get more speakers</a> + <a href="https://userbase.kde.org/Marble/CustomSpeakers">Get more speakers</a> Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter true Qt::Horizontal QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset buttonBox accepted() RoutingConfigDialog accept() 248 254 157 274 buttonBox rejected() RoutingConfigDialog reject() 316 260 286 274 voiceNavigationCheckBox toggled(bool) speakerComboBox setEnabled(bool) 80 20 130 51 voiceNavigationCheckBox toggled(bool) speakerRadioButton setEnabled(bool) 165 14 97 68 voiceNavigationCheckBox toggled(bool) soundRadioButton setEnabled(bool) 165 14 182 41 speakerComboBox currentIndexChanged(int) speakerRadioButton click() 238 68 94 68 diff --git a/src/plugins/render/satellites/SatellitesConfigDialog.ui b/src/plugins/render/satellites/SatellitesConfigDialog.ui index 270ee93dd..4a378451d 100644 --- a/src/plugins/render/satellites/SatellitesConfigDialog.ui +++ b/src/plugins/render/satellites/SatellitesConfigDialog.ui @@ -1,399 +1,399 @@ SatellitesConfigDialog 0 0 545 446 Satellites Configuration Qt::LeftToRight 2 &Satellites Qt::ScrollBarAsNeeded 25 &Data Sources 0 0 QLayout::SetNoConstraint 0 5 0 5 <html><head/><body><p><span style=" font-weight:600;">Last update:</span></p></body></html> - Qt::Horizontal 40 20 true &Reload All Data Sources Qt::Horizontal 0 Satellite Data Sources: Qt::Horizontal 40 20 Add a new data source (URL). + :/icons/bookmark-add-folder.png:/icons/bookmark-add-folder.png Open a new data source from disk. - :/icons/document-open.png:/icons/document-open.png false Remove selected data source. ... :/icons/bookmark-remove.png:/icons/bookmark-remove.png 50 false false true (Built-in Data Sources for Earth Satellites) 0 0 0 NoItemFlags 10 - <html><head/><body><p>Supported formats: <a href="http://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat"><span style=" text-decoration: underline; color:#0000ff;">Marble Satellite Catalogue</span></a>, <a href="http://en.wikipedia.org/wiki/Two-line_element_set"><span style=" text-decoration: underline; color:#0000ff;">Two-Line-Element Set</span></a></p></body></html> + <html><head/><body><p>Supported formats: <a href="https://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat"><span style=" text-decoration: underline; color:#0000ff;">Marble Satellite Catalogue</span></a>, <a href="https://en.wikipedia.org/wiki/Two-line_element_set"><span style=" text-decoration: underline; color:#0000ff;">Two-Line-Element Set</span></a></p></body></html> Qt::RichText Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter true true Qt::LeftToRight Plugin Inactive QLayout::SetNoConstraint Qt::Vertical QSizePolicy::Expanding 20 40 250 16777215 Qt::LeftToRight &Activate Plugin false Qt::Vertical QSizePolicy::Expanding 20 40 Configuration options not available since the plugin is disabled at the moment. Qt::AlignCenter true Qt::Vertical QSizePolicy::Fixed 20 20 Qt::Horizontal QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset buttonBox tabWidget treeView buttonBox accepted() SatellitesConfigDialog accept() 279 427 157 189 buttonBox rejected() SatellitesConfigDialog reject() 347 427 286 189 diff --git a/src/plugins/runner/mapquest/MapQuestConfigWidget.ui b/src/plugins/runner/mapquest/MapQuestConfigWidget.ui index 137d90fa7..7ffee1052 100644 --- a/src/plugins/runner/mapquest/MapQuestConfigWidget.ui +++ b/src/plugins/runner/mapquest/MapQuestConfigWidget.ui @@ -1,110 +1,110 @@ MapQuestConfigWidget 0 0 352 237 AppKey appKey Preference: preference Avoid motorways Avoid tollways Avoid ferries Ascending slope: ascending Descending slope: descending 0 0 - An AppKey is required for MapQuest routing to work. You can register one <a href="http://developer.mapquest.com/web/products/open">here</a>. + An AppKey is required for MapQuest routing to work. You can register one <a href="https://developer.mapquest.com/plan_purchase/steps/business_edition/business_edition_free/register">here</a>. true true