summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-09-22 12:40:46 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-09-22 12:53:37 (GMT)
commit6db7a79a16fe2b57b1640b1f7a5b7b9e49176ecd (patch)
treed980faee9bc35bed3b65493277436b0698221bf0
parent06e7889a0ff69afa18dafb416f747dcb9d43e560 (diff)
Added author and credits. Added lock for centering in KStars Lite (if
you center and track some object on Android you will be able only to pinch-to-zoom while the lock is on)
-rw-r--r--kstars/kstarslite/qml/images/CMakeLists.txt8
-rw-r--r--kstars/kstarslite/qml/images/lock-closed.pngbin0 -> 451 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@2x.pngbin0 -> 793 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@3x.pngbin0 -> 992 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-closed@4x.pngbin0 -> 1401 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-open.pngbin0 -> 458 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-open@2x.pngbin0 -> 797 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-open@3x.pngbin0 -> 1004 bytes
-rw-r--r--kstars/kstarslite/qml/images/lock-open@4x.pngbin0 -> 1409 bytes
-rw-r--r--kstars/kstarslite/qml/images/svg/lock-closed.svg122
-rw-r--r--kstars/kstarslite/qml/images/svg/lock-open.svg122
-rw-r--r--kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml16
-rw-r--r--kstars/kstarslite/qml/modules/TopMenu.qml1
-rw-r--r--kstars/kstarslite/qml/modules/menus/ContextMenu.qml1
-rw-r--r--kstars/kstarsliteinit.cpp1
-rw-r--r--kstars/kstarssplash.cpp2
-rw-r--r--kstars/main.cpp5
-rw-r--r--kstars/skycomponents/skylabeler.cpp11
-rw-r--r--kstars/skymaplite.cpp3
-rw-r--r--kstars/skymapliteevents.cpp23
20 files changed, 300 insertions, 15 deletions
diff --git a/kstars/kstarslite/qml/images/CMakeLists.txt b/kstars/kstarslite/qml/images/CMakeLists.txt
index d28c45f..ae6131e 100644
--- a/kstars/kstarslite/qml/images/CMakeLists.txt
+++ b/kstars/kstarslite/qml/images/CMakeLists.txt
@@ -128,4 +128,12 @@ install( FILES
edit-find@2x.png
edit-find@3x.png
edit-find@4x.png
+ lock-closed.png
+ lock-closed@2x.png
+ lock-closed@3x.png
+ lock-closed@4x.png
+ lock-open.png
+ lock-open@2x.png
+ lock-open@3x.png
+ lock-open@4x.png
DESTINATION ${KDE_INSTALL_DATADIR}/kstars/kstarslite/qml/images )
diff --git a/kstars/kstarslite/qml/images/lock-closed.png b/kstars/kstarslite/qml/images/lock-closed.png
new file mode 100644
index 0000000..8757011
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-closed.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@2x.png b/kstars/kstarslite/qml/images/lock-closed@2x.png
new file mode 100644
index 0000000..d28477b
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-closed@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@3x.png b/kstars/kstarslite/qml/images/lock-closed@3x.png
new file mode 100644
index 0000000..30c13d5
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-closed@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-closed@4x.png b/kstars/kstarslite/qml/images/lock-closed@4x.png
new file mode 100644
index 0000000..5ed01f9
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-closed@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-open.png b/kstars/kstarslite/qml/images/lock-open.png
new file mode 100644
index 0000000..fb35dba
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-open.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-open@2x.png b/kstars/kstarslite/qml/images/lock-open@2x.png
new file mode 100644
index 0000000..8b46ab7
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-open@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-open@3x.png b/kstars/kstarslite/qml/images/lock-open@3x.png
new file mode 100644
index 0000000..0892bb7
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-open@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/lock-open@4x.png b/kstars/kstarslite/qml/images/lock-open@4x.png
new file mode 100644
index 0000000..f880e56
--- /dev/null
+++ b/kstars/kstarslite/qml/images/lock-open@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/svg/lock-closed.svg b/kstars/kstarslite/qml/images/svg/lock-closed.svg
new file mode 100644
index 0000000..c3aa039
--- /dev/null
+++ b/kstars/kstarslite/qml/images/svg/lock-closed.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" id="svg3869" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="document-encrypted.svg">
+ <defs id="defs3871">
+ <style type="text/css" id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4146"/>
+ <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4090"/>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+ <path d="m 0,706.465 1490.926,0 L 1490.926,0 0,0 0,706.465 Z" id="path18"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
+ <path d="m 22.1953,686.117 1447.7347,0 0,-667.1902 -1447.7347,0 L 22.1953,686.117 Z" id="path26"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4534">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4536" style="fill:url(#linearGradient4538);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4584">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4586" style="fill:url(#linearGradient4588);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4550">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4552" style="fill:url(#linearGradient4554);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4568">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4570" style="fill:url(#linearGradient4572);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4528">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4530" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4578">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4580" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4562">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4564" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4544">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4546" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4390">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4392" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4407">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4409" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4424">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4426" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4441">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4443" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath id="clipPath4528-1" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none" id="rect4530-7" width="31.999989" height="31.999971" x="8.0000114" y="8.0000038" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4578-8" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none" id="rect4580-7" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4562-8" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none" id="rect4564-8" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4544-1" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none" id="rect4546-1" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ </defs>
+ <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="11.061087" inkscape:cy="12.032563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1366" inkscape:window-height="709" inkscape:window-x="-4" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:showpageshadow="false" inkscape:object-nodes="true" inkscape:snap-bbox="true">
+ <inkscape:grid type="xygrid" id="grid4132"/>
+ <sodipodi:guide position="4,18" orientation="18,0" id="guide4138"/>
+ <sodipodi:guide position="5,3" orientation="0,18" id="guide4140"/>
+ <sodipodi:guide position="20,2.0000174" orientation="-18,0" id="guide4142"/>
+ <sodipodi:guide position="2,21" orientation="0,-18" id="guide4144"/>
+ <sodipodi:guide position="3,19.000017" orientation="16,0" id="guide4146"/>
+ <sodipodi:guide position="2,4" orientation="0,16" id="guide4148"/>
+ <sodipodi:guide position="21,20" orientation="-16,0" id="guide4150"/>
+ <sodipodi:guide position="2,20" orientation="0,-16" id="guide4152"/>
+ </sodipodi:namedview>
+ <metadata id="metadata3874">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="translate(-326,-532.3622)">
+ <g transform="translate(327,-497)" id="layer1-3" inkscape:label="Capa 1">
+ <path id="rect4136" transform="translate(0,1030.3622)" d="M 11,3 C 8.784,3 7,4.784 7,7 l 0,4 -2,0 0,1 0,7 1,0 10,0 1,0 0,-8 -1,0 -1,0 0,-4 C 15,4.784 13.216,3 11,3 Z m 0,1 c 1.662,0 3,1.561 3,3.5 L 14,11 8,11 8,7.5 C 8,5.561 9.338,4 11,4 Z m -5,8 10,0 0,6 -10,0 0,-6 z" style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" inkscape:connector-curvature="0" class="ColorScheme-Text"/>
+ </g>
+ </g>
+</svg>
diff --git a/kstars/kstarslite/qml/images/svg/lock-open.svg b/kstars/kstarslite/qml/images/svg/lock-open.svg
new file mode 100644
index 0000000..a8b6f52
--- /dev/null
+++ b/kstars/kstarslite/qml/images/svg/lock-open.svg
@@ -0,0 +1,122 @@
+<?xml version="1.0"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="24" height="24" id="svg3869" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="document-decrypt.svg">
+ <defs id="defs3871">
+ <style type="text/css" id="current-color-scheme">
+ .ColorScheme-Text {
+ color:#4d4d4d;
+ }
+ .ColorScheme-Background {
+ color:#eff0f1;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
+ }
+ .ColorScheme-ViewText {
+ color:#31363b;
+ }
+ .ColorScheme-ViewBackground {
+ color:#fcfcfc;
+ }
+ .ColorScheme-ViewHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ViewFocus{
+ color:#3daee9;
+ }
+ .ColorScheme-ButtonText {
+ color:#31363b;
+ }
+ .ColorScheme-ButtonBackground {
+ color:#eff0f1;
+ }
+ .ColorScheme-ButtonHover {
+ color:#93cee9;
+ }
+ .ColorScheme-ButtonFocus{
+ color:#3daee9;
+ }
+ </style>
+ <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4146"/>
+ <inkscape:perspective sodipodi:type="inkscape:persp3d" inkscape:vp_x="0 : 12 : 1" inkscape:vp_y="0 : 1000 : 0" inkscape:vp_z="24 : 12 : 1" inkscape:persp3d-origin="12 : 8 : 1" id="perspective4090"/>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath16">
+ <path d="m 0,706.465 1490.926,0 L 1490.926,0 0,0 0,706.465 Z" id="path18"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath24">
+ <path d="m 22.1953,686.117 1447.7347,0 0,-667.1902 -1447.7347,0 L 22.1953,686.117 Z" id="path26"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4534">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4536" style="fill:url(#linearGradient4538);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4584">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4586" style="fill:url(#linearGradient4588);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4550">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4552" style="fill:url(#linearGradient4554);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4568">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4570" style="fill:url(#linearGradient4572);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4528">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4530" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4578">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4580" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4562">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4564" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4544">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4546" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4390">
+ <rect ry="15.999986" y="8.0000038" x="8.0000114" height="31.999971" width="31.999989" id="rect4392" style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4407">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4409" style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4424">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4426" style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath clipPathUnits="userSpaceOnUse" id="clipPath4441">
+ <rect ry="15.999986" y="507.798" x="392.57144" height="31.999971" width="31.999989" id="rect4443" style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none"/>
+ </clipPath>
+ <clipPath id="clipPath4528-1" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4532);fill-opacity:1;stroke:none" id="rect4530-7" width="31.999989" height="31.999971" x="8.0000114" y="8.0000038" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4578-8" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4582);fill-opacity:1;stroke:none" id="rect4580-7" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4562-8" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4566);fill-opacity:1;stroke:none" id="rect4564-8" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ <clipPath id="clipPath4544-1" clipPathUnits="userSpaceOnUse">
+ <rect style="fill:url(#linearGradient4548);fill-opacity:1;stroke:none" id="rect4546-1" width="31.999989" height="31.999971" x="392.57144" y="507.798" ry="15.999986"/>
+ </clipPath>
+ </defs>
+ <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="22.627416" inkscape:cx="11.061087" inkscape:cy="12.032563" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:window-width="1366" inkscape:window-height="709" inkscape:window-x="-4" inkscape:window-y="0" inkscape:window-maximized="1" inkscape:showpageshadow="false" inkscape:object-nodes="true" inkscape:snap-bbox="true">
+ <inkscape:grid type="xygrid" id="grid4132"/>
+ <sodipodi:guide position="4,18" orientation="18,0" id="guide4138"/>
+ <sodipodi:guide position="5,3" orientation="0,18" id="guide4140"/>
+ <sodipodi:guide position="20,2.0000174" orientation="-18,0" id="guide4142"/>
+ <sodipodi:guide position="2,21" orientation="0,-18" id="guide4144"/>
+ <sodipodi:guide position="3,19.000017" orientation="16,0" id="guide4146"/>
+ <sodipodi:guide position="2,4" orientation="0,16" id="guide4148"/>
+ <sodipodi:guide position="21,20" orientation="-16,0" id="guide4150"/>
+ <sodipodi:guide position="2,20" orientation="0,-16" id="guide4152"/>
+ </sodipodi:namedview>
+ <metadata id="metadata3874">
+ <rdf:RDF>
+ <cc:Work rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+ <dc:title/>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g inkscape:label="Capa 1" inkscape:groupmode="layer" id="layer1" transform="translate(-326,-532.3622)">
+ <g transform="translate(327,-497)" id="layer1-8" inkscape:label="Capa 1">
+ <path id="rect4136" transform="translate(0,1030.3622)" d="M 11,3 C 8.784,3 7,4.784 7,7 L 7,8 8,8 8,7.5 C 8,5.561 9.338,4 11,4 c 1.662,0 3,1.561 3,3.5 l 0,3.5 -5,0 -1,0 -1,0 -1,0 -1,0 0,1 0,7 1,0 10,0 1,0 0,-8 -1,0 -1,0 0,-4 C 15,4.784 13.216,3 11,3 Z m -5,9 10,0 0,6 -10,0 0,-6 z" style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none" inkscape:connector-curvature="0" class="ColorScheme-Text"/>
+ </g>
+ </g>
+</svg>
diff --git a/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml b/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
index dc0fcff..1c815e9 100644
--- a/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
+++ b/kstars/kstarslite/qml/modules/SkyMapLiteWrapper.qml
@@ -51,6 +51,22 @@ Item {
}
}
+ Button {
+ z: 1
+ visible: SkyMapLite.centerLocked && Qt.platform.os == "android"
+ anchors {
+ right: parent.right
+ top: parent.top
+ margins: 25
+ }
+ onClicked: SkyMapLite.centerLocked = false
+
+ Image {
+ source: "../images/lock-closed.png"
+ anchors.centerIn: parent
+ }
+ }
+
/** Circle that appears after user taps on screen **/
Rectangle {
id: tapCircle
diff --git a/kstars/kstarslite/qml/modules/TopMenu.qml b/kstars/kstarslite/qml/modules/TopMenu.qml
index 672cdf9..9f5696d 100644
--- a/kstars/kstarslite/qml/modules/TopMenu.qml
+++ b/kstars/kstarslite/qml/modules/TopMenu.qml
@@ -263,6 +263,7 @@ ColumnLayout {
return 180
else if(topMenu.state == "open")
return 0
+ return rotation //If it state is "hidden" return current rotation
}
MouseArea {
diff --git a/kstars/kstarslite/qml/modules/menus/ContextMenu.qml b/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
index 38b2720..ea3a61f 100644
--- a/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
+++ b/kstars/kstarslite/qml/modules/menus/ContextMenu.qml
@@ -63,6 +63,7 @@ Menu {
onTriggered: {
contextMenu.close()
SkyMapLite.slotCenter()
+ SkyMapLite.centerLocked = true
}
}
diff --git a/kstars/kstarsliteinit.cpp b/kstars/kstarsliteinit.cpp
index 4f47c83..fc12543 100644
--- a/kstars/kstarsliteinit.cpp
+++ b/kstars/kstarsliteinit.cpp
@@ -52,7 +52,6 @@ void KStarsLite::datainitFinished() {
Options::setShowHorizon(true);
Options::setShowEcliptic(true);
Options::setAutoSelectGrid(false);
- Options::setShowSatellites(true);
// Options::setHideGrids(false);
// Options::setShowEquatorialGrid(true);
// Options::setShowHorizontalGrid(true);
diff --git a/kstars/kstarssplash.cpp b/kstars/kstarssplash.cpp
index 60a8424..d1c9cf0 100644
--- a/kstars/kstarssplash.cpp
+++ b/kstars/kstarssplash.cpp
@@ -24,6 +24,8 @@
KStarsSplash::KStarsSplash(const QString& customMessage )
: QSplashScreen(QPixmap() )
{
+ /*Background for kstars.png is called "Venus and The Night Sky Over Mammoth"(https://www.flickr.com/photos/newdimensionfilms/7108632527)
+ *It was provided by John Lemieux (https://www.flickr.com/photos/newdimensionfilms/) and is licensed under CC BY 2.0 (http://creativecommons.org/licenses/by/2.0/)*/
setPixmap(KSPaths::locate(QStandardPaths::GenericDataLocation, "kstars.png"));
setMessage( customMessage.isEmpty() ?
i18n( "Welcome to KStars. Please stand by while loading..." ) :
diff --git a/kstars/main.cpp b/kstars/main.cpp
index cc91631..cc66603 100644
--- a/kstars/main.cpp
+++ b/kstars/main.cpp
@@ -72,9 +72,8 @@ int main(int argc, char *argv[])
#ifndef KSTARS_LITE
KCrash::initialize();
-
KAboutData aboutData( "kstars", i18n("KStars"), KSTARS_VERSION, i18n(description), KAboutLicense::GPL,
- i18n("(c) 2001-2015, The KStars Team"), i18n(notice), "http://edu.kde.org/kstars");
+ "2001-" + QString::number(QDate::currentDate().year()) + i18n("(c), The KStars Team"), i18n(notice), "http://edu.kde.org/kstars");
aboutData.addAuthor(i18n("Jason Harris"), i18n("Original Author"), "jharris@30doradus.org", "http://www.30doradus.org");
aboutData.addAuthor(i18n("Jasem Mutlaq"), i18n("Current Maintainer"), "mutlaqja@ikarustech.com", "http://www.indilib.org");
aboutData.addAuthor(i18n("James Bowlin"), QString(), "bowlin@mindspring.com");
@@ -93,6 +92,7 @@ int main(int argc, char *argv[])
aboutData.addAuthor(i18n("Samikshan Bairagya"), QString(), "samikshan.bairagya@kdemail.net");
aboutData.addAuthor(i18n("Rafał Kułaga"), QString(), "rl.kulaga@gmail.com");
aboutData.addAuthor(i18n("Rishab Arora"), QString(), "ra.rishab@gmail.com");
+ aboutData.addAuthor(i18n("Artem Fedoskin"), QString(), "afedoskin3@gmail.com");
aboutData.addCredit(i18n("Valery Kharitonov"), i18n("Converted labels containing technical terms to links to documentation") );
aboutData.addCredit(i18n("Ana-Maria Constantin"), i18n("Technical documentation on Astronomy and KStars") );
@@ -101,6 +101,7 @@ int main(int argc, char *argv[])
aboutData.addCredit(i18n("Utkarsh Simha"), i18n("Improvements to observation plan execution, star hopper etc.") );
aboutData.addCredit(i18n("Daniel Holler"), i18n("Extensive testing and suggestions for Ekos/INDI.") );
aboutData.addCredit(i18n("Stephane Lucas"), i18n("Extensive testing and suggestions for Ekos Scheduler.") );
+ aboutData.addCredit(i18n("Yuri Fabirovskij"), i18n("Splash screen for both regular KStars and KStars Lite.") );
KAboutData::setApplicationData(aboutData);
diff --git a/kstars/skycomponents/skylabeler.cpp b/kstars/skycomponents/skylabeler.cpp
index ff97ba5..79357cd 100644
--- a/kstars/skycomponents/skylabeler.cpp
+++ b/kstars/skycomponents/skylabeler.cpp
@@ -100,6 +100,17 @@ SkyLabeler::SkyLabeler() :
m_errors = 0;
m_minDeltaX = 30; // when to merge two adjacent regions
m_marks = m_hits = m_misses = m_elements = 0;
+
+#ifdef KSTARS_LITE
+ //Painter is needed to get default font and we use it only once to have only one warning
+ m_stdFont = QFont();
+
+ //For some reason there is no point size in default font on Android
+#ifdef ANDROID
+ m_stdFont.setPointSize(10);
+#endif
+
+#endif
}
diff --git a/kstars/skymaplite.cpp b/kstars/skymaplite.cpp
index 549334b..7a65dc2 100644
--- a/kstars/skymaplite.cpp
+++ b/kstars/skymaplite.cpp
@@ -100,7 +100,7 @@ int SkyMapLite::starColorMode = 0;
SkyMapLite::SkyMapLite()
:m_proj(0), count(0), data(KStarsData::Instance()),
nStarSizes(15), nSPclasses(7), pinch(false), m_loadingFinished(false), m_sizeMagLim(10.0),
- isInitialized(false), clearTextures(false)
+ isInitialized(false), clearTextures(false), m_centerLocked(false)
{
setAcceptHoverEvents(true);
setAcceptedMouseButtons(Qt::AllButtons);
@@ -362,6 +362,7 @@ void SkyMapLite::slotCenter() {
//display coordinates in statusBar
emit mousePointChanged( focusPoint() );
//showFocusCoords(); //update FocusBox
+ //Lock center so that user could only zoom on touch-enabled devices
}
void SkyMapLite::slewFocus() {
diff --git a/kstars/skymapliteevents.cpp b/kstars/skymapliteevents.cpp
index f8a92bb..30d3268 100644
--- a/kstars/skymapliteevents.cpp
+++ b/kstars/skymapliteevents.cpp
@@ -302,15 +302,18 @@ void SkyMapLite::touchEvent( QTouchEvent *e) {
//update(); //Apply rotation*/
//Allow movement of SkyMapLite while rotating or zooming
- QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonPress, pinchCenter,
- Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
- if(!pinch) {
- m_MousePoint = projector()->fromScreen( pinchCenter, data->lst(), data->geo()->lat() );
- setClickedPoint( &m_MousePoint );
- mouseButtonDown = true;
- pinch = true;
+ if(!getCenterLocked()) {
+ QMouseEvent *event = new QMouseEvent(QEvent::MouseButtonPress, pinchCenter,
+ Qt::LeftButton, Qt::LeftButton, Qt::ControlModifier);
+ if(!pinch) {
+ m_MousePoint = projector()->fromScreen( pinchCenter, data->lst(), data->geo()->lat() );
+ setClickedPoint( &m_MousePoint );
+ mouseButtonDown = true;
+ pinch = true;
+ }
+ mouseMoveEvent(event);
+ delete event;
}
- mouseMoveEvent(event);
if( e->touchPointStates() & Qt::TouchPointReleased ) {
setSlewing(false);
@@ -319,9 +322,7 @@ void SkyMapLite::touchEvent( QTouchEvent *e) {
mouseButtonDown = false;
}
}
-
- delete event;
- } else if (points.length() == 1 && !pinch) {
+ } else if (points.length() == 1 && !pinch && !getCenterLocked()) {
QPointF point = points[0].screenPos();
//Set clicked point (needed for pan)
if(e->type() == QEvent::TouchBegin) {