Skip to content
GitLab
Commit c9bf0b77 authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Remove unused marble-touch and QML 1 relicts from declarative library 

Might still be useful to implement some stuff in marble-maps, but
having it in git history seems enough for now.
parent f8c0c191
Hide whitespace changes
Inline Side-by-side
src/apps/CMakeLists.txt
View file @ c9bf0b77
......@@ -4,9 +4,6 @@ if(BUILD_MARBLE_APPS)
add_subdirectory(marble-ui)
add_subdirectory(marble-qt)
add_subdirectory(marble-kde)
if( Qt5Quick_FOUND )
add_subdirectory(marble-touch)
endif( Qt5Quick_FOUND )
endif()
add_subdirectory(behaim)
......
src/apps/marble-touch/AboutMarblePage.qml deleted 100644 → 0
View file @ f8c0c191
// 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 2011 Dennis Nienhüser <nienhueser@kde.org>
import QtQuick 2.3
import org.kde.edu.marble 0.20
import QtQuick.Controls 1.4
import QtQuick.Layouts 1.2
/*
* Page for geocaching activity.
*/
Item {
id: geocachingActivityPage
anchors.fill: parent
RowLayout {
id: toolBar
anchors.fill: parent
ToolButton {
text: "Home"
onClicked: activitySelection.showActivities()
}
}
MarbleTouch { id: project }
Rectangle {
anchors.fill: parent
color: "white"
}
Flickable {
id: pageContent
anchors.fill: parent
contentHeight: contentColumn.height
clip: true
Column {
id: contentColumn
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 10
anchors.rightMargin: 20
spacing: 12
Image {
source: "qrc:/../../../data/svg/marble-logo.svg"
anchors.horizontalCenter: parent.horizontalCenter
}
Label {
text: "Find your way and explore the world with Marble"
font.pixelSize: 20
width: parent.width
horizontalAlignment: Text.AlignHCenter
}
Label {
text: "<p>This is Marble Touch <b>version " + project.version + " (" + project.status + ")</b>. Marble is a Virtual Globe and World Atlas. It is part of the KDE Software Compilation and distributed under the terms of the LGPL, Version 2. Marble is Open Source; we create free source code and endorse free maps and free data. Please visit the <a href=\"http://edu.kde.org/marble\">Marble website</a> for further information.</p>"
font.pixelSize: 16
width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
horizontalAlignment: Text.AlignJustify
onLinkActivated: Qt.openUrlExternally(link)
}
Label {
text: "<p>&copy; 2007-2011 by the authors of Marble Virtual Globe. Please report bugs and file feature requests at <a href=\"https://bugs.kde.org/enter_bug.cgi?product=marble&rep_platform=Meego/Harmattan\">bugs.kde.org</a>. We're looking forward to your feedback! You can reach the developers of the Marble project at <a href=\"mailto:\"marble-devel@kde.org\">marble-devel@kde.org</a>.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
onLinkActivated: Qt.openUrlExternally(link)
}
Label {
text: "Changelog"
font.pixelSize: 20
width: parent.width
horizontalAlignment: Text.AlignHCenter
}
Column {
spacing: 5
Repeater {
model: project.changelog
Row {
id: changelogRow
spacing: 10
Label {
id: versionLabel
font.pixelSize: 16
text: "Version " + version
}
Label {
font.pixelSize: 16
text: summary;
width: contentColumn.width - versionLabel.width - changelogRow.spacing
}
}
}
}
Label {
text: "Authors"
font.pixelSize: 20
width: parent.width
horizontalAlignment: Text.AlignHCenter
}
Label {
text: "<p><i>Active Development Team of Marble</i>: Torsten Rahn (Developer and Original Author), Bernhard Beschow (WMS Support, Mobile, Performance), Thibaut Gridel (Geodata), Jens-Michael Hoffmann (OpenStreetMap Support, Download Management), Florian Eßer (Elevation Profile), Wes Hardaker (Amateur Radio Support), Bastian Holst (Online Services Support), Guillaume Martres (Satellites), Friedrich W. H. Kossebau (Plasma Integration, Bugfixes), Dennis Nienhüser (Routing, Navigation, Mobile), Niko Sams (Routing, Elevation Profile), Patrick Spendrin (KML and Windows Support), Eckhart Wörner (Bugfixes).</p>"
font.pixelSize: 16
width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
horizontalAlignment: Text.AlignJustify
}
Label {
text: "<p><i>Developers</i>: Médéric Boquien (Astronomical Observatories), Harshit Jain (Planet Filter, Bugfixes), Andrew Manson (Proxy Support), Pino Toscano (Network plugins), Henry de Valence (Marble Runners, World-Clock Plasmoid), Magnus Valle (Historical Maps), Inge Wallin (Original Co-Maintainer).</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p><i>Development and Patches:</i>: Simon Schmeisser, Claudiu Covaci, David Roberts, Nikolas Zimmermann, Jan Becker, Stefan Asserhäll, Laurent Montel, Prashanth Udupa, Anne-Marie Mahfouf, Josef Spillner, Frerich Raabe, Frederik Gladhorn, Fredrik Höglund, Albert Astals Cid, Thomas Zander, Joseph Wenninger, Kris Thomsen, Daniel Molkentin.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p><i>Platforms and Distributions</i>: Tim Sutton, Christian Ehrlicher, Ralf Habacker, Steffen Joeris, Marcus Czeslinski, Marcus D. Hanwell, Chitlesh Goorah, Sebastian Wiedenroth, Christophe Leske.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p><i>Artwork</i>: Nuno Pinheiro, Torsten Rahn.</p>"
font.pixelSize: 16
width: parent.width
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p><i>Various Suggestions and Testing</i>: Stefan Jordan, Robert Scott, Lubos Petrovic, Benoit Sigoure, Martin Konold, Matthias Welwarsky, Rainer Endres, Luis Silva, Ralf Gesellensetter, Tim Alder.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p><i>Student programs (GSOC, GCI, SOCIS)</i>: Guillaume Martres, Utku Aydın, Daniel Marth, Cezar Mocan, Furkan Üzümcü, Konstantin Oblaukhov, Daniel Marth, Gaurav Gupta, Harshit Jain, Siddharth Srivastava, Andrew Manson, Bastian Holst. Patrick Spendrin, Shashank Singh, Carlos Licea, Andrew Manson, Murad Tagirov. And of course we'd like to thank the people at Google and ESA for making these projects possible.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p>We'd especially like to thank John Layt who provided an important source of inspiration by creating Marble's predecessor \"Kartographer\".</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "Data"
font.pixelSize: 20
width: parent.width
horizontalAlignment: Text.AlignHCenter
}
Label {
text: "<p>Maps: Blue Marble Next Generation (500 m / pixel). NASA Goddard Space Flight Center Earth Observatory http://earthobservatory.nasa.gov/Newsroom/BlueMarble/. Earth's City Lights. Data courtesy Marc Imhoff of NASA GSFC and Christopher Elvidge of NOAA NGDC. Image by Craig Mayhew and Robert Simmon, NASA GSFC. Shuttle Radar Topography Mission (SRTM30, 1 km / pixel ). NASA Jet Propulsion Laboratory http://www2.jpl.nasa.gov/srtm/. Micro World Data Bank in Polygons (\"MWDB-POLY / MWDBII\"). CIA ; Global Associates, Ltd.; Fred Pospeschil and Antonio Rivera. Temperature and Precipitation Maps (July and December). A combination of two datasets: Legates, D.R. and Willmott, C.J. 1989. Average Monthly Surface Air Temperature and Precipitation. Digital Raster Data on a .5 degree Geographic (lat/long) 361x721 grid (centroid-registered on .5 degree meridians). Boulder CO: National Center for Atmospheric Research. http://www.ngdc.noaa.gov/ecosys/cdroms/ged_iia/datasets/a04/lw.htm. CRU CL 2.0: New, M., Lister, D., Hulme, M. and Makin, I., 2002: A high-resolution data set of surface climate over global land areas. Climate Research 21.http://www.cru.uea.ac.uk/cru/data/hrg.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p>Street Maps. OpenStreetMap. The street maps used in Marble via download are provided by the OpenStreetMap Project (\"OSM\"). OSM is an open community which creates free editable maps. License: OpenStreetMap data can be used freely under the terms of the Creative Commons Attribution-ShareAlike 2.0 license. Icons. Some icons are taken from SJJB Management and NounProject. These icons can be used freely under the terms of the CC0 1.0 Universal license. OpenRouteService. Some of the routes used in Marble via download are provided by the OpenRouteService Project (\"ORS\"). License: OpenRouteService data can be used freely under the terms of the Creative Commons Attribution-ShareAlike 2.0 license. Open Source Routing Machine. Some of the routes used in Marble via download are provided by the Open Source Routing Machine Project (\"OSRM\"). License: Open Source Routing Machine data can be used freely under the terms of the Creative Commons Attribution-ShareAlike 2.0 license. MapQuest. Some of the routes used in Marble via download are provided by MapQuest (www.mapquest.com) and their Open Data Map APIs and Web Services. Directions courtesy of MapQuest working on OpenStreetMap data that can be used freely under the terms of the Creative Commons Attribution-ShareAlike 2.0 license. Usage of the MapQuest routing service is subject to the MapQuest terms of use (http://info.mapquest.com/terms-of-use/).</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p>Cities and Locations. World Gazetteer. Stefan Helders http://www.world-gazetteer.com. Geonames.org. http://www.geonames.org/License: Geonames.org data can be used freely under the terms of the Creative Commons Attribution 3.0 license. Czech Statistical Office. Public database http://www.czso.cz.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p>Flags. Flags of the World. The flags were taken from Wikipedia (http://www.wikipedia.org) which in turn took a subset from http://www.openclipart.org and reworked them. All flags are under the public domain (see comments inside the svg files).</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
Label {
text: "<p>Stars. The Bright Star Catalogue. 5th Revised Ed. (Preliminary Version) Hoffleit D., Warren Jr W.H., Astronomical Data Center, NSSDC/ADC (1991) http://adc.gsfc.nasa.gov.</p>"
font.pixelSize: 16
width: parent.width
horizontalAlignment: Text.AlignJustify
wrapMode: Text.WrapAtWordBoundaryOrAnywhere
}
}
}
Component.onCompleted: {
settings.changelogShown = project.version
mainWindow.toolBar.replaceWith(toolBar)
}
}
src/apps/marble-touch/ActivitySelectionView.qml deleted 100644 → 0
View file @ f8c0c191
// 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 2011 Dennis Nienhüser <nienhueser@kde.org>
// Copyright 2011 Daniel Marth <danielmarth@gmx.at>
import QtQuick 2.3
import org.kde.edu.marble 0.20
/*
* Page to select activity. This component also contains the model for
* the activities, which stores all relevant information.
*/
Item {
id: activityPage
Item {
id: pageContainer
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: changelog.visible ? changelog.top : parent.bottom
visible: true
Rectangle {
anchors.fill: parent
color: "black"
}
Loader {
id: pageLoader
anchors.fill: parent
}
}
property alias model: activityView.model
property bool shown: false
signal itemSelected
Loader {
id: lazyLoader
}
Image {
anchors.bottom: parent.bottom
anchors.right: parent.right
anchors.margins: 20
source: "qrc:/marble/globe.svg"
smooth: true
width: 360
height: 360
opacity: 0.1
}
// Grid view to display images and names of activities.
ListView {
id: activityView
currentIndex: -1
anchors.top: parent.top
anchors.topMargin: 4
anchors.left: parent.left
anchors.right: parent.right
anchors.bottom: changelog.visible ? changelog.top : parent.bottom
//anchors.margins: 9
//anchors.leftMargin: 2
model: activityModel
focus: true
clip: true
spacing: 3
width: parent.width
height: parent.height
delegate:
Item {
id: delegateItem
property bool mouseOver: mouseTracker.containsMouse
width: activityView.width
height: 47
Rectangle {
color: delegateItem.mouseOver ? "#dddddd" : "white"
radius: 10
anchors.fill: parent
Row {
anchors.verticalCenter: parent.verticalCenter
spacing: 5
width: 140
height: parent.height
smooth: true
Item {
width: 2
height: parent.height
}
Image {
id: activityImage
anchors.verticalCenter: parent.verticalCenter
height: 36
width: height
source: imagePath
smooth: true
}
Text {
anchors.verticalCenter: parent.verticalCenter
color: delegateItem.mouseOver ? "#111111" : "black"
text: name
width: 180
font.bold: true
}
}
MouseArea {
id: mouseTracker
anchors.fill: parent
hoverEnabled: true
}
}
MouseArea {
anchors.fill: parent
onClicked: {
activityPage.itemSelected()
activityPage.openActivity( name, path )
}
}
}
}
Text {
id: changelog
anchors.bottom: parent.bottom
anchors.left: parent.left
anchors.right: parent.right
anchors.margins: 10
font.pixelSize: 16
visible: settings.changelogShown !== project.version
color: "white"
text: "New in version " + project.changelog.get(0).version + ": " + project.changelog.get(0).summary
MarbleTouch { id: project }
MouseArea {
anchors.fill: parent
onClicked: openActivity( "qrc:/AboutMarblePage.qml" )
}
}
// Model that stores information about activities.
ListModel {
id: activityModel
property string configureIcon: main.icon( "actions/configure", 48 );
ListElement {
name: "Virtual Globe"
imagePath: "qrc:/icons/activity-virtualglobe.png"
path: "qrc:/activities/VirtualGlobe.qml"
}
ListElement {
name: "Search"
imagePath: "qrc:/icons/activity-search.png"
path: "qrc:/activities/Search.qml"
}
ListElement {
name: "Routing"
imagePath: "qrc:/icons/activity-routing.png"
path: "qrc:/activities/Routing.qml"
}
ListElement {
name: "Tracking"
imagePath: "qrc:/icons/activity-tracking.png"
path: "qrc:/activities/Tracking.qml"
}
ListElement {
name: "Navigation"
imagePath: "qrc:/icons/activity-navigation.png"
path: "qrc:/activities/Navigation.qml"
}
ListElement {
name: "Weather"
imagePath: "qrc:/icons/activity-weather.png"
path: "qrc:/activities/Weather.qml"
}
ListElement {
name: "Community"
imagePath: "qrc:/icons/activity-friends.png"
path: "qrc:/activities/Friends.qml"
}
ListElement {
name: "Space View"
imagePath: "qrc:/icons/activity-spaceview.png"
path: "qrc:/activities/SpaceView.qml"
}
ListElement {
name: "Explore"
imagePath: "qrc:/icons/activity-explore.png"
path: "qrc:/activities/Explore.qml"
}
ListElement {
name: "Info"
imagePath: "qrc:/icons/information.png"
path: "qrc:/AboutMarblePage.qml"
}
ListElement {
name: "Preferences"
imagePath: "qrc:/icons/preferences.png"
path: "qrc:/PreferencesPage.qml"
}
}
function openActivity( name ) {
for ( var i=0; i<activityModel.count; i++ ) {
if ( activityModel.get(i).name === name ) {
switchTo( name, activityModel.get(i).path )
return
}
}
}
function showActivities()
{
pageContainer.visible = false
pageLoader.source = ""
activityView.visible = true
activityPage.shown = true
}
function switchTo( name, path ) {
if ( marbleWidget === null ) {
lazyLoader.source = "qrc:/MainWidget.qml";
marbleWidget = lazyLoader.item
}
settings.lastActivity = name
//pageStack.replace( path, undefined, true )
pageLoader.source = path
pageContainer.visible = true
activityView.visible = false
activityPage.shown = false
}
Timer {
id: loadTimer
interval: 50; running: false; repeat: false
onTriggered: activityPage.initialize()
}
function initializeDelayed() {
if ( marbleWidget === null ) {
loadTimer.running = true
}
}
function initialize() {
if ( marbleWidget === null ) {
lazyLoader.source = "qrc:/MainWidget.qml";
marbleWidget = lazyLoader.item
}
}
}
src/apps/marble-touch/CMakeLists.txt deleted 100644 → 0
View file @ f8c0c191
PROJECT( marble-touch )
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
)
set( my_SRCS
main.cpp
)
FILE (GLOB QML_FILES *.qml activities/*.qml)
marble_add_project_resources(${QML_FILES})
qt_add_resources(my_SRCS meego.qrc)
add_executable( marble-touch ${my_SRCS} )
target_link_libraries (
marble-touch
Qt5::Widgets
Qt5::Network
Qt5::WebKitWidgets
${MARBLEWIDGET}
marbledeclarative
)
src/apps/marble-touch/CloudSyncPage.qml deleted 100644 → 0
View file @ f8c0c191
// 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 2013 Andrei Duma <andrei.duma.dorian@gmail.com>
import QtQuick 2.3
import QtMultimediaKit 1.1
import com.nokia.meego 1.0
import org.kde.edu.marble 0.20
Page {
id: cloudSyncPage
tools: ToolBarLayout {
MarbleToolIcon {
iconSource: main.icon( "actions/go-previous-view", 48 );
onClicked: pageStack.pop()
}
}
Row {
id: syncSetting
anchors.top: parent.top
anchors.left: parent.left
anchors.margins: 10
Label {
id: syncLabel
width: 142
text: "Sync:"
anchors.verticalCenter: parent.verticalCenter
}
Switch {
id: syncSwitch
checked: settings.owncloudSync
anchors.verticalCenter: parent.verticalCenter
onCheckedChanged: settings.owncloudSync = checked
}
}
Rectangle {
width: parent.width
anchors.left: parent.left
anchors.top: syncSetting.bottom
anchors.right: parent.right
anchors.margins: 10
Column {
id: labelsColumn
width: 140
spacing: 35
anchors.top: parent.top
anchors.topMargin: 12
Label {
text: "Server:"
}
Label {
text: "Username:"
}
Label {
text: "Password:"
}
}
Column {
anchors.left: labelsColumn.