|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/positionprovider/placemark
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/positionprovider/placemark/CMakeLists.txt
^
|
| @@ -1,12 +0,0 @@
-PROJECT( PlacemarkPositionProviderPlugin )
-
-INCLUDE_DIRECTORIES(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set( placemark_SRCS
- PlacemarkPositionProviderPlugin.cpp
-)
-
-marble_add_plugin( PlacemarkPositionProviderPlugin ${placemark_SRCS} )
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/positionprovider/routesimulation
^
|
| -(directory)
|
|
[-]
[+]
|
Deleted |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/positionprovider/routesimulation/CMakeLists.txt
^
|
| @@ -1,12 +0,0 @@
-PROJECT( RouteSimulationPositionProviderPlugin )
-
-INCLUDE_DIRECTORIES(
- ${CMAKE_CURRENT_SOURCE_DIR}
- ${CMAKE_CURRENT_BINARY_DIR}
-)
-
-set( the_SRCS
- RouteSimulationPositionProviderPlugin.cpp
-)
-
-marble_add_plugin( RouteSimulationPositionProviderPlugin ${the_SRCS} )
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/data/CMakeLists.txt
^
|
| @@ -266,10 +266,16 @@
add_subdirectory(lang)
-# shared-mime-info 0.40 is mandatory for generic-icon
-set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" )
-find_package( SharedMimeInfo QUIET )
-IF( SHAREDMIMEINFO_FOUND )
- install( FILES mimetypes/geo.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
- update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
-ENDIF()
+set(KDE_SKIP_UNINSTALL_TARGET ON CACHE BOOL "KDE uninstall target must be disabled")
+find_package(ECM QUIET) # for FindSharedMimeInfo
+set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH})
+if(ECM_FOUND)
+ include(KDEInstallDirs) # for XDG_MIME_INSTALL_DIR
+ # shared-mime-info 0.40 is mandatory for generic-icon
+ set( SHARED_MIME_INFO_MINIMUM_VERSION "0.40" )
+ find_package( SharedMimeInfo QUIET )
+ IF( SHAREDMIMEINFO_FOUND )
+ install( FILES mimetypes/geo.xml DESTINATION ${XDG_MIME_INSTALL_DIR} )
+ update_xdg_mimetypes( ${XDG_MIME_INSTALL_DIR} )
+ ENDIF()
+endif()
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-kde/kdemain.cpp
^
|
| @@ -266,6 +266,7 @@
QApplication app( argc, argv );
KAboutData::setApplicationData(aboutData);
+ QApplication::setWindowIcon(QIcon::fromTheme(QStringLiteral("marble")));
QCommandLineParser parser;
parser.addHelpOption();
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-kde/marble.desktop
^
|
| @@ -66,6 +66,7 @@
Comment[ast]=Navegación y mapes
Comment[ca]=Navegació i mapes
Comment[ca@valencia]=Navegació i mapes
+Comment[cs]=Navigace a mapy
Comment[da]=Navigation og kort
Comment[de]=Navigation und Karten
Comment[en_GB]=Navigation and Maps
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-maps-sailfishos/CircularButton.qml
^
|
| @@ -38,14 +38,6 @@
verticalCenter: root.verticalCenter
}
- Text {
- id: text
- anchors.fill: parent
- horizontalAlignment: Text.AlignHCenter
- verticalAlignment: Text.AlignVCenter
- color: palette.buttonText
- }
-
Image {
id: icon
anchors {
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-maps-sailfishos/RouteEditor.qml
^
|
| @@ -81,6 +81,9 @@
contentHeight: Theme.itemSizeExtraSmall
highlighted: down || waypointList.currentIndex === index
menu: contextMenu
+ ListView.onAdd: AddAnimation {
+ target: listItem
+ }
ListView.onRemove: animateRemoval(listItem)
function remove() {
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-maps/MainScreen.qml
^
|
| @@ -120,7 +120,6 @@
id: routing
anchors.fill: parent
marbleItem: marbleMaps
- selectedPlacemark: search.searchResultPlacemark
routingProfile: routeEditor.routingProfile
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-maps/RoutingManager.qml
^
|
| @@ -16,7 +16,6 @@
id: root
property var marbleItem: null
- property var selectedPlacemark: null
marbleMap: marbleItem.marbleMap
waypointDelegate: Waypoint {visible: false}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/apps/marble-qt/marble-qt.desktop
^
|
| @@ -99,6 +99,7 @@
Comment[ast]=Navegación y mapes
Comment[ca]=Navegació i mapes
Comment[ca@valencia]=Navegació i mapes
+Comment[cs]=Navigace a mapy
Comment[da]=Navigation og kort
Comment[de]=Navigation und Karten
Comment[en_GB]=Navigation and Maps
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/plugins/runner/json/marble_thumbnail_geojson.desktop
^
|
| @@ -3,6 +3,7 @@
Name=GeoJSON Geographic Data
Name[ca]=Dades geogràfiques GeoJSON
Name[ca@valencia]=Dades geogràfiques GeoJSON
+Name[cs]=Zeměpisná data GeoJSON
Name[de]=GeoJSON-Geografiedaten
Name[en_GB]=GeoJSON Geographic Data
Name[es]=Datos geográficos GeoJSON
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/plugins/runner/kml/marble_thumbnail_kmz.desktop
^
|
| @@ -6,6 +6,7 @@
Name[bs]=KML geografski kompresovani podaci
Name[ca]=Dades geogràfiques comprimides KML
Name[ca@valencia]=Dades geogràfiques comprimides KML
+Name[cs]=Komprimovaná zeměpisná data KML
Name[da]=KML geografiske komprimerede data
Name[de]=KML-Geografiedaten (komprimiert)
Name[en_GB]=KML Geographic Compressed Data
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160510.tar.xz/src/plugins/runner/shp/marble_thumbnail_shp.desktop
^
|
| @@ -6,6 +6,7 @@
Name[bs]=ESRI datoteka s likovima
Name[ca]=Fitxers de formes ESRI
Name[ca@valencia]=Fitxers de formes ESRI
+Name[cs]=Soubor tvaru ESRI
Name[da]=ESRI-shapefil
Name[de]=ESRI-Shapefile
Name[en_GB]=ESRI Shapefile
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160503
+Version: 1.14.21_sfos_160510
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
