summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArtem Fedoskin <afedoskin3@gmail.com>2016-10-26 17:34:11 (GMT)
committerArtem Fedoskin <afedoskin3@gmail.com>2016-10-26 17:34:11 (GMT)
commited8bc05be1c44da583e4995c8dbd03ad4f3f1ae2 (patch)
treec61b64dcf8e97c237e856c636a25dac82232d058
parentfe65e034f20c6d90446fb950af83a4ba7adb5cb5 (diff)
Update icons in KStars Lite
-rw-r--r--CMakeLists.txt2
-rw-r--r--kstars/CMakeLists.txt1
-rw-r--r--kstars/kstarslite/qml/images/kstars_constellationart.pngbin782 -> 733 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_constellationart@2x.pngbin1708 -> 1454 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_constellationart@3x.pngbin2636 -> 2084 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_constellationart@4x.pngbin3500 -> 2780 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_planets.pngbin1190 -> 1205 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_planets@2x.pngbin2597 -> 2554 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_planets@3x.pngbin3922 -> 3722 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_planets@4x.pngbin5472 -> 5008 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_supernovae.pngbin1054 -> 506 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_supernovae@2x.pngbin2018 -> 827 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_supernovae@3x.pngbin2937 -> 1104 bytes
-rw-r--r--kstars/kstarslite/qml/images/kstars_supernovae@4x.pngbin3843 -> 1391 bytes
-rw-r--r--kstars/kstarslite/qml/images/svg/kstars_constellationart.svg6
-rw-r--r--kstars/kstarslite/qml/images/svg/kstars_planets.svg25
-rw-r--r--kstars/kstarslite/qml/images/svg/kstars_supernovae.svg82
-rw-r--r--kstars/kstarslite/qml/modules/helpers/TopMenuButton.qml4
-rw-r--r--kstars/skymapliteevents.cpp2
19 files changed, 94 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1229083..648e472 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -32,7 +32,7 @@ set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH})
set(CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules" ${CMAKE_MODULE_PATH})
if(BUILD_KSTARS_LITE)
- find_package(Qt5 5.7 REQUIRED COMPONENTS Gui Qml Quick QuickControls2 Xml Svg Sql Network Sensors Positioning)
+ find_package(Qt5 5.7 REQUIRED COMPONENTS Gui Qml Quick QuickControls2 Xml Svg Sql Network Positioning)
else()
find_package(Qt5 5.4 REQUIRED COMPONENTS Gui Qml Quick Xml Sql Svg Network PrintSupport)
endif()
diff --git a/kstars/CMakeLists.txt b/kstars/CMakeLists.txt
index 38034d5..75812a2 100644
--- a/kstars/CMakeLists.txt
+++ b/kstars/CMakeLists.txt
@@ -864,7 +864,6 @@ if(BUILD_KSTARS_LITE)
Qt5::Sql
Qt5::Qml
Qt5::Quick
- Qt5::Sensors
Qt5::QuickControls2
Qt5::Positioning
${ZLIB_LIBRARIES}
diff --git a/kstars/kstarslite/qml/images/kstars_constellationart.png b/kstars/kstarslite/qml/images/kstars_constellationart.png
index ddf75d0..85a833c 100644
--- a/kstars/kstarslite/qml/images/kstars_constellationart.png
+++ b/kstars/kstarslite/qml/images/kstars_constellationart.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_constellationart@2x.png b/kstars/kstarslite/qml/images/kstars_constellationart@2x.png
index 0a9620f..972c91f 100644
--- a/kstars/kstarslite/qml/images/kstars_constellationart@2x.png
+++ b/kstars/kstarslite/qml/images/kstars_constellationart@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_constellationart@3x.png b/kstars/kstarslite/qml/images/kstars_constellationart@3x.png
index 33693c8..8e31a3c 100644
--- a/kstars/kstarslite/qml/images/kstars_constellationart@3x.png
+++ b/kstars/kstarslite/qml/images/kstars_constellationart@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_constellationart@4x.png b/kstars/kstarslite/qml/images/kstars_constellationart@4x.png
index fe7b6a6..8c291d1 100644
--- a/kstars/kstarslite/qml/images/kstars_constellationart@4x.png
+++ b/kstars/kstarslite/qml/images/kstars_constellationart@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_planets.png b/kstars/kstarslite/qml/images/kstars_planets.png
index 1031c92..aff5915 100644
--- a/kstars/kstarslite/qml/images/kstars_planets.png
+++ b/kstars/kstarslite/qml/images/kstars_planets.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_planets@2x.png b/kstars/kstarslite/qml/images/kstars_planets@2x.png
index 1a9e60f..bf07c14 100644
--- a/kstars/kstarslite/qml/images/kstars_planets@2x.png
+++ b/kstars/kstarslite/qml/images/kstars_planets@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_planets@3x.png b/kstars/kstarslite/qml/images/kstars_planets@3x.png
index 5e91ce6..bd1fa68 100644
--- a/kstars/kstarslite/qml/images/kstars_planets@3x.png
+++ b/kstars/kstarslite/qml/images/kstars_planets@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_planets@4x.png b/kstars/kstarslite/qml/images/kstars_planets@4x.png
index 90345d0..8a2f234 100644
--- a/kstars/kstarslite/qml/images/kstars_planets@4x.png
+++ b/kstars/kstarslite/qml/images/kstars_planets@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_supernovae.png b/kstars/kstarslite/qml/images/kstars_supernovae.png
index d804d66..1b2586f 100644
--- a/kstars/kstarslite/qml/images/kstars_supernovae.png
+++ b/kstars/kstarslite/qml/images/kstars_supernovae.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_supernovae@2x.png b/kstars/kstarslite/qml/images/kstars_supernovae@2x.png
index f3c523c..7e287a6 100644
--- a/kstars/kstarslite/qml/images/kstars_supernovae@2x.png
+++ b/kstars/kstarslite/qml/images/kstars_supernovae@2x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_supernovae@3x.png b/kstars/kstarslite/qml/images/kstars_supernovae@3x.png
index b998728..c5994ae 100644
--- a/kstars/kstarslite/qml/images/kstars_supernovae@3x.png
+++ b/kstars/kstarslite/qml/images/kstars_supernovae@3x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/kstars_supernovae@4x.png b/kstars/kstarslite/qml/images/kstars_supernovae@4x.png
index ee8ef73..eb3f21c 100644
--- a/kstars/kstarslite/qml/images/kstars_supernovae@4x.png
+++ b/kstars/kstarslite/qml/images/kstars_supernovae@4x.png
Binary files differ
diff --git a/kstars/kstarslite/qml/images/svg/kstars_constellationart.svg b/kstars/kstarslite/qml/images/svg/kstars_constellationart.svg
index 5a4e970..d8c071f 100644
--- a/kstars/kstarslite/qml/images/svg/kstars_constellationart.svg
+++ b/kstars/kstarslite/qml/images/svg/kstars_constellationart.svg
@@ -2,13 +2,13 @@
<defs id="defs3051">
<style type="text/css" id="current-color-scheme">
.ColorScheme-Text {
- color:#f2f2f2
+ color:#f2f2f2;
}
</style>
</defs>
<path
style="fill:currentColor;fill-opacity:1;stroke:none"
- d="M 11 3 A 3.9999902 4.0000296 0 0 0 7 7 A 3.9999902 4.0000296 0 0 0 11 11 A 3.9999902 4.0000296 0 0 0 15 7 A 3.9999902 4.0000296 0 0 0 11 3 z M 11 4 A 3 3.0000296 0 0 1 14 7 A 3 3.0000296 0 0 1 11 10 A 3 3.0000296 0 0 1 8 7 A 3 3.0000296 0 0 1 11 4 z M 11 12 A 7.9999504 8.0000296 0 0 0 3.0722656 19 L 4.0800781 19 A 6.9999604 7.0000296 0 0 1 11 13 A 6.9999604 7.0000296 0 0 1 17.921875 19 L 18.929688 19 A 7.9999504 8.0000296 0 0 0 11 12 z "
- class="ColorScheme-Text"
+ d="M 6.1679688,2.015625 C 5.9110088,1.9170648 5.6328519,2.3104271 5.5449219,2.8964844 5.4656789,3.4246825 5.5472328,6.2139553 5.6523438,6.5742188 5.7043718,6.7525398 5.6178466,6.8366112 5.1660156,7.046875 4.5019686,7.355895 3.5475828,8.2595435 3.2304688,8.8808594 3.0925597,9.1510596 3,9.538221 3,9.8398438 c 0,0.4401542 0.053471,0.5594932 0.4101562,0.9160152 0.432368,0.432172 0.8873398,0.60784 1.8710938,0.720703 0.328613,0.0377 0.6631375,0.119121 0.7421875,0.181641 0.281505,0.222621 0.561689,0.944271 0.671875,1.724609 0.069579,0.492764 0.2617124,1.109964 0.5058594,1.63086 0.391134,0.834505 0.3921425,0.839263 0.3203125,1.898437 -0.039645,0.584556 -0.1266694,1.419543 -0.1933594,1.853516 -0.109063,0.709725 -0.1031164,0.810199 0.072266,1.003906 0.298794,0.330021 1.0788668,0.299669 1.3085938,-0.05078 0.171711,-0.261945 0.394771,-1.027813 0.53125,-1.824219 L 9.3105469,17.488281 9.8222656,17.75 c 0.2898814,0.148899 0.5903744,0.408243 0.6953124,0.597656 l 0.185547,0.333985 -0.296875,0 c -0.440458,0 -0.7792969,0.283183 -0.7792969,0.65039 C 9.6269531,19.98303 10,20 10,20 l 6,0 c 1,0 1.058718,-0.211372 1.146484,-1.146484 0.02519,-0.268424 0.102631,-0.342785 0.5,-0.47461 0.955811,-0.317088 1.579116,-1.305432 1.277344,-2.027344 -0.161353,-0.385998 -0.667106,-0.657035 -1.080078,-0.578124 -0.244654,0.04675 -0.264105,0.0081 -0.369141,-0.720704 C 17.250865,13.500303 16.626697,12.435565 15.503906,11.6875 14.67212,11.133317 13.73575,10.877969 12.123047,10.763672 10.59553,10.655414 10.087723,10.4801 9.5898438,9.8886719 9.4353357,9.7051323 9.2807638,9.3725862 9.2460938,9.1503906 9.1013707,8.22292 8.9451966,7.8710575 8.4785156,7.421875 L 8.0058594,6.9648438 8.2167969,6.3515625 c 0.628371,-1.8255676 0.7290332,-4.2832031 0.1757812,-4.2832031 -0.312813,0 -0.8024425,0.7559969 -1.1484375,1.7734375 L 7.0605469,4.3789062 6.9199219,3.7402344 C 6.7323379,2.8878447 6.3888418,2.100344 6.1679688,2.015625 Z M 5.5,8 C 5.7761424,8 6,8.2238576 6,8.5 6,8.7761424 5.7761424,9 5.5,9 5.2238576,9 5,8.7761424 5,8.5 5,8.2238576 5.2238576,8 5.5,8 Z"
+ class="ColorScheme-Text"
/>
</svg>
diff --git a/kstars/kstarslite/qml/images/svg/kstars_planets.svg b/kstars/kstarslite/qml/images/svg/kstars_planets.svg
index 3473ecc..99604cc 100644
--- a/kstars/kstarslite/qml/images/svg/kstars_planets.svg
+++ b/kstars/kstarslite/qml/images/svg/kstars_planets.svg
@@ -2,18 +2,21 @@
<defs id="defs3051">
<style type="text/css" id="current-color-scheme">
.ColorScheme-Text {
- color:#f2f2f2
+ color:#f2f2f2;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
}
</style>
</defs>
- <g transform="translate(-421.71429,-525.79074)">
- <rect
- style="opacity:1;fill:currentColor;fill-opacity:1;stroke:none"
- id="rect4035" width="0" height="10.999983" x="383.45605" y="518.13037"
- class="ColorScheme-Text"/>
- <path id="path3011"
- d="m 432.71834,528.79074 c -0.31896,0 -0.62792,0.026 -0.93788,0.063 -0.30396,0.036 -0.61392,0.087 -0.90589,0.1559 -0.094,0.022 -0.18497,0.067 -0.28096,0.094 -0.084,0.023 -0.16698,0.037 -0.24997,0.063 -0.10499,0.033 -0.21397,0.059 -0.31296,0.094 -0.10699,0.038 -0.20697,0.083 -0.31296,0.1249 -0.20597,0.083 -0.39695,0.182 -0.59393,0.2809 -0.071,0.036 -0.14898,0.056 -0.21897,0.094 -0.22997,0.1209 -0.44094,0.2629 -0.65592,0.4058 -0.082,0.055 -0.16997,0.098 -0.24996,0.1559 -0.033,0.024 -0.061,0.038 -0.094,0.063 -0.094,0.071 -0.19098,0.1418 -0.28097,0.2188 -0.10698,0.089 -0.20997,0.1869 -0.31296,0.2809 -0.032,0.03 -0.062,0.064 -0.094,0.094 -0.011,0.011 -0.02,0.02 -0.031,0.031 -0.016,0.016 -0.015,0.047 -0.031,0.063 -0.20997,0.2039 -0.43894,0.3988 -0.62492,0.6247 -0.005,0.01 0.005,0.025 0,0.031 -0.18098,0.2199 -0.34296,0.4478 -0.49994,0.6877 -0.021,0.032 -0.042,0.061 -0.063,0.094 -0.015,0.024 -0.047,0.037 -0.063,0.063 -0.06,0.098 -0.10099,0.209 -0.15598,0.3129 -0.018,0.033 -0.045,0.061 -0.063,0.094 -0.075,0.1459 -0.14998,0.2898 -0.21897,0.4378 -0.004,0.01 0.004,0.023 0,0.031 -0.11699,0.2528 -0.22198,0.5136 -0.31296,0.7805 -0.019,0.053 -0.045,0.103 -0.063,0.156 -0.003,0.01 0.003,0.022 0,0.031 -0.02,0.062 -0.044,0.125 -0.063,0.188 -0.073,0.2568 -0.13998,0.5137 -0.18798,0.7806 -0.034,0.1919 -0.074,0.3968 -0.094,0.5938 -0.027,0.2648 -0.031,0.5417 -0.031,0.8125 0,0.4038 0.036,0.7996 0.094,1.1875 0.006,0.041 -0.007,0.085 0,0.1249 0.044,0.2659 0.11798,0.5248 0.18798,0.7807 0.026,0.096 0.064,0.1859 0.094,0.2809 0.04,0.1289 0.079,0.2489 0.12499,0.3748 0.077,0.2119 0.15598,0.4218 0.24997,0.6246 0.05,0.106 0.10198,0.2099 0.15598,0.3129 0.15198,0.2919 0.31496,0.5747 0.49993,0.8436 0.016,0.024 0.046,0.039 0.063,0.063 0.19797,0.2809 0.39395,0.5597 0.62492,0.8126 0.04,0.044 0.084,0.082 0.12498,0.125 0.04,0.042 0.084,0.084 0.12499,0.1249 0.21397,0.2139 0.45094,0.4048 0.68791,0.5938 0.30596,0.2438 0.62892,0.4587 0.96888,0.6556 0.012,0.01 0.019,0.024 0.031,0.031 0.053,0.03 0.10299,0.065 0.15598,0.094 0.31596,0.156 0.69192,0.3249 0.93788,0.4378 0.10999,0.042 0.23098,0.057 0.34396,0.094 0.053,0.018 0.10299,0.046 0.15598,0.063 0.13598,0.041 0.26797,0.09 0.40595,0.1249 0.042,0.011 0.083,0.021 0.12499,0.031 0.29196,0.069 0.60192,0.1209 0.90588,0.1559 0.30896,0.036 0.61792,0.063 0.93788,0.063 0.33996,0 0.67092,-0.021 0.99988,-0.063 0.36495,-0.048 0.68091,-0.1239 0.99987,-0.1879 1.69779,-0.4358 3.1616,-1.4213 4.21847,-2.7487 0.028,-0.035 0.067,-0.058 0.094,-0.094 0.009,-0.012 0.022,-0.02 0.031,-0.031 0.014,-0.018 0.018,-0.044 0.031,-0.063 0.62292,-0.8246 1.07686,-1.7801 1.34383,-2.8117 0.056,-0.2169 0.11799,-0.4318 0.15598,-0.6557 0.005,-0.03 -0.005,-0.063 0,-0.094 0.006,-0.04 0.025,-0.079 0.031,-0.125 0.006,-0.043 0.026,-0.082 0.031,-0.1249 l -0.031,0 c 0.044,-0.3289 0.094,-0.6587 0.094,-0.9996 0,-0.5517 -0.05,-1.1034 -0.15598,-1.6242 -0.009,-0.043 -0.022,-0.082 -0.031,-0.1249 -0.046,-0.2079 -0.12398,-0.4229 -0.18798,-0.6248 -0.003,-0.01 0.003,-0.022 0,-0.031 -0.012,-0.038 -0.018,-0.056 -0.031,-0.094 -0.039,-0.119 -0.081,-0.2579 -0.12498,-0.3748 -0.012,-0.032 -0.018,-0.064 -0.031,-0.094 -0.043,-0.109 -0.10799,-0.2059 -0.15598,-0.3128 -0.002,0 0.002,-0.026 0,-0.031 -0.025,-0.054 -0.068,-0.1029 -0.094,-0.1559 -0.098,-0.2029 -0.19797,-0.3998 -0.31296,-0.5937 -0.058,-0.098 -0.094,-0.2169 -0.15598,-0.3129 -0.024,-0.036 -0.069,-0.058 -0.094,-0.094 -0.067,-0.099 -0.14698,-0.185 -0.21897,-0.2809 -0.08,-0.1 -0.13999,-0.2159 -0.21898,-0.3129 -0.005,-0.01 0.005,-0.025 0,-0.031 -0.17197,-0.2089 -0.36995,-0.4028 -0.56292,-0.5937 -0.093,-0.092 -0.18398,-0.1939 -0.28097,-0.2809 -0.028,-0.025 -0.065,-0.038 -0.094,-0.063 -0.20897,-0.1819 -0.42994,-0.3398 -0.65592,-0.4996 -0.055,-0.038 -0.10098,-0.088 -0.15598,-0.125 -0.07,-0.046 -0.14798,-0.081 -0.21897,-0.1249 -0.13498,-0.084 -0.26597,-0.174 -0.40595,-0.2499 -0.12298,-0.067 -0.24797,-0.127 -0.37495,-0.1879 -0.21397,-0.102 -0.43195,-0.198 -0.65592,-0.2809 -0.26596,-0.099 -0.53393,-0.1799 -0.8129,-0.2499 -0.24496,-0.062 -0.49693,-0.118 -0.7499,-0.1559 -0.39695,-0.061 -0.8049,-0.094 -1.21885,-0.094 m 0,0.9996 c 0.29896,0 0.58493,0.027 0.87489,0.063 0.17998,0.023 0.35496,0.058 0.53093,0.094 0.01,0 0.021,0 0.031,0 0.16598,0.035 0.33796,0.079 0.49994,0.1249 0.096,0.027 0.18698,0.063 0.28097,0.094 0.17197,0.057 0.33395,0.1169 0.49993,0.1879 0.19398,0.08 0.37896,0.1528 0.56293,0.2498 -0.031,0.01 -0.063,0.021 -0.094,0.031 -0.047,0.017 -0.11298,0.096 -0.12498,0.1249 -0.02,0.048 0.005,0.115 0,0.188 0.038,0.017 0.06,0.089 0.12498,0.1249 0.025,0.014 0.041,-0.01 0.063,0 0.038,0.021 0.07,0.087 0.063,0.1249 -0.011,0.055 -0.088,0.022 -0.12498,0.063 0.006,0.078 -0.043,0.105 -0.063,0.1559 0.012,0.033 0.057,0.024 0.063,0.063 -0.007,0.043 -0.079,0.049 -0.063,0.094 0.072,0.056 0.15098,-0.022 0.21897,-0.031 0.14898,-0.019 0.28297,0.041 0.37495,-0.031 -0.012,-0.071 0.10099,-0.092 0.094,-0.1559 -0.006,-0.048 -0.09,-0.061 -0.12498,-0.094 -0.019,-0.018 -0.04,-0.059 -0.063,-0.094 -0.026,-0.04 -0.064,-0.087 -0.094,-0.125 -0.039,-0.052 -0.12498,-0.1169 -0.12498,-0.1559 0.001,-0.045 0.052,-0.063 0.063,-0.125 -0.012,-0.057 -0.11699,0 -0.12499,-0.063 0.002,-0.019 0.021,-0.051 0.031,-0.063 0.14998,0.082 0.29796,0.1789 0.43795,0.2809 0.032,0.021 0.062,0.041 0.094,0.063 0.10798,0.081 0.20697,0.17 0.31296,0.2499 -0.067,0.012 -0.10099,0.09 -0.15598,0.156 -0.038,0.046 -0.099,0.1009 -0.15598,0.1249 -0.028,0.012 -0.068,-0.016 -0.094,0 -0.037,0.025 -0.051,0.096 -0.094,0.125 -0.031,0.021 -0.12399,0.094 -0.15598,0.094 -0.038,10e-4 -0.098,-0.04 -0.12499,-0.031 -0.04,0.013 -0.017,0.077 -0.063,0.094 -0.088,0.031 -0.24997,-0.069 -0.28096,0.063 0.038,0.076 0.15298,0.051 0.21897,0.094 0.042,0.026 0.11399,0.143 0.12498,0.1879 0.01,0.038 0.015,0.179 0,0.2189 -0.041,0.106 -0.15898,0.097 -0.28096,0.094 -0.034,-10e-4 -0.063,0 -0.094,0 -0.20697,-0.014 -0.40695,-0.085 -0.49994,0.063 0.007,0.1129 0.025,0.1829 0,0.2808 -0.018,0.072 -0.097,0.125 -0.094,0.188 0.002,0.032 0.055,0.082 0.063,0.1249 0.005,0.023 -0.011,0.073 0,0.094 0.034,0.066 0.12699,-0.01 0.18798,0 0.059,0.01 0.12598,0.1209 0.12498,0.1879 -10e-4,0.046 -0.033,0.1119 -0.063,0.1559 -0.058,0.089 -0.16698,0.077 -0.24997,0.1249 -0.07,0.039 -0.084,0.1189 -0.12498,0.1879 -0.044,0.074 -0.081,0.1109 -0.063,0.2189 -0.06,0.1179 -0.12598,0.1939 -0.24997,0.2499 -0.037,0.017 -0.092,0.039 -0.12498,0.063 -0.027,0.019 -0.056,0.051 -0.094,0.094 -0.047,0.052 -0.1,0.085 -0.12499,0.125 -0.019,0.031 -0.01,0.084 -0.031,0.1249 -0.029,0.056 -0.088,0.1 -0.12498,0.1559 -0.017,0.026 -0.043,0.059 -0.063,0.094 -0.042,0.077 -0.10099,0.1509 -0.094,0.2189 0.007,0.066 0.089,0.068 0.094,0.1249 0.004,0.032 -0.033,0.059 -0.031,0.094 0.001,0.051 0.027,0.086 0.031,0.1249 0.01,0.099 -0.044,0.12 -0.063,0.188 -0.009,0.032 0.008,0.068 0,0.094 -0.016,0.05 -0.093,0.098 -0.094,0.156 -0.001,0.042 0.059,0.097 0.063,0.1559 0.002,0.04 -0.038,0.057 -0.031,0.094 0.014,0.073 0.16198,0.162 0.21897,0.2189 0.075,0.075 0.15498,0.139 0.18798,0.219 0.027,0.067 0.041,0.1678 0.094,0.2188 0.039,0.037 0.10598,0.054 0.15598,0.094 0.047,0.036 0.10698,0.055 0.15598,0.094 0.081,0.064 0.18297,0.1969 0.31296,0.1879 0.068,-0.01 0.14198,-0.05 0.21897,-0.063 0.079,-0.014 0.16998,-0.039 0.24997,-0.031 0.061,0.01 0.12398,0.066 0.18797,0.063 0.067,0 0.14299,-0.061 0.21898,-0.094 0.13198,-0.057 0.33896,-0.1529 0.53093,-0.1249 0.14598,0.021 0.14898,0.2169 0.24997,0.2809 0.11798,0.01 0.21897,-0.054 0.31296,-0.031 0.07,0.017 0.14898,0.1319 0.15598,0.1879 0.007,0.058 -0.054,0.121 -0.063,0.1559 -0.018,0.078 -0.017,0.169 -0.031,0.2189 -0.011,0.038 -0.032,0.086 -0.031,0.125 0,0.035 0.058,0.1419 0.094,0.1879 0.044,0.056 0.10299,0.096 0.15598,0.1559 0.087,0.109 0.15498,0.2359 0.21897,0.3749 0.017,0.037 -0.016,0.077 0,0.1249 -0.029,0.2239 -0.10298,0.3769 -0.24997,0.6247 -0.069,0.08 -0.15798,0.15 -0.15598,0.2499 -0.005,0.2399 0.13599,0.3928 0.12499,0.6247 -0.024,0.3118 0.024,0.3328 0,0.4997 0.10499,0.053 0.031,0.2329 0,0.3439 -0.045,0.1319 -0.1,0.1619 -0.12499,0.2499 0.071,0.031 0.17098,0.019 0.24997,0 0,0 0.096,0.4008 0.094,0.4058 -0.8069,0.7967 -1.81877,1.3874 -2.93763,1.7182 -0.54993,0.1329 -0.71291,0.1329 -0.96888,0.1879 -0.33395,0.055 -0.68291,0.094 -1.03087,0.094 -0.24296,0 -0.48293,-0.01 -0.71891,-0.031 -0.18197,-0.018 -0.35395,-0.062 -0.53093,-0.094 -0.053,-0.01 -0.10398,-0.02 -0.15598,-0.031 -0.16298,-0.055 -0.35095,-0.088 -0.49994,-0.1249 -0.16997,-0.048 -0.33495,-0.096 -0.49993,-0.156 0.014,-0.013 0.027,-0.011 0.031,-0.031 0.009,-0.04 0.002,-0.062 0,-0.1249 0.015,-0.065 0.08,-0.058 0.094,-0.1249 -0.028,-0.048 -0.083,-0.038 -0.12498,-0.063 -0.041,-0.024 -0.068,-0.074 -0.063,-0.125 0.07,-0.029 0.19997,0.066 0.24996,-0.031 0.025,-0.046 -0.034,-0.1409 0,-0.1879 0.023,-0.031 0.16898,-0.055 0.21898,-0.063 0.071,-0.012 0.14798,-0.01 0.18797,-0.031 0.044,-0.029 0.10099,-0.105 0.094,-0.188 -0.004,-0.039 -0.033,-0.059 -0.063,-0.094 -0.025,-0.029 -0.013,-0.066 -0.031,-0.094 -0.031,-0.047 -0.08,-0.058 -0.094,-0.1249 0.096,-0.019 0.23597,0.1019 0.37496,0.063 0.066,-0.019 0.15698,-0.188 0.18797,-0.2499 0.01,-0.019 -0.01,-0.04 0,-0.063 0.012,-0.026 0.059,-0.049 0.063,-0.063 0.01,-0.036 -0.008,-0.071 0,-0.094 0.024,-0.068 0.085,-0.075 0.12498,-0.125 0.03,-0.038 0.065,-0.087 0.094,-0.1249 0.031,-0.041 0.042,-0.089 0.063,-0.125 0.02,-0.1219 -0.06,-0.2059 -0.031,-0.3128 0.032,-0.12 0.19598,-0.165 0.31296,-0.2189 0.04,-0.019 0.092,-0.05 0.12499,-0.063 0.08,-0.028 0.17598,-0.036 0.24997,-0.063 0.12498,-0.046 0.15698,-0.1669 0.21897,-0.2809 0.029,-0.054 0.057,-0.1179 0.063,-0.1559 0.005,-0.035 -0.007,-0.053 0,-0.094 0.006,-0.04 0.02,-0.081 0.031,-0.1248 0.014,-0.058 0.031,-0.1539 0.031,-0.2189 0,-0.053 -0.029,-0.078 -0.031,-0.1249 -0.009,-0.173 0.061,-0.218 0.12498,-0.3129 0.032,-0.047 0.04,-0.091 0.063,-0.125 0.10799,-0.1609 0.29497,-0.2259 0.28097,-0.4688 -0.005,-0.08 -0.035,-0.2558 -0.094,-0.2808 -0.034,-0.015 -0.10699,-0.011 -0.15598,-0.031 -0.15798,-0.059 -0.27397,-0.2689 -0.43795,-0.2809 -0.035,0 -0.055,0.031 -0.094,0.031 -0.065,0 -0.14698,-0.053 -0.21897,-0.063 -0.046,-0.01 -0.12898,0.013 -0.15598,0 -0.042,-0.02 -0.029,-0.1019 -0.063,-0.1249 -0.027,-0.018 -0.084,-0.015 -0.12498,-0.031 -0.066,-0.025 -0.11199,-0.056 -0.18798,-0.063 -0.023,-0.001 -0.067,0 -0.094,0 -0.042,-0.01 -0.086,-0.04 -0.12498,-0.063 -0.048,-0.029 -0.074,-0.052 -0.094,-0.094 0.044,-0.1439 -0.096,-0.1669 -0.12498,-0.2499 -0.014,-0.039 0.013,-0.09 0,-0.1249 -0.017,-0.05 -0.071,-0.084 -0.12499,-0.125 -0.097,-0.074 -0.17398,-0.1389 -0.31296,-0.1559 -0.061,-0.01 -0.14498,0 -0.21897,0 -0.078,-0.01 -0.16098,-0.058 -0.21897,-0.125 -0.056,-0.065 -0.076,-0.1249 -0.12499,-0.1559 -0.047,-0.03 -0.12398,-0.031 -0.15598,-0.063 -0.014,-0.014 -0.017,-0.031 -0.031,-0.063 -0.023,-0.048 -0.061,-0.098 -0.031,-0.156 -0.053,-0.027 -0.035,0.072 -0.094,0.063 -0.052,-0.074 -0.10099,-0.115 -0.21897,-0.094 -0.054,0.01 -0.093,0.06 -0.15598,0.063 -0.052,0 -0.088,-0.053 -0.15598,-0.063 -0.052,-0.01 -0.11999,0.036 -0.15598,0.031 -0.057,-0.011 -0.073,-0.059 -0.12499,-0.094 -0.038,-0.025 -0.10398,-0.095 -0.12498,-0.094 -0.067,0 -0.12598,0.1429 -0.21897,0.094 -0.045,-0.057 0.085,-0.071 0.031,-0.125 -0.04,-0.041 -0.061,0.01 -0.094,0.031 -0.037,0.025 -0.084,0.047 -0.12499,0.063 -0.092,0.034 -0.14698,0.025 -0.21897,0.063 -0.066,0.034 -0.087,0.088 -0.12499,0.156 -0.031,0.056 -0.079,0.1529 -0.12498,0.1559 -0.056,0 -0.10599,-0.072 -0.15598,-0.094 -0.15298,-0.066 -0.24797,0.03 -0.37495,0.031 -0.11799,0 -0.28697,-0.1709 -0.28097,-0.2808 0.004,-0.067 0.054,-0.166 0.063,-0.2499 0.006,-0.066 0.062,-0.127 0.063,-0.1879 0.001,-0.081 -0.13499,-0.147 -0.18798,-0.156 -0.12498,-0.023 -0.29496,0.061 -0.43794,0 -0.027,-0.045 0.047,-0.081 0.063,-0.1249 0.009,-0.025 -0.009,-0.034 0,-0.063 0.016,-0.042 0.074,-0.08 0.094,-0.1249 0.015,-0.034 0.016,-0.082 0.031,-0.125 0.017,-0.049 0.059,-0.091 0.063,-0.1249 0.005,-0.045 -0.027,-0.095 -0.063,-0.125 -0.11098,0.01 -0.18697,0 -0.24997,0.031 -0.14398,0.066 -0.10598,0.2659 -0.24997,0.3129 -0.05,0.016 -0.13298,0.021 -0.18797,0.031 -0.047,0.01 -0.10699,0.032 -0.15598,0.031 -0.058,-0.001 -0.15298,-0.057 -0.18798,-0.094 -0.009,-0.01 -0.024,-0.036 -0.031,-0.063 0.002,-0.01 -0.002,-0.021 0,-0.031 0.046,-0.2229 0.093,-0.4438 0.15598,-0.6557 0.003,-0.01 -0.003,-0.022 0,-0.031 0.042,-0.1389 0.10298,-0.2699 0.15598,-0.4058 0.013,-0.01 0.019,-0.023 0.031,-0.031 0.077,-0.053 0.15598,-0.1189 0.24997,-0.1249 0.057,0 0.16398,0.02 0.21897,0.031 0.05,0.01 0.082,0.059 0.12499,0.063 0.12298,0.01 0.14898,-0.1029 0.24997,-0.1559 0.10398,0.015 0.15598,-0.01 0.24996,0 0.064,0.01 0.13799,0.09 0.18798,0.094 0.042,0 0.053,-0.069 0.094,-0.063 0.04,0.01 0.11898,0.1079 0.12498,0.1559 0.007,0.06 -0.048,0.122 -0.031,0.1879 0.063,0.064 0.19097,0.056 0.28096,0.094 0.059,-0.048 0.009,-0.118 0,-0.1879 -0.002,-0.031 0.004,-0.066 0,-0.094 -0.006,-0.048 -0.031,-0.084 -0.031,-0.1249 -0.001,-0.1899 0.15398,-0.2999 0.28096,-0.3749 0.055,-0.033 0.10799,-0.069 0.15598,-0.094 0.067,-0.034 0.1,-0.063 0.15598,-0.094 0.10099,-0.057 0.20198,-0.092 0.28097,-0.1559 0.037,-0.086 -0.004,-0.1959 0,-0.2809 0.037,-0.022 0.055,0 0.094,0 0.061,-0.013 0.09,-0.091 0.12499,-0.1249 0.02,-0.02 0.069,-0.043 0.094,-0.063 0.061,-0.048 0.072,-0.104 0.12498,-0.125 0.019,-0.01 0.064,-0.017 0.094,-0.031 0.04,-0.011 0.092,-0.04 0.15598,-0.063 0.042,-0.014 0.13998,-0.015 0.15598,-0.031 0.02,-0.02 -0.006,-0.095 0,-0.1249 0.032,-0.151 0.27196,-0.168 0.40595,-0.2189 0.094,-0.036 0.17798,-0.114 0.28096,-0.094 -0.02,0.072 -0.10998,0.038 -0.094,0.1249 0.023,0.121 0.17598,-0.013 0.21898,-0.031 0.081,-0.034 0.23697,-0.055 0.34395,-0.094 0.094,-0.034 0.24497,-0.08 0.15598,-0.1879 -0.074,0 -0.092,0.066 -0.15598,0.094 -0.044,0.01 -0.056,-0.027 -0.094,-0.031 -0.036,0 -0.057,0.038 -0.094,0.031 -0.037,-0.01 -0.088,-0.082 -0.094,-0.1249 -0.015,-0.111 0.10999,-0.136 0.15598,-0.2189 -0.03,-0.101 -0.16598,-0.024 -0.24997,-0.063 0.009,-0.06 0.055,-0.1139 0.12499,-0.1249 0.057,-0.01 0.18497,0.01 0.21897,0.031 0.02,0.017 0,0.066 0.031,0.094 0.034,0.031 0.081,0.01 0.12499,0 0.016,-0.076 -0.10599,-0.043 -0.094,-0.094 0.09,-0.059 0.26497,-0.016 0.37495,-0.031 0.063,-0.01 0.13099,-0.062 0.18798,-0.094 0.054,-0.03 0.099,-0.081 0.15598,-0.031 0.016,0.054 -0.032,0.066 -0.063,0.094 -0.10199,0.091 -0.20198,0.2069 -0.28097,0.3128 0.049,0.048 0.13599,0.022 0.21898,0.031 0.032,0 0.06,0.025 0.094,0.031 0.04,0.01 0.094,-0.012 0.12499,0 0.056,0.014 0.07,0.094 0.12498,0.094 0.091,0 0.083,-0.125 0.031,-0.1879 0.016,-0.063 0.053,-0.08 0.031,-0.125 -0.041,-0.082 -0.21097,0.014 -0.21897,-0.094 -0.005,-0.067 0.07,-0.075 0.094,-0.125 -0.011,-0.1289 0.10598,-0.1349 0.094,-0.2499 -0.006,-0.048 -0.06,-0.049 -0.094,-0.094 -0.017,-0.023 -0.01,-0.076 -0.031,-0.094 -0.07,-0.059 -0.20997,-0.044 -0.21897,-0.1559 -0.004,-0.066 0.01,-0.115 0,-0.1879 -0.009,-0.067 -0.066,-0.2679 -0.12498,-0.2809 -0.075,-0.016 -0.12899,0.1139 -0.21898,0.1559 -0.049,0.023 -0.13898,0.04 -0.18797,0.031 -0.032,-0.01 -0.089,-0.032 -0.094,-0.094 -0.006,-0.07 0.05,-0.082 0.063,-0.1558 -0.011,-0.044 -0.051,-0.029 -0.094,-0.063 -0.049,-0.037 -0.091,-0.1159 -0.15598,-0.1249 -0.033,0 -0.093,0.029 -0.12498,0.031 -0.06,0 -0.10599,-0.015 -0.15598,-0.031 0.021,-0.01 0.041,-0.024 0.063,-0.031 0.12198,-0.042 0.24997,-0.059 0.37495,-0.094 0.022,-0.01 0.041,-0.025 0.063,-0.031 0.031,0.033 0.056,0.1029 0.094,0.1249 0.025,0.014 0.063,-0.01 0.094,0 0.098,0.03 0.17398,0.085 0.28097,0.063 0.037,-0.065 -0.074,-0.074 -0.031,-0.125 0.072,0.01 0.13198,0.04 0.18798,0.063 0.077,-0.056 0.12798,-0.066 0.12498,-0.1559 -0.001,-0.046 -0.062,-0.063 -0.094,-0.094 0.063,-0.011 0.12399,-0.022 0.18798,-0.031 0.005,0.017 0.021,0.03 0.031,0.031 0.038,0.01 0.16498,-0.051 0.18797,-0.063 0.004,0 -0.006,-0.027 0,-0.031 0.25297,-0.027 0.52094,-0.031 0.7809,-0.031 m -2.49968,0.4688 c -0.023,0.043 -0.047,0.079 -0.094,0.094 0.012,0.065 -0.084,0.1049 -0.094,0.1558 -0.006,0.035 -0.002,0.094 0,0.125 0.02,0.3189 -0.25096,0.4768 -0.56293,0.4688 -0.061,0.058 -0.029,0.1699 -0.063,0.2499 -0.028,0.067 -0.11998,0.1309 -0.18797,0.1249 -0.05,0 -0.12499,-0.079 -0.12499,-0.1249 0,-0.057 0.081,-0.091 0.031,-0.156 0.007,-0.044 0.10598,-0.086 0.094,-0.1559 -0.012,-0.074 -0.096,-0.019 -0.18798,-0.031 -0.052,-0.01 -0.13298,-0.037 -0.18798,-0.063 0.10099,-0.067 0.20498,-0.126 0.31296,-0.188 0.094,-0.056 0.18498,-0.1049 0.28097,-0.1559 0.25197,-0.1269 0.52193,-0.2438 0.7809,-0.3437 m 5.37432,0.7495 c -0.027,0 -0.04,0.018 -0.063,0.031 -0.051,0.031 -0.054,0.079 -0.094,0.094 -0.054,0.021 -0.11698,0.01 -0.12498,0.063 -0.006,0.041 0.033,0.055 0.031,0.094 -0.02,0.049 -0.053,0.066 -0.063,0.1249 0.068,0.11 0.22897,-0.01 0.31296,-0.031 0.038,-0.011 0.073,0 0.094,-0.031 0.023,-0.035 0.013,-0.105 0.031,-0.156 0.019,-0.056 0.069,-0.043 0.063,-0.094 -0.006,-0.05 -0.10599,-0.102 -0.18797,-0.094 m -7.31208,0.7807 c 0.061,0.016 0.19597,0.1929 0.063,0.2499 -0.013,0.01 -0.18698,0.036 -0.21897,0.031 -0.046,-0.01 -0.078,-0.086 -0.12499,-0.094 -0.092,-0.016 -0.21797,0.101 -0.28096,0 0.016,-0.059 0.086,-0.043 0.15598,-0.063 0.12498,-0.034 0.29796,-0.1529 0.40595,-0.1249 m 0.24996,0.3128 c 0.031,0 0.056,0.059 0.094,0.063 0.036,0 0.072,-0.036 0.094,-0.031 0.056,0.015 0.084,0.115 0.031,0.156 -0.044,0 -0.061,-0.037 -0.094,-0.031 -0.091,0.016 -0.11999,0.1929 -0.18798,0.1879 -0.064,-0.01 -0.096,-0.1409 -0.031,-0.1879 0.002,-0.04 -0.033,-0.054 -0.031,-0.094 0.02,-0.025 0.072,-0.066 0.12498,-0.063 m -0.31296,0.031 c 0.019,0.001 0.024,0 0.031,0 -0.009,0.071 -0.039,0.091 -0.094,0.125 -0.095,0.057 -0.15698,0.1279 -0.18797,0.2499 -0.009,0.036 -0.11099,0.1339 -0.15598,0.1249 -0.10599,-0.022 0.038,-0.2199 0.063,-0.2499 0.027,-0.033 0.062,-0.056 0.094,-0.094 0.03,-0.037 0.033,-0.105 0.063,-0.125 0.032,-0.022 0.13198,-0.033 0.18797,-0.031 m 9.49881,0.031 c 0.048,0.013 0.058,0.069 0.094,0.094 0.027,0.018 0.064,0.012 0.094,0.031 0.035,0.022 0.054,0.06 0.094,0.094 0.056,0.047 0.13998,0.088 0.21897,0.125 0.016,0.01 0.044,0.023 0.063,0.031 0.055,0.071 0.10399,0.1449 0.15598,0.2189 0.006,0.04 0.012,0.099 0.031,0.1249 0.052,0.071 0.13098,0.1319 0.18798,0.2189 -10e-4,0.083 0.036,0.133 0.094,0.1559 0.073,0.124 0.14898,0.2479 0.21897,0.3748 0.029,0.058 0.035,0.1289 0.063,0.1879 -0.021,0 -0.043,0.01 -0.063,0 -0.066,-0.116 -0.40895,-0.1389 -0.43795,0.031 -0.013,0.075 0.049,0.1749 -0.063,0.1879 -0.071,0.01 -0.15298,-0.073 -0.24997,-0.094 -0.04,-0.01 -0.094,0.014 -0.12498,0 -0.073,-0.025 -0.062,-0.1119 -0.12498,-0.1559 -0.036,-0.025 -0.12999,-0.056 -0.18798,-0.063 -0.036,0 -0.056,0 -0.094,0 -0.045,-0.01 -0.11798,-0.01 -0.15598,-0.031 -0.036,-0.022 -0.11599,-0.062 -0.12498,-0.094 -0.014,-0.049 0.09,-0.1139 0.094,-0.1558 0.002,-0.031 -0.023,-0.045 -0.031,-0.094 -0.005,-0.029 0.006,-0.074 0,-0.094 -0.01,-0.034 -0.071,-0.062 -0.12499,-0.063 -0.048,0 -0.084,0.03 -0.12498,0.031 -0.059,0.001 -0.17698,-0.037 -0.24997,-0.031 -0.044,0 -0.084,0.028 -0.12499,0.031 -0.11598,0.01 -0.19097,-0.01 -0.28096,0 -0.066,0 -0.18898,0.034 -0.24997,0.063 -0.031,0.014 -0.054,0.043 -0.094,0.063 -0.018,0.01 -0.039,0.021 -0.063,0.031 -0.038,0.017 -0.089,0.053 -0.12498,0.063 -0.052,0.013 -0.12399,0 -0.21898,0 -0.068,0 -0.18697,-0.014 -0.18797,-0.094 -10e-4,-0.1229 0.22697,-0.072 0.34396,-0.094 0.044,-0.01 0.073,-0.063 0.12498,-0.094 0.025,-0.015 0.039,-0.015 0.063,-0.031 0.04,-0.028 0.11898,-0.093 0.12498,-0.1249 0.006,-0.03 -0.035,-0.072 -0.031,-0.094 0.005,-0.028 0.057,-0.058 0.094,-0.094 0.056,-0.055 0.087,-0.1199 0.15598,-0.1559 0.047,-0.025 0.13499,-0.024 0.15599,-0.063 0.005,-0.043 -0.001,-0.055 0,-0.094 0.029,-0.027 0.038,-0.058 0.063,-0.063 0.072,-0.016 0.13498,0.035 0.21897,0.031 0.036,0 0.086,-0.01 0.12498,-0.031 0.033,-0.022 0.062,-0.045 0.094,-0.063 0.035,-0.018 0.051,-0.059 0.094,-0.063 0.10499,-0.01 0.17098,0.1239 0.21897,0.1879 0.04,0.053 0.15299,0.1189 0.21898,0.1559 0.037,0.021 0.084,0.045 0.12498,0.063 0.087,0.039 0.24697,0.1649 0.24997,0.2499 0.002,0.042 -0.038,0.054 -0.031,0.094 0.066,0.011 0.12298,-0.059 0.12498,-0.1249 10e-4,-0.041 -0.039,-0.05 -0.031,-0.094 0.031,-0.066 0.14798,-0.01 0.18798,-0.031 -0.007,-0.075 -0.12398,-0.086 -0.18798,-0.1249 -0.034,-0.021 -0.058,-0.048 -0.094,-0.063 -0.052,-0.021 -0.11598,-0.032 -0.15598,-0.063 -0.038,-0.029 -0.057,-0.08 -0.094,-0.1249 -0.054,-0.064 -0.15798,-0.073 -0.12498,-0.2189 0.016,-0.022 0.037,-0.069 0.063,-0.063 m -8.81189,0.2189 0.094,0 c 0.034,10e-4 0.08,-0.018 0.094,0 -0.022,0.088 -0.21197,0.063 -0.28096,0.031 0.004,-0.033 0.05,-0.027 0.094,-0.031 m -0.31296,0.156 c 0.023,0 0.039,-0.01 0.063,0 -0.062,0.052 -0.14398,0.092 -0.24997,0.1249 -0.051,0.016 -0.11598,0.025 -0.12498,-0.031 -0.011,-0.069 0.047,-0.056 0.094,-0.063 0.058,-0.01 0.14999,-0.029 0.21898,-0.031 m 8.6869,0 c -0.043,0.014 -0.066,0.1129 0,0.1249 0.031,-0.018 0.039,-0.068 0.031,-0.1249 -0.017,-0.018 -0.017,0 -0.031,0 m -0.031,0.1879 c -0.021,0.01 -0.04,0.01 -0.063,0.031 10e-4,0.075 0.015,0.1229 0,0.1879 0.043,0.082 0.13398,0.026 0.15598,-0.031 0.026,-0.1389 -0.03,-0.2049 -0.094,-0.1879 m 0.43795,0.3748 c 0.049,0.08 0.14098,0.137 0.24997,0.1559 0.04,-0.03 0.044,-0.1049 0.063,-0.1559 -0.047,10e-4 -0.097,0 -0.15598,0 -0.059,0 -0.12198,-0.028 -0.15598,0 m -11.68652,2.6867 c 0.16398,-0.01 0.21197,0.2159 0.34395,0.2809 0.033,0.017 0.082,0.022 0.12499,0.031 0.035,0.01 0.061,0.02 0.094,0.031 0.071,0.024 0.16198,0.01 0.21897,0.031 0.085,0.038 0.14598,0.2069 0.21897,0.2499 0.004,0.043 -0.013,0.093 0,0.1249 0.035,0.047 0.099,0.064 0.15598,0.094 0.068,0.037 0.092,0.1269 0.15598,0.1559 0.022,0.01 0.059,-0.01 0.094,0 0.088,0.027 0.11199,0.1468 0.18798,0.1248 0.05,-0.014 0.055,-0.078 0.063,-0.1248 0.033,-0.036 0.074,-0.093 0.12498,-0.094 0.083,0 0.095,0.075 0.12499,0.1559 0.017,0.046 0.051,0.1079 0.063,0.1559 0.021,0.083 0.017,0.3249 0,0.3748 -0.021,0.061 -0.10599,0.089 -0.15598,0.156 -0.024,0.031 -0.044,0.071 -0.063,0.094 -0.032,0.04 -0.069,0.057 -0.094,0.094 -0.014,0.021 -0.018,0.066 -0.031,0.094 -0.04,0.085 -0.096,0.148 -0.063,0.2499 0.014,0.042 0.062,0.076 0.063,0.125 0,0.058 -0.11498,0.093 -0.12498,0.1559 -0.007,0.047 0.048,0.126 0.063,0.1879 0.011,0.047 0.097,0.094 0.12498,0.125 0.047,0.053 0.082,0.1209 0.12499,0.1879 0.085,0.1299 0.13598,0.2799 0.21897,0.4058 0.043,0.066 0.12698,0.119 0.15598,0.1879 0.015,0.035 -0.014,0.094 0,0.125 0.048,0.1079 0.26597,0.2279 0.37495,0.2809 0.051,0.025 0.10999,0 0.15598,0.031 0.071,0.039 0.21398,0.1569 0.24997,0.2189 0.032,0.056 0.047,0.1929 0.063,0.2808 0.021,0.117 -0.005,0.2169 0,0.3439 0.004,0.069 0.03,0.1189 0.031,0.1879 0,0.024 10e-4,0.07 0,0.094 -0.002,0.083 0.007,0.1659 0,0.2498 -0.004,0.046 -0.003,0.087 0,0.125 0.004,0.041 0.028,0.057 0.031,0.094 0.002,0.039 -0.035,0.095 -0.031,0.125 0.009,0.084 0.077,0.1419 0.094,0.2189 0.013,0.061 0.039,0.2079 0.031,0.2809 -0.005,0.039 -0.025,0.083 -0.031,0.1249 -0.004,0.033 0.005,0.062 0,0.094 -0.006,0.047 -0.034,0.081 -0.031,0.1249 0.006,0.09 0.08,0.16 0.094,0.2499 0.005,0.03 -10e-4,0.065 0,0.094 10e-4,0.027 0.023,0.038 0.031,0.063 -0.26297,-0.1499 -0.50894,-0.3178 -0.74991,-0.4997 -0.22897,-0.173 -0.45094,-0.3639 -0.65592,-0.5628 -0.01,-0.01 -0.021,-0.021 -0.031,-0.031 -0.20698,-0.2039 -0.41395,-0.4278 -0.59393,-0.6557 -0.10398,-0.1319 -0.21797,-0.2669 -0.31296,-0.4058 -0.056,-0.083 -0.10399,-0.1639 -0.15598,-0.2499 -0.032,-0.051 -0.063,-0.104 -0.094,-0.1559 -0.089,-0.153 -0.17297,-0.3078 -0.24997,-0.4687 -0.049,-0.101 -0.081,-0.2079 -0.12498,-0.3129 -0.10499,-0.2479 -0.20497,-0.4888 -0.28096,-0.7497 -0.054,-0.1849 -0.086,-0.3708 -0.12499,-0.5627 -0.03,-0.146 -0.073,-0.2889 -0.094,-0.4378 -0.011,-0.081 -0.023,-0.168 -0.031,-0.2499 -0.024,-0.2349 -0.031,-0.4768 -0.031,-0.7186 0,-0.3019 0.026,-0.5837 0.063,-0.8746 10e-4,-0.01 -10e-4,-0.021 0,-0.031 0.063,0 0.14899,-0.092 0.21898,-0.094 m 2.68766,0.7497 c 0.064,-0.029 0.084,0.117 0.031,0.125 -0.05,0.01 -0.08,-0.102 -0.031,-0.125"
- style="fill:currentColor;fill-opacity:1"
- class="ColorScheme-Text"/>
- </g>
+ <path
+ style="fill:currentColor;fill-opacity:1;stroke:none"
+ d="m 11,4 a 7,7 0 0 0 -7,7 7,7 0 0 0 7,7 7,7 0 0 0 7,-7 7,7 0 0 0 -7,-7 z"
+ class="ColorScheme-Text"
+ />
+ <path
+ style="fill:currentColor;fill-opacity:1;stroke:none"
+ d="M 18.507664,2.0085649 C 17.21672,1.9061675 15.203123,2.7253487 12.918248,4.2795048 a 6.9994649,6.9983219 0 0 1 1.249905,0.4901167 C 16.569065,3.132598 18.411467,2.4468578 18.93732,3.299271 19.77371,4.6550702 16.968824,9.3840312 12.51203,13.455038 8.0552349,17.526045 3.7983678,19.958041 2.9619776,18.602242 2.4983032,17.850621 3.2126068,16.079636 4.6747373,13.968587 A 6.9994649,6.9983219 0 0 1 4.2841421,12.943442 C 2.5143079,15.554087 1.6223044,17.88786 2.1514928,19.125554 3.0636295,21.260032 7.7647462,19.352681 12.650691,14.864856 17.536453,10.377031 20.757911,5.0096482 19.845453,2.8755445 19.617419,2.3419251 19.152935,2.0597475 18.507664,2.0085649 Z"
+ class="ColorScheme-Highlight"
+ />
</svg>
diff --git a/kstars/kstarslite/qml/images/svg/kstars_supernovae.svg b/kstars/kstarslite/qml/images/svg/kstars_supernovae.svg
index 97f94cc..0335d35 100644
--- a/kstars/kstarslite/qml/images/svg/kstars_supernovae.svg
+++ b/kstars/kstarslite/qml/images/svg/kstars_supernovae.svg
@@ -1,14 +1,78 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 22 22">
- <defs id="defs3051">
- <style type="text/css" id="current-color-scheme">
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+ viewBox="0 0 22 22"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="kstars_supernovae.svg">
+ <metadata
+ id="metadata12">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="1360"
+ inkscape:window-height="708"
+ id="namedview10"
+ showgrid="true"
+ inkscape:zoom="21.454545"
+ inkscape:cx="7.6795112"
+ inkscape:cy="12.007271"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4134" />
+ </sodipodi:namedview>
+ <defs
+ id="defs3051">
+ <style
+ type="text/css"
+ id="current-color-scheme">
.ColorScheme-Text {
- color:#f2f2f2
+ color:#f2f2f2;
+ }
+ .ColorScheme-Highlight {
+ color:#3daee9;
}
</style>
</defs>
- <path
- style="fill:currentColor;fill-opacity:0.5;stroke:none"
- d="M 14 3 C 12.338 3 11 4.338 11 6 C 11 7.662 12.338 9 14 9 C 15.662 9 17 7.662 17 6 C 17 4.338 15.662 3 14 3 z M 8 6 C 6.3380003 6 5 7.3380003 5 9 C 5 10.662 6.3380003 12 8 12 C 9.6619997 12 11 10.662 11 9 C 11 7.3380003 9.6619997 6 8 6 z M 14 10 C 13.353654 10 12.744006 10.134157 12.181641 10.361328 L 12.636719 11.275391 C 13.064535 11.114885 13.514485 11 14 11 C 16.21602 11 18 12.78398 18 15 L 14.5 15 L 15 16 L 19 16 L 19 15 C 19 12.22998 16.77002 10 14 10 z M 8 13 C 5.2299834 13 3 15.229983 3 18 L 3 19 L 13 19 L 13 18 C 13 15.229983 10.770017 13 8 13 z M 8 14 C 10.216017 14 12 15.783983 12 18 L 4 18 C 4 15.783983 5.7839834 14 8 14 z "
- class="ColorScheme-Text"
- />
+ <path
+ sodipodi:type="star"
+ style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:2;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4136"
+ sodipodi:sides="4"
+ sodipodi:cx="11"
+ sodipodi:cy="11"
+ sodipodi:r1="9"
+ sodipodi:r2="2.8284271"
+ sodipodi:arg1="0"
+ sodipodi:arg2="0.78539816"
+ inkscape:flatsided="false"
+ inkscape:rounded="0"
+ inkscape:randomized="0"
+ d="M 20,11 13,13 11,20 9,13 2,11 9,9 11,2 13,9 Z" />
</svg>
diff --git a/kstars/kstarslite/qml/modules/helpers/TopMenuButton.qml b/kstars/kstarslite/qml/modules/helpers/TopMenuButton.qml
index 1fdf804..8a1b2bf 100644
--- a/kstars/kstarslite/qml/modules/helpers/TopMenuButton.qml
+++ b/kstars/kstarslite/qml/modules/helpers/TopMenuButton.qml
@@ -64,8 +64,8 @@ AbstractButton {
Image {
id: icon
source: iconSrc
- width: sourceSize.width/num.pixelRatio
- height: sourceSize.height/num.pixelRatio
+ width: sourceSize.width
+ height: sourceSize.height
anchors.centerIn: iconRect
}
diff --git a/kstars/skymapliteevents.cpp b/kstars/skymapliteevents.cpp
index 30d3268..dc9535c 100644
--- a/kstars/skymapliteevents.cpp
+++ b/kstars/skymapliteevents.cpp
@@ -12,7 +12,7 @@
#include "projections/projector.h"
#include "skymapcomposite.h"
#include "ksutils.h"
-#include <QTapSensor>
+//#include <QTapSensor>
void SkyMapLite::mousePressEvent( QMouseEvent *e ) {
if ( ( e->modifiers() & Qt::ControlModifier ) && (e->button() == Qt::LeftButton) ) {