summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDennis Nienhüser <nienhueser@kde.org>2016-11-12 18:01:58 (GMT)
committerDennis Nienhüser <nienhueser@kde.org>2016-11-12 18:01:58 (GMT)
commitef5c0ba82c514798b3040dd22d662400d468ba31 (patch)
treeb7826f8d0d805d119dfdc708b7ac69ca6f1f3012
parent0b03928c7a6dd17862389261efd377a79d02018d (diff)
Stars and coordinate grid in low zoom, adjust colors. F-up to 0db4ede.
-rw-r--r--src/apps/marble-maps/MainScreen.qml18
-rwxr-xr-xsrc/apps/marble-maps/create-apk.py5
2 files changed, 16 insertions, 7 deletions
diff --git a/src/apps/marble-maps/MainScreen.qml b/src/apps/marble-maps/MainScreen.qml
index 4453b47..acba10c 100644
--- a/src/apps/marble-maps/MainScreen.qml
+++ b/src/apps/marble-maps/MainScreen.qml
@@ -54,26 +54,27 @@ ApplicationWindow {
property string currentPositionProvider: "QtPositioning"
property bool wlanOnly: false
+ property bool smallZoom : radius < 2 * Math.max(root.width, root.height)
anchors.fill: parent
visible: true
// Theme settings.
- projection: MarbleItem.Mercator
+ projection: smallZoom ? MarbleItem.Spherical : MarbleItem.Mercator
mapThemeId: "earth/vectorosm/vectorosm.dgml"
// Visibility of layers/plugins.
showFrameRate: false
- showAtmosphere: false
+ showAtmosphere: smallZoom
showCompass: false
showClouds: false
showCrosshairs: false
- showGrid: false
+ showGrid: smallZoom
showOverviewMap: false
showOtherPlaces: false
showScaleBar: false
- showBackground: false
+ showBackground: smallZoom
positionProvider: suspended ? "" : currentPositionProvider
keepScreenOn: !suspended && navigationManager.visible
showPositionMarker: false
@@ -105,7 +106,14 @@ ApplicationWindow {
updateIndicator();
}
- Component.onCompleted: marbleMaps.loadSettings()
+ Component.onCompleted: {
+ setPluginSetting("coordinate-grid", "gridColor", "#999999");
+ setPluginSetting("coordinate-grid", "tropicsColor", "#888888");
+ setPluginSetting("coordinate-grid", "equatorColor", "#777777");
+ setPluginSetting("coordinate-grid", "primaryLabels", "false");
+ setPluginSetting("coordinate-grid", "secondaryLabels", "false");
+ marbleMaps.loadSettings()
+ }
Component.onDestruction: marbleMaps.writeSettings()
function updateIndicator() {
diff --git a/src/apps/marble-maps/create-apk.py b/src/apps/marble-maps/create-apk.py
index 6866b65..21244bb 100755
--- a/src/apps/marble-maps/create-apk.py
+++ b/src/apps/marble-maps/create-apk.py
@@ -35,7 +35,7 @@ class Filter(object):
return ['include']
if dir == '/assets/data':
# Currently not used
- return ['mwdbii', 'weather', 'naturalearth', 'stars', 'flags']
+ return ['mwdbii', 'weather', 'naturalearth', 'flags']
elif dir == '/assets/data/maps':
# Other planets are not used
return ['moon']
@@ -58,7 +58,8 @@ class Filter(object):
fileFormats = ['CachePlugin', 'GpxPlugin', 'KmlPlugin', 'OsmPlugin']
floatItems = ['License']
positioning = ['QtPositioningPositionProviderPlugin']
- plugins = search + routing + fileFormats + floatItems + positioning
+ render = ['StarsPlugin', 'GraticulePlugin']
+ plugins = search + routing + fileFormats + floatItems + positioning + render
whitelist = set(['lib{}.so'.format(plugin) for plugin in plugins])
masked = [item for item in files if item not in whitelist]
if len(files) - len(masked) != len(whitelist):