|
[-]
[+]
|
Changed |
marble.spec
|
|
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/.krazy
^
|
| @@ -1 +1,2 @@
+CHECKSETS kde5
EXCLUDE qclasses,cpp
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/apps/behaim/CMakeLists.txt
^
|
| @@ -60,7 +60,7 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/deploy-behaim.json DESTINATION "${CMAKE_INSTALL_PREFIX}/share")
install(TARGETS ${TARGET} LIBRARY DESTINATION libs/${ANDROID_ABI})
else()
- if(CMAKE_SYSTEM_NAME STREQUAL Android OR MARBLE_INSTALL_ANDROID_APPS)
+ if(MARBLE_INSTALL_ANDROID_APPS)
install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
endif()
endif()
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/apps/marble-kde/kdemain.cpp
^
|
| @@ -13,7 +13,6 @@
#include <kaboutdata.h>
#include <KConfig>
#include <KConfigGroup>
-#include <kcrash.h>
#include <klocalizedstring.h>
#include <KSharedConfig>
@@ -44,7 +43,7 @@
ControlView::applicationVersion(),
i18n( "A World Atlas." ),
KAboutLicense::LGPL_V2,
- i18n( "(c) 2007-%1", QLatin1String("2015") ),
+ i18n( "(c) 2007-%1", QLatin1String("2016") ),
QString(),
"http://marble.kde.org/" );
@@ -263,15 +262,15 @@
i18n( "Special thanks for providing an"
" important source of inspiration by creating"
" Marble's predecessor \"Kartographer\"." ));
- KAboutData::setApplicationData(aboutData);
-
- KCrash::setCrashHandler( KCrash::defaultCrashHandler );
- KCrash::setDrKonqiEnabled( true );
QApplication app( argc, argv );
+
+ KAboutData::setApplicationData(aboutData);
+
QCommandLineParser parser;
parser.addHelpOption();
parser.addVersionOption();
+ aboutData.setupCommandLine(&parser);
// Autodetect profiles
MarbleGlobal::Profiles profiles = MarbleGlobal::detectProfiles();
@@ -305,6 +304,7 @@
parser.addPositionalArgument("file", i18n( "One or more placemark files to be opened") );
parser.process( app );
+ aboutData.processCommandLine(&parser);
KLocalizedString::setApplicationDomain("marble");
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/apps/marble-maps-sailfishos/MainScreen.qml
^
|
| @@ -205,7 +205,11 @@
property real distance: 0
function updateIndicator() {
- var point = marbleMaps.mapFromItem(zoomToPositionButton, diameter * 0.5, diameter * 0.5);
+ // TODO: seems mapFromItem() returns 0,0 for some reason in SFOS
+ // for now use middle of map view as reference, which perhaps also is more expected?
+ // old code from Android Marble Maps:
+ // var point = marbleMaps.mapFromItem(zoomToPositionButton, diameter * 0.5, diameter * 0.5);
+ var point = Qt.point(marbleMaps.width * 0.5, marbleMaps.height * 0.5);
distance = 0.001 * marbleMaps.distanceFromPointToCurrentLocation(point);
angle = marbleMaps.angleFromPointToCurrentLocation(point);
}
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/apps/marble-maps/CMakeLists.txt
^
|
| @@ -60,7 +60,7 @@
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/deploy-marble-maps.json DESTINATION "${CMAKE_INSTALL_PREFIX}/share")
install(TARGETS ${TARGET} LIBRARY DESTINATION libs/${ANDROID_ABI})
else()
- if(CMAKE_SYSTEM_NAME STREQUAL Android OR MARBLE_INSTALL_ANDROID_APPS)
+ if(MARBLE_INSTALL_ANDROID_APPS)
if(APPS_INSTALL_DIR)
install(PROGRAMS org.kde.marble.maps.desktop DESTINATION ${APPS_INSTALL_DIR})
endif(APPS_INSTALL_DIR)
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/runner/gpx/marble_thumbnail_gpx.desktop
^
|
| @@ -20,7 +20,7 @@
Name[it]=Dati geografici GPX
Name[ko]=GPX 지리 데이터
Name[nds]=GPX-Geodaten
-Name[nl]=GPX Geographic Data
+Name[nl]=GPX geografische gegevens
Name[pl]=Dane geograficzne GPX
Name[pt]=Dados Geográficos em GPX
Name[pt_BR]=Dados geográficos em GPX
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/runner/json/marble_geojson.desktop
^
|
| @@ -3,8 +3,99 @@
TryExec=marble
Exec=marble %F
Name=Marble
+Name[ast]=Marble
+Name[bg]=Marble
+Name[bs]=Marble
+Name[ca]=Marble
+Name[ca@valencia]=Marble
+Name[cs]=Marble
+Name[csb]=Marble
+Name[da]=Marble
+Name[de]=Marble
+Name[el]=Marble
+Name[en_GB]=Marble
+Name[eo]=Marble
+Name[es]=Marble
+Name[et]=Marble
+Name[eu]=Marmola
+Name[fi]=Marble
+Name[fr]=Marble
+Name[ga]=Marble
+Name[gl]=Marble
+Name[gu]=માર્બલ
+Name[he]=Marble
+Name[hi]=संगमरमर
+Name[hne]=संगमरमर
+Name[hr]=Marble
+Name[hu]=Marble
+Name[is]=Marble
+Name[it]=Marble
+Name[ja]=Marble
+Name[kk]=Marble
+Name[km]=ថ្មម៉ាប
+Name[ko]=Marble
+Name[lt]=Marble
+Name[lv]=Marble
+Name[ml]=മാര്ബിള്
+Name[mr]=मार्बल
+Name[nb]=Marble
+Name[nds]=Marble
+Name[ne]=मार्बल
+Name[nl]=Marble
+Name[nn]=Marble
+Name[pa]=ਮਾਰਬਲ
+Name[pl]=Marble
+Name[pt]=Marble
+Name[pt_BR]=Marble
+Name[ro]=Marble
+Name[ru]=Marble
+Name[sk]=Marble
+Name[sl]=Marble
+Name[sv]=Marble
+Name[tr]=Marble
+Name[ug]=Marble
+Name[uk]=Marble
+Name[x-test]=xxMarblexx
+Name[zh_CN]=Marble
+Name[zh_TW]=地理_Marble
NoDisplay=true
GenericName=Virtual Globe
+GenericName[ast]=Globu virtual
+GenericName[bg]=Настолен глобус
+GenericName[bs]=Virtualni globus
+GenericName[ca]=Globus virtual
+GenericName[ca@valencia]=Globus virtual
+GenericName[cs]=Virtuální globus
+GenericName[da]=Virtuel globus
+GenericName[de]=Virtueller Globus
+GenericName[el]=Εικονική υδρόγειος
+GenericName[en_GB]=Virtual Globe
+GenericName[eo]=Virtuala Globuso
+GenericName[es]=Globo terráqueo virtual
+GenericName[et]=Virtuaalgloobus
+GenericName[fi]=Virtuaalinen maapallo
+GenericName[fr]=Globe virtuel
+GenericName[gl]=Globo virtual
+GenericName[hu]=Virtuális földgömb
+GenericName[it]=Globo virtuale
+GenericName[kk]=Виртуалды глобус
+GenericName[ko]=가상 지구본
+GenericName[lt]=Virtualus gaublys
+GenericName[mr]=आभासी पृथ्वी
+GenericName[nb]=Virtuell globus
+GenericName[nds]=Virtuell Globus
+GenericName[nl]=Virtuele globe
+GenericName[pl]=Wirtualna kula ziemska
+GenericName[pt]=Globo Virtual
+GenericName[pt_BR]=Globo Virtual
+GenericName[ru]=Виртуальный глобус
+GenericName[sk]=Virtuálny glóbus
+GenericName[sl]=Navidezni globus
+GenericName[sv]=Virtuell glob
+GenericName[tr]=Masaüstünde Dünya
+GenericName[uk]=Віртуальний глобус
+GenericName[x-test]=xxVirtual Globexx
+GenericName[zh_TW]=虛擬地球儀
MimeType=application/vnd.geo+json;
Icon=marble
Terminal=false
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/runner/json/marble_part_geojson.desktop
^
|
| @@ -1,6 +1,59 @@
[Desktop Entry]
Type=Service
Name=Marble Part
+Name[ast]=Part Marble
+Name[bg]=Marble
+Name[bs]=Marble dio
+Name[ca]=Part del Marble
+Name[ca@valencia]=Part del Marble
+Name[cs]=Součást Marble
+Name[csb]=Mòduł Marble
+Name[da]=Marble Part
+Name[de]=Marble-Part
+Name[el]=Τμήμα Marble
+Name[en_GB]=Marble Part
+Name[eo]=Marble Part
+Name[es]=Part Marble
+Name[et]=Marble komponent
+Name[eu]=Marmolaren zatia
+Name[fi]=Marble-osa
+Name[fr]=Composant Marble
+Name[ga]=Comhpháirt Marble
+Name[gl]=Compoñente para Marble
+Name[gu]=માર્બલ ભાગ
+Name[he]=Marble Part
+Name[hi]=मार्बल पार्ट
+Name[hne]=मार्बल पार्ट
+Name[hu]=Marble objektum
+Name[is]=Marble Part
+Name[it]=Componente Marble
+Name[ja]=Marble コンポーネント
+Name[kk]=Marble бөлшегі
+Name[km]=ផ្នែកថ្មម៉ាប
+Name[ko]=Marble 부분
+Name[lt]=Marble dalis
+Name[lv]=Marble Part
+Name[ml]=മാര്ബിള് പാര്ട്ട്
+Name[mr]=मार्बल पार्ट
+Name[nb]=Marble Part
+Name[nds]=Marble-Komponent
+Name[ne]=मार्बल अंश
+Name[nl]=Onderdeel van Marble
+Name[nn]=Marble-del
+Name[pa]=ਮਾਰਬਲ ਭਾਗ
+Name[pl]=Moduł Marble
+Name[pt]=Componente do Marble
+Name[pt_BR]=Componente do Marble
+Name[ro]=Marble Part
+Name[ru]=Компонент Marble
+Name[sk]=Časť Marble
+Name[sl]=Sestavni del Marble
+Name[sv]=Marble-delprogram
+Name[tr]=Marble Part
+Name[uk]=Компонент Marble
+Name[x-test]=xxMarble Partxx
+Name[zh_CN]=Marble 组件
+Name[zh_TW]=Marble 部件
MimeType=application/vnd.geo+json;
X-KDE-ServiceTypes=Browser/View,KParts/ReadOnlyPart
X-KDE-Library=libmarble_part
|
|
[-]
[+]
|
Changed |
marble-1.14.21_sfos_160503.tar.xz/src/plugins/runner/json/marble_thumbnail_geojson.desktop
^
|
| @@ -1,6 +1,20 @@
[Desktop Entry]
Type=Service
Name=GeoJSON Geographic Data
+Name[ca]=Dades geogràfiques GeoJSON
+Name[ca@valencia]=Dades geogràfiques GeoJSON
+Name[de]=GeoJSON-Geografiedaten
+Name[en_GB]=GeoJSON Geographic Data
+Name[es]=Datos geográficos GeoJSON
+Name[fi]=GeoJSON-paikkatieto
+Name[gl]=Datos xeográficos GeoJSON
+Name[nl]=GeoJSON Geografische gegevens
+Name[pl]=Dane geograficzne GeoJSON
+Name[pt]=Dados Geográficos em GeoJSON
+Name[pt_BR]=Dados geográficos em
+Name[sv]=GeoJSON geografisk data
+Name[uk]=географічні дані GeoJSON
+Name[x-test]=xxGeoJSON Geographic Dataxx
X-KDE-ServiceTypes=ThumbCreator
MimeType=application/vnd.geo+json;
|
|
[-]
[+]
|
Changed |
marble.yaml
^
|
| @@ -1,6 +1,6 @@
Name: marble
Summary: Virtual Globe
-Version: 1.14.21_sfos_160427
+Version: 1.14.21_sfos_160503
Release: 1
Group: Applications/Engineering
License: LGPLv2+
|
