Commit 777c4b11 authored by Yuri Chornoivan's avatar Yuri Chornoivan
Browse files

Use URLs with transport encryption

parent fb4b2527
......@@ -354,7 +354,7 @@ marble_install_po_files_as_qm(poqm)
# 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
......
......@@ -15,7 +15,7 @@ XmlListModel {
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
......
......@@ -11,37 +11,37 @@ 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
}
}
......@@ -43,7 +43,7 @@ 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 )
......
......@@ -208,9 +208,9 @@ Item {
text: qsTr("<h3>Germanisches Nationalmuseum</h3>\
<p>The original Behaim globe can be visited in the
<a href=\"http://www.gnm.de/\">Germanisches Nationalmuseum</a> in Nuremberg, Germany.</p>\
<a href=\"https://www.gnm.de/\">Germanisches Nationalmuseum</a> in Nuremberg, Germany.</p>\
<h3>KDE Marble</h3>\
<p>This app is part of the <a href=\"http://marble.kde.org\">Marble</a> project.\
<p>This app is part of the <a href=\"https://marble.kde.org\">Marble</a> project.\
The Marble community works on maps and virtual globes with the goal to produce visually appealing, easy-to-use Free Software.</p>\
<h3>Map Content</h3>\
<p>Digitized map based on orthophotographic gores by TU Vienna, 1990. Germanisches Nationalmuseum and\
......
......@@ -265,9 +265,9 @@ Kirigami.ApplicationWindow {
}
text: qsTr("<h3>Germanisches Nationalmuseum</h3>\
<p>The original Behaim globe can be visited in the
<a href=\"http://www.gnm.de/\">Germanisches Nationalmuseum</a> in Nuremberg, Germany.</p>\
<a href=\"https://www.gnm.de/\">Germanisches Nationalmuseum</a> in Nuremberg, Germany.</p>\
<h3>KDE Marble</h3>\
<p>This app is part of the <a href=\"http://marble.kde.org\">Marble</a> project.\
<p>This app is part of the <a href=\"https://marble.kde.org\">Marble</a> project.\
The Marble community works on maps and virtual globes with the goal to produce visually appealing, easy-to-use Free Software.</p>\
<h3>Map Content</h3>\
<p>Digitized map based on orthophotographic gores by TU Vienna, 1990. Germanisches Nationalmuseum and\
......
......@@ -118,7 +118,7 @@ Kirigami.Page {
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
width: parent.width
text: qsTr("<h3>Attribution</h3><p>The map is based on data from the <a href=\"https://www.openstreetmap.org\">OpenStreetMap</a> project, available under the <a href=\"http://opendatacommons.org/licenses/odbl/\">Open Database License</a>. Additionally public domain data from the <a href=\"http://www.naturalearthdata.com/\">Natural Earth</a> project is used. The map style is influenced by and uses icons from <a href=\"https://github.com/gravitystorm/openstreetmap-carto\">OpenStreetMap Carto</a> (<a href=\"http://creativecommons.org/publicdomain/zero/1.0/\">CC0 Public Domain)</a>.</p>")
text: qsTr("<h3>Attribution</h3><p>The map is based on data from the <a href=\"https://www.openstreetmap.org\">OpenStreetMap</a> project, available under the <a href=\"https://opendatacommons.org/licenses/odbl/\">Open Database License</a>. Additionally public domain data from the <a href=\"https://www.naturalearthdata.com/\">Natural Earth</a> project is used. The map style is influenced by and uses icons from <a href=\"https://github.com/gravitystorm/openstreetmap-carto\">OpenStreetMap Carto</a> (<a href=\"https://creativecommons.org/publicdomain/zero/1.0/\">CC0 Public Domain)</a>.</p>")
onLinkActivated: Qt.openUrlExternally(link)
}
......
......@@ -22,7 +22,7 @@ endif()
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."
)
......@@ -44,7 +44,7 @@ if(EXPERIMENTAL_PYTHON_BINDINGS)
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"
)
......@@ -54,7 +54,7 @@ if(EXPERIMENTAL_PYTHON_BINDINGS)
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."
)
......
......@@ -75,7 +75,7 @@
<item row="2" column="0">
<widget class="QLabel" name="descriptionLabel">
<property name="text">
<string>Enter a search term and press Enter. &lt;a href=&quot;http://userbase.kde.org/Marble/Search&quot;&gt;Details...&lt;/a&gt;</string>
<string>Enter a search term and press Enter. &lt;a href=&quot;https://userbase.kde.org/Marble/Search&quot;&gt;Details...&lt;/a&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
......
......@@ -96,7 +96,7 @@ p, li { white-space: pre-wrap; }
p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;WMS Server&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please choose a &lt;a href=&quot;http://en.wikipedia.org/wiki/Web_Map_Service&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;WMS&lt;/span&gt;&lt;/a&gt; server or enter a custom server URL.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Please choose a &lt;a href=&quot;https://en.wikipedia.org/wiki/Web_Map_Service&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;WMS&lt;/span&gt;&lt;/a&gt; server or enter a custom server URL.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
<bool>true</bool>
......@@ -150,7 +150,7 @@ p, li { white-space: pre-wrap; }
<item row="1" column="1">
<widget class="QLineEdit" name="lineEditWmsUrl">
<property name="text">
<string>http://</string>
<string>https://</string>
</property>
</widget>
</item>
......@@ -199,7 +199,7 @@ p, li { white-space: pre-wrap; }
&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;&quot;&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;World Map Bitmap Image&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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 &lt;a href=&quot;http://en.wikipedia.org/wiki/Equirectangular_projection&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;Equirectangular projection&lt;/span&gt;&lt;/a&gt;, so the shape should look like this (size ratio: 2:1):&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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 &lt;a href=&quot;https://en.wikipedia.org/wiki/Equirectangular_projection&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0057ae;&quot;&gt;Equirectangular projection&lt;/span&gt;&lt;/a&gt;, so the shape should look like this (size ratio: 2:1):&lt;/p&gt;
&lt;p style=&quot; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;img src=&quot;:/data/svg/worldmap.svg&quot; width=&quot;150&quot; /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="wordWrap">
......
......@@ -102,7 +102,7 @@ p, li { white-space: pre-wrap; }
&lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;(c) 2007, The Marble Project&lt;/span&gt;&lt;/p&gt;
&lt;p style=&quot;-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;&quot;&gt;&lt;/p&gt;
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;http://edu.kde.org/marble&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-size:9pt;&quot;&gt;https://edu.kde.org/marble&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
......
......@@ -85,7 +85,7 @@
<string extracomment="Mark the point on the globe where the sun crosses the zenith during noon and doesn't cast a shadow."/>
</property>
<property name="text">
<string>Display &lt;a href=&quot;http://en.wikipedia.org/wiki/Subsolar_point&quot;&gt;Subsolar Point&lt;/a&gt; icon</string>
<string>Display &lt;a href=&quot;https://en.wikipedia.org/wiki/Subsolar_point&quot;&gt;Subsolar Point&lt;/a&gt; icon</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
......@@ -128,7 +128,7 @@
<string extracomment="Lock the globe so that only the daytime hemisphere is shown."/>
</property>
<property name="text">
<string>&lt;b&gt;Lock&lt;/b&gt; map view to &lt;a href=&quot;http://en.wikipedia.org/wiki/Subsolar_point&quot;&gt;Subsolar Point&lt;/a&gt;.</string>
<string>&lt;b&gt;Lock&lt;/b&gt; map view to &lt;a href=&quot;https://en.wikipedia.org/wiki/Subsolar_point&quot;&gt;Subsolar Point&lt;/a&gt;.</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
......
......@@ -93,7 +93,7 @@ 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
......
......@@ -2,7 +2,7 @@ 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 )
......@@ -13,7 +13,7 @@ find_package(Qt5 ${REQUIRED_QT_VERSION}
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 )
......@@ -22,7 +22,7 @@ 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 )
......
......@@ -47,7 +47,7 @@ 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 )
......
......@@ -85,7 +85,7 @@
<item>
<widget class="QLabel" name="label_2">
<property name="text">
<string>&lt;a href=&quot;http://userbase.kde.org/Marble/CustomSpeakers&quot;&gt;Get more speakers&lt;/a&gt;</string>
<string>&lt;a href=&quot;https://userbase.kde.org/Marble/CustomSpeakers&quot;&gt;Get more speakers&lt;/a&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
......
......@@ -229,7 +229,7 @@
</font>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Supported formats: &lt;a href=&quot;http://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Marble Satellite Catalogue&lt;/span&gt;&lt;/a&gt;, &lt;a href=&quot;http://en.wikipedia.org/wiki/Two-line_element_set&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Two-Line-Element Set&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Supported formats: &lt;a href=&quot;https://techbase.kde.org/Projects/Marble/SatelliteCatalogFormat&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Marble Satellite Catalogue&lt;/span&gt;&lt;/a&gt;, &lt;a href=&quot;https://en.wikipedia.org/wiki/Two-line_element_set&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;Two-Line-Element Set&lt;/span&gt;&lt;/a&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="textFormat">
<enum>Qt::RichText</enum>
......
......@@ -93,7 +93,7 @@
</sizepolicy>
</property>
<property name="text">
<string>An AppKey is required for MapQuest routing to work. You can register one &lt;a href=&quot;http://developer.mapquest.com/web/products/open&quot;&gt;here&lt;/a&gt;.</string>
<string>An AppKey is required for MapQuest routing to work. You can register one &lt;a href=&quot;https://developer.mapquest.com/plan_purchase/steps/business_edition/business_edition_free/register&quot;&gt;here&lt;/a&gt;.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment