From 15b0b38acbad223d301c9146f432d0b915f7bd0f Mon Sep 17 00:00:00 2001
From: SeeLook <seelook@gmail.com>
Date: Sat, 22 Feb 2020 23:02:44 +0100
Subject: [PATCH] [ANDROID] configurable options for full screen, rotation and
lock
- new settings in Tglobals
- settings page and pane icon
- JNI implementation
- get rid of old code for full screen and screen on
---
TODO.md | 4 -
changes | 2 +
picts/pane/phoneSett.png | Bin 0 -> 6099 bytes
spare_parts/scalable/pane/phoneSett.svg | 1037 +++++++++++++++++++++++
src/libs/core/Android/tandroid.cpp | 44 +-
src/libs/core/Android/tandroid.h | 6 +-
src/libs/core/core.qrc | 1 +
src/libs/core/tglobals.cpp | 39 +-
src/libs/core/tglobals.h | 16 +-
src/libs/core/tinitcorelib.cpp | 6 +-
src/nootka.qrc | 1 +
src/qml/MainWindow.qml | 6 +-
src/qml/settings/+android/PhonePage.qml | 54 ++
src/qml/settings/TsettingsDialog.qml | 3 +
14 files changed, 1188 insertions(+), 31 deletions(-)
create mode 100644 picts/pane/phoneSett.png
create mode 100644 spare_parts/scalable/pane/phoneSett.svg
create mode 100644 src/qml/settings/+android/PhonePage.qml
diff --git a/TODO.md b/TODO.md
index 0188af4a5..238ccaa0d 100644
--- a/TODO.md
+++ b/TODO.md
@@ -98,10 +98,6 @@
============================================================================
#### To consideration:
- - additional settings options [Android]:
- - disable screen locking (TRUE by default)
- - full screen mode (TRUE by default)
- - home button actions
- In wizard: option for single note mode for very beginners
diff --git a/changes b/changes
index c9a39b37b..cc33b2dbf 100644
--- a/changes
+++ b/changes
@@ -6,6 +6,8 @@
- disabling level creator pages which are currently unused
- added help topic selector on 'help page' with all the context
- make controls look (check boxes, radios, sliders) consistent
+ ANDROID
+ - configurable options for full screen, rotation and lock
Under the hood:
- reduced memory usage for charts with many questions
diff --git a/picts/pane/phoneSett.png b/picts/pane/phoneSett.png
new file mode 100644
index 0000000000000000000000000000000000000000..4545c6041a7510edd9d6969826d5f58ce0cba3eb
GIT binary patch
literal 6099
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
P10EP$GS+#mg}eJd%wr}}
literal 0
HcmV?d00001
diff --git a/spare_parts/scalable/pane/phoneSett.svg b/spare_parts/scalable/pane/phoneSett.svg
new file mode 100644
index 000000000..2e6e63154
--- /dev/null
+++ b/spare_parts/scalable/pane/phoneSett.svg
@@ -0,0 +1,1037 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- 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="256mm"
+ height="256mm"
+ viewBox="0 0 907.08664 907.08661"
+ id="svg4160"
+ version="1.1"
+ inkscape:version="0.92.4 5da689c313, 2019-01-14"
+ sodipodi:docname="phoneSett.svg"
+ inkscape:export-filename="../../../picts/pane/phoneSett.png"
+ inkscape:export-xdpi="25.4"
+ inkscape:export-ydpi="25.4">
+ <defs
+ id="defs4162">
+ <filter
+ style="color-interpolation-filters:sRGB"
+ y="-0.25"
+ x="-0.25"
+ height="1.5"
+ width="1.5"
+ inkscape:label="Drop shadow"
+ id="filter4748-3">
+ <feGaussianBlur
+ result="blur"
+ stdDeviation="1"
+ in="SourceAlpha"
+ id="feGaussianBlur4750-0" />
+ <feColorMatrix
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 "
+ type="matrix"
+ result="bluralpha"
+ id="feColorMatrix4752-7" />
+ <feOffset
+ result="offsetBlur"
+ dy="1"
+ dx="1"
+ in="bluralpha"
+ id="feOffset4754-8" />
+ <feMerge
+ id="feMerge4756-6">
+ <feMergeNode
+ in="offsetBlur"
+ id="feMergeNode4758-8" />
+ <feMergeNode
+ in="SourceGraphic"
+ id="feMergeNode4760-8" />
+ </feMerge>
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB"
+ id="filter4748-3-2"
+ inkscape:label="Drop shadow"
+ width="1.5"
+ height="1.5"
+ x="-0.25"
+ y="-0.25">
+ <feGaussianBlur
+ id="feGaussianBlur4750-0-3"
+ in="SourceAlpha"
+ stdDeviation="1"
+ result="blur" />
+ <feColorMatrix
+ id="feColorMatrix4752-7-4"
+ result="bluralpha"
+ type="matrix"
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+ <feOffset
+ id="feOffset4754-8-0"
+ in="bluralpha"
+ dx="1"
+ dy="1"
+ result="offsetBlur" />
+ <feMerge
+ id="feMerge4756-6-9">
+ <feMergeNode
+ id="feMergeNode4758-8-9"
+ in="offsetBlur" />
+ <feMergeNode
+ id="feMergeNode4760-8-2"
+ in="SourceGraphic" />
+ </feMerge>
+ </filter>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="31.355"
+ cy="34.2617"
+ cx="96.109398"
+ id="XMLID_24_">
+ <stop
+ id="stop541"
+ style="stop-color:#494949;stop-opacity:1;"
+ offset="0" />
+ <stop
+ id="stop543"
+ style="stop-color:#eee;stop-opacity:0;"
+ offset="0.34909999" />
+ <stop
+ id="stop545"
+ style="stop-color:#545652;stop-opacity:1;"
+ offset="0.53250003" />
+ <stop
+ id="stop547"
+ style="stop-color:white;stop-opacity:0;"
+ offset="0.95859998" />
+ </radialGradient>
+ <radialGradient
+ id="XMLID_40_"
+ cx="95.362297"
+ cy="96.292999"
+ r="30.361099"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#6c6c6c;stop-opacity:1;"
+ id="stop1245" />
+ <stop
+ offset="0.20488018"
+ style="stop-color:#eee;stop-opacity:0.2783505;"
+ id="stop1247" />
+ <stop
+ offset="0.54275459"
+ style="stop-color:#7e7e7e;stop-opacity:1;"
+ id="stop1249" />
+ <stop
+ offset="0.95859998"
+ style="stop-color:white;stop-opacity:0.19587629;"
+ id="stop1251" />
+ </radialGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="59.252399"
+ cy="63.5186"
+ cx="64"
+ id="XMLID_25_">
+ <stop
+ id="stop560"
+ style="stop-color:#CF4913"
+ offset="0.5917" />
+ <stop
+ id="stop562"
+ style="stop-color:#FF7E00"
+ offset="0.7574" />
+ <stop
+ id="stop564"
+ style="stop-color:#FF9126"
+ offset="0.7713" />
+ <stop
+ id="stop566"
+ style="stop-color:#FFA247"
+ offset="0.7859" />
+ <stop
+ id="stop568"
+ style="stop-color:#FFAF60"
+ offset="0.801" />
+ <stop
+ id="stop570"
+ style="stop-color:#FFB872"
+ offset="0.8167" />
+ <stop
+ id="stop572"
+ style="stop-color:#FFBD7D"
+ offset="0.8332" />
+ <stop
+ id="stop574"
+ style="stop-color:#FFBF80"
+ offset="0.8521" />
+ <stop
+ id="stop576"
+ style="stop-color:#EC7331"
+ offset="0.9408" />
+ <stop
+ id="stop578"
+ style="stop-color:#CF4913"
+ offset="1" />
+ </radialGradient>
+ <linearGradient
+ id="XMLID_38_"
+ gradientUnits="userSpaceOnUse"
+ x1="96.990196"
+ y1="92.234398"
+ x2="119.4531"
+ y2="69.7715">
+ <stop
+ offset="0"
+ style="stop-color:#ff9832;stop-opacity:0;"
+ id="stop995" />
+ <stop
+ offset="1"
+ style="stop-color:#7e2800;stop-opacity:1;"
+ id="stop997" />
+ </linearGradient>
+ <linearGradient
+ y2="122.771"
+ x2="64.357903"
+ y1="61.5439"
+ x1="64.357903"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_26_">
+ <stop
+ id="stop583"
+ style="stop-color:#F29B68"
+ offset="0" />
+ <stop
+ id="stop585"
+ style="stop-color:#EC7331"
+ offset="0.2249" />
+ <stop
+ id="stop587"
+ style="stop-color:#CF4913"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="65.002899"
+ cy="64.103996"
+ cx="63.330601"
+ id="XMLID_27_">
+ <stop
+ id="stop592"
+ style="stop-color:#2C72C7"
+ offset="0.5325" />
+ <stop
+ id="stop594"
+ style="stop-color:#BFD9FF"
+ offset="0.68" />
+ <stop
+ id="stop596"
+ style="stop-color:#FFFFFF"
+ offset="0.83" />
+ <stop
+ id="stop598"
+ style="stop-color:#F9FBFD"
+ offset="0.8521" />
+ <stop
+ id="stop600"
+ style="stop-color:#EAF0F8"
+ offset="0.8803" />
+ <stop
+ id="stop602"
+ style="stop-color:#CFDEF1"
+ offset="0.9119" />
+ <stop
+ id="stop604"
+ style="stop-color:#ABC5E5"
+ offset="0.9459" />
+ <stop
+ id="stop606"
+ style="stop-color:#7CA6D7"
+ offset="0.9815" />
+ <stop
+ id="stop608"
+ style="stop-color:#6193CF"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="64.9991"
+ cy="64.103996"
+ cx="63.3325"
+ id="XMLID_28_">
+ <stop
+ id="stop613"
+ style="stop-color:#2C72C7"
+ offset="0.5325" />
+ <stop
+ id="stop615"
+ style="stop-color:#BFD9FF"
+ offset="0.68" />
+ <stop
+ id="stop617"
+ style="stop-color:#FFFFFF"
+ offset="0.83" />
+ <stop
+ id="stop619"
+ style="stop-color:#F9FBFD"
+ offset="0.8521" />
+ <stop
+ id="stop621"
+ style="stop-color:#EAF0F8"
+ offset="0.8803" />
+ <stop
+ id="stop623"
+ style="stop-color:#CFDEF1"
+ offset="0.9119" />
+ <stop
+ id="stop625"
+ style="stop-color:#ABC5E5"
+ offset="0.9459" />
+ <stop
+ id="stop627"
+ style="stop-color:#7CA6D7"
+ offset="0.9815" />
+ <stop
+ id="stop629"
+ style="stop-color:#6193CF"
+ offset="1" />
+ </radialGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="65"
+ cy="64.103996"
+ cx="63.3335"
+ id="XMLID_29_">
+ <stop
+ id="stop634"
+ style="stop-color:#2C72C7"
+ offset="0.5325" />
+ <stop
+ id="stop636"
+ style="stop-color:#BFD9FF"
+ offset="0.68" />
+ <stop
+ id="stop638"
+ style="stop-color:#FFFFFF"
+ offset="0.83" />
+ <stop
+ id="stop640"
+ style="stop-color:#F9FBFD"
+ offset="0.8521" />
+ <stop
+ id="stop642"
+ style="stop-color:#EAF0F8"
+ offset="0.8803" />
+ <stop
+ id="stop644"
+ style="stop-color:#CFDEF1"
+ offset="0.9119" />
+ <stop
+ id="stop646"
+ style="stop-color:#ABC5E5"
+ offset="0.9459" />
+ <stop
+ id="stop648"
+ style="stop-color:#7CA6D7"
+ offset="0.9815" />
+ <stop
+ id="stop650"
+ style="stop-color:#6193CF"
+ offset="1" />
+ </radialGradient>
+ <linearGradient
+ y2="4.3505998"
+ x2="70.501999"
+ y1="6.2460999"
+ x1="70.501999"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_30_">
+ <stop
+ id="stop655"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop657"
+ style="stop-color:#0057AE"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ gradientUnits="userSpaceOnUse"
+ r="65.003197"
+ cy="64.101097"
+ cx="63.3335"
+ id="XMLID_31_">
+ <stop
+ id="stop662"
+ style="stop-color:#2C72C7"
+ offset="0.5325" />
+ <stop
+ id="stop664"
+ style="stop-color:#BFD9FF"
+ offset="0.68" />
+ <stop
+ id="stop666"
+ style="stop-color:#FFFFFF"
+ offset="0.83" />
+ <stop
+ id="stop668"
+ style="stop-color:#F9FBFD"
+ offset="0.8521" />
+ <stop
+ id="stop670"
+ style="stop-color:#EAF0F8"
+ offset="0.8803" />
+ <stop
+ id="stop672"
+ style="stop-color:#CFDEF1"
+ offset="0.9119" />
+ <stop
+ id="stop674"
+ style="stop-color:#ABC5E5"
+ offset="0.9459" />
+ <stop
+ id="stop676"
+ style="stop-color:#7CA6D7"
+ offset="0.9815" />
+ <stop
+ id="stop678"
+ style="stop-color:#6193CF"
+ offset="1" />
+ </radialGradient>
+ <linearGradient
+ gradientTransform="rotate(-90,-1.37355,-377.49855)"
+ y2="-249.4575"
+ x2="-442.20651"
+ y1="-253.4575"
+ x1="-442.20651"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_32_">
+ <stop
+ id="stop683"
+ style="stop-color:#6193CF"
+ offset="0" />
+ <stop
+ id="stop685"
+ style="stop-color:#6E9CD3"
+ offset="0.023" />
+ <stop
+ id="stop687"
+ style="stop-color:#A1BFE3"
+ offset="0.1223" />
+ <stop
+ id="stop689"
+ style="stop-color:#CADBEF"
+ offset="0.2155" />
+ <stop
+ id="stop691"
+ style="stop-color:#E7EFF8"
+ offset="0.3001" />
+ <stop
+ id="stop693"
+ style="stop-color:#F9FBFD"
+ offset="0.373" />
+ <stop
+ id="stop695"
+ style="stop-color:#FFFFFF"
+ offset="0.426" />
+ <stop
+ id="stop697"
+ style="stop-color:#F5F8FC"
+ offset="0.534" />
+ <stop
+ id="stop699"
+ style="stop-color:#D9E5F4"
+ offset="0.7195" />
+ <stop
+ id="stop701"
+ style="stop-color:#ACC6E6"
+ offset="0.959" />
+ <stop
+ id="stop703"
+ style="stop-color:#A4C0E4"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ y2="4.4061999"
+ x2="57.582001"
+ y1="7.5858998"
+ x1="57.582001"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_34_">
+ <stop
+ id="stop715"
+ style="stop-color:#FFFFFF"
+ offset="0" />
+ <stop
+ id="stop717"
+ style="stop-color:#0057AE"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ id="radialGradient6446"
+ cx="95.362297"
+ cy="96.292999"
+ r="30.361099"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#6c6c6c;stop-opacity:1;"
+ id="stop6448" />
+ <stop
+ offset="0.20488018"
+ style="stop-color:#eee;stop-opacity:0.2783505;"
+ id="stop6450" />
+ <stop
+ offset="0.54275459"
+ style="stop-color:#7e7e7e;stop-opacity:1;"
+ id="stop6452" />
+ <stop
+ offset="0.95859998"
+ style="stop-color:white;stop-opacity:0.19587629;"
+ id="stop6454" />
+ </radialGradient>
+ <linearGradient
+ gradientTransform="rotate(90,190.4365,322.4365)"
+ y2="511.7695"
+ x2="-68.833504"
+ y1="507.7695"
+ x1="-68.833504"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_37_">
+ <stop
+ id="stop966"
+ style="stop-color:#2C72C7"
+ offset="0" />
+ <stop
+ id="stop968"
+ style="stop-color:#2F74C8"
+ offset="0.0034" />
+ <stop
+ id="stop970"
+ style="stop-color:#6D9ED8"
+ offset="0.0905" />
+ <stop
+ id="stop972"
+ style="stop-color:#A1C0E6"
+ offset="0.1739" />
+ <stop
+ id="stop974"
+ style="stop-color:#CADBF1"
+ offset="0.2513" />
+ <stop
+ id="stop976"
+ style="stop-color:#E7EFF9"
+ offset="0.3215" />
+ <stop
+ id="stop978"
+ style="stop-color:#F9FBFD"
+ offset="0.382" />
+ <stop
+ id="stop980"
+ style="stop-color:#FFFFFF"
+ offset="0.426" />
+ <stop
+ id="stop982"
+ style="stop-color:#F5F8FC"
+ offset="0.534" />
+ <stop
+ id="stop984"
+ style="stop-color:#D9E5F4"
+ offset="0.7195" />
+ <stop
+ id="stop986"
+ style="stop-color:#ACC6E6"
+ offset="0.959" />
+ <stop
+ id="stop988"
+ style="stop-color:#A4C0E4"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ id="radialGradient6485"
+ cx="95.362297"
+ cy="96.292999"
+ r="30.361099"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#6c6c6c;stop-opacity:1;"
+ id="stop6487" />
+ <stop
+ offset="0.20488018"
+ style="stop-color:#eee;stop-opacity:0.2783505;"
+ id="stop6489" />
+ <stop
+ offset="0.54275459"
+ style="stop-color:#7e7e7e;stop-opacity:1;"
+ id="stop6491" />
+ <stop
+ offset="0.95859998"
+ style="stop-color:white;stop-opacity:0.19587629;"
+ id="stop6493" />
+ </radialGradient>
+ <linearGradient
+ id="XMLID_41_"
+ gradientUnits="userSpaceOnUse"
+ x1="87.068398"
+ y1="24.355499"
+ x2="87.068398"
+ y2="53.477501">
+ <stop
+ offset="0"
+ style="stop-color:#CF5F32"
+ id="stop1258" />
+ <stop
+ offset="1"
+ style="stop-color:#803F00"
+ id="stop1260" />
+ </linearGradient>
+ <linearGradient
+ id="XMLID_42_"
+ gradientUnits="userSpaceOnUse"
+ x1="40.932098"
+ y1="24.355499"
+ x2="40.932098"
+ y2="53.477501">
+ <stop
+ offset="0"
+ style="stop-color:#CF5F32"
+ id="stop1265" />
+ <stop
+ offset="1"
+ style="stop-color:#803F00"
+ id="stop1267" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="rotate(180,-254,188)"
+ y2="249.2695"
+ x2="-572.00049"
+ y1="253.2695"
+ x1="-572.00049"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_43_">
+ <stop
+ id="stop1272"
+ style="stop-color:#6193CF"
+ offset="0" />
+ <stop
+ id="stop1274"
+ style="stop-color:#6E9CD3"
+ offset="0.023" />
+ <stop
+ id="stop1276"
+ style="stop-color:#A1BFE3"
+ offset="0.1223" />
+ <stop
+ id="stop1278"
+ style="stop-color:#CADBEF"
+ offset="0.2155" />
+ <stop
+ id="stop1280"
+ style="stop-color:#E7EFF8"
+ offset="0.3001" />
+ <stop
+ id="stop1282"
+ style="stop-color:#F9FBFD"
+ offset="0.373" />
+ <stop
+ id="stop1284"
+ style="stop-color:#FFFFFF"
+ offset="0.426" />
+ <stop
+ id="stop1286"
+ style="stop-color:#F5F8FC"
+ offset="0.534" />
+ <stop
+ id="stop1288"
+ style="stop-color:#D9E5F4"
+ offset="0.7195" />
+ <stop
+ id="stop1290"
+ style="stop-color:#ACC6E6"
+ offset="0.959" />
+ <stop
+ id="stop1292"
+ style="stop-color:#A4C0E4"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ gradientTransform="rotate(180,64,4.4375)"
+ y2="7.6455002"
+ x2="64"
+ y1="3.8954999"
+ x1="64"
+ gradientUnits="userSpaceOnUse"
+ id="XMLID_44_">
+ <stop
+ id="stop1297"
+ style="stop-color:#2C72C7"
+ offset="0" />
+ <stop
+ id="stop1299"
+ style="stop-color:#2F74C8"
+ offset="0.0034" />
+ <stop
+ id="stop1301"
+ style="stop-color:#6D9ED8"
+ offset="0.0905" />
+ <stop
+ id="stop1303"
+ style="stop-color:#A1C0E6"
+ offset="0.1739" />
+ <stop
+ id="stop1305"
+ style="stop-color:#CADBF1"
+ offset="0.2513" />
+ <stop
+ id="stop1307"
+ style="stop-color:#E7EFF9"
+ offset="0.3215" />
+ <stop
+ id="stop1309"
+ style="stop-color:#F9FBFD"
+ offset="0.382" />
+ <stop
+ id="stop1311"
+ style="stop-color:#FFFFFF"
+ offset="0.426" />
+ <stop
+ id="stop1313"
+ style="stop-color:#F5F8FC"
+ offset="0.534" />
+ <stop
+ id="stop1315"
+ style="stop-color:#D9E5F4"
+ offset="0.7195" />
+ <stop
+ id="stop1317"
+ style="stop-color:#ACC6E6"
+ offset="0.959" />
+ <stop
+ id="stop1319"
+ style="stop-color:#A4C0E4"
+ offset="1" />
+ </linearGradient>
+ <filter
+ style="color-interpolation-filters:sRGB"
+ id="filter4748-3-2-3"
+ inkscape:label="Drop shadow"
+ width="1.5"
+ height="1.5"
+ x="-0.25"
+ y="-0.25">
+ <feGaussianBlur
+ id="feGaussianBlur4750-0-3-6"
+ in="SourceAlpha"
+ stdDeviation="1"
+ result="blur" />
+ <feColorMatrix
+ id="feColorMatrix4752-7-4-7"
+ result="bluralpha"
+ type="matrix"
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+ <feOffset
+ id="feOffset4754-8-0-5"
+ in="bluralpha"
+ dx="1"
+ dy="1"
+ result="offsetBlur" />
+ <feMerge
+ id="feMerge4756-6-9-3">
+ <feMergeNode
+ id="feMergeNode4758-8-9-5"
+ in="offsetBlur" />
+ <feMergeNode
+ id="feMergeNode4760-8-2-6"
+ in="SourceGraphic" />
+ </feMerge>
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB"
+ id="filter4748-3-2-3-2"
+ inkscape:label="Drop shadow"
+ width="1.5"
+ height="1.5"
+ x="-0.25"
+ y="-0.25">
+ <feGaussianBlur
+ id="feGaussianBlur4750-0-3-6-9"
+ in="SourceAlpha"
+ stdDeviation="1"
+ result="blur" />
+ <feColorMatrix
+ id="feColorMatrix4752-7-4-7-1"
+ result="bluralpha"
+ type="matrix"
+ values="1 0 0 0 0 0 1 0 0 0 0 0 1 0 0 0 0 0 0.7 0 " />
+ <feOffset
+ id="feOffset4754-8-0-5-2"
+ in="bluralpha"
+ dx="1"
+ dy="1"
+ result="offsetBlur" />
+ <feMerge
+ id="feMerge4756-6-9-3-7">
+ <feMergeNode
+ id="feMergeNode4758-8-9-5-0"
+ in="offsetBlur" />
+ <feMergeNode
+ id="feMergeNode4760-8-2-6-9"
+ in="SourceGraphic" />
+ </feMerge>
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1238">
+ <feFlood
+ flood-opacity="0.498039"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1228" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="out"
+ result="composite1"
+ id="feComposite1230" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="3"
+ result="blur"
+ id="feGaussianBlur1232" />
+ <feOffset
+ dx="25"
+ dy="25"
+ result="offset"
+ id="feOffset1234" />
+ <feComposite
+ in="offset"
+ in2="SourceGraphic"
+ operator="atop"
+ result="composite2"
+ id="feComposite1236" />
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1394">
+ <feFlood
+ flood-opacity="0.498039"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1384" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="out"
+ result="composite1"
+ id="feComposite1386" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="7"
+ result="blur"
+ id="feGaussianBlur1388" />
+ <feOffset
+ dx="30"
+ dy="30"
+ result="offset"
+ id="feOffset1390" />
+ <feComposite
+ in="offset"
+ in2="SourceGraphic"
+ operator="atop"
+ result="composite2"
+ id="feComposite1392" />
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1562">
+ <feFlood
+ flood-opacity="0.498039"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1552" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite1554" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="7"
+ result="blur"
+ id="feGaussianBlur1556" />
+ <feOffset
+ dx="20"
+ dy="20"
+ result="offset"
+ id="feOffset1558" />
+ <feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite1560" />
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1132">
+ <feFlood
+ flood-opacity="0.498039"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1122" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="out"
+ result="composite1"
+ id="feComposite1124" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="10"
+ result="blur"
+ id="feGaussianBlur1126" />
+ <feOffset
+ dx="50"
+ dy="50"
+ result="offset"
+ id="feOffset1128" />
+ <feComposite
+ in="offset"
+ in2="SourceGraphic"
+ operator="atop"
+ result="composite2"
+ id="feComposite1130" />
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1076">
+ <feFlood
+ flood-opacity="0.498039"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1066" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite1068" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="3"
+ result="blur"
+ id="feGaussianBlur1070" />
+ <feOffset
+ dx="12"
+ dy="12"
+ result="offset"
+ id="feOffset1072" />
+ <feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite1074" />
+ </filter>
+ <filter
+ style="color-interpolation-filters:sRGB;"
+ inkscape:label="Drop Shadow"
+ id="filter1172">
+ <feFlood
+ flood-opacity="0.784314"
+ flood-color="rgb(0,0,0)"
+ result="flood"
+ id="feFlood1162" />
+ <feComposite
+ in="flood"
+ in2="SourceGraphic"
+ operator="in"
+ result="composite1"
+ id="feComposite1164" />
+ <feGaussianBlur
+ in="composite1"
+ stdDeviation="4"
+ result="blur"
+ id="feGaussianBlur1166" />
+ <feOffset
+ dx="20"
+ dy="20"
+ result="offset"
+ id="feOffset1168" />
+ <feComposite
+ in="SourceGraphic"
+ in2="offset"
+ operator="over"
+ result="composite2"
+ id="feComposite1170" />
+ </filter>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.70000001"
+ inkscape:cx="145.86959"
+ inkscape:cy="490.76407"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1920"
+ inkscape:window-height="1043"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ objecttolerance="2"
+ guidetolerance="3" />
+ <metadata
+ id="metadata4165">
+ <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="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(5.0565524,612.75506)">
+ <path
+ style="opacity:1;fill:#00a0a0;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:56.69291687;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:normal;filter:url(#filter1172)"
+ d="M 731.83789 34.119141 L 237.60938 34.121094 C 224.75339 34.13304 213.93215 43.708732 212.39648 56.419922 L 210.69336 905.0957 C 208.87816 920.15596 220.67477 933.4184 235.90625 933.43945 L 237.78516 933.43945 L 731.54492 933.43945 C 745.58646 933.41695 756.9497 922.05948 756.92773 908.07617 L 756.92773 905.52344 C 756.92773 904.52833 756.87019 903.53004 756.75391 902.54102 L 757.04883 56.419922 C 755.51317 43.70838 744.6939 34.13625 731.83789 34.119141 z M 676.72461 81.873047 C 686.72431 81.888332 695.14148 90.443119 696.33594 101.80469 L 696.10547 858.06836 C 696.19599 858.95233 696.24023 859.84496 696.24023 860.73438 L 696.24023 863.01562 C 696.25732 875.51392 687.41793 885.66549 676.49609 885.68555 L 292.43945 885.68555 L 290.97852 885.68555 C 279.13111 885.66672 269.95528 873.81242 271.36719 860.35156 L 272.69141 101.80664 C 273.88589 90.445382 282.30304 81.886093 292.30273 81.875 L 676.72461 81.873047 z "
+ transform="matrix(0.93749999,0,0,0.93749999,-5.0565524,-612.75506)"
+ id="rect6156-0-3" />
+ <path
+ id="rect1047"
+ style="opacity:1;fill:#ff2a2a;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:7.34285736;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+ d="m 480.7677,-426.35687 c 1.28021,-0.50176 2.57576,-0.96321 3.88359,-1.38252 12.54927,-4.04142 26.26669,-4.32261 39.68509,-0.0244 13.48311,4.31903 28.41636,15.80123 36.6304,28.16064 23.43989,35.26947 16.27029,83.84693 -15.98763,108.3202 -9.93497,7.53743 -27.33217,13.6956 -39.33585,13.92522 -17.99957,0.34433 -43.86941,-12.79343 -54.29879,-27.57706 -2.01647,-2.8583 -3.72458,-4.387 -3.79354,-3.39475 -0.069,0.99222 2.42198,94.83176 5.53462,208.533487 3.11261,113.701739 5.43508,207.933043 5.16042,209.402653 -0.27462,1.46971 -0.88393,2.73564 -1.35551,2.81084 -2.00624,0.32096 -7.6315,-1.40435 -8.80382,-2.70014 -0.69993,-0.77364 -1.9824,-8.37118 -2.85016,-16.884655 -1.1075,-10.86567 -3.32395,-21.308257 -7.44055,-35.030623 -9.40353,-31.346059 -19.35333,-50.6733657 -66.54951,-129.295499 -36.04365,-60.043543 -49.23353,-99.325203 -49.02674,-145.995453 0.0642,-14.49081 1.17301,-21.84174 5.50453,-36.44485 2.98443,-10.06184 6.31268,-18.57046 7.39416,-18.90467 1.08155,-0.33401 4.4915,0.95862 7.57834,2.87314 9.84037,6.10319 10.80642,12.54801 6.63538,44.23118 -4.10539,31.18506 -3.46536,41.19092 4.03998,63.31105 8.6913,25.61555 22.08604,48.99573 45.9695,80.236465 12.20275,15.9618 36.76638,44.532439 41.43144,48.190792 1.86025,1.458873 1.50087,-29.622266 -1.70989,-147.521717 -5.24341,-192.53784 -5.21703,-184.1954 -0.6513,-198.43836 7.17167,-22.37219 23.15236,-38.87549 42.35582,-46.40106 z"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccssccscccccsccccccscsccc" />
+ </g>
+</svg>
diff --git a/src/libs/core/Android/tandroid.cpp b/src/libs/core/Android/tandroid.cpp
index fa8c0f238..40a1e8310 100644
--- a/src/libs/core/Android/tandroid.cpp
+++ b/src/libs/core/Android/tandroid.cpp
@@ -28,20 +28,38 @@
#include <QtCore/qdebug.h>
-void Tandroid::setScreenLockDisabled() {
- QAndroidJniObject activity = QtAndroid::androidActivity();
- if (activity.isValid()) {
- QAndroidJniObject window = activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
- if (window.isValid()) {
- const int FLAG_KEEP_SCREEN_ON = 128;
- const int FLAG_FULLSCREEN = 1024;
-// const int FLAG_FORCE_NOT_FULLSCREEN = 2048;
- window.callMethod<void>("addFlags", "(I)V", FLAG_KEEP_SCREEN_ON | FLAG_FULLSCREEN);
- QAndroidJniEnvironment env;
- if (env->ExceptionCheck())
- env->ExceptionClear();
+void Tandroid::keepScreenOn(bool on) {
+ QtAndroid::runOnAndroidThread([on]{
+ QAndroidJniObject activity = QtAndroid::androidActivity();
+ if (activity.isValid()) {
+ QAndroidJniObject window =
+ activity.callObjectMethod("getWindow", "()Landroid/view/Window;");
+
+ if (window.isValid()) {
+ const int FLAG_KEEP_SCREEN_ON = 128;
+ if (on)
+ window.callMethod<void>("addFlags", "(I)V", FLAG_KEEP_SCREEN_ON);
+ else
+ window.callMethod<void>("clearFlags", "(I)V", FLAG_KEEP_SCREEN_ON);
+ }
}
- }
+ QAndroidJniEnvironment env;
+ if (env->ExceptionCheck())
+ env->ExceptionClear();
+ });
+}
+
+
+void Tandroid::disableRotation(bool disRot) {
+ int orientation = disRot ? 0 : 10; // SCREEN_ORIENTATION_LANDSCAPE or SCREEN_ORIENTATION_FULL_SENSOR
+ QtAndroid::runOnAndroidThread([orientation]{
+ QAndroidJniObject activity = QtAndroid::androidActivity();
+ if (activity.isValid())
+ activity.callMethod<void>("setRequestedOrientation" , "(I)V", orientation);
+ QAndroidJniEnvironment env;
+ if (env->ExceptionCheck())
+ env->ExceptionClear();
+ });
}
diff --git a/src/libs/core/Android/tandroid.h b/src/libs/core/Android/tandroid.h
index 3aa60bd78..0a23c04a8 100644
--- a/src/libs/core/Android/tandroid.h
+++ b/src/libs/core/Android/tandroid.h
@@ -28,11 +28,9 @@
* Android functions requiring invoking native methods through JNI
*/
namespace Tandroid {
+ void keepScreenOn(bool on);
- /**
- * Sets phone/tablet screen saving disabled.
- */
- void setScreenLockDisabled();
+ void disableRotation(bool disRot);
/**
* Returns a number of Android API on a hosting device.
diff --git a/src/libs/core/core.qrc b/src/libs/core/core.qrc
index 4795bfd79..29165b5f8 100644
--- a/src/libs/core/core.qrc
+++ b/src/libs/core/core.qrc
@@ -36,6 +36,7 @@
<file>picts/pane/license.png</file>
<file>picts/pane/melody.png</file>
<file>picts/pane/notSaved.png</file>
+ <file>picts/pane/phoneSett.png</file>
<file>picts/pane/qt.png</file>
<file>picts/pane/questions.png</file>
<file>picts/pane/range.png</file>
diff --git a/src/libs/core/tglobals.cpp b/src/libs/core/tglobals.cpp
index 20cbde927..c27a35961 100755
--- a/src/libs/core/tglobals.cpp
+++ b/src/libs/core/tglobals.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2019 by Tomasz Bojczuk *
+ * Copyright (C) 2011-2020 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -313,7 +313,7 @@ void Tglobals::setMarkedFrets(const QString& frets) {
}
bool ok;
int frNr = fr[i].toInt(&ok);
- if (ok && frNr > 0 && frNr <= GfretsNumber)
+ if (ok && frNr > 0 && static_cast<uint>(frNr) <= GfretsNumber)
GmarkedFrets << fr[i] + exMark;
}
}
@@ -449,7 +449,7 @@ QString Tglobals::examsDir() const { return E->examsDir; }
void Tglobals::setGuitarParams(int fretNr, const Ttune& tun) {
bool doEmit = false;
- if (fretNr != GfretsNumber) {
+ if (static_cast<uint>(fretNr) != GfretsNumber) {
GfretsNumber = fretNr;
doEmit = true;
}
@@ -667,6 +667,12 @@ void Tglobals::loadSettings(QSettings* cfg) {
A->quantization = cfg->value(QStringLiteral("quantization"), 6).toInt();
cfg->endGroup();
+#if defined (Q_OS_ANDROID)
+ m_keepScreenOn = cfg->value(QStringLiteral("keepScreenOn"), true).toBool();
+ m_disableRotation = cfg->value(QStringLiteral("disableRotation"), true).toBool();
+ m_fullScreen = cfg->value(QStringLiteral("fullScreen"), true).toBool();
+#endif
+
// cfg->beginGroup(QLatin1String("layout"));
// L->guitarEnabled = cfg->value(QStringLiteral("guitarEnabled"), true).toBool();
// #if defined (Q_OS_ANDROID)
@@ -861,6 +867,12 @@ void Tglobals::storeSettings(QSettings* cfg) {
#endif
cfg->endGroup();
+#if defined (Q_OS_ANDROID)
+ cfg->setValue(QStringLiteral("keepScreenOn"), m_keepScreenOn);
+ cfg->setValue(QStringLiteral("disableRotation"), m_disableRotation);
+ cfg->setValue(QStringLiteral("fullScreen"), m_fullScreen);
+#endif
+
// cfg->beginGroup(QLatin1String("layout"));
// cfg->setValue(QStringLiteral("toolBarAutoHide"), L->toolBarAutoHide);
// cfg->setValue(QStringLiteral("iconTextOnToolBar"), (int)L->iconTextOnToolBar);
@@ -876,3 +888,24 @@ void Tglobals::storeSettings(QSettings* cfg) {
// cfg->setValue(QStringLiteral("initialAnimAccepted"), TtouchParams::i()->initialAnimAccepted);
// cfg->endGroup();
}
+
+
+#if defined (Q_OS_ANDROID)
+
+void Tglobals::setDisableRotation(bool disRot) {
+ if (disRot != m_disableRotation) {
+ Tandroid::disableRotation(disRot);
+ m_disableRotation = disRot;
+ }
+}
+
+
+void Tglobals::keepScreenOn(bool on) {
+ if (on != m_keepScreenOn) {
+ Tandroid::keepScreenOn(on);
+ m_keepScreenOn = on;
+ }
+}
+
+#endif
+
diff --git a/src/libs/core/tglobals.h b/src/libs/core/tglobals.h
index d2a2c5582..394340bcc 100644
--- a/src/libs/core/tglobals.h
+++ b/src/libs/core/tglobals.h
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2011-2019 by Tomasz Bojczuk *
+ * Copyright (C) 2011-2020 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -311,6 +311,15 @@ public:
QString examsDir() const;
+#if defined (Q_OS_ANDROID)
+ Q_INVOKABLE void keepScreenOn(bool on);
+ Q_INVOKABLE void setDisableRotation(bool disRot);
+ Q_INVOKABLE bool isKeepScreenOn() { return m_keepScreenOn; }
+ Q_INVOKABLE bool disableRotation() { return m_disableRotation; }
+ Q_INVOKABLE bool fullScreen() { return m_fullScreen; }
+ Q_INVOKABLE void setFullScreen(bool fs) { m_fullScreen = fs; }
+#endif
+
/**
* Updates key signature names according to name style and major/minor suffixes.
* Emits @p keyNameChanged() to inform MainScore.qml
@@ -447,6 +456,11 @@ private:
Tinstrument m_instrument;
qreal m_guiScale;
bool m_isExam = false;
+#if defined (Q_OS_ANDROID)
+ bool m_keepScreenOn;
+ bool m_disableRotation;
+ bool m_fullScreen;
+#endif
};
#endif // TGLOBALS_H
diff --git a/src/libs/core/tinitcorelib.cpp b/src/libs/core/tinitcorelib.cpp
index d705536ba..be4319b7e 100644
--- a/src/libs/core/tinitcorelib.cpp
+++ b/src/libs/core/tinitcorelib.cpp
@@ -1,5 +1,5 @@
/***************************************************************************
- * Copyright (C) 2014-2019 by Tomasz Bojczuk *
+ * Copyright (C) 2014-2020 by Tomasz Bojczuk *
* seelook@gmail.com *
* *
* This program is free software; you can redistribute it and/or modify *
@@ -35,7 +35,6 @@
#endif
-
bool initCoreLibrary() {
if (GLOB == nullptr) {
qDebug() << "Tglobals was not created. Construct it first!";
@@ -60,7 +59,8 @@ bool initCoreLibrary() {
#endif
#if defined (Q_OS_ANDROID)
qApp->addLibraryPath(qApp->applicationDirPath());
- Tandroid::setScreenLockDisabled(); // TODO: interact with some settings option
+ Tandroid::keepScreenOn(GLOB->isKeepScreenOn());
+ Tandroid::disableRotation(GLOB->disableRotation());
#endif
return true;
diff --git a/src/nootka.qrc b/src/nootka.qrc
index b08195190..4247d8e84 100644
--- a/src/nootka.qrc
+++ b/src/nootka.qrc
@@ -104,6 +104,7 @@
<file alias="settings/Select7note.qml">qml/settings/Select7note.qml</file>
<file alias="settings/ExamPage.qml">qml/settings/ExamPage.qml</file>
<file alias="settings/MiddleA440.qml">qml/settings/MiddleA440.qml</file>
+ <file alias="settings/PhonePage.qml">qml/settings/+android/PhonePage.qml</file>
<file alias="LevelCreator.qml">qml/level/LevelCreator.qml</file>
<file alias="level/LevelsPage.qml">qml/level/LevelsPage.qml</file>
diff --git a/src/qml/MainWindow.qml b/src/qml/MainWindow.qml
index 4c9673125..2c87ed8ea 100644
--- a/src/qml/MainWindow.qml
+++ b/src/qml/MainWindow.qml
@@ -13,7 +13,7 @@ ApplicationWindow {
visible: true
title: "Nootka"
color: activPal.window
- visibility: Noo.isAndroid() ? "FullScreen" : "AutomaticVisibility"
+ visibility: Noo.isAndroid() && GLOB.fullScreen() ? "FullScreen" : "AutomaticVisibility"
property alias mainMenu: mainMenu
@@ -112,8 +112,8 @@ ApplicationWindow {
function showDialog(page) {
if (!dialogLoader) {
- var c = Qt.createComponent("qrc:/DialogLoader.qml")
- dialogLoader = c.createObject(nootkaWindow)
+ var d = Qt.createComponent("qrc:/DialogLoader.qml")
+ dialogLoader = d.createObject(nootkaWindow)
}
if (page === Nootka.Charts) {
var c = Qt.createComponent("qrc:/charts/AnalyzeDialog.qml")
diff --git a/src/qml/settings/+android/PhonePage.qml b/src/qml/settings/+android/PhonePage.qml
new file mode 100644
index 000000000..7c4e5381a
--- /dev/null
+++ b/src/qml/settings/+android/PhonePage.qml
@@ -0,0 +1,54 @@
+/** This file is part of Nootka (http://nootka.sf.net) *
+ * Copyright (C) 2020 by Tomasz Bojczuk (seelook@gmail.com) *
+ * on the terms of GNU GPLv3 license (http://www.gnu.org/licenses) */
+
+
+import QtQuick 2.9
+import QtQuick.Controls 2.2
+
+import "../"
+
+
+Tflickable {
+ contentHeight: phoneCol.height
+ contentWidth: width
+
+ Column {
+ id: phoneCol
+ anchors.horizontalCenter: parent.horizontalCenter
+ topPadding: Noo.fontSize()
+ spacing: Noo.fontSize()
+
+ TcheckBox {
+ id: screenOnChB
+ text: qsTr("keep screen on")
+ checked: GLOB.isKeepScreenOn()
+ }
+ TcheckBox {
+ id: disRotatChB
+ text: qsTr("disable screen rotation")
+ checked: GLOB.disableRotation()
+ }
+ TcheckBox {
+ id: fullScrChB
+ text: qsTr("use full screen")
+ checked: GLOB.fullScreen()
+ }
+
+ }
+
+ function save() {
+ GLOB.keepScreenOn(screenOnChB.checked)
+ GLOB.setDisableRotation(disRotatChB.checked)
+ nootkaWindow.visibility = fullScrChB.checked ? "FullScreen" : "AutomaticVisibility"
+ GLOB.setFullScreen(fullScrChB.checked)
+ }
+
+ function defaults() {
+ screenOnChB.checked = true
+ disRotatChB.checked = true
+ fullScrChB.checked = true
+ }
+}
+
+
diff --git a/src/qml/settings/TsettingsDialog.qml b/src/qml/settings/TsettingsDialog.qml
index 3730853e5..e795d5fa9 100644
--- a/src/qml/settings/TsettingsDialog.qml
+++ b/src/qml/settings/TsettingsDialog.qml
@@ -22,6 +22,9 @@ Item {
pages.addItem("sound", qsTr("Sound"), "settings/Sound")
}
pages.addItem("questions", qsTr("Exercises") + "\n& " + qsTr("Exam"), "settings/Exam")
+ if (Noo.isAndroid() && !GLOB.isExam)
+ pages.addItem("phoneSett", qsTr("Phone") + "\n&" + qsTr("Tablet"), "settings/Phone")
+
dialLoader.standardButtons = DialogButtonBox.Apply | DialogButtonBox.Cancel | DialogButtonBox.RestoreDefaults | DialogButtonBox.Help
dialLoader.title = "Nootka - " + qsTranslate("TsettingsDialog", "application's settings")
}
--
GitLab