Commit ef5c0ba8 authored by Dennis Nienhüser's avatar Dennis Nienhüser
Browse files

Stars and coordinate grid in low zoom, adjust colors. F-up to 0db4edeb.

parent 0b03928c
......@@ -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() {
......
......@@ -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):
......
Supports Markdown
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