diff --git a/.gitignore b/.gitignore index c2d90870..5561ff45 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ *.user.* *.bc *.qmlc +build/** \ No newline at end of file diff --git a/qml/ConfigPageEmulation.qml b/qml/ConfigPageEmulation.qml index 210bae58..7fed0256 100644 --- a/qml/ConfigPageEmulation.qml +++ b/qml/ConfigPageEmulation.qml @@ -92,28 +92,42 @@ ColumnLayout { font.pixelSize: TextMetrics.title2Size Layout.topMargin: 10 Layout.bottomMargin: 5 - visible: Emu.isMobile() } FBLabel { Layout.maximumWidth: parent.width wrapMode: Text.WordWrap - text: qsTr("Change the side of the keypad in landscape orientation.") + text: qsTr("Change the side of the keypad.") font.pixelSize: TextMetrics.normalSize - visible: Emu.isMobile() } CheckBox { text: qsTr("Left-handed mode") checked: Emu.leftHanded - visible: Emu.isMobile() onCheckedChanged: { Emu.leftHanded = checked; checked = Qt.binding(function() { return Emu.leftHanded; }); } } + FBLabel { + Layout.maximumWidth: parent.width + wrapMode: Text.WordWrap + text: qsTr("Whether the keypad scrolls vertically in portrait orientation.") + font.pixelSize: TextMetrics.normalSize + } + + CheckBox { + text: qsTr("Scrolling keypad") + + checked: Emu.keypadFillMode === Emu.FillWidth + onCheckedChanged: { + Emu.keypadFillMode = checked ? Emu.FillWidth : Emu.ResizeToFit + checked = Qt.binding(function() { return Emu.keypadFillMode === Emu.FillWidth; }); + } + } + Item { Layout.fillHeight: true } diff --git a/qml/Keypad.qml b/qml/Keypad.qml index b39d2ec0..cd316912 100644 --- a/qml/Keypad.qml +++ b/qml/Keypad.qml @@ -2,6 +2,7 @@ import Firebird.Emu 1.0 import QtQuick 2.3 import QtQuick.Layouts 1.0 +import QtQuick.Shapes 1.15 Rectangle { id: rectangle1 @@ -9,6 +10,10 @@ Rectangle { height: 340 color: "#444" + property color color_ctrl: "#3b91ca" + property color color_main: "#f0f0f0" + property color color_submain: "#c8c8c8" + ColumnLayout { id: columnLayout1 width: 33 @@ -26,39 +31,54 @@ Rectangle { NBigButton { id: nButton1 - text: "esc" + text: ""//"esc" Layout.fillWidth: true keymap_id: 73 + + colorSvg: rectangle1.color_submain + svg: "m 56.92951,-7.8225901 -9.639023,1.8024477 q -0.487195,-2.9920901 -2.227058,-4.5061386 -1.705107,-1.514048 -4.454153,-1.514048 -3.65381,0 -5.846074,2.6315618 -2.157469,2.595517 -2.157469,8.72383923 0,6.81325617 2.192264,9.62508227 2.227058,2.8118257 5.950456,2.8118257 2.783841,0 4.558536,-1.622222 1.774695,-1.6582285 2.505449,-5.6596586 l 9.604266,1.6942739 q -1.496303,6.8493017 -5.74169,10.3460617 -4.24535,3.496721 -11.378924,3.496721 -8.107926,0 -12.944853,-5.299169 -4.802133,-5.2992078 -4.802133,-14.67193589 0,-9.48086341 4.836927,-14.74398711 4.836928,-5.299208 13.08403,-5.299208 6.750837,0 10.717796,3.028096 4.001752,2.992091 5.741653,9.1564579 z M -18.373336,8.2191752 -8.5603038,6.6690818 q 0.6263717,2.9560065 2.5402438,4.5061002 1.9139092,1.514048 5.35891605,1.514048 3.79298705,0 5.70685905,-1.441958 1.2875376,-1.009378 1.2875376,-2.7036523 0,-1.1535589 -0.6959602,-1.9105831 Q 4.9065379,5.9120576 2.3662571,5.2992138 -9.4650298,2.595523 -12.631682,0.36049555 -17.01621,-2.7396914 -17.01621,-8.2552083 q 0,-4.9747247 3.792987,-8.3633497 3.7929875,-3.388586 11.7616988,-3.388586 7.585974,0 11.2745781,2.559472 3.6885671,2.559472 5.0804871,7.57028 l -9.2214542,1.7664026 q -0.5915774,-2.2350276 -2.2618894,-3.4246696 -1.6354805,-1.189604 -4.697713,-1.189604 -3.8625756,0 -5.5328876,1.117513 -1.1135289,0.79307 -1.1135289,2.0548024 0,1.0814686 0.9743517,1.8384928 1.3222948,1.0093784 9.1170717,2.8478712 7.8295341,1.8384928 10.9265607,4.50610007 3.062233,2.70369083 3.062233,7.53423523 0,5.2631623 -4.24535,9.0482833 -4.2453504,3.785121 -12.56207895,3.785121 -7.55117975,0 -11.97053805,-3.172277 -4.384528,-3.172316 -5.741654,-8.6157038 z m -14.789136,-1.2617326 9.743443,1.6943124 q -1.879115,5.551524 -5.950456,8.471485 -4.036584,2.883916 -10.126218,2.883916 -9.63906,0 -14.267185,-6.524857 -3.65381,-5.2270787 -3.65381,-13.19389367 0,-9.51690853 4.802134,-14.88820633 4.802133,-5.407343 12.144509,-5.407343 8.247103,0 13.014442,5.659697 4.767339,5.6236138 4.558536,17.2674144 h -24.497786 q 0.104383,4.5061385 2.366273,7.0295653 2.261852,2.4873813 5.63727,2.4873813 2.296647,0 3.862576,-1.297777 1.565892,-1.2977781 2.366272,-4.1816944 z m 0.556746,-10.2378876 q -0.104383,-4.3979647 -2.192264,-6.6690372 -2.087881,-2.3071558 -5.080524,-2.3071558 -3.20141,0 -5.289291,2.4152911 -2.08788,2.4152914 -2.053086,6.5609019 z" } NBigButton { id: nButton2 - text: "pad" + text: ""//"pad" Layout.fillWidth: true keymap_id: 65 + colorSvg: rectangle1.color_submain + svg:"m -21.266889,-34.132301 c -4.52878,0 -8.87852,3.646008 -9.75254,8.174794 l -9.964451,51.629654 c -0.87405,4.528777 2.0681,8.174794 6.59688,8.174804 h 4.135541 c -4.528781,0 -7.470891,-3.646027 -6.596871,-8.174804 l 9.964651,-51.629654 c 0.87405,-4.528786 5.22356,-8.174794 9.752341,-8.174794 z m 10.838281,0 c -4.52878,0 -8.878521,3.646008 -9.752531,8.174794 l -9.96446,51.629654 c -0.87405,4.528777 2.0681,8.174794 6.59688,8.174804 h 4.13554 c -4.52878,0 -5.61698,-3.360878 -4.74296,-7.889644 l 9.822071,-51.914814 c 0.87405,-4.528786 3.51223,-8.174794 8.0410102,-8.174794 z m 11.5513707,0.28535 c -4.5287803,0 -8.8783306,3.646007 -9.7523406,8.174794 l -9.9646511,51.629654 c -0.87405,4.528786 2.068091,8.174804 6.596871,8.174804 h 33.264072 c 4.52878,0 8.878481,-3.646018 9.752541,-8.174804 l 9.96464,-51.629654 c 0.87402,-4.528787 -2.06828,-8.174794 -6.59707,-8.174794 z m -1.53340007,4.336127 H 34.246595 c 1.54507,0 2.54902,1.243929 2.25078,2.789058 l -3.3998,17.6152275 c -0.29817,1.5451389 -1.78228,2.789058 -3.32735,2.789058 H -4.8869977 c -1.5451501,0 -2.5489901,-1.2439191 -2.2507801,-2.789058 l 3.3998002,-17.6152275 c 0.2982,-1.545129 1.7822001,-2.789058 3.32734023,-2.789058 z M -7.3694278,-2.3268533 h 8.9892606 c 0.55707,0 0.91902,0.4483996 0.81153,1.0054692 L 1.2055727,5.0293914 C 1.0980127,5.586451 0.56303269,6.0348607 0.00596265,6.0348607 H -8.9830979 c -0.5570601,0 -0.9192801,-0.4484097 -0.8117201,-1.0054693 l 1.2257801,-6.3507755 c 0.10749,-0.5570696 0.64255,-1.0054692 1.1996101,-1.0054692 z m 14.5461009,0 h 8.9892609 c 0.55706,0 0.91905,0.4483996 0.81152,1.0054692 l -1.22578,6.3507755 c -0.10753,0.5570596 -0.64235,1.0054693 -1.19942,1.0054693 H 5.563003 c -0.55707,0 -0.91905,-0.4484097 -0.81153,-1.0054693 l 1.22578,-6.3507755 c 0.1075301,-0.5570696 0.6423901,-1.0054692 1.1994201,-1.0054692 z m 14.8316409,0 h 8.989261 c 0.55706,0 0.91885,0.4483996 0.81132,1.0054692 l -1.22578,6.3507755 c -0.10752,0.5570596 -0.64235,1.0054693 -1.19941,1.0054693 h -8.989261 c -0.55706,0 -0.91924,-0.4484097 -0.81172,-1.0054693 l 1.22578,-6.3507755 c 0.10753,-0.5570696 0.64274,-1.0054692 1.19981,-1.0054692 z M -9.698328,9.7403181 h 8.98926061 c 0.55706003,0 0.91885006,0.4483999 0.81132005,1.0054689 l -1.22558006,6.350776 c -0.10749,0.557079 -0.6425501,1.005469 -1.1996101,1.005469 h -8.9892605 c -0.55706,0 -0.91905,-0.44839 -0.81152,-1.005469 l 1.22558,-6.350776 c 0.10753,-0.557069 0.64274,-1.0054689 1.19981,-1.0054689 z m 14.546091,0 h 8.989261 c 0.55706,0 0.91886,0.4483999 0.81133,1.0054689 l -1.22559,6.350776 c -0.10753,0.557079 -0.642541,1.005469 -1.199611,1.005469 H 3.2338929 c -0.5570601,0 -0.9188501,-0.44839 -0.8113201,-1.005469 l 1.2255801,-6.350776 c 0.10753,-0.557069 0.64255,-1.0054689 1.1996101,-1.0054689 z m 14.831451,0 h 8.989251 c 0.55707,0 0.9189,0.4483999 0.81133,1.0054689 l -1.22558,6.350776 c -0.107531,0.557079 -0.642551,1.005469 -1.199611,1.005469 h -8.98926 c -0.5571,0 -0.91882,-0.44839 -0.81133,-1.005469 l 1.22559,-6.350776 c 0.10756,-0.557069 0.6425,-1.0054689 1.19961,-1.0054689 z M -12.027238,21.8075 h 8.9892605 c 0.55706,0 0.91889,0.448399 0.81133,1.005469 l -1.2257801,6.350775 c -0.10749,0.55707 -0.64235,1.00567 -1.1994201,1.00567 h -8.9892603 c -0.55706,0 -0.91924,-0.4486 -0.81171,-1.00567 l 1.22578,-6.350775 c 0.10756,-0.55707 0.6427,-1.005469 1.1998,-1.005469 z m 14.5461008,0 h 8.9892502 c 0.55707,0 0.91886,0.448399 0.81133,1.005469 l -1.22578,6.350775 c -0.10749,0.55707 -0.64235,1.00567 -1.1994097,1.00567 H 0.90499271 c -0.55707003,0 -0.91901006,-0.4486 -0.81153005,-1.00567 L 1.3192527,22.812969 C 1.4267727,22.255899 1.9617928,21.8075 2.5188628,21.8075 Z m 14.8314412,0 h 8.98926 c 0.55706,0 0.91885,0.448399 0.81133,1.005469 l -1.22578,6.350775 c -0.10753,0.55707 -0.64235,1.00567 -1.19942,1.00567 h -8.98926 c -0.5571,0 -0.91905,-0.4486 -0.81152,-1.00567 l 1.22578,-6.350775 c 0.10757,-0.55707 0.64251,-1.005469 1.19961,-1.005469 z" + Text { id: text6 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "save" - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// color: "#68cce0" +// text: "save" +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter anchors.bottom: parent.top + + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 55.381051,-2.1213874 q 0,0.6756008 -0.05217,1.75656198 -0.02608,1.08096124 -0.104345,2.02680332 h -17.4256 q 0,1.8106101 0.521725,3.1888356 0.547811,1.3782266 1.513,2.3240677 0.991278,0.918816 2.347761,1.4052496 1.382569,0.4864315 3.052088,0.4864315 1.93038,0 4.121623,-0.2972633 2.217329,-0.3242884 4.591176,-1.0269142 v 5.2426632 q -1.017363,0.297265 -2.21733,0.54048 -1.199965,0.243217 -2.452104,0.432385 -1.25214,0.189168 -2.530364,0.270241 -1.278225,0.108096 -2.478192,0.108096 -3.026001,0 -5.425933,-0.891794 -2.399933,-0.891793 -4.069451,-2.621331 -1.669518,-1.7565627 -2.556451,-4.3238456 -0.88693,-2.5672829 -0.88693,-5.94528677 0,-3.35097983 0.88693,-6.08040793 0.886933,-2.7564521 2.504279,-4.7021827 1.617345,-1.972754 3.912933,-3.026691 2.321673,-1.080961 5.165072,-1.080961 2.817312,0 4.982468,0.918817 2.165156,0.891793 3.625985,2.513236 1.460829,1.6214404 2.217328,3.864435 0.756502,2.2429955 0.756502,4.9183746 z m -6.469384,-0.9458411 q 0.02609,-1.6214418 -0.391293,-2.8104992 -0.41738,-1.2160824 -1.147794,-1.9997783 -0.704328,-0.7836969 -1.669518,-1.1620343 -0.939104,-0.3783364 -2.034726,-0.3783364 -2.399932,0 -3.939019,1.6754909 -1.539087,1.6484649 -1.826036,4.6751573 z M 17.73863,13.714697 H 10.408402 L -0.10434537,-13.741722 H 6.9911072 L 12.4953,1.8241221 14.138732,6.8505918 15.756078,2.0403133 21.312443,-13.741722 h 6.83459 z m -27.5731374,0 -0.1565169,-3.594197 q -0.8347597,0.918818 -1.7477777,1.702514 -0.913017,0.756673 -2.008638,1.324178 -1.095622,0.567505 -2.399933,0.864769 -1.278225,0.324289 -2.817312,0.324289 -2.034725,0 -3.573812,-0.621553 -1.539088,-0.621553 -2.582536,-1.729538 -1.043449,-1.107986 -1.59126,-2.6753794 -0.521725,-1.5673948 -0.521725,-3.4590769 0,-1.9457303 0.782587,-3.5941961 0.808674,-1.64846591 2.426018,-2.83752326 1.643433,-1.18905734 4.069452,-1.86465914 2.452105,-0.6756008 5.738968,-0.6756008 h 3.469468 v -1.6484658 q 0,-1.0539372 -0.286948,-1.8916822 -0.286949,-0.864769 -0.939105,-1.4592986 -0.626069,-0.5945277 -1.643431,-0.9188171 -1.017363,-0.3242884 -2.504278,-0.3242884 -2.34776,0 -4.643347,0.5675057 -2.269502,0.5404796 -4.408572,1.5403687 V -12.52564 q 1.904294,-0.783697 4.382486,-1.297154 2.504277,-0.513456 5.191158,-0.513456 2.947743,0 5.060727,0.594528 2.1129842,0.567505 3.4694679,1.729538 1.3825696,1.162035 2.0347244,2.9185957 0.6521569,1.7295389 0.6521569,4.0536046 V 13.714697 Z M -10.747525,1.5809058 h -3.886847 q -1.617346,0 -2.739053,0.3242874 -1.121708,0.3242893 -1.826036,0.891794 -0.704329,0.5675046 -1.043449,1.3241785 -0.313035,0.7296478 -0.313035,1.5673928 0,1.6754909 1.043449,2.5672839 1.043449,0.864768 2.843399,0.864768 1.330397,0 2.765139,-0.9998892 1.434742,-0.9998891 3.156433,-2.8645462 z m -23.216739,4.0536046 q 0,2.3510907 -1.017363,4.0265816 -0.991275,1.648466 -2.660794,2.702403 -1.643432,1.026914 -3.756416,1.486322 -2.086897,0.486433 -4.27814,0.486433 -2.921658,0 -5.269416,-0.297265 -2.347761,-0.27024 -4.434658,-0.81072 V 7.2829773 q 2.452103,1.0539372 4.878122,1.5403687 2.452106,0.4594096 4.617262,0.4594096 2.504278,0 3.73033,-0.810721 1.252138,-0.8377459 1.252138,-2.1619224 0,-0.6215537 -0.260862,-1.1350093 -0.260862,-0.5134576 -0.991276,-0.9728661 -0.704329,-0.4864326 -2.00864,-0.9728651 -1.30431,-0.5134566 -3.417295,-1.1350103 -1.956467,-0.5675037 -3.44338,-1.27012946 -1.460829,-0.72964883 -2.42602,-1.70251294 -0.965189,-0.9728651 -1.460828,-2.2429956 -0.469551,-1.2971534 -0.469551,-3.0266924 0,-1.6754889 0.730414,-3.1618116 0.730413,-1.4863214 2.165156,-2.5943074 1.460829,-1.13501 3.625985,-1.783586 2.165156,-0.648576 5.060727,-0.648576 2.504277,0 4.434658,0.270239 1.930379,0.270241 3.417295,0.59453 v 5.3777818 q -2.269502,-0.7566719 -4.278141,-1.0539372 -1.982553,-0.3242884 -3.93902,-0.3242884 -1.956467,0 -3.156432,0.7296499 -1.173881,0.7296478 -1.173881,2.0268023 0,0.6215517 0.234777,1.1079852 0.234776,0.4864326 0.913017,0.9458411 0.704328,0.4594085 1.930381,0.9728651 1.252138,0.4864326 3.286864,1.0809612 2.295588,0.6756008 3.86076,1.4592977 1.565175,0.75667285 2.504279,1.72953896 0.965189,0.97286514 1.382569,2.21597054 0.417379,1.2431054 0.417379,2.8375232 z" + } } } NBigButton { id: nButton3 - text: "tab" + text: ""//"tab" Layout.fillWidth: true keymap_id: 75 + + colorSvg: rectangle1.color_submain + svg: "m 15.450312,25.991276 v -52.847727 h 9.778231 v 19.0338338 q 4.523739,-5.3352418 10.717788,-5.3352418 6.750796,0 11.170151,5.0828989 4.419319,5.0468505 4.419319,14.5277167 0,9.8053094 -4.523701,15.1045034 -4.488944,5.299191 -10.926592,5.299191 -3.166613,0 -6.263638,-1.622203 -3.062193,-1.658251 -5.289287,-4.866603 v 5.623631 z M 25.158954,6.0201697 q 0,5.9480753 1.809489,8.7959383 2.540242,4.037481 6.750795,4.037481 3.236239,0 5.498089,-2.847866 2.296683,-2.883911 2.296683,-9.0482805 0,-6.56090412 -2.296683,-9.4448193 -2.296644,-2.9199621 -5.880863,-2.9199621 -3.514594,0 -5.846033,2.8478642 -2.331477,2.81181713 -2.331477,8.5796444 z M -16.45942,-0.61283232 -25.332926,-2.2710838 q 1.49634,-5.5515334 5.15011,-8.2191532 3.653808,-2.667622 10.8569655,-2.667622 6.5420302,0 9.74343739,1.622202 3.20140811,1.5861534 4.48894481,4.0735297 1.3223306,2.4513263 1.3223306,9.0482803 l -0.1044199,11.82405 q 0,5.046848 0.4523998,7.462127 0.4871579,2.379231 1.7746946,5.118946 h -9.6738494 q -0.3827739,-1.00937 -0.9395568,-2.992058 -0.2435599,-0.901224 -0.3479799,-1.189616 -2.5054473,2.523422 -5.3588756,3.785136 -2.8534271,1.261713 -6.0896301,1.261713 -5.706892,0 -9.012683,-3.208356 -3.270996,-3.208353 -3.270996,-8.111008 0,-3.244401 1.496302,-5.7678274 1.496303,-2.5594752 4.175759,-3.8932858 2.714251,-1.3698556 7.794735,-2.3792263 6.8552156,-1.3338106 9.4998409,-2.4873773 V 4.9999986e-7 Q -3.3753971,-2.9199626 -4.7673167,-4.1456263 -6.1592363,-5.4073389 -10.02181,-5.4073389 q -2.609831,0 -4.071339,1.0814677 -1.461545,1.0454187 -2.366271,3.71303888 z M -3.3753971,7.6063233 q -1.8790775,0.6488808 -5.9504534,1.5501045 -4.0713385,0.9012242 -5.3240805,1.7663972 -1.913909,1.40591 -1.913909,3.568842 0,2.126888 1.531134,3.676992 1.531097,1.550105 3.897368,1.550105 2.6446623,0 5.0456896,-1.802447 1.7747316,-1.36986 2.3314764,-3.352552 0.3827749,-1.297758 0.3827749,-4.9387013 z M -30.552624,-12.292684 v 8.0749597 h -6.681207 V 11.211217 q 0,4.686359 0.174009,5.479436 0.208765,0.757027 0.869931,1.261712 0.69596,0.504686 1.670311,0.504686 1.357125,0 3.932162,-0.973322 l 0.835174,7.858666 q -3.410211,1.514056 -7.725147,1.514056 -2.644662,0 -4.767336,-0.901224 -2.122673,-0.937273 -3.131819,-2.37923 -0.974351,-1.478003 -1.357125,-3.96538 -0.313185,-1.766398 -0.313185,-7.137687 V -4.2177243 h -4.488945 v -8.0749597 h 4.488945 v -7.606324 l 9.813025,-5.912024 v 13.518348 z" + } } @@ -76,12 +96,16 @@ Rectangle { // See above. spacing: 0 + NBigButton { id: nButton4 - text: "⌂on" + text: ""//on Layout.fillWidth: true keymap_id: 9 + colorSvg: rectangle1.color_submain + svg: "M 83.547754,30.90482 H 74.258809 V 12.476905 q 0,-5.8479795 -0.595049,-7.5479785 -0.595012,-1.733997 -1.950354,-2.685975 -1.322249,-0.952016 -3.20649,-0.952016 -2.413178,0 -4.330476,1.360006 -1.917297,1.360007 -2.644534,3.603993 -0.694181,2.2439861 -0.694181,8.2959605 V 30.90482 H 51.548743 V -5.2030285 h 8.627821 v 5.303991 q 4.594925,-6.119972 11.569898,-6.119972 3.074302,0 5.619668,1.155973 2.545366,1.122012 3.834595,2.890009 1.322286,1.767997 1.818129,4.011983 0.5289,2.243986 0.5289,6.4259661 z M 8.1120593,12.340908 q 0,-4.7600045 2.2809157,-9.2139775 2.280954,-4.453973 6.446111,-6.799956 4.198213,-2.345984 9.355057,-2.345984 7.966697,0 13.057465,5.337952 5.090769,5.303992 5.090769,13.4299565 0,8.193962 -5.156881,13.599951 -5.123825,5.371951 -12.92524,5.371951 -4.826282,0 -9.222833,-2.243986 Q 12.673929,27.232829 10.392975,22.914853 8.1120593,18.562878 8.1120593,12.340908 Z m 9.5203757,0.509988 q 0,5.37199 2.479253,8.227962 2.479291,2.855971 6.115511,2.855971 3.636258,0 6.082455,-2.855971 2.479291,-2.855972 2.479291,-8.29596 0,-5.3039925 -2.479291,-8.1599635 -2.446197,-2.855972 -6.082455,-2.855972 -3.63622,0 -6.115511,2.855972 -2.479253,2.855971 -2.479253,8.2279615 z M -40.121614,-31.720801 -83.547751,6.0353385 c 4.350861,0 8.701759,0 13.05262,0 V 30.484142 h 26.577046 V 9.6310136 h 9.376449 V 30.484142 h 23.341525 V 6.0353385 H 3.0336262 L -11.200111,-6.4179545 V -28.620434 l -17.22933,0.209668 v 6.919012 z m -0.01379,9.026579 18.509318,16.1936275 V -21.689578 l 3.623065,-0.04427 v 18.4037675 l 2.929146,2.562283 h -2.929146 V 23.681006 h -9.735222 V 2.8278755 H -50.721031 V 23.681004 H -63.691737 V -0.7677995 h -1.662389 z" + onClicked: { if(!Emu.isRunning) { @@ -97,41 +121,64 @@ Rectangle { NBigButton { id: nButton5 - text: "doc" + text: ""//"doc" Layout.fillWidth: true keymap_id: 69 + colorSvg : rectangle1.color_submain + svg: "M 54.718651,-5.0801482 H 79.113152 L 66.915851,16.046084 Z m -12.352,4.10682854 -9.639,1.80244937 q -0.4872,-2.99206891 -2.2271,-4.50611841 -1.7051,-1.5140595 -4.4542,-1.5140595 -3.653701,0 -5.846001,2.6315691 -2.1575,2.59552909 -2.1575,8.7238369 0,6.8132472 2.1923,9.6250662 2.2271,2.811819 5.950501,2.811819 2.7838,0 4.5585,-1.622199 1.7747,-1.658249 2.5054,-5.659688 l 9.6043,1.694299 q -1.4963,6.849298 -5.7417,10.346047 -4.2453,3.496749 -11.3789,3.496749 -8.108001,0 -12.944901,-5.299199 -4.8020998,-5.299188 -4.8020998,-14.6719144 0,-9.4808667 4.8368998,-14.7440048 4.8369,-5.2991978 13.084101,-5.2991978 6.7508,0 10.7178,3.028119 4.0017,2.9920585 5.7416,9.15642634 z M -35.650351,6.3085578 q 0,-5.0468482 2.401,-9.7692566 2.401,-4.7224083 6.7856,-7.2097872 4.419401,-2.487379 9.847801,-2.487379 8.3862998,0 13.7451999,5.6596876 5.3589002,5.6236281 5.3589002,14.239325 0,8.6877874 -5.4285002,14.4195654 -5.3937001,5.695738 -13.6059999,5.695738 -5.0805,0 -9.708601,-2.37923 -4.5934,-2.379229 -6.9944,-6.957447 -2.401,-4.614259 -2.401,-11.2112162 z m 10.0217,0.5407298 q 0,5.6957384 2.6099,8.7238474 2.609801,3.028108 6.437601,3.028108 3.8278,0 6.4029,-3.028108 2.6097998,-3.028109 2.6097998,-8.7959374 0,-5.623628 -2.6097998,-8.6517469 -2.5751,-3.028109 -6.4029,-3.028109 -3.8278,0 -6.437601,3.028109 -2.6099,3.0281189 -2.6099,8.7238369 z m -17.399,19.1419834 h -9.0822 v -5.623638 q -2.2619,3.280459 -5.3589,4.902658 -3.0622,1.58616 -6.1941,1.58616 -6.368001,0 -10.926501,-5.299199 -4.5238,-5.335238 -4.5238,-14.8521543 0,-9.7332066 4.4194,-14.7800549 4.4193,-5.0829078 11.170101,-5.0829078 6.1941,0 10.7178,5.3352477 V -26.856451 h 9.7782 z M -69.126052,6.0201679 q 0,6.1283181 1.635401,8.8680371 2.3663,3.965378 6.6117,3.965378 3.3754,0 5.7416,-2.956009 2.3663,-2.992059 2.3663,-8.9040864 0,-6.59694774 -2.2967,-9.4808667 -2.2966,-2.919959 -5.8808,-2.919959 -3.4798,0 -5.8461,2.883909 -2.331401,2.84786899 -2.331401,8.543597 z" + Text { id: text7 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "+page" - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// color: "#68cce0" +// text: "+page" +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter anchors.bottom: parent.top + + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m -71.234455,-21.10605 v 11.791811 h -11.791597 v 7.0957068 h 11.791597 V 9.5732793 h 7.095899 V -2.2185322 h 11.791597 V -9.314239 H -64.138556 V -21.10605 Z M 75.356411,0.4118004 82.629909,1.6766016 q -1.4028,4.144234 -4.442099,6.3239862 -3.013199,2.1528522 -7.559198,2.1528522 -7.195498,0 -10.650498,-4.8708149 -2.727499,-3.9020438 -2.727499,-9.8492795 0,-7.1043966 3.584799,-11.1140806 3.584799,-4.036594 9.065898,-4.036594 6.156399,0 9.715298,4.224964 3.558799,4.198054 3.402899,12.8901825 H 64.731913 q 0.078,3.36382324 1.7664,5.2475651 1.688499,1.8568318 4.208299,1.8568318 1.714399,0 2.883399,-0.968781 1.1689,-0.9687809 1.7664,-3.121633 z m 0.4156,-7.6426074 q -0.078,-3.283093 -1.6365,-4.978465 -1.5586,-1.722272 -3.792599,-1.722272 -2.389899,0 -3.948499,1.803012 -1.5586,1.803012 -1.5326,4.897725 z m -49.563589,18.622138 8.338498,1.049511 q 0.2078,1.506992 0.9612,2.072112 1.039,0.807321 3.272999,0.807321 2.8575,0 4.286199,-0.888051 0.9611,-0.592031 1.4547,-1.910652 0.3377,-0.941871 0.3377,-3.4714632 V 4.8789647 q -3.273099,4.6286245 -8.260598,4.6286245 -5.558999,0 -8.806098,-4.8708247 -2.545699,-3.84821374 -2.545699,-9.5801693 0,-7.1851272 3.324999,-10.9795202 3.350999,-3.794404 8.312498,-3.794404 5.117499,0 8.442498,4.655544 v -4.009683 h 6.831898 V 6.5743364 q 0,5.0591846 -0.8053,7.5618776 -0.805299,2.502682 -2.259999,3.928944 -1.4547,1.426261 -3.896499,2.233582 -2.4158,0.80731 -6.130499,0.80731 -7.013698,0 -9.949097,-2.502682 -2.9354,-2.475772 -2.9354,-6.297086 0,-0.37674 0.026,-0.914951 z m 6.520199,-16.7653062 q 0,4.5478944 1.688399,6.6738265 1.7145,2.099032 4.208299,2.099032 2.6756,0 4.519999,-2.1528521 1.8443,-2.17975211 1.8443,-6.4316362 0,-4.4402443 -1.7664,-6.593086 -1.766499,-2.152853 -4.467999,-2.152853 -2.623699,0 -4.338199,2.125933 -1.688399,2.0990316 -1.688399,6.4316358 z M 2.7514279,-10.35244 -3.8725705,-11.590321 q 1.1168997,-4.144234 3.84449907,-6.135616 2.72759933,-1.991392 8.10479813,-1.991392 4.8835993,0 7.2733983,1.210981 2.389899,1.184071 3.350999,3.040903 0.9872,1.829912 0.9872,6.7545566 l -0.078,8.82667851 q 0,3.76748369 0.3377,5.57049539 0.3637,1.7760917 1.3248,3.8213037 h -7.221499 q -0.2858,-0.7535007 -0.7014,-2.2335821 -0.1818,-0.6727707 -0.2597,-0.8880509 Q 11.219826,8.269698 9.0897264,9.2115689 6.9596269,10.15344 4.5438275,10.15344 q -4.260199,0 -6.7279984,-2.3950425 -2.4417994,-2.3950423 -2.4417994,-6.0548858 0,-2.4219524 1.1169997,-4.3056942 1.1169997,-1.9106519 3.11719926,-2.9063428 2.02619954,-1.022611 5.81879864,-1.7761018 5.1174987,-0.9956909 7.0916987,-1.8568318 v -0.7535007 q 0,-2.1797524 -1.0391,-3.0947134 -1.0391,-0.941871 -3.9224992,-0.941871 -1.9481996,0 -3.0392993,0.807321 -1.0909997,0.780401 -1.7663996,2.771783 z m 9.7672981,6.1356259 q -1.4028,0.4843905 -4.4419993,1.1571511 -3.0392993,0.6727607 -3.9744991,1.3186213 -1.4286997,1.04951103 -1.4286997,2.6641426 0,1.5877315 1.1429998,2.7448827 1.1428997,1.1571611 2.9092993,1.1571611 1.9742995,0 3.766699,-1.3455313 1.3248,-1.022601 1.7404,-2.50269245 0.2858,-0.96877094 0.2858,-3.68674355 z M -35.408363,-19.071468 h 6.805898 v 4.198054 q 1.3248,-2.152853 3.584799,-3.498384 2.26,-1.345531 5.013499,-1.345531 4.805699,0 8.156698,3.902044 3.3509996,3.902033 3.3509996,10.8718802 0,7.1582169 -3.3769996,11.1409808 -3.376999,3.955864 -8.182598,3.955864 -2.285999,0 -4.156299,-0.9418711 -1.844399,-0.9418709 -3.896599,-3.2292731 V 20.37947 h -7.299398 z m 7.221498,13.8051329 q 0,4.81699466 1.8444,7.1313069 1.844299,2.2874022 4.493999,2.2874022 2.545699,0 4.234199,-2.099022 1.688399,-2.12594207 1.688399,-6.9429367 0,-4.4940644 -1.740399,-6.6738263 -1.7404,-2.179762 -4.312099,-2.179762 -2.6756,0 -4.441999,2.152852 -1.7665,2.1259318 -1.7665,6.3239859 z" + } } } NBigButton { id: nButton6 - text: "menu" + text: ""//"menu" Layout.fillWidth: true keymap_id: 71 - Image { - source: "qrc:/keyimages/resources/keyimages/context_menu.png" - height: 10 - anchors.bottom: nButton6.top - anchors.horizontalCenter: parent.horizontalCenter - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true + colorSvg: rectangle1.color_submain + svg: "m 75.646852,18.504251 v -5.540824 q -2.0514,2.962077 -5.4114,4.669635 -3.324601,1.707538 -7.038201,1.707538 -3.7845,0 -6.7908,-1.637848 -3.0063,-1.637848 -4.3503,-4.599925 -1.344,-2.962077 -1.344,-8.189262 v -23.417806 h 9.9385 v 17.0057825 q 0,7.8059421 0.5306,9.5831803 0.5658,1.7423983 2.016,2.7878372 1.4501,1.010589 3.6782,1.010589 2.546601,0 4.562501,-1.359069 2.016,-1.3939182 2.7588,-3.4150962 0.7427,-2.0560279 0.7427,-10.0013599 V -18.504241 h 9.9385 v 37.008492 z m -30.177001,0 h -9.9385 V -0.38331961 q 0,-5.99384389 -0.6366,-7.73624219 -0.6367,-1.7772482 -2.0868,-2.7529872 -1.4147,-0.975739 -3.4307,-0.975739 -2.5819,0 -4.6332,1.393919 -2.0514,1.3939082 -2.829501,3.6938758 -0.7427,2.2999577 -0.7427,8.5028914 V 18.504251 h -9.9385 v -37.008492 h 9.2311 v 5.436274 q 4.916201,-6.272633 12.378901,-6.272633 3.2893,0 6.0126,1.184838 2.7234,1.149979 4.1027,2.962067 1.4148,1.812099 1.9453,4.112056 0.5659,2.2999679 0.5659,6.5862635 z M -2.6034501,6.7256532 7.2996502,8.3635115 Q 5.3897501,13.730086 1.25165,16.552773 -2.8510501,19.3406 -9.0405502,19.3406 q -9.7969998,0 -14.5010008,-6.307473 -3.7136,-5.0529451 -3.7136,-12.75433728 0,-9.19985072 4.880801,-14.39219572 4.8808,-5.227194 12.3435,-5.227194 8.3823,0 13.2278001,5.471124 4.8454001,5.4362845 4.6332001,16.6921631 H -17.06915 q 0.1061,4.3559956 2.4051,6.7953432 2.2989,2.4045077 5.7295998,2.4045077 2.3343001,0 3.9259001,-1.254529 1.5916,-1.2545186 2.4051,-4.0423558 z m 0.5659001,-9.89681 q -0.1062,-4.2514457 -2.2282001,-6.4468635 -2.1222,-2.2302677 -5.1638001,-2.2302677 -3.2538998,0 -5.3759998,2.3348076 -2.1221,2.3348077 -2.0867,6.3423236 z M -84.877952,-18.504241 h 9.1604 v 5.052945 q 4.9162,-5.889304 11.706901,-5.889304 3.6075,0 6.2602,1.463618 2.6526,1.463609 4.3503,4.425686 2.4757,-2.962077 5.3406,-4.425686 2.8648,-1.463618 6.1187,-1.463618 4.1381,0 7.0029,1.672708 2.8649,1.637848 4.2796,4.843855 1.0256,2.369668 1.0256,7.6665522 V 18.504251 h -9.9384 V -2.6484373 q 0,-5.5059744 -1.0257,-7.1089828 -1.3794,-2.0908679 -4.2442,-2.0908679 -2.0868,0 -3.9259,1.254519 -1.8391,1.2545285 -2.6526,3.693886 -0.8135,2.4045075 -0.8135,7.63169226 V 18.504251 h -9.9385 V -1.7772382 q 0,-5.4014345 -0.5305,-6.9695829 -0.5305,-1.5681589 -1.6623,-2.3348179 -1.0964,-0.766649 -3.0063,-0.766649 -2.299001,0 -4.138101,1.219679 -1.8392,1.2196685 -2.6526,3.5196362 -0.7781,2.2999677 -0.7781,7.63169227 V 18.504251 h -9.9385 z" +// Image { +// source: "qrc:/keyimages/resources/keyimages/context_menu.png" +// height: 10 +// anchors.bottom: nButton6.top +// anchors.horizontalCenter: parent.horizontalCenter +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } + Text { +// id: text7 + x: 0 + y: -11 + width: 33 + height: 11 + anchors.bottom: parent.top + + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 35.095351,11.03693 -22.04979,-23.221009 0.179188,32.021489 5.506162,-6.01497 6.830926,16.975961 7.796482,-3.13722 L 26.527393,10.68521 Z M -23.792188,0.85374002 V 6.5230301 H 8.1979417 V 0.85374002 Z m 0,-10.47779822 v 5.6692931 H 8.1979417 v -5.6692931 z m 0,-10.0350728 v 5.669292 H 8.1979417 v -5.669292 z m -11.303163,-11.13927 V 18.78871 H 8.1979417 V 11.98556 H -28.292205 v -35.980811 h 49.964306 v 13.920768 l 6.803146,6.4697619 V -30.798401 Z" + } } } } @@ -146,6 +193,10 @@ Rectangle { anchors.horizontalCenter: gridLayout1.horizontalCenter anchors.top: parent.top anchors.topMargin: 6 + + colorSvg1: color_submain + colorSvg2: color_ctrl + } GridLayout { @@ -167,156 +218,214 @@ Rectangle { NBigButton { id: nButton11 width: 33 - text: "shift" + text: ""//"shift" keymap_id: 85 + colorSvg: rectangle1.color_submain + svg: "M -34.309189,-0.21390849 H -45.824924 V 23.423651 c -7.00373,0 -14.007463,0 -21.011193,0 V -0.21392849 H -78.351852 L -56.330518,-25.568751 Z M 77.804335,-1.2622585 V 4.2617713 H 73.233756 V 14.816611 q 0,3.20592 0.119026,3.74846 0.142826,0.5179 0.595125,0.86313 0.476104,0.34527 1.142647,0.34527 0.9284,0 2.689973,-0.66587 l 0.571325,5.37607 q -2.332898,1.03577 -5.284731,1.03577 -1.80919,0 -3.261298,-0.61652 -1.452112,-0.64119 -2.142459,-1.62761 -0.666543,-1.0111 -0.9284,-2.71269 -0.214243,-1.2084 -0.214243,-4.88288 V 4.2617713 h -3.070859 v -5.5240298 h 3.070859 v -5.2034498 l 6.713035,-4.0443797 v 9.2478295 z m -30.756188,0 h 3.713598 v -1.9728799 q 0,-3.3045499 0.666543,-4.9321698 0.690347,-1.6276099 2.499537,-2.6387098 1.832986,-1.03576 4.618188,-1.03576 2.856607,0 5.594196,0.88779 l -0.904594,4.8335397 q -1.594943,-0.39458 -3.070859,-0.39458 -1.452112,0 -2.094847,0.71516 -0.618934,0.69051 -0.618934,2.6880399 v 1.8495699 h 4.999071 V 4.1877913 H 57.450975 V 24.927591 h -6.68923 V 4.1877913 H 47.048147 Z M 36.431076,-4.8134283 v -6.4118297 h 6.68923 v 6.4118297 z m 0,29.7410193 V -1.2622585 h 6.68923 V 24.927591 Z M 13.316331,-11.225258 V 2.0669514 q 3.237493,-3.9210798 7.736655,-3.9210798 2.309094,0 4.165893,0.88778994 1.856795,0.88779996 2.785194,2.26880996 0.952204,1.3809999 1.285477,3.0579398 0.357078,1.67694 0.357078,5.2034598 V 24.927591 h -6.689234 v -13.83476 q 0,-4.1183598 -0.380879,-5.2280997 -0.380886,-1.10974 -1.356894,-1.75092 -0.952204,-0.6658499 -2.404312,-0.6658499 -1.666355,0 -2.975641,0.8384699 -1.309277,0.83847 -1.928211,2.5400699 -0.595126,1.67694 -0.595126,4.9814998 v 13.11959 H 6.6271005 v -36.152849 z m -40.920955,24.389589 6.855865,-0.6905 q 0.61893,3.57582 2.499533,5.25278 1.904412,1.67692 5.118101,1.67692 3.4041276,0 5.1180916,-1.47965 1.737773,-1.50429 1.737773,-3.50184 0,-1.28235 -0.73796,-2.17016 -0.714152,-0.91244 -2.523338,-1.5783 -1.2378676,-0.44388 -5.6418086,-1.5782698 -5.665613,-1.455 -7.950903,-3.5758299 -3.213685,-2.9839699 -3.213685,-7.2749597 0,-2.7620199 1.499721,-5.1541198 1.523525,-2.41677 4.356327,-3.6744698 2.856616,-1.25771 6.879678,-1.25771 6.5702036,0 9.8791145,2.9839698 3.3327111,2.9839599 3.4993499,7.96545973 l -7.0463118,0.32058999 q -0.452296,-2.78667992 -1.952017,-3.99505982 -1.4759156,-1.23305 -4.4515526,-1.23305 -3.070855,0 -4.808628,1.30703 -1.118842,0.8384699 -1.118842,2.2441399 0,1.28235994 1.047425,2.1948199 1.333086,1.15906 6.474987,2.4167599 5.1419006,1.25771 7.5938255,2.6140599 2.4757284,1.33168 3.85642721,3.6744599 1.40449918,2.3181398 1.40449918,5.7459998 0,3.10726 -1.66635548,5.81995 -1.66635551,2.71269 -4.71340981,4.04438 -3.047054,1.30702 -7.5938246,1.30702 -6.617818,0 -10.164776,-3.15658 -3.546959,-3.18124 -4.237306,-9.24784 z" + Text { id: text5 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "CAPS" +// color: "#68cce0" +// text: "CAPS" anchors.bottom: parent.top - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 62.856301,7.7849394 q 0,3.2286376 -1.165089,5.6123956 -1.13595,2.383769 -3.203979,3.952818 -2.06803,1.538889 -4.922479,2.293248 -2.854459,0.754349 -6.233198,0.754349 -3.000099,0 -5.796298,-0.362089 -2.796199,-0.36209 -5.534149,-1.206969 v -7.332325 q 1.33984,0.482779 2.7962,0.905219 1.456359,0.42244 2.912709,0.75436 1.485479,0.301739 2.941839,0.482789 1.456349,0.18104 2.825329,0.18104 2.038899,0 3.466129,-0.36209 1.427219,-0.362089 2.330169,-0.995749 0.90294,-0.633659 1.31072,-1.508709 0.40778,-0.875049 0.40778,-1.9311484 0,-1.448359 -0.81556,-2.4139383 Q 53.389984,5.612401 52.079265,4.8580415 50.768545,4.1036921 49.079175,3.5002025 47.418926,2.8967229 45.671306,2.2027134 43.952807,1.5087039 42.263437,0.63366455 40.603188,-0.24139483 39.292468,-1.5388839 37.981749,-2.836373 37.166189,-4.6166517 q -0.78643,-1.8104487 -0.78643,-4.3450769 0,-2.3234184 0.81556,-4.4054364 0.81556,-2.082019 2.563179,-3.620898 1.74763,-1.569059 4.485579,-2.474288 2.737949,-0.935399 6.611848,-0.935399 1.13596,0 2.359299,0.120699 1.25247,0.0905 2.44668,0.27157 1.223339,0.15087 2.330169,0.39226 1.135959,0.21122 2.068019,0.45262 v 6.789185 q -0.93206,-0.36209 -2.038889,-0.66383 -1.10683,-0.301739 -2.30105,-0.512959 -1.165079,-0.2414 -2.359289,-0.36209 -1.194209,-0.1207 -2.271919,-0.1207 -1.89326,0 -3.203979,0.33192 -1.31072,0.30174 -2.15541,0.875049 -0.844679,0.54313 -1.223329,1.357839 -0.37866,0.8147 -0.37866,1.8104489 0,1.2371391 0.78643,2.1423685 0.815559,0.8750493 2.126279,1.5992288 1.33985,0.6940095 3.000099,1.3276691 1.68937,0.6034795 3.436999,1.327659 1.77675,0.6940095 3.436999,1.5992289 1.68937,0.90522934 3.000089,2.20271841 1.33985,1.29748909 2.12628,3.07776779 0.815559,1.7501088 0.815559,4.164037 z M 30.699971,-7.1814599 q 0,3.0777678 -0.99032,5.702926 -0.99033,2.5949781 -2.941839,4.4959567 Q 24.816293,4.9183915 21.903584,5.9744907 18.990874,7.03058 15.146096,7.03058 H 11.505207 V 19.703741 H 4.2816787 V -19.733911 H 15.437365 q 3.699139,0 6.524468,0.844869 2.85446,0.8147 4.776849,2.413939 1.95152,1.599229 2.941839,3.952817 1.01945,2.323408 1.01945,5.3408261 z m -7.514798,0.5129697 q 0,-1.5690589 -0.49516,-2.836378 -0.46603,-1.2974888 -1.456349,-2.2027188 -0.9612,-0.905219 -2.44668,-1.388009 -1.485489,-0.482789 -3.524379,-0.482789 H 11.505207 V 0.87505438 h 3.990418 q 1.86413,0 3.291359,-0.51295964 1.42723,-0.54313961 2.38842,-1.53888894 0.990319,-0.9957493 1.485479,-2.3837583 0.52429,-1.388009 0.52429,-3.1079377 z M -7.6895577,19.703741 -9.7867071,11.918806 H -23.068673 l -2.1554,7.784935 h -7.107017 l 11.272186,-39.437652 h 10.019727 L 0.23300993,19.703741 Z m -8.6507473,-32.195857 -5.009869,18.3459068 h 9.961467 z m -19.660804,30.656978 q -2.53406,1.056099 -4.922479,1.569059 -2.359299,0.51296 -4.922478,0.51296 -4.106929,0 -7.281778,-1.23714 -3.145729,-1.267319 -5.330259,-3.741597 -2.155409,-2.474288 -3.291369,-6.1253655 -1.106829,-3.6812474 -1.106829,-8.53929393 0,-4.97873647 1.223339,-8.84103367 1.22334,-3.8924769 3.495249,-6.5477949 2.27192,-2.685509 5.505029,-4.073518 3.262239,-1.418189 7.310907,-1.418189 1.31072,0 2.44667,0.0604 1.165089,0.0603 2.271919,0.24139 1.10683,0.15087 2.242779,0.42244 1.13596,0.27157 2.3593,0.694009 v 7.362495 q -2.4758,-1.206969 -4.718589,-1.719929 -2.242789,-0.512959 -4.077799,-0.512959 -2.708819,0 -4.631208,1.025919 -1.92239,0.995749 -3.174849,2.836378 -1.22334,1.8104487 -1.80589,4.3450869 -0.58254,2.5044483 -0.58254,5.521876099961 0,3.198457700039 0.58254,5.733095900039 0.61167,2.5044482 1.86414,4.254557 1.252469,1.7500991 3.203979,2.6854981 1.951519,0.905229 4.631218,0.905229 0.96119,0 2.06802,-0.18105 1.135959,-0.211219 2.271919,-0.512959 1.16508,-0.33192 2.271909,-0.75435 1.13596,-0.452619 2.09715,-0.905229 z" + } } } NBigButton { id: nButton12 width: 33 - text: "var" - Layout.preferredWidth: -1 - Layout.fillWidth: false - border.width: 1 - clip: false + text: ""//"var" keymap_id: 56 +// Layout.preferredWidth: -1 +// Layout.fillWidth: false +// border.width: 1 +// clip: false Layout.column: 2 + colorSvg: rectangle1.color_submain + svg: "m 39.600136,19.141976 h -9.778253 v -38.283952 h 9.082293 v 5.443385 c 1.554293,-2.571488 2.946214,-4.265788 4.175761,-5.082896 1.252719,-0.817109 2.667835,-1.225663 4.245351,-1.225663 2.227058,0 4.372928,0.636864 6.437613,1.910593 L 50.7355,-9.2645721 c -1.647128,-1.1055009 -3.17825,-1.6582509 -4.593368,-1.6582509 -1.368723,0 -2.528658,0.396538 -3.479801,1.1896141 -0.951143,0.7690446 -1.705094,2.1749529 -2.261852,4.2177258 -0.533562,2.0427699 -0.800343,6.32057468 -0.800343,12.8334132 z m -41.688015,-26.6041011 -8.87349,-1.6582511 c 0.9975439,-3.7010208 2.7142455,-6.4407398 5.1501064,-8.2191538 2.4358584,-1.778414 6.05485049,-2.66762 10.8569762,-2.66762 4.3613484,0 7.6091604,0.540733 9.7434364,1.622202 2.134278,1.057435 3.630592,2.415278 4.488944,4.073529 0.881549,1.634216 1.322324,4.6503081 1.322324,9.0482788 L 20.496024,6.5609025 c 0,3.3645673 0.150791,5.8519415 0.452374,7.4621255 0.324781,1.586153 0.916348,3.292469 1.774699,5.118948 h -9.673844 c -0.255186,-0.672913 -0.568368,-1.670267 -0.939547,-2.992062 -0.16239,-0.600815 -0.278384,-0.997353 -0.34798,-1.189614 -1.670304,1.682284 -3.4566023,2.943997 -5.3588936,3.785138 -1.9022889,0.841142 -3.9321717,1.261712 -6.08964849,1.261712 -3.80458031,0 -6.80880781,-1.069451 -9.01268161,-3.208355 -2.1806723,-2.138901 -3.2710093,-4.842569 -3.2710093,-8.1110056 0,-2.1629358 0.49877,-4.0855448 1.496311,-5.7678259 0.997543,-1.7063161 2.3894635,-3.00407746 4.1757612,-3.89328499 C -4.4889381,-1.886561 -1.8906877,-2.6796376 1.4963163,-3.3525512 6.0664528,-4.2417558 9.2330707,-5.0708793 10.99617,-5.8399239 v -1.0093695 c 0,-1.946642 -0.463973,-3.3285186 -1.3919205,-4.1456276 -0.927947,-0.841142 -2.6794457,-1.261713 -5.2544961,-1.261713 -1.7399006,0 -3.0970231,0.360489 -4.0713675,1.081468 -0.97434435,0.696947 -1.7630993,1.9346269 -2.3662649,3.7130409 z M 10.99617,0.7570276 C 9.7434416,1.1896144 7.7599561,1.7063161 5.0457136,2.3071318 2.3314687,2.9079475 0.55677,3.4967472 -0.2783823,4.0735299 -1.5543095,5.0107994 -2.192273,6.2004127 -2.192273,7.64237 c 0,1.4179242 0.5103709,2.643589 1.53111256,3.676991 1.02074167,1.033402 2.31986754,1.550104 3.89737744,1.550104 1.7630993,0 3.445002,-0.600815 5.045708,-1.802446 C 9.4650575,10.15378 10.242213,9.0362622 10.613392,7.7144679 10.868577,6.8492934 10.99617,5.2030603 10.99617,2.7757675 Z M -38.86936,19.141976 -53.762901,-19.141976 h 10.265406 c 3.142315,8.660801 6.256907,17.266788 8.977884,26.0633673 2.637923,-8.8190063 5.918111,-17.2681773 9.082277,-26.0633673 h 10.056622 l -14.684755,38.283952 z" Text { id: text4 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "sto→" +// color: "#68cce0" +// text: "sto→" anchors.bottom: parent.top - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 43.830701,-8.6649714 v 8.73359133 h -15.9664 V 8.037552 h 15.9664 v 8.733591 L 61.897101,4.052986 Z M -13.7103,4.3191457 q 0,-3.76747625 1.7924,-7.2927627 1.7924,-3.5252765 5.0654998,-5.3821047 3.2990001,-1.8568283 7.35140021,-1.8568283 6.26040009,0 10.26079999,4.224956 4.0004,4.1980458 4.0004,10.6296694 0,6.4854436 -4.0524,10.7642196 -4.0263999,4.251855 -10.15689999,4.251855 -3.79260011,0 -7.24750011,-1.776088 Q -10.1255,16.105964 -11.9179,12.688327 -13.7103,9.2437708 -13.7103,4.3191457 Z m 7.4812999,0.4036596 q 0,4.2518658 1.9483,6.5123437 1.9482,2.260488 4.80570011,2.260488 2.85740009,0 4.77970009,-2.260488 1.9482001,-2.2604779 1.9482001,-6.5661736 0,-4.19803587 -1.9482001,-6.4585236 -1.9223,-2.2604878 -4.77970009,-2.2604878 -2.85750011,0 -4.80570011,2.2604878 -1.9483,2.26048773 -1.9483,6.5123535 z M -17.0873,-9.5666905 v 6.027954 h -4.9875 V 7.9789821 q 0,3.4983669 0.1299,4.0903959 0.1558,0.565119 0.6494,0.941869 0.5195,0.37675 1.2469,0.37675 1.0131,0 2.9354,-0.72658 l 0.6234,5.866495 q -2.5457,1.130238 -5.7668,1.130238 -1.974301,0 -3.558901,-0.672759 -1.5845,-0.699669 -2.3379,-1.776098 -0.7273,-1.103329 -1.0131,-2.960157 -0.2337,-1.318619 -0.2337,-5.3282849 V -3.5387365 h -3.351 v -6.027954 h 3.351 v -5.6781345 l 7.325401,-4.413325 v 10.0914595 z m -44.809801,20.4250995 7.3255,-1.1571587 q 0.4676,2.2066677 1.8963,3.3638267 1.4287,1.130239 4.0004,1.130239 2.8315,0 4.2602,-1.076419 0.9611,-0.753499 0.9611,-2.018298 0,-0.861139 -0.5195,-1.4262586 -0.5455,-0.5382095 -2.4418,-0.995689 -8.8321,-2.018288 -11.196,-3.6867464 -3.2731,-2.3142977 -3.2731,-6.4316136 0,-3.7136563 2.8315,-6.2432538 2.8315,-2.5295876 8.7801,-2.5295876 5.663,0 8.4164,1.9106483 2.7536,1.9106481 3.7926,5.6512143 l -6.8837,1.3186187 q -0.4416,-1.6684583 -1.6885,-2.5564974 -1.2209,-0.8880591 -3.5069,-0.8880591 -2.8834,0 -4.1303,0.8342391 -0.8312,0.5920294 -0.8312,1.5338985 0,0.8073192 0.7273,1.3724286 0.9871,0.75349928 6.8059,2.1259379 5.8447,1.3724386 8.1566,3.3638167 2.286,2.018288 2.286,5.6243044 0,3.928946 -3.1692,6.754553 -3.1691,2.825597 -9.3775,2.825597 -5.637,0 -8.936,-2.368117 -3.2731,-2.368138 -4.2862,-6.431624 z" + } } } NNumButton { id: nNumButton1 - text: "7" + text: ""//"7" keymap_id: 40 + + colorSvg: rectangle1.color_main + svg: "M -3.7269833,35.537201 H -18.214979 L 9.0812443,-22.703562 H -23.831701 v -12.833639 h 47.663402 v 11.582907 z" } NNumButton { id: nNumButton2 - text: "8" + text: ""//"8" keymap_id: 72 + + colorSvg: rectangle1.color_main + svg: "m 11.390877,-2.1207779 q 2.572134,1.46823292 4.881806,3.2627569 2.36216,1.7401289 4.094414,4.0784838 1.784746,2.283922 2.782106,5.2204262 1.049848,2.88211 1.049848,6.579946 0,4.839779 -1.889731,8.537576 -1.889731,3.69784 -5.249251,6.1993 -3.307027,2.50142 -7.8213875,3.75216 -4.461864,1.25073 -9.658622,1.25073 -5.774176,0 -10.2360405,-1.25073 -4.409372,-1.30509 -7.453938,-3.64341 -2.992074,-2.33831 -4.566849,-5.6555 -1.522283,-3.31716 -1.522283,-7.395602 0,-3.643442 0.997358,-6.471195 1.04985,-2.8821103 2.834596,-5.2204262 1.784745,-2.338317 4.094416,-4.1872359 2.362165,-1.8489179 4.98679,-3.42590188 -2.362164,-1.41387592 -4.461865,-3.09964992 -2.047208,-1.6857729 -3.621984,-3.8065879 -1.574775,-2.1207759 -2.519641,-4.7309892 -0.892372,-2.610252 -0.892372,-5.927402 0,-3.860944 1.417298,-7.23249 1.46979,-3.425903 4.304386,-5.98176 2.887088,-2.555818 7.1914755,-4.024089 4.356879,-1.468233 10.183548,-1.468233 5.354238,0 9.553637,1.196336 4.1994035,1.14198 7.0340015,3.317152 2.887086,2.175209 4.356879,5.220464 1.522281,2.990861 1.522281,6.634303 0,3.371546 -0.892371,6.090509 -0.892375,2.719003 -2.414656,4.9485683 -1.522285,2.1751719 -3.621985,3.9696959 -2.099699,1.7401289 -4.461864,3.2627949 z M 1.3123135,-7.2324918 q 1.889731,-1.0875859 3.516997,-2.2839219 1.679761,-1.2507313 2.88709,-2.7190023 1.207328,-1.468233 1.942222,-3.208401 0.7348955,-1.740128 0.7348955,-3.860943 0,-3.534653 -2.6771175,-5.383572 Q 5.0392825,-26.537251 5.0000003e-7,-26.537251 -4.9342965,-26.537251 -7.6114135,-24.633937 q -2.6771215,1.903274 -2.6771215,5.709862 0,2.066421 0.8923745,3.697798 0.892372,1.631379 2.467149,3.045255 1.574774,1.359482 3.674477,2.5558573 2.152192,1.196337 4.566848,2.3926729 z m -2.677117,12.0179126 q -2.047211,1.14198 -3.88445,2.447068 -1.784742,1.3051249 -3.149551,2.8821092 -1.312312,1.577022 -2.0996995,3.480297 -0.787387,1.848919 -0.787387,4.187234 0,4.132841 3.0970595,6.308052 3.097059,2.17517 8.18883200000001,2.17517 2.30966899999999,0 4.35687999999999,-0.4894 2.047207,-0.48943 3.569488,-1.52263 1.574778,-1.03323 2.4671495,-2.610247 0.892375,-1.631379 0.892375,-3.860945 0,-2.283922 -0.997359,-4.078445 Q 9.2911735,11.854766 7.5589235,10.332138 5.8266695,8.8095107 3.5169975,7.4500288 1.2073295,6.0905078 -1.3648035,4.7854208 Z" } NNumButton { id: nNumButton3 - text: "9" - Layout.alignment: Qt.AlignRight | Qt.AlignVCenter + text: ""//"9" +// Layout.alignment: Qt.AlignRight | Qt.AlignVCenter keymap_id: 36 + + colorSvg: rectangle1.color_main + svg: "m 24.933951,-3.6162229 c 0,5.5829488 -0.454931,10.4589607 -1.364801,14.6280749 -0.90987,4.132869 -2.20469,7.667519 -3.88445,10.604029 -1.644768,2.9365 -3.621986,5.34732 -5.931655,7.23248 -2.309673,1.88515 -4.8818061,3.37154 -7.7164055,4.45913 -2.7995995,1.08758 -5.80916896,1.83076 -9.0287115,2.22956 -3.1845464,0.39877 -6.4915749,0.59815 -9.921088,0.59815 h -7.926372 v -11.36532 h 9.343672 c 4.0944154,0 7.5064289,-0.36253 10.2360443,-1.08759 2.7646014,-0.76133 4.9867828,-1.84891 6.6665451,-3.26275 1.7147573,-1.45015 2.9745775,-3.24467 3.7794626,-5.38361 0.839883,-2.138889 1.399803,-4.604109 1.679762,-7.3955853 l 0.104984,-1.3594809 c -1.854736,0.906321 -3.9719334,1.6494959 -6.3515957,2.2295269 -2.3796584,0.58007 -4.77681783,0.87008 -7.1914722,0.87008 -3.3245265,0 -6.3515959,-0.39876 -9.0812101,-1.19633 -2.729611,-0.7975729 -5.091776,-2.0664599 -7.086491,-3.8065878 -1.959721,-1.740128 -3.482007,-3.98780991 -4.56685,-6.7430468 -1.084846,-2.7914749 -1.62727,-6.1448988 -1.62727,-10.0602341 0,-3.552769 0.612413,-6.779285 1.837239,-9.679549 1.259821,-2.936501 2.992075,-5.437961 5.19676,-7.50438 2.239683,-2.066418 4.881806,-3.661557 7.926374,-4.785418 3.0795625,-1.160098 6.4390829,-1.740127 10.07856352,-1.740127 3.56949358,0 6.85902408,0.525673 9.86859658,1.57702 3.0445679,1.051309 5.6691939,2.845831 7.8738779,5.383567 2.239684,2.50146 3.97194,5.836727 5.19676,10.00584 1.25982,4.169111 1.889731,9.3532963 1.889731,15.5525511 z M -0.52492159,-24.987383 c -1.67976231,0 -3.20204451,0.290015 -4.56684961,0.870045 -1.3648052,0.580068 -2.5371394,1.395757 -3.5170016,2.447104 -0.9448642,1.051308 -1.6797582,2.320157 -2.2046842,3.806546 -0.524926,1.450151 -0.787391,3.081527 -0.787391,4.894169 0,3.8428213 0.979862,6.7068092 2.9395832,8.5919641 1.9597203,1.848916 4.6718377,2.773356 8.13634321,2.773356 0.94486416,0 1.94222029,-0.09063 2.99207149,-0.271897 1.0848432,-0.181264 2.1521924,-0.435041 3.2020445,-0.761293 1.0848432,-0.326291 2.0997004,-0.688819 3.0445675,-1.087585 0.9798582,-0.435041 1.8372391,-0.8882399 2.5721331,-1.3595189 0,-3.2265159 -0.209969,-6.0723862 -0.62991,-8.5375702 -0.384947,-2.465222 -1.0498519,-4.53164 -1.9947151,-6.199293 -0.9098731,-1.70389 -2.1172013,-2.990857 -3.6219856,-3.86094 -1.5047882,-0.870045 -3.3595215,-1.305087 -5.56420589,-1.305087 z" } NNumButton { id: nNumButton4 - text: "4" + text: ""//"4" keymap_id: 29 + + colorSvg: rectangle1.color_main + svg: "M 17.007577,21.072121 V 35.537057 H 4.5143539 V 21.072121 H -27.401102 V 9.7067955 L -0.62991341,-35.537045 H 17.007577 V 9.3805046 H 27.4011 V 21.072121 Z M 4.6718306,-22.703448 -14.855391,9.3805046 H 4.6718306 Z" } NNumButton { id: nNumButton5 - text: "5" + text: ""//"5" keymap_id: 61 + + colorSvg: rectangle1.color_main + svg: "m 22.309301,12.262585 q 0,5.709855 -2.309669,10.168985 -2.30967,4.40474 -6.404081,7.449991 -4.0944146,3.04525 -9.658617,4.62227 -5.5641987,1.57702 -12.0732674,1.57702 -1.6272644,0 -3.4645016,-0.10879 -1.837236,-0.10875 -3.726965,-0.27189 -1.88973,-0.16311 -3.674474,-0.43501 -1.784744,-0.21754 -3.307026,-0.48943 V 23.19287 q 2.992071,0.76133 6.876516,1.25073 3.884442,0.43504 7.9263603,0.43504 7.87387226,0 11.968283,-3.09961 4.1469067,-3.15404 4.1469067,-8.700757 0,-5.7642142 -3.83195,-8.5375703 Q 0.94486603,1.7129516 -7.6114081,1.7129516 H -21.049481 V -36.080851 h 39.579325 v 12.507302 h -27.61104 v 14.4649702 h 4.9342928 q 5.2492457,0 10.0260583,0.978834 4.7768159,0.978834 8.3987979,3.4258991 3.674473,2.3927101 5.826663,6.5255473 2.204685,4.1328761 2.204685,10.4408834 z" } NNumButton { id: nNumButton6 - text: "6" + text: ""//"6" keymap_id: 25 + + colorSvg: rectangle1.color_main + svg: "m 24.960201,12.398551 q 0,5.383592 -1.889731,9.788332 -1.889734,4.350349 -5.249254,7.504369 -3.307028,3.099659 -7.9263756,4.785409 -4.6193393,1.68574 -10.13105692,1.68574 -12.02079148,0 -18.37238848,-7.830609 -6.351596,-7.830689 -6.351596,-23.9270536 0,-5.8730072 0.682402,-11.1478284 0.682401,-5.329171 2.257179,-9.788296 1.62727,-4.513511 4.304389,-8.156899 2.729613,-3.643464 6.771535,-6.144907 4.0419266,-2.555867 9.5536412,-3.915363 5.5117165,-1.413846 12.8081838,-1.413846 h 7.821383 v 11.256566 h -9.133696 q -5.6691942,0 -9.50114928,1.196371 -3.83195512,1.196334 -6.24661282,3.425915 -2.4146576,2.229543 -3.621987,5.437945 -1.2073279,3.208404 -1.5747789,7.2325041 l -0.104984,1.3050708 q 2.7296142,-1.3594958 6.1941192,-2.2295807 3.517003,-0.8700468 7.3489581,-0.8700468 5.5642106,0 9.7636107,1.5226577 4.199404,1.4682328 6.981508,4.2959614 2.834597,2.82772861 4.199404,6.851791 1.417297,4.0241005 1.417297,9.1357975 z m -13.333104,0.598148 q 0,-2.501443 -0.629911,-4.5678602 Q 10.367274,6.3080321 9.0024711,4.8397993 7.6901587,3.3171795 5.5904561,2.5014816 3.5432446,1.6313968 0.65615674,1.6313968 q -1.67976244,0 -3.35952594,0.3262869 -1.6272645,0.271899 -3.2020429,0.7613099 -1.5222805,0.4894109 -2.9395779,1.0875969 -1.36481,0.5981479 -2.467151,1.2507208 0,5.4923327 0.734896,9.2989217 0.7348948,3.75216 2.2046852,6.14487 1.5222844,2.3927 3.726971,3.4803 2.2571797,1.033209 5.19676151,1.033209 2.51964169,0 4.56685029,-0.870079 2.0472076,-0.87009 3.464505,-2.44706 1.469794,-1.63143 2.25718,-3.80659 0.787389,-2.229539 0.787389,-4.894184 z" } NNumButton { id: nNumButton7 - text: "1" + text: ""//"1" keymap_id: 18 + + colorSvg: rectangle1.color_main + svg: "M 14.502347,-34.974266 V 34.974235 H 0.63980598 v -53.864337 q -2.55923708,2.297771 -6.99525198,4.153613 -4.436011,1.811681 -8.146908,2.253571 v -12.239877 q 11.6871896,-3.534999 20.2179823,-10.251471 z" } NNumButton { id: nNumButton8 - text: "2" + text: ""//"2" keymap_id: 70 + + colorSvg: rectangle1.color_main + svg: "M -23.122946,36.135251 V 26.346872 L -6.9027657,9.5435865 Q -2.3359199,4.812564 0.39369673,1.3866874 3.1757934,-2.0392273 4.6455836,-4.703832 q 1.5222833,-2.7189547 1.9947161,-5.0029225 0.4724338,-2.2839685 0.4724338,-4.7310245 0,-2.012031 -0.6299117,-3.806589 -0.6299107,-1.848868 -1.8372382,-3.154015 -1.2073284,-1.359458 -3.0445634,-2.120806 -1.83723517,-0.815698 -4.199398,-0.815698 -4.041927,0 -7.5064292,1.848945 -3.464505,1.79452 -6.561562,4.83976 l -6.771532,-9.027022 q 4.461862,-4.295961 10.02607,-6.851791 5.6166957,-2.610256 12.1257655,-2.610256 5.0392806,0 9.1336937,1.359534 4.0944128,1.305071 6.9814988,3.915289 2.939582,2.610254 4.514359,6.525541 1.627264,3.915364 1.627264,9.027023 0,4.241614 -1.102344,7.9394273 -1.102337,3.6434266 -3.202041,7.12372823 Q 14.566669,3.2355942 11.469608,6.7158958 8.4250448,10.19616 4.4881097,14.057133 l -9.9735762,9.842689 H 23.4379 v 12.235429 z" } NNumButton { id: nNumButton9 - text: "3" + text: ""//"3" keymap_id: 14 + + colorSvg: rectangle1.color_main + svg: "m 23.122951,13.893929 q 0,5.274828 -1.889733,9.516477 -1.889729,4.187218 -5.826669,7.178077 -3.884447,2.936499 -9.816096,4.513508 -5.93165614,1.57701 -13.9630076,1.57701 -1.7847454,0 -3.7794574,-0.10878 -1.942224,-0.0544 -3.884451,-0.21747 -1.942223,-0.10882 -3.779462,-0.32633 -1.837232,-0.16312 -3.307026,-0.43502 V 24.062936 q 3.307026,0.652539 7.401443,1.087559 4.146912,0.38068 8.608776,0.38068 4.3568746,0 7.50642763,-0.76131 3.14955097,-0.761319 5.19675737,-2.175159 2.0472074,-1.468269 2.9920741,-3.589079 0.9973527,-2.120799 0.9973527,-4.785408 0,-2.338319 -0.9973527,-4.2415732 Q 7.5851664,8.0753525 5.537959,6.770244 3.4907487,5.4107105 0.28870766,4.7038257 -2.8608444,3.942478 -7.217724,3.942478 h -7.611411 V -6.1721002 h 6.9815042 q 4.0944177,0 6.7715319,-0.8156977 2.7296121,-0.8700847 4.3043856,-2.2839301 1.6272715,-1.413883 2.3096723,-3.317177 0.6824018,-1.957644 0.6824018,-4.078449 0,-4.350349 -2.7296121,-6.579929 -2.72960819,-2.283968 -8.4512904,-2.283968 -4.0944137,0 -8.0838473,0.815698 -3.989431,0.815735 -8.241322,2.175231 v -11.147826 q 2.362162,-0.815698 4.514353,-1.359495 2.152194,-0.543799 4.304386,-0.924473 2.152195,-0.380636 4.3568793,-0.543798 2.2046843,-0.163087 4.5668466,-0.163087 5.6691932,0 9.9210849,1.250722 4.3043842,1.25072 7.1914752,3.589037 2.939579,2.283931 4.409369,5.601069 1.46979,3.317139 1.46979,7.395626 0,6.471154 -2.88709,10.4952536 -2.834592,3.9697115 -7.9788559,6.0905177 3.3070249,0.5437978 5.9841429,1.90329333 2.677117,1.30510851 4.566847,3.42591377 1.942223,2.0664182 2.93958,4.7854092 1.049854,2.7189544 1.049854,6.0360884 z" } NNumButton { id: nNumButton10 - text: "0" + text: ""//"0" keymap_id: 7 + + colorSvg: rectangle1.color_main + svg: "m -23.672897,1.1046995 q 0,-17.7632725 6.312775,-27.1309975 6.312775,-9.367688 18.25585917,-9.367688 22.77716783,0 22.77716783,34.90793093 0,17.18885907 -6.184812,26.55654607 -6.184813,9.323525 -17.87197147,9.323525 -23.28901853,0 -23.28901853,-34.2893165 z M -9.7250797,0.75121131 q 0,23.68436269 9.7677373,23.68436269 9.5971229,0 9.5971229,-24.39137754 0,-24.47974046 -9.34119754,-24.47974046 -10.02366266,0 -10.02366266,25.18675531 z" } NNumButton { id: nNumButton11 - text: "." + text: ""//"." keymap_id: 59 + colorSvg: rectangle1.color_main + svg: "m -8.1682002,-0.02209948 q 0,-3.31403032 2.4312902,-5.43503502 2.4312523,-2.1209657 5.80090943,-2.1209657 3.41228707,0 5.75824447,2.1651667 2.3459563,2.1651656 2.3459563,5.39083402 0,3.40243128 -2.3459563,5.52339698 -2.3459574,2.0768027 -5.92887328,2.0768027 -3.32699122,0 -5.71561452,-2.1651657 -2.3459563,-2.1651656 -2.3459563,-5.43503398 z" + Text { id: text3 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "capture" +// color: "#68cce0" +// text: "capture" anchors.bottom: parent.top - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 80.399253,4.5388164 4.765599,0.6104595 q -1.1273,4.3264865 -4.176299,6.7153451 -3.049,2.388818 -7.788999,2.388818 -5.969899,0 -9.480099,-3.795577 -3.484499,-3.8221673 -3.484499,-10.69677181 0,-7.11345429 3.535799,-11.04179119 3.5358,-3.928307 9.172499,-3.928307 5.457499,0 8.916398,3.848707 3.4589,3.848667 3.4589,10.82945142 0,0.42465966 -0.026,1.27403899 H 65.000155 q 0.2562,4.64497629 2.5366,7.11346429 2.280299,2.4684883 5.687999,2.4684883 2.536499,0 4.330099,-1.3802491 1.7935,-1.3802189 2.844,-4.4060765 z M 65.256755,-3.1851475 h 15.193698 q -0.3074,-3.5567271 -1.7423,-5.3350857 -2.2034,-2.7604678 -5.713599,-2.7604678 -3.1771,0 -5.354899,2.2030582 -2.1523,2.2030583 -2.3829,5.8924953 z M 44.288358,13.616439 v -28.188437 h 4.1507 v 4.273396 q 1.588599,-2.999317 2.920899,-3.954877 1.358,-0.955529 2.9721,-0.955529 2.331599,0 4.740099,1.539479 l -1.5886,4.4326264 q -1.691,-1.0351594 -3.382099,-1.0351594 -1.5116,0 -2.7159,0.9555294 -1.2042,0.9290093 -1.7166,2.601208 -0.7687,2.5481179 -0.7687,5.5739755 V 13.616439 Z m -11.275998,0 V 9.4757624 q -3.1771,4.7776766 -8.634499,4.7776766 -2.408399,0 -4.509399,-0.95552 -2.0754,-0.955559 -3.1003,-2.388858 -0.999199,-1.4598485 -1.409199,-3.5567269 -0.2818,-1.4067588 -0.2818,-4.4591664 V -14.571998 h 4.611899 V 1.0617092 q 0,3.742537 0.2819,5.0431259 0.4355,1.8845385 1.8447,2.9727777 1.409199,1.0617292 3.484599,1.0617292 2.0753,0 3.8945,-1.0882792 1.819099,-1.1147791 2.562099,-2.9993176 0.7687,-1.9110785 0.7687,-5.52089562 V -14.571998 h 4.611899 v 28.188437 z m -21.808397,-4.2733964 0.6662,4.2203164 q -1.9471995,0.42469 -3.4844993,0.42469 -2.5109996,0 -3.8944994,-0.822839 Q 3.1075645,12.34236 2.5438646,11.015231 1.9801647,9.6615623 1.9801647,5.3616157 V -10.856011 h -3.3819995 v -3.715987 h 3.3819995 v -6.980745 l 4.5862993,-2.866608 v 9.847353 h 4.637499 v 3.715987 H 6.566464 V 5.6270555 q 0,2.0437984 0.2306,2.6277479 0.2561999,0.5839196 0.7942998,0.9289793 0.5636999,0.3450597 1.5884998,0.3450597 0.7686999,0 2.0240994,-0.1857998 z M -28.535931,24.419351 v -38.991349 h 4.202 v 3.662897 q 1.486,-2.149969 3.356399,-3.211668 1.8704,-1.088239 4.5351,-1.088239 3.484499,0 6.149199,1.857999 2.6645992,1.857998 4.022599,5.2554655 1.3578998,3.3709273 1.3578998,7.40543405 0,4.32644655 -1.5115998,7.80355375 -1.4860998,3.4505477 -4.355699,5.3085457 -2.844,1.831449 -5.995499,1.831449 -2.306,0 -4.1507,-1.0086 -1.8192,-1.008609 -2.997799,-2.548128 v 13.72264 z m 4.1764,-24.73789075 q 0,5.44126565 2.126599,8.04247355 2.1266,2.6012082 5.1499,2.6012082 3.074599,0 5.252499,-2.6808381 2.2033995,-2.7073378 2.2033995,-8.36095333 0,-5.38818567 -2.1521995,-8.06902357 -2.1266,-2.680798 -5.098699,-2.680798 -2.9465,0 -5.2268,2.8666079 -2.254699,2.8400577 -2.254699,8.28132335 z M -39.940029,10.139342 q -2.562179,2.256108 -4.944999,3.185127 -2.35719,0.92897 -5.073099,0.92897 -4.4838,0 -6.892239,-2.256099 -2.40844,-2.2826877 -2.40844,-5.8128749 0,-2.0703484 0.89676,-3.769077 0.92238,-1.72527865 2.38282,-2.76046782 1.486059,-1.03515918 3.330819,-1.56601878 1.35796,-0.3715697 4.099479,-0.7166294 5.58553,-0.6901295 8.224569,-1.6456487 0.0256,-0.9821092 0.0256,-1.247539 0,-2.9196877 -1.30671,-4.1141067 -1.767889,-1.6191387 -5.252449,-1.6191387 -3.253959,0 -4.816879,1.194449 -1.5373,1.1678691 -2.28033,4.1672267 l -4.509429,-0.6370395 q 0.61493,-2.9993176 2.02412,-4.8307762 1.409189,-1.857988 4.073849,-2.840098 2.66466,-1.008609 6.174839,-1.008609 3.48455,0 5.662399,0.849349 2.17784,0.84939 3.20271,2.149979 1.02487,1.274039 1.43482,3.2382072 0.230589,1.220989 0.230589,4.4061164 v 6.370245 q 0,6.6622647 0.28184,8.4406234 0.30746,1.751828 1.1786,3.370927 h -4.816879 q -0.71741,-1.486389 -0.92238,-3.477097 z m -0.38433,-10.67019158 q -2.510929,1.06169916 -7.532779,1.80490858 -2.844019,0.4246596 -4.022609,0.9555192 -1.1786,0.5308696 -1.81915,1.5660188 -0.64054,1.0086492 -0.64054,2.2561482 0,1.9110785 1.38357,3.1851274 1.4092,1.2740394 4.09948,1.2740394 2.664659,0 4.740019,-1.1944094 2.075349,-1.2209591 3.048979,-3.3178474 0.74303,-1.6190987 0.74303,-4.7776862 z m -25.829146,3.82212698 4.535039,0.6104995 q -0.743029,4.8573161 -3.817629,7.6177841 -3.048989,2.733878 -7.507169,2.733878 -5.585529,0 -8.993218,-3.769077 -3.38207,-3.7955773 -3.38207,-10.8559917 0,-4.5653364 1.46044,-7.9893436 1.46044,-3.4240177 4.432559,-5.1227557 2.99774,-1.725279 6.507909,-1.725279 4.43256,0 7.250949,2.335738 2.81839,2.309238 3.61266,6.582635 l -4.4838,0.7166294 q -0.64054,-2.8400577 -2.280329,-4.2733566 -1.61417,-1.4333388 -3.92012,-1.4333388 -3.484559,0 -5.662399,2.6012079 -2.17785,2.574658 -2.17785,8.1751935 0,5.6801155 2.10098,8.2547834 2.10098,2.5746582 5.483049,2.5746582 2.7159,0 4.53504,-1.7252789 1.819149,-1.7253086 2.305959,-5.3085857 z" + } + } } NNumButton { id: nNumButton12 - text: "(-)" + text: ""//"(-)" keymap_id: 3 + colorSvg: rectangle1.color_main + svg: "M 19.812764,26.598201 Q 33.97388,14.81722 33.97388,0.15393 q 0,-14.60734 -14.161116,-26.752131 h 11.303299 q 14.886236,11.613131 14.886236,26.752131 0,15.58674 -14.971544,26.444271 z M 18.909958,0.53644001 H -18.437033 V -5.8437701 H 18.909958 Z M -31.244034,26.598201 Q -46.002303,15.88057 -46.002303,0.15393 q 0,-15.19499 14.758269,-26.752131 h 11.26065 q -13.990499,12.032871 -13.990499,26.752131 0,14.66329 14.075807,26.444271 z" + Text { id: text2 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "ans" +// color: "#68cce0" +// text: "ans" anchors.bottom: parent.top - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "M 17.741102,5.6801537 22.30177,4.9369481 q 0.384325,2.8400866 2.126599,4.3530319 1.7679,1.512906 4.919373,1.512906 3.177077,0 4.714411,-1.3271041 1.537296,-1.3536754 1.537296,-3.1585885 0,-1.6191492 -1.357976,-2.5481187 Q 33.293484,3.132036 29.527091,2.1499635 24.453994,0.8228211 22.48112,-0.13271844 20.533869,-1.114791 19.509002,-2.8135361 q -0.999247,-1.7252782 -0.999247,-3.7956272 0,-1.8845471 0.819893,-3.4770887 0.845521,-1.619148 2.280336,-2.680855 1.076111,-0.822803 2.920874,-1.380207 1.870387,-0.583936 3.996987,-0.583936 3.202718,0 5.611138,0.955539 2.434076,0.95554 3.587039,2.601183 1.15302,1.6191112 1.588573,4.3530308 l -4.509433,0.6370017 q -0.307468,-2.1764779 -1.793521,-3.3974913 -1.460432,-1.2209382 -4.150714,-1.2209382 -3.177093,0 -4.535044,1.0882392 -1.357949,1.0882765 -1.357949,2.5481178 0,0.9289705 0.563675,1.6722142 0.563678,0.7697376 1.767899,1.2740404 0.691786,0.2653978 4.073855,1.2209754 4.893731,1.3536753 6.815363,2.22957987 1.947261,0.84937359 3.048993,2.49501683 1.101732,1.6456432 1.101732,4.087595 0,2.3888878 -1.357946,4.5122623 -1.332347,2.096881 -3.868878,3.264793 -2.536565,1.141341 -5.739264,1.141341 -5.303698,0 -8.096461,-2.282721 -2.767147,-2.282681 -3.5358,-6.7683753 z M -9.5953294,14.094174 v -28.188386 h 4.1507209 v 4.00796 q 2.9977352,-4.644998 8.6601356,-4.644998 2.4596813,0 4.5094168,0.929006 2.0753654,0.902438 3.1002331,2.388812 1.024868,1.4864503 1.43481,3.5301903 0.256218,1.3271814 0.256218,4.6449998 V 14.094174 H 7.9042978 V -3.05244 q 0,-2.9197216 -0.5380568,-4.3530309 -0.5380579,-1.4598423 -1.9216285,-2.3092149 -1.3579496,-0.8759052 -3.2027101,-0.8759052 -2.94650021,0 -5.0987216,1.9376497 -2.1265994,1.9376111 -2.1265994,7.3523494 V 14.094174 Z M -21.02068,10.617085 q -2.562172,2.25615 -4.944993,3.18512 -2.357196,0.929045 -5.0731,0.929045 -4.483796,0 -6.892235,-2.256151 -2.408443,-2.282719 -2.408443,-5.8128727 0,-2.070311 0.896761,-3.7690942 0.922382,-1.7252782 2.382821,-2.76041466 1.486057,-1.0351745 3.330821,-1.56604624 1.357951,-0.3716028 4.099471,-0.7166737 5.585533,-0.6900656 8.224568,-1.6456432 0.02563,-0.9820725 0.02563,-1.2475083 0,-2.9197216 -1.306704,-4.114128 -1.767904,-1.61911 -5.252454,-1.61911 -3.253961,0 -4.816886,1.1944052 -1.5373,1.1679114 -2.280331,4.1672289 l -4.509418,-0.6370387 q 0.614918,-2.9993185 2.02411,-4.8307624 1.409197,-1.857977 4.073854,-2.84005 2.664661,-1.008641 6.174836,-1.008641 3.484549,0 5.662395,0.849372 2.177842,0.849335 3.20271,2.149983 1.024873,1.274041 1.43482,3.2381846 0.230596,1.2209764 0.230596,4.4060959 v 6.3702769 q 0,6.6622467 0.28184,8.4405896 0.307456,1.751847 1.178595,3.370922 h -4.816878 q -0.717411,-1.486375 -0.922383,-3.477089 z m -0.384329,-10.67016947 q -2.510925,1.06166947 -7.532782,1.80487507 -2.844007,0.4247058 -4.022607,0.9555776 -1.1786,0.5308347 -1.819138,1.5660082 -0.640547,1.0086045 -0.640547,2.2561129 0,1.9110801 1.383571,3.1851585 1.409193,1.2740402 4.099474,1.2740402 2.664662,0 4.740018,-1.1944053 2.075357,-1.2209764 3.048986,-3.3178964 0.743025,-1.6190732 0.743025,-4.7776606 z" + } } } } @@ -324,43 +433,53 @@ Rectangle { NBigButton { id: nButton7 width: 33 - color: "#68cce0" - text: "ctrl" + color: rectangle1.color_ctrl//"#68cce0" + text: ""//"ctrl" anchors.top: gridLayout1.top anchors.topMargin: 0 keymap_id: 86 anchors.left: parent.left anchors.leftMargin: 5 active_color: "#cce" - back_color: "#bbf" - font_color: "#222" +// back_color: "#bbf" +// font_color: "#222" + + colorSvg: rectangle1.color_main + svg: "m 41.740159,25.99128 v -52.847731 h 9.778242 V 25.99128 Z m -18.373324,0 h -9.778232 v -38.283958 h 9.082272 v 5.4433816 q 2.33146,-3.8572306 4.175751,-5.0828906 1.8791,-1.225671 4.245361,-1.225671 3.3406,0 6.437621,1.910601 l -3.027431,8.8319815 q -2.47065,-1.6582503 -4.593321,-1.6582503 -2.05309,0 -3.4798,1.1896102 -1.426721,1.1535702 -2.261871,4.2177209 -0.80035,3.0641606 -0.80035,12.8334227 z M 7.2205816,-12.292678 v 8.0749521 H 0.53937012 V 11.211217 q 0,4.686361 0.17399003,5.479431 0.20879005,0.757031 0.86995015,1.261721 0.6959502,0.50468 1.6703004,0.50468 1.3571103,0 3.9321709,-0.97332 l 0.8351501,7.858661 q -3.4102107,1.514061 -7.72515164,1.514061 -2.64465056,0 -4.76732106,-0.901221 Q -6.5942214,25.01795 -7.6033516,23.576 -8.5777019,22.09799 -8.9604719,19.610609 -9.273662,17.844219 -9.273662,12.472928 V -4.2177259 h -4.488941 v -8.0749521 h 4.488941 v -7.606321 l 9.81303212,-5.912031 v 13.518352 z m -24.3585856,11.3193528 -9.639042,1.80245037 q -0.48717,-2.99206067 -2.22706,-4.50611097 -1.705101,-1.5140603 -4.454151,-1.5140603 -3.653781,0 -5.846061,2.6315806 -2.157471,2.59552051 -2.157471,8.7238318 0,6.8132517 2.192271,9.6250717 2.22708,2.811801 5.950461,2.811801 2.78384,0 4.558531,-1.62219 1.7747,-1.658261 2.50545,-5.659692 l 9.604242,1.694311 q -1.49631,6.849291 -5.741661,10.346042 -4.245351,3.496741 -11.378942,3.496741 -8.107922,0 -12.944843,-5.299192 -4.802121,-5.299191 -4.802121,-14.6719126 0,-9.4808619 4.836921,-14.744013 4.836921,-5.2991914 13.084033,-5.2991914 6.750811,0 10.717782,3.028111 4.001761,2.9920605 5.741661,9.1564218 z" } NBigButton { id: nButton10 x: 230 width: 33 - text: "del" + text: ""//"del" anchors.top: gridLayout1.top anchors.topMargin: 0 keymap_id: 64 anchors.right: parent.right anchors.rightMargin: 5 + colorSvg: rectangle1.color_submain + svg: "M -7.4977002,33.087001 -26.317401,24.017116 -7.4977002,14.947242 Z m 0,-12.124716 v 6.466533 H 30.087901 V 20.962285 Z M 25.852401,3.0658565 V -33.087001 h 6.6892 V 3.0658565 Z M 13.3785,-5.2695275 20.044,-4.110467 q -1.2855,3.79778185 -4.0708,5.7953128 -2.7613,1.9728709 -6.9271998,1.9728709 -6.5940001,0 -9.76020022,-4.46362208 -2.49940008,-3.57582172 -2.49940008,-9.02588432 0,-6.5104733 3.2850001,-10.1849453 3.2852001,-3.699121 8.3080002,-3.699121 5.6417998,0 8.9031998,3.871752 3.2612,3.847091 3.1184,11.8125652 H 3.6422001 q 0.072,3.0826114 1.6187,4.8088723 1.5474001,1.7016008 3.8565001,1.7016008 1.5711998,0 2.6423998,-0.8878004 1.0712,-0.8877905 1.6187,-2.8606614 z m 0.3809,-7.0036835 q -0.072,-3.008631 -1.4997,-4.562262 -1.4284,-1.578301 -3.4755998,-1.578301 -2.1900001,0 -3.6184001,1.652281 -1.4282,1.652281 -1.4045,4.488282 z M -7.8556002,3.0658565 H -14.0687 v -3.84709187 q -1.5474,2.24413107 -3.6661,3.35387157 -2.0948,1.0850805 -4.2373,1.0850805 -4.356301,0 -7.474801,-3.62515168 -3.0947,-3.64981172 -3.0947,-10.16027502 0,-6.658443 3.0233,-10.110965 3.0232,-3.477181 7.641501,-3.477181 4.2373,0 7.332,3.649801 v -13.020946 h 6.6891998 z M -25.709501,-10.59627 q 0,4.192352 1.1189,6.0665728 1.6187,2.7127013 4.522901,2.7127013 2.3092,0 3.9279,-2.0221909 1.6187,-2.046861 1.6187,-6.0912429 0,-4.5129423 -1.5711,-6.4858133 -1.5712,-1.997531 -4.0231,-1.997531 -2.3805,0 -3.999201,1.972871 -1.595,1.948211 -1.595,5.844633 z" + Text { id: text9 x: 0 y: -11 width: 33 height: 11 - color: "#68cce0" - text: "clear" - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 9 +// color: "#68cce0" +// text: "clear" +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 9 anchors.bottomMargin: 0 - font.bold: true - verticalAlignment: Text.AlignVCenter +// font.bold: true +// verticalAlignment: Text.AlignVCenter anchors.bottom: parent.top + NSvg { + colorSvg: rectangle1.color_ctrl + svg: "m 50.784598,19.402501 h -7.2995 V -9.1764938 h 6.78 v 4.0634951 q 1.7404,-2.8794265 3.1172,-3.7943854 1.4027,-0.9149589 3.1691,-0.9149589 2.4938,0 4.8057,1.4262583 l -2.26,6.5930819 q -1.8443,-1.2378885 -3.4289,-1.2378885 -1.5326,0 -2.5976,0.8880489 -1.0651,0.861139 -1.6885,3.14853618 -0.5975,2.28739722 -0.5975,9.58014822 z m -31.1201,-19.85997544 -6.6241,-1.23788846 q 1.117,-4.1442249 3.8445,-6.1356025 2.7276,-1.9913776 8.1048,-1.9913776 4.8836,0 7.2735,1.2109685 2.3899,1.1840686 3.351,3.0408963 0.9871,1.8299178 0.9871,6.7545417 l -0.078,8.8266595 q 0,3.767475 0.3377,5.570483 0.3637,1.776098 1.3248,3.821295 h -7.2216 q -0.2857,-0.753499 -0.7013,-2.233577 -0.1819,-0.672759 -0.2598,-0.888049 -1.8703,1.883738 -4.0004,2.825607 -2.1301,0.941868 -4.5459,0.941868 -4.2602,0 -6.728,-2.395037 -2.4418,-2.395037 -2.4418,-6.054872 0,-2.4219472 1.117,-4.3056849 1.117,-1.9106477 3.1172,-2.9063365 2.0262,-1.0225987 5.8188,-1.7760978 5.1174,-0.9956888 7.0916,-1.85682772 V 4.9999938e-6 q 0,-2.1797572999938 -1.0391,-3.0947161999938 -1.039,-0.9418689 -3.9224,-0.9418689 -1.9483,0 -3.0393,0.8073191 -1.091,0.780409 -1.7664,2.77178656 z m 9.7672,6.13560244 q -1.4027,0.4843895 -4.442,1.1571486 -3.0393,0.6727692 -3.9744,1.3186184 -1.4288,1.0495087 -1.4288,2.664147 0,1.587718 1.143,2.744876 1.143,1.157149 2.9094,1.157149 1.9743,0 3.7666,-1.345528 1.3248,-1.022599 1.7405,-2.502677 0.2857,-0.9687791 0.2857,-3.6867458 z M 0.59749765,10.306742 7.8709976,11.571541 q -1.4027,4.144215 -4.442,6.323972 -3.01329995,2.152837 -7.5592,2.152837 -7.1955996,0 -10.6504996,-4.870804 -2.7276,-3.902025 -2.7276,-9.8492575 0,-7.1043813 3.5849,-11.1140464 3.5847,-4.0365851 9.0657996,-4.0365851 6.1565,0 9.7153,4.2249549 3.5588,4.1980448 3.403,12.8901442 H -10.026902 q 0.078,3.3638159 1.7663996,5.2475539 1.6885,1.856827 4.2082,1.856827 1.7145,0 2.8834,-0.968778 Q 9.7647767e-5,12.45958 0.59749765,10.306742 Z M 1.0131976,2.6641517 q -0.078,-3.28308594 -1.63659995,-4.9784539 -1.55850005,-1.7222779 -3.79260005,-1.7222779 -2.3898,0 -3.9484,1.8030078 -1.5586,1.80300783 -1.5327,4.897724 z M -30.1589,19.402501 V -20.04835 h 7.2995 V 19.402501 Z M -35.692,-0.72658411 -42.8875,0.61894424 Q -43.2512,-1.614633 -44.55,-2.7448716 q -1.2729,-1.1302487 -3.3251,-1.1302487 -2.7275,0 -4.364,1.9644776 -1.6106,1.93755767 -1.6106,6.5123521 0,5.0860937 1.6365,7.1851116 1.6626,2.099017 4.4421,2.099017 2.0781,0 3.4029,-1.210969 1.3248,-1.237888 1.8703,-4.2249544 l 7.1696,1.2647885 q -1.117,5.1130039 -4.2861,7.7233309 -3.1692,2.610316 -8.4944,2.610316 -6.0526,0 -9.663401,-3.955845 -3.5848,-3.955855 -3.5848,-10.9525863 0,-7.0774713 3.6108,-11.0064165 3.610801,-3.9558452 9.767201,-3.9558452 5.0395,0 8.0009,2.2604873 2.9873,2.2335672 4.2861,6.83527159 z" + } } } @@ -378,57 +497,259 @@ Rectangle { columnSpacing: 10 columns: 9 - NAlphaButton { width: 21; text: "EE" ;keymap_id: 30 } - NAlphaButton { text: "A" ;keymap_id: 50 } - NAlphaButton { text: "B" ;keymap_id: 49 } - NAlphaButton { text: "C" ;keymap_id: 48 } - NAlphaButton { text: "D" ;keymap_id: 46 } - NAlphaButton { text: "E" ;keymap_id: 45 } - NAlphaButton { text: "F" ;keymap_id: 44 } - NAlphaButton { text: "G" ;keymap_id: 39 } - NAlphaButton { width: 21; text: "?!▸";keymap_id: 8 } - NAlphaButton { width: 21; text: "π▸";keymap_id: 19 } - NAlphaButton { text: "H" ;keymap_id: 38 } - NAlphaButton { text: "I" ;keymap_id: 37 } - NAlphaButton { text: "J" ;keymap_id: 35 } - NAlphaButton { text: "K" ;keymap_id: 34 } - NAlphaButton { text: "L" ;keymap_id: 33 } - NAlphaButton { text: "M" ;keymap_id: 28 } - NAlphaButton { text: "N" ;keymap_id: 27 } - NAlphaButton { width: 21; text: "";keymap_id: 66; - Image { - source: "qrc:/keyimages/resources/keyimages/flag.png" - anchors.fill: parent - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } + NAlphaButton { + width: 21; + text: ""//"EE" ; + keymap_id: 30 + + colorSvg: rectangle1.color_submain + svg: "m 3.0080111,18.20045 v -36.4009 H 29.06178 v 6.157863 H 10.102714 v 8.0697813 H 27.74349 V 2.1602077 H 10.102714 v 9.9072393 h 19.630187 v 6.133003 z m -32.7409121,0 v -36.4009 h 26.0537297 v 6.157863 H -22.638238 v 8.0697813 H -4.9974618 V 2.1602077 H -22.638238 v 9.9072393 h 19.6301869 v 6.133003 z" + } + NAlphaButton { + text: ""//"A" ; + keymap_id: 50 + + colorSvg: rectangle1.color_submain + svg: "M 21.641549,22.343335 H 12.166926 L 8.4006044,12.192809 H -8.8420152 l -3.5603408,10.150526 h -9.239196 L -4.8403033,-22.343366 H 4.3694826 Z M 5.6053289,4.6637287 -0.33840062,-11.918521 -6.1644163,4.6637287 Z" + } + NAlphaButton { + text: ""//"B" ; + keymap_id: 49 + + colorSvg: rectangle1.color_submain + svg: "m -18.066501,-22.343341 h 17.24262115 q 5.11982405,0 7.62088475,0.457238 2.5304891,0.426732 4.5019121,1.828914 2.000852,1.402182 3.324946,3.749307 1.32409,2.316619 1.32409,5.212422 0,3.1396561 -1.647759,5.7611009 -1.618333,2.6214833 -4.4136414,3.9321865 3.9428534,1.18879614 6.0614004,4.0541321 2.118547,2.8652975 2.118547,6.7365497 0,3.0481778 -1.38294,5.9439808 -1.353515,2.865336 -3.736881,4.60281 -2.353944,1.706968 -5.8260059,2.103272 -2.1773962,0.243853 -10.5044631,0.304787 h -14.682711 z m 8.7095849,7.43764 v 10.3334055 h 5.7083073 q 5.0903993,0 6.3262154,-0.1524127 2.2362456,-0.2743198 3.5014902,-1.5850615 1.2946656,-1.3412088 1.2946656,-3.505454 0,-2.0727663 -1.118121,-3.3530033 -1.0886962,-1.310741 -3.2660924,-1.585061 -1.2946693,-0.152413 -7.44434,-0.152413 z m 0,17.771046 v 11.948972 h 8.0622481 q 4.7078816,0 5.9731261,-0.274358 1.9420021,-0.365798 3.1483972,-1.767941 1.2358199,-1.432688 1.2358199,-3.8102797 0,-2.011794 -0.9415763,-3.4139756 Q 7.1795226,4.1455811 5.3846404,3.505463 3.6191829,2.865345 -2.3245185,2.865345 Z" + } + NAlphaButton { + text: "C" ; + keymap_id: 48 + + colorSvg: rectangle1.color_submain + svg: "m 10.342634,5.9134704 8.444765,2.773856 q -1.942003,7.3157296 -6.473341,10.8821156 -4.5019137,3.535919 -11.44604296,3.535919 -8.59188824,0 -14.12365304,-6.065923 -5.531764,-6.096428 -5.531764,-16.64321244 0,-11.15643556 5.561189,-17.31379756 5.5611892,-6.187868 14.6238658,-6.187868 7.9151306,0 12.8584082,4.84666 2.942428,2.865296 4.413643,8.230128 l -8.621313,2.1337767 Q 9.2833587,-11.36986 6.841143,-13.381653 q -2.412791,-2.011831 -5.88485376,-2.011831 -4.79615714,0 -7.79743534,3.566424 -2.9718498,3.5663867 -2.9718498,11.5526623 0,8.4740191 2.942425,12.0709107 2.9424288,3.596892 7.65031174,3.596892 3.47206646,0 5.97313166,-2.286151 2.5010614,-2.286151 3.5897615,-7.1937836 z" + } + NAlphaButton { + text: ""//"D" ; + keymap_id: 46 + + colorSvg: rectangle1.color_submain + svg: "m -18.08125,-22.34335 h 15.9185651 q 5.3846505,0 8.2093869,0.853492 3.7957384,1.158311 6.502776,4.115111 2.707041,2.956723 4.119407,7.254724 1.412365,4.267464 1.412365,10.54676986 0,5.51723914 -1.324091,9.51042184 -1.618339,4.8771013 -4.61962,7.8948643 -2.2656705,2.286159 -6.12026,3.566398 -2.8835845,0.944919 -7.7091773,0.944919 H -18.08125 Z m 8.709603,7.559581 V 14.81427 h 6.5027752 q 3.64862144,0 5.2669564,-0.426709 2.1185526,-0.548674 3.5014952,-1.859413 1.4123656,-1.31074 2.2950986,-4.2980018 0.8827281,-3.017687 0.8827281,-8.19964521 0,-5.18195829 -0.8827281,-7.95582729 -0.882733,-2.7738697 -2.4716438,-4.3284657 -1.5889129,-1.554556 -4.0311329,-2.103268 -1.82431216,-0.426709 -7.1501116,-0.426709 z" + } + NAlphaButton { + text: ""//"E" ; + keymap_id: 45 + + colorSvg: rectangle1.color_submain + svg: "m -16.404047,22.34332 v -44.6867 h 31.984218 v 7.559579 H -7.6944552 v 9.9066646 H 13.961836 V 2.6518991 H -7.6944552 V 14.814246 H 16.404054 v 7.529074 z" + } + NAlphaButton { + text: ""//"F" ; + keymap_id: 44 + + colorSvg: rectangle1.color_submain + svg: "m -14.7857,22.34335 v -44.6867 h 29.571401 v 7.559543 H -6.0760813 V -4.2065001 H 11.931553 V 3.3530451 H -6.0760813 V 22.34335 Z" + } + NAlphaButton { + text: ""//"G" ; + keymap_id: 39 + + colorSvg: rectangle1.color_submain + svg:"M 1.3976512,5.9135176 V -1.6155189 H 20.17035 V 16.185967 q -2.736454,2.743398 -7.944534,4.846666 -5.1786742,2.072768 -10.5044866,2.072768 -6.7675883,0 -11.7991254,-2.926298 -5.031536,-2.956757 -7.562083,-8.413031 -2.530471,-5.4867647 -2.530471,-11.91849835 0,-6.98036605 2.824745,-12.40617465 2.824707,-5.425809 8.2682126,-8.321567 4.1488656,-2.225233 10.3279435,-2.225233 8.0328251,0 12.5347369,3.505472 4.531354,3.474932 5.826033,9.6323044 l -8.65074,1.6765213 q -0.912152,-3.2920407 -3.4426229,-5.1819527 -2.5011036,-1.920376 -6.267407,-1.920376 -5.7082996,0 -9.0921128,3.749286 -3.3543703,3.7493254 -3.3543703,11.12597402 0,7.95582808 3.4132174,11.94896398 3.4132181,3.962646 8.9449766,3.962646 2.7364938,0 5.4729495,-1.097349 2.7658977,-1.127809 4.7373375,-2.712907 V 5.9135176 Z" + } + NAlphaButton { + width: 21; + text: ""//"?!▸"; + keymap_id: 8 + + colorSvg: rectangle1.color_submain + svg: "M -1.1021803,11.049674 -3.2501426,-11.62895 V -22.114759 H 5.6948111 V -11.62895 L 3.5762958,11.049674 Z m -1.794895,11.522231 v -8.565457 h 8.268229 v 8.565457 z M -23.376391,11.049674 h -7.503163 q -0.02933,-1.6764997 -0.02933,-2.0422976 0,-3.7797706 1.2064,-6.2183336 1.206399,-2.43856295 4.825599,-5.4867378 3.619163,-3.0482133 4.325372,-3.993156 1.088686,-1.4936203 1.088686,-3.2920657 0,-2.4995353 -1.942019,-4.2674753 -1.912571,-1.798446 -5.178667,-1.798446 -3.148381,0 -5.266934,1.85938 -2.118552,1.859418 -2.913028,5.6696559 l -7.591467,-0.9754098 q 0.323694,-5.4562711 4.472495,-9.2665471 4.178248,-3.810238 10.94583,-3.810238 7.120686,0 11.328381,3.871211 4.207657,3.840743 4.207657,8.9617217 0,2.834828 -1.559467,5.3648308 -1.530057,2.5300028 -6.591048,6.8889567 -2.61878,2.2556833 -3.266095,3.6273581 -0.617905,1.3716748 -0.559085,4.9075927 z m -7.503163,11.522231 v -8.565457 h 8.268192 v 8.565457 z m 53.589848,-8.925446 v -29.58293 l 19.644661,14.7914456 z" + } + NAlphaButton { + width: 21; + text: ""//"π▸"; + keymap_id: 19 + + colorSvg: rectangle1.color_submain + svg: "m 20.314998,11.642593 v -29.58299 L 39.959651,-3.1489172 Z M -24.210736,-22.556 c -1.75999,0 -3.329989,0.1821 -4.715749,0.5658 h -0.003 -0.003 c -1.340309,0.3793 -2.576359,0.937101 -3.695378,1.675301 h -0.006 -0.006 c -1.06781,0.724001 -2.0838,1.600801 -3.047599,2.623602 -0.95617,1.014801 -2.14763,2.445672 -3.600749,4.314073 l -0.67144,0.8624 4.257149,3.800703 0.682189,-0.8981006 c 1.55151,-2.0440014 2.957379,-3.3423024 4.086619,-3.9293024 1.17289,-0.609601 2.666659,-0.940701 4.508648,-0.942201 l -2.438499,11.0966077 c -2.477729,11.3068077 -5.279588,18.4433123 -7.859347,21.1552143 l -0.22929,0.2411 -0.74023,3.851703 h 10.881136 l 0.24292,-0.771901 c 0.32212,-1.0256 0.75167,-2.650401 1.30847,-4.925503 v 0 0 c 0.55649,-2.303301 1.04408,-4.446203 1.462509,-6.4297043 v 0 l 4.932189,-24.2114167 h 10.236246 c -0.5884997,1.760801 -1.2155695,3.781403 -1.977039,6.6349046 h -0.002 l -0.002,0.01 c -0.86281,3.3376023 -1.53207,6.1932043 -2.00927,8.57640591 L -13.53287,5.1931886 c -0.78398,3.7740026 -1.18809,6.6707044 -1.18809,8.7977064 0,2.428001 0.60531,4.534503 1.86598,6.146804 h 0.004 0.004 c 1.277909,1.599601 3.1347884,2.427401 5.2589377,2.427401 2.1496892,0 4.1974985,-0.6045 6.0672178,-1.787101 h 0.002 c 1.88376937,-1.174401 3.8702287,-3.010302 6.0213479,-5.503404 l 0.7130098,-0.8259 -4.0006286,-3.952803 -0.72088977,0.905601 c -2.16092923,2.718002 -3.95178863,3.833502 -5.04678823,3.833502 -0.5478898,0 -0.6940897,-0.1081 -0.8420097,-0.3255 -0.1411699,-0.2074 -0.3389199,-0.8434 -0.3389199,-1.897301 0,-1.304501 0.2875099,-3.4385024 0.8885497,-6.2799044 v 0 L -0.33577488,-14.484425 H 9.5615316 L 11.234021,-22.5651 Z" + } + NAlphaButton { + text: ""//"H" ; + keymap_id: 38 + + colorSvg: rectangle1.color_submain + svg: "m -17.2426,22.34335 v -44.6867 h 8.7095332 V -4.7551968 H 8.5330299 V -22.34335 H 17.2426 v 44.6867 H 8.5330299 V 2.8043549 H -8.5330668 V 22.34335 Z" + } + NAlphaButton { + text: ""//"I" ; + keymap_id: 37 + + colorSvg: rectangle1.color_submain + svg: "m -4.3548001,22.34335 v -44.6867 h 8.7096002 v 44.6867 z" + } + NAlphaButton { + text: ""//"J" ; + keymap_id: 35 + + colorSvg: rectangle1.color_submain + svg:"M 5.1198206,-22.724381 H 13.799983 V 5.5630039 q 0,5.5477391 -0.941579,8.5349981 -1.265239,3.90163 -4.5901861,6.279269 -3.3249372,2.34712 -8.76843247,2.34712 -6.38506453,0 -9.82771143,-3.68836 -3.442637,-3.718789 -3.472057,-10.8820476 l 8.2093728,-0.9754298 q 0.1471199,3.8407194 1.0886991,5.4258194 1.4123588,2.408049 4.29593628,2.408049 2.91300752,0 4.11940642,-1.70699 1.206389,-1.737479 1.206389,-7.1632982 z" + } + NAlphaButton { + text: ""//"K" ; + keymap_id: 34 + + colorSvg: rectangle1.color_submain + svg:"m -19.449442,22.343331 v -44.686672 h 8.709581 V -2.4995345 L 6.8558541,-22.343341 H 18.566714 L 2.324518,-4.938084 19.449443,22.343331 H 8.179943 L -3.6780368,1.3716847 -10.739861,8.8397633 V 22.343331 Z" + } + NAlphaButton { + text: ""//"L" ; + keymap_id: 33 + + colorSvg: rectangle1.color_submain + svg:"m -15.182922,22.160471 v -44.320932 h 8.7095826 V 14.631382 H 15.182922 v 7.529089 z" + } + NAlphaButton { + text: ""//"M" ; + keymap_id: 28 + + colorSvg: rectangle1.color_submain + svg: "M -20.832377,22.343381 V -22.343371 H -7.7974083 L 0.02941497,8.1387034 7.7680283,-22.343371 H 20.832377 V 22.343381 H 12.740714 V -12.832943 L 4.1782814,22.343381 h -8.3859328 l -8.5330326,-35.176324 v 35.176324 z" + } + NAlphaButton { + text: ""//"N" ; + keymap_id: 27 + + colorSvg: rectangle1.color_submain + svg: "m -17.110235,22.343381 v -44.686762 h 8.4741924 L 9.0185422,7.4985935 V -22.343381 H 17.110235 V 22.343381 H 8.3711428 L -9.0185422,-6.7975037 V 22.343381 Z" + } + NAlphaButton { + width: 21; + text: ""; + keymap_id: 66; +// Image { +// source: "qrc:/keyimages/resources/keyimages/flag.png" +// anchors.fill: parent +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } + + colorSvg: rectangle1.color_submain + svg: "m -32.202868,1.5356937 c 13.242765,-6.7573658 20.493898,5.3909591 28.5055293,1.0167266 V -12.900055 c -11.5167173,4.6342042 -20.7764483,-8.453141 -28.5055293,-1.264887 z m -9.273694,-22.8635387 6.845113,0.04605 v 2.682266 c 16.445955,-7.40087 19.534327,6.899238 36.4285597,0.63077 V 3.4554335 C -13.751805,15.993215 -17.129597,-4.241837 -34.631449,7.3027609 V 21.327856 h -6.845039 z M 21.831925,14.440736 V -15.1422 l 19.644614,14.79146768 z" + } + NAlphaButton { + width: 21; + text: ""//"," ; + keymap_id: 87 + + colorSvg: rectangle1.color_submain + svg: "M -5.2727789,-12.872469 H 6.2129066 v 8.5110564 q 0,5.16594482 -0.8583461,8.1299869 -0.8583833,3.006396 -3.2699592,5.3776374 -2.37072869,2.3712413 -6.0493817,3.7262203 L -6.2128935,7.9605718 q 3.474306,-1.1856015 4.9458044,-3.2604425 1.47146115,-2.074841 1.55322962,-5.67403772 H -5.2727789 Z" + } + NAlphaButton { + text: ""//"O" ; + keymap_id: 26 + + colorSvg: rectangle1.color_submain + svg: "m -20.920652,0.27433495 q 0,-6.82797865 1.971398,-11.46125795 1.471219,-3.414009 4.001727,-6.126879 2.559868,-2.712949 5.5905951,-4.023649 4.0311265,-1.76795 9.29808195,-1.76795 9.53343175,0 15.24176695,6.126879 5.737735,6.126919 5.737735,17.03950699 0,10.82112801 -5.678895,16.94800701 -5.6788852,6.096409 -15.18294705,6.096409 -9.62169175,0 -15.30057695,-6.065909 -5.678885,-6.096459 -5.678885,-16.76515705 z m 8.974362,-0.30481994 q 0,7.59000849 3.3838074,11.52219799 3.3837771,3.901719 8.59188257,3.901719 5.20811553,0 8.53303263,-3.871179 3.3544074,-3.9017195 3.3544074,-11.67465797 0,-7.68147853 -3.2661174,-11.46126803 -3.2366673,-3.779789 -8.62132263,-3.779789 -5.38464537,0 -8.68013257,3.840749 -3.2955574,3.8102995 -3.2955574,11.52222801 z" + } + NAlphaButton { + text: ""//"P" ; + keymap_id: 24 + + colorSvg: rectangle1.color_submain + svg: "m -16.521751,22.3384 v -44.676701 h 13.9765448 q 7.9445645,0 10.3573583,0.670435 3.7074649,1.005691 6.2085289,4.388443 2.501068,3.352291 2.501068,8.6854268 0,4.114184 -1.441791,6.9178812 -1.441791,2.8037357 -3.67804,4.4189413 Q 9.1950938,4.3275331 6.8999991,4.8455896 3.7810221,5.4856028 -2.1332632,5.4856028 H -7.8121578 V 22.3384 Z m 8.7095932,-37.118845 v 12.677693 h 4.766738 q 5.1492562,0 6.8852915,-0.7009339 1.7360352,-0.7009339 2.7070339,-2.1942212 1.0004273,-1.4932874 1.0004273,-3.4741708 0,-2.4380191 -1.3829418,-4.0227261 -1.3829418,-1.584707 -3.5014915,-1.980884 -1.5594904,-0.304757 -6.2673788,-0.304757 z" + } + NAlphaButton { + text: ""//"Q" ; + keymap_id: 23 + + colorSvg: rectangle1.color_submain + svg:"m 14.756292,14.814311 q 3.207247,2.377629 6.973557,3.779771 l -3.207247,6.370748 q -1.971429,-0.609612 -3.854585,-1.6765 -0.411939,-0.213386 -5.7965891,-3.962652 -4.2370993,1.920353 -9.38635506,1.920353 -9.94541484,0 -15.59488384,-6.065922 -5.620041,-6.0659232 -5.620041,-17.0394789 0,-10.9430501 5.649466,-17.0089731 5.649469,-6.096428 15.33006444,-6.096428 9.59232466,0 15.21236956,6.096428 5.620041,6.065923 5.620041,17.0089731 0,5.7916031 -1.559487,10.1810254 -1.176972,3.3530005 -3.76631,6.4926555 z M 7.7533054,9.7238363 q 1.6771856,-2.0422985 2.5010646,-4.9381 0.853307,-2.8958016 0.853307,-6.6451062 0,-7.7424233 -3.2955221,-11.5527011 -3.2955253,-3.840744 -8.62132227,-3.840744 -5.32580073,0 -8.65074713,3.840744 -3.2955255,3.840745 -3.2955255,11.5527011 0,7.8339016 3.2955255,11.7356189 3.3249464,3.871212 8.385928,3.871212 1.88315518,0 3.5603408,-0.640118 -2.648188,-1.798446 -5.3846502,-2.804362 L -0.45607763,5.1514958 Q 3.8398711,6.6756221 7.7533054,9.7238363 Z" + } + NAlphaButton { + text: ""//"R" ; + keymap_id: 22 + + colorSvg: rectangle1.color_submain + svg: "m -19.390597,22.343351 v -44.686702 h 18.3313219 q 6.9147041,0 10.0336724,1.21927 3.1484077,1.18881 5.0315557,4.267499 1.883148,3.07869 1.883148,7.0413389 0,5.029569 -2.854147,8.3216084 -2.854158,3.2615794 -8.5330429,4.1150792 2.8247376,1.7070197 4.649036,3.7493293 1.8537289,2.0422596 4.9727059,7.2546882 l 5.266945,8.717889 H 8.9743973 L 2.6776027,12.619613 Q -0.67675442,7.4071536 -1.9125734,6.0659138 -3.1484023,4.6942441 -4.5313411,4.2065342 -5.9142799,3.6883243 -8.9155473,3.6883243 H -10.681016 V 22.343351 Z m 8.709581,-25.7878253 h 6.4439136 q 6.2673757,0 7.8268633,-0.5486699 1.5594787,-0.5486799 2.4422089,-1.8898797 0.8827292,-1.3412397 0.8827292,-3.3530093 0,-2.2556998 -1.1769689,-3.6273998 -1.1475391,-1.402169 -3.2660972,-1.767949 -1.0592691,-0.15243 -6.3556346,-0.15243 h -6.7970143 z" + } + NAlphaButton { + text: ""//"S" ; + keymap_id: 17 + + colorSvg: rectangle1.color_submain + svg:"m -17.536865,7.7881635 8.4741928,-0.8534498 q 0.7650293,4.4198893 3.0895473,6.4926583 2.353948,2.07273 6.3262246,2.07273 4.2076664,0 6.3262145,-1.82891 2.1479682,-1.859379 2.1479682,-4.3284288 0,-1.5850597 -0.9121492,-2.6824095 Q 7.0324039,5.5325039 4.7961559,4.7094741 3.2660972,4.1608042 -2.1773881,2.7586345 -9.1803721,0.96022481 -12.0051,-1.6612547 q -3.972276,-3.6883693 -3.972276,-8.9922183 0,-3.414009 1.853728,-6.370729 1.883159,-2.987259 5.3846455,-4.541859 3.530907,-1.55459 8.5036127,-1.55459 8.121103,0 12.2110698,3.68832 4.119406,3.688369 4.325376,9.8457079 l -8.7095925,0.3962899 q -0.5590596,-3.4444798 -2.412788,-4.9380688 -1.8243084,-1.52413 -5.50233522,-1.52413 -3.79573678,0 -5.94370488,1.61556 -1.3829388,1.03638 -1.3829388,2.773869 0,1.5850499 1.2946589,2.7128997 1.6477586,1.4326697 8.0034031,2.9872694 6.3556445,1.5545497 9.3863514,3.2310794 3.060118,1.64601963 4.766726,4.5417791 1.736029,2.8653394 1.736029,7.1023686 0,3.8407188 -2.059698,7.1937288 -2.059699,3.353049 -5.8260053,4.999109 -3.7663068,1.61552 -9.38634193,1.61552 -8.17994297,0 -12.56415877,-3.90168 -4.384217,-3.932189 -5.237526,-11.4308075 z" + } + NAlphaButton { + id: nAlphaButtonT; + text: ""//"T" ; + keymap_id: 16 + + colorSvg: rectangle1.color_submain + svg: "M -4.3400813,22.343331 V -14.783792 H -17.13963 v -7.559539 h 34.27926 v 7.559539 H 4.3695212 v 37.127123 z" + } + NAlphaButton { + id: nAlphaButtonU; + text: ""//"U" ; + keymap_id: 15 + + colorSvg: rectangle1.color_submain + svg: "m -17.198485,-22.724361 h 8.7095923 V 1.4784047 q 0,5.7610889 0.3236997,7.4680686 0.5590996,2.7434097 2.6481978,4.4198987 2.1184981,1.64605 5.76709498,1.64605 3.70749682,0 5.59059522,-1.55459 Q 7.7238933,11.872773 8.106393,9.5866131 8.4888927,7.3004536 8.4888927,1.9965646 V -22.724371 H 17.198485 V 0.74682485 q 0,8.04725845 -0.706199,11.36979815 -0.7061,3.322509 -2.618698,5.608669 -1.883198,2.286199 -5.0609956,3.657869 -3.1777973,1.34121 -8.29759284,1.34121 -6.17909466,0 -9.38639196,-1.46313 -3.1777976,-1.49363 -5.0314956,-3.840719 -1.853698,-2.37762 -2.442298,-4.968599 -0.853299,-3.8407197 -0.853299,-11.3393382 z" + } + NAlphaButton { + width: 21; + text: ""//"↵"; + keymap_id: 0 + + colorSvg: rectangle1.color_submain + svg: "M 17.9989,-17.21365 V 5.0174501 h 6.803201 V -17.21365 Z M -4.2681001,17.21365 -24.802101,8.0723502 -4.2681001,-0.92615002 Z m 0,-12.1246999 V 11.55545 l 29.0702011,-0.071 V 5.0178501 Z" } - NAlphaButton { width: 21; text: "," ;keymap_id: 87 } - NAlphaButton { text: "O" ;keymap_id: 26 } - NAlphaButton { text: "P" ;keymap_id: 24 } - NAlphaButton { text: "Q" ;keymap_id: 23 } - NAlphaButton { text: "R" ;keymap_id: 22 } - NAlphaButton { text: "S" ;keymap_id: 17 } - NAlphaButton { id: nAlphaButtonT; text: "T" ;keymap_id: 16 } - NAlphaButton { id: nAlphaButtonU; text: "U" ;keymap_id: 15 } - NAlphaButton { width: 21; text: "↵";keymap_id: 0 } Rectangle { color: "#00000000" width: 15 height: 15 } - NAlphaButton { text: "V" ;keymap_id: 13 } - NAlphaButton { text: "W" ;keymap_id: 12 } - NAlphaButton { text: "X" ;keymap_id: 11 } - NAlphaButton { text: "Y" ;keymap_id: 6 } - NAlphaButton { text: "Z" ;keymap_id: 5 } + NAlphaButton { + text: ""//"V" ; + keymap_id: 13 + + colorSvg: rectangle1.color_submain + svg:"m -4.663741,22.343331 -15.418307,-44.686662 h 9.445142 L 0.27953476,10.729713 10.842816,-22.343331 h 9.239232 L 4.634341,22.343331 Z" + } + NAlphaButton { + text: ""//"W" ; + keymap_id: 12 + + colorSvg: rectangle1.color_submain + svg: "m -18.007649,22.343331 -10.298502,-44.686672 h 8.915553 l 6.502764,30.6954244 7.8857033,-30.6954244 H 5.3552104 L 12.917254,8.8702933 19.537718,-22.343341 h 8.768433 L 17.83111,22.343331 H 8.5918876 L -4.9999957e-6,-11.065003 -8.5624676,22.343331 Z" + } + NAlphaButton { + text: ""//"X" ; + keymap_id: 11 + + colorSvg: rectangle1.color_submain + svg: "M -20.052638,22.343331 -5.3110804,-0.97539481 -18.669699,-22.343331 H -8.4889077 L 0.16183486,-7.9863034 8.6360176,-22.343331 H 18.728549 L 5.3110804,-0.64011488 20.052638,22.343331 H 9.5481768 L -0.01471499,6.8889537 -9.6070267,22.343331 Z" + } + NAlphaButton { + text: ""//"Y" ; + keymap_id: 6 + + colorSvg: rectangle1.color_submain + svg:"M -4.3695012,22.343351 V 3.5359343 L -20.170337,-22.343351 H -9.9601064 L 0.19126484,-4.6637441 10.136666,-22.343351 H 20.170338 L 4.3106613,3.5968643 V 22.343351 Z" + } + NAlphaButton { + text: ""//"Z" ; + keymap_id: 5 + + colorSvg: rectangle1.color_submain + svg: "M -17.52215,22.343351 V 14.204632 L 5.1345306,-14.783772 H -14.962242 v -7.559579 h 31.572243 v 7.010869 L -7.017689,14.814272 H 17.52215 v 7.529079 z" + } NAlphaButton { - text: "space" + text: ""//"space" Layout.fillWidth: true keymap_id: 4 Layout.columnSpan: 2 + + colorSvg: rectangle1.color_submain + svg: "m -31.686051,-10.99425 v 21.9885 h 63.372102 v -21.9885 H 24.882897 V 1.1606191 H -24.882896 V -10.99425 Z" } } @@ -437,69 +758,107 @@ Rectangle { x: 5 anchors.top: nButton7.bottom anchors.topMargin: 0 - topText1: "|≠≥>" - topText2: "" + topText1: ""//"|≠≥>" + topText2: ""//"" id1: 51 id2: 20 anchors.left: parent.left anchors.leftMargin: 5 - text2: "trig" - text1: "=" - - Image { - source: "qrc:/keyimages/resources/keyimages/questionmark.png" - width: nDualButton1.button2.width * .55 - anchors.bottom: nDualButton1.button2.top - anchors.left: nDualButton1.button2.left - anchors.leftMargin: nDualButton1.button2.width / 4 - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } + text2: ""//"trig" + text1: ""//"=" + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1: "M -26.162965,4.4066819 V 16.200434 h 52.32593 V 4.4066819 Z m 0,-20.6071219 v 11.7937511 h 52.32593 V -16.20044 Z" + svg2: "M -10.742123,38.688951 V 9.1059991 L 8.9025345,23.897474 Z m 27.299762,-31.1148059 9.332757,1.174645 q 0.232601,1.6866819 1.075742,2.3191749 1.162962,0.903568 3.663327,0.903568 3.198145,0 4.797188,-0.993909 1.075762,-0.662633 1.628163,-2.1384929 0.377961,-1.054137 0.377961,-3.885376 V 0.28529115 Q 33.76945,5.4657931 28.18724,5.4657931 q -6.221811,0 -9.856097,-5.45160395 -2.849225,-4.30702035 -2.849225,-10.72239315 0,-8.041828 3.721466,-12.288648 3.750547,-4.246793 9.303657,-4.246793 5.72759,0 9.449056,5.210616 v -4.487755 h 7.646454 V 2.1827951 q 0,5.6624 -0.901281,8.4634989 -0.901302,2.801073 -2.529425,4.397414 -1.628163,1.596289 -4.361088,2.499883 -2.703905,0.903569 -6.861492,0.903569 -7.849954,0 -11.13532,-2.801073 -3.285386,-2.770959 -3.285386,-7.0479179 0,-0.421645 0.029,-1.024024 z m 7.297594,-18.7642471 q 0,5.0901339 1.889803,7.4695361 1.918883,2.3493149 4.709968,2.3493149 2.994605,0 5.058869,-2.4095685 2.064284,-2.4396297 2.064284,-7.1984605 0,-4.969653 -1.977044,-7.379222 -1.977043,-2.409515 -5.000729,-2.409515 -2.936465,0 -4.855348,2.379402 -1.889803,2.349315 -1.889803,7.198513 z M 0.77047147,-30.857971 v -7.83098 H 8.940266 v 7.83098 z m 0,36.3237641 V -26.520784 H 8.940266 V 5.4657931 Z m -15.35106747,0 H -22.75039 V -26.520784 h 7.588313 v 4.548008 q 1.947964,-3.22277 3.488886,-4.246845 1.569983,-1.024024 3.5470267,-1.024024 2.791105,0 5.3786896,1.596342 l -2.5294244,7.379169 q -2.0642638,-1.385493 -3.8377668,-1.385493 -1.7154031,0 -2.9074251,0.993962 -1.192022,0.963796 -1.889804,3.52396 -0.668701,2.56011 -0.668701,10.7223928 z M -28.07092,-26.520784 v 6.746702 h -5.58223 v 12.8910002 q 0,3.9154897 0.14538,4.5781223 0.174461,0.6324928 0.726862,1.0541633 0.581461,0.42169685 1.395562,0.42169685 1.133862,0 3.285346,-0.81322745 l 0.697781,6.5659679 q -2.849265,1.265011 -6.454431,1.265011 -2.209624,0 -3.983147,-0.752999 -1.773503,-0.783087 -2.616665,-1.987846 -0.814061,-1.234898 -1.133862,-3.31311095 -0.26168,-1.47585975 -0.26168,-5.96361485 V -19.774082 h -3.750547 v -6.746702 h 3.750547 v -6.355146 l 8.198854,-4.939565 v 11.294711 z" + topSvg1:"M 49.200428,12.56938 V -9.2524493 L 67.272351,1.6584786 Z M -1.6007868,21.29044 V 15.098 H 35.970488 v 6.19244 z M 6.0882053,-19.26535 34.659857,-3.6718588 6.0882053,11.889469 0.19038498,6.563319 20.505108,-3.6077088 0.19038498,-13.93916 Z m -31.6546123,2.14429 h 9.305439 l -4.325071,8.0854908 h 9.130717 v 6.2245605 h -12.450939 l -3.407688,6.4170475 h 15.858627 v 6.2245605 h -19.178816 l -4.325105,8.0854907 h -9.30544 l 4.325071,-8.0854907 h -9.087019 V 3.6060388 h 12.407276 l 3.407619,-6.4170475 h -15.814895 v -6.2245605 h 19.135153 z m -41.705944,42.115661 v -49.989202 h 5.301382 v 49.989202 z" + topSvg2:"M -1.3882306,5.2677445 C -3.2598295,3.9815266 -1.5472976,0.35956824 0.09314524,-1.3820739 1.9404741,-3.3433762 5.1875099,-5.2469905 4.9140829,-7.8002802 4.6479209,-10.285216 1.8902991,-11.207056 -0.09414274,-11.181246 c -1.97362386,0.0258 -5.17391856,1.06909 -4.68737766,3.8769722 0.334738,1.9319932 -0.7497489,3.1681091 -2.4341398,3.2191061 -2.3080038,0.06989 -3.1544308,-2.0558514 -3.1173488,-3.4451363 0.08901,-3.335592 3.0876908,-8.493776 10.30484825,-8.391716 7.91242035,0.111951 10.50686375,4.442703 10.59296275,8.389784 0.09229,4.2308728 -3.4553593,6.83855954 -6.1846801,8.972748 C 2.5861211,2.8433239 0.51350421,6.5746474 -1.3882306,5.2677445 Z M 3.519006,12.582663 c 0.08323,2.286356 -1.8243769,3.41776 -3.84270773,3.445173 C -2.2778066,15.821738 -3.5231175,14.711807 -3.7394245,12.965477 -3.8247645,10.730762 -2.2099096,9.3643452 -0.11022874,9.3289162 1.8230001,9.5745583 3.492063,10.79797 3.519006,12.582663 Z M 2.0249998e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.090811 -32.828751,-3.4100023e-4 -32.828711,18.090021 -18.090394,32.828401 2.0249998e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4100023e-4 32.828751,-18.090811 18.090394,-32.828401 2.0249998e-5,-32.828401 Z m 0,6.803165 C 14.413737,-26.025236 26.025606,-14.414139 26.025606,-3.4100023e-4 26.025566,14.413344 14.413737,26.025235 2.0249998e-5,26.025235 -14.413699,26.025235 -26.025566,14.413344 -26.025606,-3.4100023e-4 -26.025606,-14.414059 -14.413699,-26.025206 2.0249998e-5,-26.025236 Z" +// Image { +// source: "qrc:/keyimages/resources/keyimages/questionmark.png" +// width: nDualButton1.button2.width * .55 +// anchors.bottom: nDualButton1.button2.top +// anchors.left: nDualButton1.button2.left +// anchors.leftMargin: nDualButton1.button2.width / 4 +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } } NDualButton { id: nDualButton2 x: 5 - topText1: "n√x" - topText2: "√" + topText1: ""//"n√x" + topText2: ""//"√" anchors.top: nDualButton1.bottom anchors.topMargin: 0 id1: 53 id2: 31 anchors.left: parent.left anchors.leftMargin: 5 - text2: "x2" - text1: "^" + text2: ""//"x2" + text1: ""//"^" + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1: "M 28.457345,17.412844 -2.1488576e-5,-4.8721027 -28.457357,17.412844 V 4.7847369 L -2.1488576e-5,-17.412857 28.457345,4.7847369 Z" + svg2: "M 29.247801,-3.3944945 V 2.3156747 H 8.4458773 q 0.3378799,-3.23793957 2.0273897,-6.1258191 1.689509,-2.9097696 6.673518,-7.7010386 4.012558,-3.87236 4.920658,-5.2507 1.22486,-1.903389 1.22486,-3.762999 0,-2.05653 -1.07703,-3.15042 -1.05593,-1.115749 -2.935529,-1.115749 -1.85843,0 -2.956579,1.159519 -1.0982,1.15952 -1.26715,3.85052 l -5.9132079,-0.61261 q 0.5279598,-5.075669 3.3156289,-7.285349 2.787659,-2.20963 6.969138,-2.20963 4.582778,0 7.201487,2.5597 2.61874,2.5597 2.61874,6.366479 0,2.1659 -0.76027,4.134919 -0.73919,1.94712 -2.365309,4.09117 -1.07706,1.42207 -3.885849,4.0911393 -2.808799,2.6691096 -3.569039,3.5442294 -0.73918,0.8751299 -1.2038,1.7064698 z M -29.247801,29.888601 -16.803995,11.477473 -28.727961,-5.8566041 h 11.144197 l 6.108158,9.8282385 6.4331176,-9.8282385 H 5.6793082 L -6.0172181,11.073553 6.7515078,29.888601 H -4.4576686 l -7.0179374,-11.073619 -7.082888,11.073619 z" + topSvg1:"M -0.16648508,-10.9252 -8.4863591,11.2444 -11.28567,6.3959001 h -7.258434 V 11.0144 h 4.591902 L -7.0661284,22.941401 3.3038766,-6.3067001 H 30.61294 V -10.9252 Z M 25.185387,24.587801 19.710435,16.2268 14.211942,24.587801 H 7.2503085 L 16.241473,12.0708 7.7222588,-0.25050001 h 7.0088432 l 5.380533,8.16530021 5.309712,-8.16530021 H 31.8874 L 23.627886,12.022 32.335801,24.587801 Z M -18.034934,0.78830002 V -15.3956 q 0,-4.0827 -2.926261,-4.0827 -1.463091,0 -2.808222,1.2223 -1.32155,1.2224 -2.808311,3.3248 V 0.78830002 h -5.758073 V -24.049901 h 4.979343 l 0.14158,3.667001 q 0.73157,-0.9534 1.510341,-1.7357 0.80235,-0.782301 1.72271,-1.320101 0.920351,-0.5624 1.982281,-0.8557 1.061981,-0.2934 2.383491,-0.2934 1.840701,0 3.209422,0.6356 1.368721,0.6112 2.289071,1.760201 0.920351,1.1246 1.368761,2.7381 0.47195,1.5891 0.47195,3.5693 V 0.78830002 Z" + topSvg2:"m -9.0254769,-21.1391 -7.2556711,25.0482001 -4.123511,-7.1420002 h -10.691942 v 6.8032002 h 6.764032 L -14.189108,21.1391 -3.913516,-14.336 H 31.0966 v -6.8031 z" + } NDualButton { id: nDualButton3 x: 5 - topText2: "log" - topText1: "ln" + topText2: ""//"log" + topText1: ""//"ln" anchors.top: nDualButton2.bottom anchors.topMargin: 0 id1: 42 id2: 21 anchors.left: parent.left anchors.leftMargin: 5 - text2: "10x" - text1: "ex" + text2: ""//"10x" + text1: ""//"ex" + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1: "M 5.8742601,-2.5731906 13.96272,-14.540391 6.2121701,-25.807551 H 13.45588 l 3.97034,6.38837 4.18151,-6.38837 h 6.969181 l -7.602751,11.00461 8.299641,12.2297504 H 21.98787 l -4.56165,-7.19782 -4.60391,7.19782 z m -12.5022902,16.1964096 9.0973102,1.58195 q -1.75449008,5.18338 -5.5558702,7.90973 -3.7688901,2.69265 -9.4546899,2.69265 -8.99984,0 -13.321051,-6.09217 -3.41147,-4.88043 -3.41147,-12.3189596 0,-8.88579 4.48367,-13.90087 4.483671,-5.0487804 11.339111,-5.0487804 7.7002299,0 12.15141,5.2843604 4.4511801,5.2507 4.2562301,16.12236 H -19.91659 q 0.0975,4.2073096 2.20934,6.5633996 2.11187,2.32243 5.26345,2.32243 2.14436,0 3.6064198,-1.21172 1.46207,-1.21169 2.2093501,-3.90438 z m 0.51983,-9.5589496 q -0.0975,-4.10633997 -2.0468801,-6.2268 -1.9494098,-2.15413 -4.7435698,-2.15413 -2.98912,0 -4.93857,2.25511 -1.9494,2.25511003 -1.91691,6.12582 z" + svg2: "m 22.801778,-2.5900346 8.08847,-11.9672084 -7.75059,-11.267108 h 7.24375 l 3.9703,6.388369 4.18152,-6.388369 h 6.96918 l -7.60276,11.004599 8.29965,12.2297174 h -7.28593 l -4.56166,-7.1978287 -4.60387,7.1978287 z M 3.801412,-24.562201 q 6.920436,0 10.819286,5.116099 4.64613,6.058499 4.64613,20.09400689 0,14.00188711 -4.67862,20.12770611 -3.86636,5.04874 -10.786796,5.04874 -6.952953,0 -11.209185,-5.519939 -4.256272,-5.55364 -4.256272,-19.75748709 0,-13.93452791 4.678632,-20.06034691 3.866362,-5.048779 10.786825,-5.048779 z m 0,7.842409 q -1.657021,0 -2.95662202,1.1107 -1.29964,1.077089 -2.01442998,3.904379 -0.942191,3.6687894 -0.942191,12.35261789 0,8.68386851 0.84471,11.94873811 0.84476098,3.231179 2.11191098,4.308259 1.29960102,1.07708 2.95662202,1.07708 1.656981,0 2.956631,-1.07708 1.299605,-1.11074 2.014395,-3.938029 0.94223,-3.6350996 0.94223,-12.31896811 0,-8.68382849 -0.84476,-11.91503789 -0.84475,-3.26487 -2.144365,-4.341959 -1.26715,-1.1107 -2.924131,-1.1107 z m -29.078903,41.702683 h -9.129805 v -35.644184 q -5.003512,4.846819 -11.794005,7.1692486 v -8.5828886 q 3.573932,-1.21173 7.765214,-4.577539 4.191251,-3.39951 5.750792,-7.909729 h 7.407804 z" + topSvg1:"M 19.93715,19.72545 H 12.637708 V 5.1399164 q 0,-4.62863126 -0.46759,-5.97414163 -0.46759,-1.37245037 -1.53262,-2.12593057 -1.0390804,-0.7535302 -2.5197508,-0.7535302 -1.8963005,0 -3.4029709,1.0764303 Q 3.2081159,-1.5608254 2.6366257,0.21527506 2.0911356,1.9913655 2.0911356,6.7814469 V 19.72545 h -7.299452 V -8.8535974 h 6.7799118 v 4.1980511 q 3.610771,-4.8439013 9.0918626,-4.8439013 2.415841,0 4.416051,0.9149802 2.000201,0.8880503 3.013291,2.2873807 1.03907,1.3993404 1.42872,3.1754308 0.41563,1.7761405 0.41563,5.0861314 z m -39.8743,0 v -39.4509 h 7.299452 v 39.4509 z" + topSvg2:"m 10.32575,15.809938 8.33852,1.049499 q 0.20784,1.507009 0.96114,2.072119 1.03907,0.807339 3.273071,0.807339 2.85744,0 4.28616,-0.888049 0.96113,-0.59203 1.45471,-1.910659 0.3377,-0.941869 0.3377,-3.471447 V 9.2975929 q -3.27308,4.6286161 -8.260621,4.6286161 -5.55903,0 -8.80611,-4.8708159 -2.5456998,-3.8482071 -2.5456998,-9.5801427 0,-7.1851245 3.3250298,-10.9795114 3.35098,-3.794397 8.31253,-3.794397 5.117431,0 8.442461,4.655516 v -4.009667 h 6.83186 v 25.645751 q 0,5.059196 -0.80529,7.561884 -0.80528,2.502698 -2.25995,3.928917 -1.45472,1.426259 -3.89652,2.233598 -2.41584,0.80731 -6.13051,0.80731 -7.013711,0 -9.949091,-2.502699 -2.93538,-2.475758 -2.93538,-6.297035 0,-0.376759 0.026,-0.914979 z m 6.52016,-16.76526727 q 0,4.54787657 1.68847,6.67380487 1.71446,2.0990384 4.208251,2.0990384 2.6756,0 4.51996,-2.1528583 1.84435,-2.1797484 1.84435,-6.43160512 0,-4.44023658 -1.76641,-6.59309498 -1.76645,-2.1528584 -4.468,-2.1528584 -2.623691,0 -4.338151,2.1259684 -1.68847,2.0989984 -1.68847,6.43160513 z m -40.030141,0.18837985 q 0,-3.76749708 1.792371,-7.29276448 1.79241,-3.5252971 5.06549,-5.3820961 3.29903,-1.856848 7.3513898,-1.856848 6.2604101,0 10.2608302,4.224966 4.0004101,4.1980472 4.0004101,10.62965234 0,6.48545506 -4.0523601,10.76424166 -4.0264101,4.251857 -10.1569302,4.251857 -3.7925698,0 -7.2474898,-1.776099 -3.42893,-1.776088 -5.22134,-5.1937158 -1.792371,-3.4445574 -1.792371,-8.36919362 z m 7.481291,0.4036497 q 0,4.25185672 1.94826,6.51235502 1.94826,2.2604883 4.8056998,2.2604883 2.8574401,0 4.7797001,-2.2604883 1.9482601,-2.2604983 1.9482601,-6.56617498 0,-4.19803682 -1.9482601,-6.45852512 -1.92226,-2.2604982 -4.7797001,-2.2604982 -2.8574398,0 -4.8056998,2.2604982 -1.94826,2.2604883 -1.94826,6.51234508 z M -36.276501,13.926209 v -39.45086 h 7.29945 v 39.45086 z" + } NDualButton { id: nDualButton4 - topText2: "{ }" - topText1: "[ ]" + topText2: ""//"{ }" + topText1: ""//"[ ]" anchors.top: nDualButton3.bottom anchors.topMargin: 0 id1: 60 id2: 58 anchors.left: parent.left anchors.leftMargin: 5 - text2: ")" - text1: "(" + text2: ""//")" + text1: ""//"(" + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1:"M 8.1713188,32.345698 H 1.900687 q -4.9710241,-7.775089 -7.5702769,-16.15602 -2.5992156,-8.3809313 -2.5992156,-16.22334018 0,-9.72725672 3.2165275,-18.41112882 2.7942051,-7.539468 7.0829332,-13.900911 H 8.268795 q -4.4511884,10.198497 -6.1406637,17.367743 -1.65702037,7.135548 -1.65702037,15.14625717 0,5.51998023 0.97472447,11.30920283 1.0071793,5.789222 2.7291838,11.0063 1.1371476,3.433134 3.9962996,9.861897 z" + svg2:"m -8.2038102,32.345727 q 2.6966857,-5.991221 3.8013758,-9.188734 1.104653,-3.197552 2.0468833,-7.371207 0.9422302,-4.173616 1.39708079,-7.9096904 0.4548877,-3.7697727 0.4548877,-7.70776869 0,-8.01070921 -1.65701669,-15.14629491 -1.6570166,-7.169208 -6.1081949,-17.367706 h 6.2056709 q 4.9060288,7.236567 7.6027145,15.348218 2.7292148,8.1116504 2.7292148,16.45896016 0,7.03456744 -2.1443591,15.07893684 -2.4367871,9.020434 -8.0251475,17.805286 z" + topSvg1: "m 21.61075,-21.31715 v 42.6343 H 8.5675353 V 16.302712 H 14.617698 V -16.348061 H 8.5675353 v -4.969089 z m -43.2215,42.6343 v -42.6343 h 13.0432147 v 5.014469 h -6.0501627 v 32.605393 h 6.0501627 v 5.014438 z" + topSvg2: "m 26.551301,2.7080732 q -1.89633,0.0902 -2.857479,0.4964597 -0.96112,0.4062097 -1.66252,1.376619 -0.67536,0.9477994 -0.961109,2.3920984 -0.20782,1.0832493 -0.20782,3.7461777 0,4.378017 -0.46759,6.115686 -0.44159,1.737679 -1.66251,2.775758 -1.220919,1.060669 -3.584788,1.669969 -1.58461,0.406209 -4.987569,0.406209 H 8.7831569 v -5.416106 q 2.7795091,0 3.6367791,-0.31596 0.857219,-0.293369 1.246869,-0.880089 0.41564,-0.5642 0.41564,-1.940789 0.026,-1.376589 0.23377,-5.2581463 0.12988,-2.3470084 0.70139,-3.7461775 0.571479,-1.421709 1.506639,-2.3920984 Q 17.485404,0.7447245 18.966043,1.499999e-5 17.043774,-1.0832343 16.160554,-2.1213236 q -1.220879,-1.489419 -1.662519,-3.7912674 -0.28571,-1.579709 -0.41559,-6.950685 -0.0259,-1.692549 -0.3637,-2.256719 -0.3117,-0.564169 -1.168929,-0.857539 -0.83128,-0.31596 -3.7666591,-0.31596 v -5.393556 h 1.3767591 q 3.506889,0 5.377218,0.473909 1.87033,0.47392 3.143199,1.624839 1.27286,1.128349 1.71445,2.798348 0.46759,1.647379 0.46759,5.213017 0,4.129767 0.389639,5.3935561 0.57148,1.8053488 1.74045,2.5952183 1.168939,0.7672595 3.558839,0.8801294 z m -53.102602,0 v -5.4161064 q 1.89628,-0.0903 2.857439,-0.4964997 0.96116,-0.4062097 1.66251,-1.354049 0.7014,-0.9703794 0.961159,-2.4146684 0.20782,-1.0832193 0.20782,-3.7687277 0,-4.378017 0.46758,-6.093146 0.46758,-1.737669 1.68846,-2.775758 1.220929,-1.060629 3.558838,-1.669959 1.58458,-0.406209 4.987539,-0.406209 h 1.3767491 v 5.393556 q -2.8833891,0 -3.7146691,0.29338 -0.805279,0.27079 -1.194929,0.857539 -0.38964,0.56417 -0.38964,1.963339 0,1.421759 -0.23381,5.3935662 -0.12989,2.2341685 -0.67536,3.6332976 -0.545519,1.3766291 -1.402749,2.2792985 -0.83128,0.90270935 -2.571729,1.87308869999 1.532629,0.76728949001 2.493789,1.80537880001 0.987109,1.0155093 1.506639,2.4823883 0.51952,1.466839 0.6754,3.9266774 0.18183,3.7461375 0.18183,4.7842265 0,1.489459 0.41563,2.076209 0.41564,0.58672 1.246879,0.880089 0.85727,0.31596 3.6627191,0.31596 v 5.416106 h -1.3767491 q -3.506849,0 -5.377178,-0.496459 -1.87034,-0.47392 -3.169199,-1.602259 -1.27286,-1.128379 -1.71445,-2.798338 -0.44159,-1.647419 -0.44159,-5.213027 0,-4.152347 -0.415639,-5.3935561 -0.57151,-1.8053788 -1.74045,-2.5726683 -1.142979,-0.7898395 -3.532839,-0.9026694 z" + } NDualButton { @@ -507,8 +866,8 @@ Rectangle { x: 210 anchors.top: nButton10.bottom anchors.topMargin: 0 - topText2: "∞β°" - topText1: ":=" + topText2: ""//"∞β°" + topText1: ""//":=" id1: 63 id2: 62 anchors.right: parent.right @@ -516,35 +875,55 @@ Rectangle { text2: "" text1: "" - Image { - source: "qrc:/keyimages/resources/keyimages/templates.png" - anchors.fill: nDualButton5.button1 - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } - Image { - source: "qrc:/keyimages/resources/keyimages/catalog.png" - anchors.fill: nDualButton5.button2 - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } +// Image { +// source: "qrc:/keyimages/resources/keyimages/templates.png" +// anchors.fill: nDualButton5.button1 +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } +// Image { +// source: "qrc:/keyimages/resources/keyimages/catalog.png" +// anchors.fill: nDualButton5.button2 +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1:"m 22.384442,32.000246 q -6.235334,-0.03371 -9.281331,-2.762152 -3.045996,-2.694727 -3.045996,-8.690596 V 9.8021539 q 0,-7.3768893 -6.0203418,-7.5116275 v -4.5810989 q 6.0203418,-0.202089 6.0203418,-7.7137535 v -10.40848 q 0,-11.520098 12.327327,-11.587449 v 4.816863 q -6.235334,0.03371 -6.235334,7.174801 v 10.3411293 q 0,7.7474284 -5.733659,9.53270046 V -2.304028e-5 Q 16.149108,1.785249 16.149108,9.5326775 V 19.739069 q 0,3.974795 1.39755,5.726392 1.433414,1.751597 4.837784,1.785272 z M 42.640731,23.618335 V 4.1896132 H 24.354968 V 23.618335 Z m -4.9292,-5.119429 H 29.284324 V 9.3086024 h 8.427207 z m 4.9292,-41.603618 V -3.6759905 H 24.354968 V -23.104712 Z m -4.9292,5.119429 h -8.427207 v 9.1903034 h 8.427207 z m -75.209399,0.38494 h 27.142916 m -4.428576,8.142812 V 9.9711538 H -33.069253 V -9.457531 Z m -4.9292,5.1193921 h -8.427208 v 9.1903035 h 8.427208 z m 9.357776,-13.2622041 h 5.1428287 v 35.714309 h -5.1428287 z m -32.285745,0 h 5.142829 v 35.714309 h -5.142829 z" + svg2:"m 13.50555,-27.148601 c -4.2866998,0 -8.8021999,1.708101 -13.78620001,6.452701 C -14.74025,-34.316501 -27.440651,-19.119001 -40.652151,-16.502501 l 0.099,6.101901 h -4.9625 v 37.549501 c 10.8929,-2.5442 35.098101,-11.422801 39.3344009,-6.874801 0.8907,0.9562 1.2,2.307001 1.5451,3.603101 3.3121001,0.001 6.5865001,-0.012 9.8983002,-0.012 0.048,-0.7544 -0.23,-4.059701 2.0160001,-4.418201 7.3458998,-1.1726 26.5822008,4.388001 38.2375008,7.694901 V -10.3891 h -4.5828 l 0.09,-6.130301 c -9.7643,-2.368 -18.0868,-10.6304 -27.517301,-10.6295 z m 0.037,4.447801 c 7.7831,0.017 15.344901,6.8486 22.995101,9.6129 l -0.4238,28.9856 C 28.059951,15.2695 14.15675,-0.74430018 2.05545,10.2346 L 1.94485,-16.581801 C 5.8875501,-21.0918 9.7414502,-22.709 13.54255,-22.7008 Z m -26.6127,0.7006 c 3.5984998,0.032 7.0719999,1.5305 10.5799999,5.475399 v 0 l 0.1112,26.962701 C -16.00275,0.70310005 -23.993351,11.6472 -35.690651,15.8367 l -0.469,-28.8138 c 8.8933,-3.802801 16.219301,-9.0847 23.089301,-9.0233 z m 53.959501,14.6113997 h 1.6268 V 23.198901 C 31.482751,20.8241 16.22865,14.1555 6.0698501,15.9549 c -2.0388,0.3611 -2.3712,3.2124 -3.0195,4.9106 -1.8349001,0 -3.63170011,-0.012 -5.4670002,-0.012 -0.667,-1.7781 -1.4383,-2.8498 -2.425,-4.0904 -3.8543001,-4.846 -23.7765009,3.2315 -37.6498009,6.429101 V -7.3769003 h 1.9881 l 0.4605,28.2918003 C -17.53015,14.1171 -15.39435,3.6052001 -2.3541501,16.3713 L 2.08045,16.2993 c 14.7141,-13.2125999 17.8431,2.3723 38.393301,4.7407 z" + topSvg1: "M -9.8137002,4.2796501 H 30.326601 V 12.69145 H -9.8137002 Z m 0,-16.0856001 H 30.326601 v 8.4116999 H -9.8137002 Z m -7.2311998,23.907 a 6.6408566,6.6408566 0 0 1 -6.640801,6.6409 6.6408566,6.6408566 0 0 1 -6.6409,-6.6409 6.6408566,6.6408566 0 0 1 6.6409,-6.6407999 6.6408566,6.6408566 0 0 1 6.640801,6.6407999 z m 0,-24.2022 a 6.6408566,6.6408566 0 0 1 -6.640801,6.6408999 6.6408566,6.6408566 0 0 1 -6.6409,-6.6408999 6.6408566,6.6408566 0 0 1 6.6409,-6.6408 6.6408566,6.6408566 0 0 1 6.640801,6.6408 z" + topSvg2: "m -4.7496535,4.8551876 q 0,2.4324663 -0.6798342,4.5174124 -0.6398559,2.084946 -1.9595867,3.613909 -1.2797118,1.528962 -3.1992796,2.397693 -1.919568,0.86873 -4.399035,0.86873 -1.799633,0 -3.279277,-0.451734 -1.439706,-0.451734 -2.839393,-1.320464 -1.359709,-0.903504 -2.759397,-2.258707 -1.399687,-1.355237 -3.079304,-3.1621742 -1.839611,1.9459592 -3.359274,3.3359352 -1.479684,1.355202 -2.879372,2.223933 -1.359709,0.833992 -2.799374,1.250953 -1.399728,0.382258 -3.079345,0.382258 -2.199497,0 -3.99913,-0.764481 -1.799592,-0.799219 -3.079304,-2.223968 -1.279712,-1.424714 -1.999565,-3.4054109 -0.679875,-1.980697 -0.679875,-4.3783901 0,-2.4324312 0.719853,-4.51737717 0.759832,-2.08494603 2.079563,-3.61390873 1.359709,-1.5289628 3.239298,-2.3976932 1.919568,-0.9035036 4.199062,-0.9035036 1.31969,0 2.559424,0.2780092 1.279752,0.2432361 2.639421,1.0077175 1.399687,0.7644813 3.039366,2.189195 1.639638,1.4247137 3.71916,3.7181578 1.799592,-1.8417099 3.279277,-3.1969125 1.479684,-1.3552025 2.879372,-2.223933 1.439706,-0.9035036 2.839393,-1.3204646 1.399688,-0.4517694 3.039326,-0.4517694 2.039543,0 3.839176,0.6254943 1.7995924,0.6254944 3.1192826,1.945959 1.3197307,1.3204647 2.0795622,3.37067273 0.7998097,2.05020807 0.7998097,4.86486227 z m -6.1586485,0.3475203 q 0,-5.62937882 -4.558989,-5.62937882 -0.839828,0 -1.639638,0.31274719 -0.79981,0.31274718 -1.759614,0.9729795 -0.919785,0.66023233 -2.039543,1.70268773 -1.07978,1.0077526 -2.439489,2.4324663 1.519663,1.8069368 2.719418,2.9536765 1.239733,1.1119665 2.239516,1.7374608 0.999782,0.6254589 1.759614,0.8687309 0.79981,0.208498 1.399687,0.208498 4.319038,0 4.319038,-5.5598681 z m -19.315775,0.069476 q -5.278842,-5.83784172 -8.198192,-5.83784172 -4.239081,0 -4.239081,5.69885472 0,5.6988551 4.51901,5.6988551 0.679875,0 1.319731,-0.173725 0.639856,-0.173761 1.479685,-0.7297437 0.879807,-0.5907564 2.079521,-1.7027229 1.239734,-1.1119665 3.039326,-2.9536765 z M 39.44902,-24.743654 a 9.3709926,9.3709918 0 0 0 -9.371106,9.37093 9.3709926,9.3709918 0 0 0 9.371106,9.3711416 9.3709926,9.3709918 0 0 0 9.370984,-9.3711416 9.3709926,9.3709918 0 0 0 -9.370984,-9.37093 z m 0,2.99613 a 6.3748252,6.3748248 0 0 1 6.37484,6.3748 6.3748252,6.3748248 0 0 1 -6.37484,6.3748002 6.3748252,6.3748248 0 0 1 -6.374759,-6.3748002 6.3748252,6.3748248 0 0 1 6.374759,-6.3748 z M 15.543198,-5.9451068 q 7.774446,2.1995178 9.416517,8.1958646 0.846114,3.089845 -0.01257,5.7868975 -0.828435,2.6970527 -3.464856,4.2943287 -2.61339,1.571099 -6.591233,1.571099 -2.561492,0 -4.620659,-0.366616 Q 8.2485324,13.196064 5.9325873,12.331984 L 6.107016,24.743647 H 1.1949936 L 0.63545926,-9.8728549 q -0.0709149,-4.6609441 1.13926064,-7.7245771 1.2102566,-3.063633 3.8322832,-4.713298 2.6148906,-1.675841 6.7735279,-1.675841 4.64077,0 7.666878,1.80676 3.018931,1.780584 3.922458,5.079914 0.365684,1.335402 0.34391,2.906502 0,1.544922 -0.878752,3.063668 -0.887065,1.4925335 -2.856139,2.7755826 -1.938909,1.2830843 -5.032931,2.199553 z m -5.348094,-1.1521653 q 3.197212,-0.2094846 5.431781,-1.6234528 2.234569,-1.4140031 3.087332,-3.6920871 0.875752,-2.30426 0.12999,-5.027524 -0.595133,-2.173341 -2.176345,-3.325471 -1.551045,-1.15213 -4.022119,-1.15213 -3.8271343,0 -5.5066699,3.220728 -1.6866717,3.194588 -1.5284614,9.714646 L 6.0382906,7.4353783 q 0.014191,0.602277 0.1289767,1.021211 0.1936476,0.7070193 0.6915115,1.2045188 0.5279896,0.4974999 1.387483,0.9950339 0.8824019,0.471323 2.1580592,0.837903 1.268521,0.340404 3.076587,0.340404 2.440949,0 4.071383,-1.309226 Q 19.21277,9.2159621 19.698227,6.8069597 20.183684,4.3979221 19.33753,1.3081124 18.52726,-1.6507783 16.169836,-3.3266198 13.842538,-5.0024613 10.282359,-5.2381227 Z" + } NDualButton { id: nDualButton6 x: 210 - topText2: "÷" - topText1: "\"□\"" + topText2: ""//"÷" + topText1: ""//"\"□\"" anchors.top: nDualButton5.bottom anchors.topMargin: 0 id1: 52 id2: 41 anchors.right: parent.right anchors.rightMargin: 5 - text2: "÷" - text1: "×" + text2: ""//"÷" + text1: ""//"×" + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1:"M -23.764104,15.348553 -8.9971071,0.05064372 -23.861915,-15.297852 -14.766979,-24.719751 0.09779104,-9.3712164 14.864825,-24.669088 23.715235,-15.449842 8.948238,-0.15197072 23.861913,15.29789 14.767015,24.71975 -0.14669727,9.2699279 -14.913694,24.567799 Z" + svg2:"M -25.728901,5.5174079 V -5.5174379 H 25.728901 V 5.5174079 Z m 25.49040099,7.6310641 q 1.74890001,0 3.23270011,0.65881 1.5368,0.603881 2.6497,1.701891 1.1129,1.097971 1.7488001,2.580292 0.636,1.42737 0.636,3.129271 0,1.756781 -0.636,3.293992 -0.6359001,1.537171 -1.7488001,2.690071 -1.1129,1.098011 -2.6497,1.756791 -1.4838001,0.603911 -3.23270011,0.603911 -1.74879999,0 -3.23260009,-0.603911 -1.4839,-0.65878 -2.5968,-1.756791 -1.0599001,-1.1529 -1.6958001,-2.690071 -0.5829,-1.537211 -0.5829,-3.293992 0,-1.701901 0.5829,-3.129271 0.6359,-1.482321 1.6958001,-2.580292 1.1129,-1.09801 2.5968,-1.701891 1.4838001,-0.65881 3.23260009,-0.65881 z m 0,-26.296974 q -1.74879999,0 -3.23260009,-0.60388 -1.4839,-0.658821 -2.5968,-1.756791 -1.0599001,-1.098011 -1.6958001,-2.580282 -0.5829,-1.48232 -0.5829,-3.184211 0,-1.756781 0.5829,-3.239052 0.6359,-1.537211 1.6958001,-2.635221 1.1129,-1.152871 2.5968,-1.756791 1.4838001,-0.658771 3.23260009,-0.658771 1.74890001,0 3.23270011,0.658771 1.5368,0.60392 2.6497,1.756791 1.1129,1.09801 1.7488001,2.635221 0.636,1.482271 0.636,3.239052 0,1.701891 -0.636,3.184211 -0.6359001,1.482271 -1.7488001,2.580282 -1.1129,1.09797 -2.6497,1.756791 -1.4838001,0.60388 -3.23270011,0.60388 z" + topSvg1: "m 24.460513,-15.61675 h 5.460288 v 12.6914318 h -5.460288 z m -11.141903,0 h 5.460288 V -2.9253182 H 13.31861 Z m -32.09747,0 h 5.46025 v 12.6914318 h -5.46025 z m -11.141941,0 h 5.460288 v 12.6914318 h -5.460288 z M 9.2332408,-3.8119575 V 15.61675 H -9.0525036 V -3.8119575 Z m -4.9291871,5.119409 h -8.4272183 v 9.1903045 h 8.4272183 z" + topSvg2: "m -17.00795,-3.1461501 h 34.0159 v 5.8292002 h -34.0159 z M 9.6022502,-25.431051 V -6.0023501 H -8.6835502 V -25.431051 Z m 0,31.4334011 V 25.431051 H -8.6835502 V 6.0023501 Z M 4.6730501,11.12175 h -8.4272002 v 9.1903 h 8.4272002 z" + } NDualButton { @@ -558,30 +937,40 @@ Rectangle { id2: 57 anchors.right: parent.right anchors.rightMargin: 5 - text2: "‒" - text1: "+" - - Image { - source: "qrc:/keyimages/resources/keyimages/contrast_plus.png" - width: nDualButton7.button1.width * .5 - anchors.bottom: nDualButton7.button1.top - anchors.left: nDualButton7.button1.left - anchors.leftMargin: nDualButton7.button1.width / 4 - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } - - Image { - source: "qrc:/keyimages/resources/keyimages/contrast_minus.png" - width: nDualButton7.button2.width * .5 - anchors.bottom: nDualButton7.button2.top - anchors.left: nDualButton7.button2.left - anchors.leftMargin: nDualButton7.button2.width / 4 - fillMode: Image.PreserveAspectFit - smooth: true - mipmap: true - } + text2: ""//"‒" + text1: ""//"+" + +// Image { +// source: "qrc:/keyimages/resources/keyimages/contrast_plus.png" +// width: nDualButton7.button1.width * .5 +// anchors.bottom: nDualButton7.button1.top +// anchors.left: nDualButton7.button1.left +// anchors.leftMargin: nDualButton7.button1.width / 4 +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } + +// Image { +// source: "qrc:/keyimages/resources/keyimages/contrast_minus.png" +// width: nDualButton7.button2.width * .5 +// anchors.bottom: nDualButton7.button2.top +// anchors.left: nDualButton7.button2.left +// anchors.leftMargin: nDualButton7.button2.width / 4 +// fillMode: Image.PreserveAspectFit +// smooth: true +// mipmap: true +// } + + colorSvg1: rectangle1.color_submain + colorSvg2: rectangle1.color_submain + colorTopSvg1: rectangle1.color_ctrl + colorTopSvg2: rectangle1.color_ctrl + svg1:"M 4.9386337,5.1161373 V 26.492651 H -4.9386342 V 5.1161373 H -25.573351 V -5.1162103 H -4.9386342 V -26.492651 H 4.9386337 V -5.1162103 H 25.573351 V 5.1161373 Z" + svg2:"M -24.422851,6.2356777 V -6.2356776 H 24.422851 V 6.2356777 Z" + topSvg1: "M 13.649918,13.06292 V -13.062873 L 30.998851,2.2999989e-5 Z M -12.21721,-18.7832 c -10.373048,0 -18.781641,8.410158 -18.781641,18.783222999989 C -30.998851,10.373623 -22.589438,18.783107 -12.215838,18.7832 -1.8421296,18.7832 6.5673897,10.373692 6.5673897,2.2999989e-5 6.5673897,-10.373669 -1.8421296,-18.7832 -12.215838,-18.7832 Z m 0,3.756654 C -3.9182352,-15.026569 2.8093974,-8.2989492 2.8093624,2.2999989e-5 2.8093974,8.2989492 -3.9182352,15.026593 -12.21721,15.026546 c 0,-30.053092 0,0 0,-30.053092 z" + topSvg2: "m 12.21575,-18.7832 c -10.3731,0 -18.7817001,8.4101 -18.7817001,18.7833 0,10.3735 8.4095001,18.783 18.7831001,18.7831 10.3737,0 18.783201,-8.4095 18.783201,-18.7831 0,-10.3738 -8.409501,-18.7833 -18.783201,-18.7833 z m 0,3.7566 c 8.299,0 15.026601,6.7275998 15.026601,15.0267 0,8.2989002 -6.727601,15.0265 -15.026601,15.0264 z m -25.8672,1.9637 V 13.0629 L -31.000351,0 Z" + } NButton { @@ -591,24 +980,31 @@ Rectangle { anchors.rightMargin: 5 width: 50 height: 20 - text: "enter" + text: ""//"enter" anchors.top: nDualButton7.bottom anchors.topMargin: 10 + colorSvg: rectangle1.color_submain + svg: "m 67.498734,23.779597 h -9.129803 v -35.745142 h 8.48 v 5.0824337 q 2.176852,-3.6014687 3.898854,-4.7458337 1.754456,-1.144402 3.9638,-1.144402 3.119082,0 6.010721,1.783905 l -2.826655,8.2462834 q -2.30682,-1.5482844 -4.28872,-1.5482844 -1.916953,0 -3.24905,1.1107425 -1.332098,1.077044 -2.111868,3.93803099 Q 67.498734,3.618279 67.498734,12.739685 Z M 41.733886,12.403085 50.83116,13.985029 q -1.754456,5.183375 -5.555833,7.909722 -3.768885,2.692649 -9.454687,2.692649 -8.999835,0 -13.321047,-6.092158 -3.41151,-4.880435 -3.41151,-12.3189547 0,-8.8857859 4.483671,-13.9008608 4.483672,-5.0487735 11.339148,-5.0487735 7.70023,0 12.15141,5.2843552 4.45118,5.2506952 4.256228,16.1223458 H 28.44533 q 0.09748,4.207311 2.209344,6.563398 2.111868,2.322426 5.263442,2.322426 2.14436,0 3.606426,-1.211722 1.462065,-1.211684 2.209344,-3.904371 z M 42.25372,2.8441368 q -0.09748,-4.1063311 -2.046884,-6.2267975 -1.949408,-2.1541264 -4.743607,-2.1541264 -2.989115,0 -4.938523,2.2551065 -1.949408,2.2551065 -1.916916,6.1258174 z M 15.416673,-11.965545 v 7.5394619 H 9.1785454 V 9.9796782 q 0,4.3756118 0.16246,5.1160938 0.1949148,0.706822 0.8122626,1.178024 0.649803,0.47124 1.559504,0.47124 1.267151,0 3.671446,-0.908782 l 0.779734,7.337501 Q 12.979923,24.5874 8.9511015,24.5874 q -2.4692427,0 -4.4511799,-0.841463 -1.9819,-0.875083 -2.9241305,-2.221446 Q 0.66605247,20.144507 0.30867771,17.82208 0.0162498,16.172816 0.0162498,11.157741 V -4.4260831 h -4.1912439 v -7.5394619 h 4.1912439 v -7.10192 l 9.1622956,-5.519937 v 12.621857 z M -9.6658805,23.779597 H -18.795647 V 5.5367853 q 0,-5.7892172 -0.584856,-7.4721417 -0.584819,-1.7165845 -1.916916,-2.6589884 -1.299605,-0.9424423 -3.151574,-0.9424423 -2.371767,0 -4.256228,1.3463242 -1.884424,1.3463242 -2.599211,3.56777069 -0.682295,2.22144651 -0.682295,8.21266231 V 23.779597 h -9.129803 v -35.745142 h 8.479964 v 5.2506954 q 4.516163,-6.0584974 11.371639,-6.0584974 3.021607,0 5.523379,1.144402 2.501734,1.110704 3.768848,2.860949 1.299642,1.7502446 1.786985,3.9716911 0.5198345,2.2214464 0.5198345,6.3613991 z m -48.4106145,-11.376512 9.097275,1.581944 q -1.754457,5.183375 -5.555834,7.909722 -3.768885,2.692649 -9.454686,2.692649 -8.999836,0 -13.321048,-6.092158 -3.41151,-4.880435 -3.41151,-12.3189547 0,-8.8857859 4.483672,-13.9008608 4.483672,-5.0487735 11.339147,-5.0487735 7.700231,0 12.15141,5.2843552 4.45118,5.2506952 4.256228,16.1223458 h -22.87321 q 0.09748,4.207311 2.209344,6.563398 2.111868,2.322426 5.263443,2.322426 2.14436,0 3.606425,-1.211722 1.462065,-1.211684 2.209344,-3.904371 z m 0.519835,-9.5589482 q -0.09748,-4.1063311 -2.046884,-6.2267975 -1.949408,-2.1541264 -4.743608,-2.1541264 -2.989115,0 -4.938523,2.2551065 -1.949408,2.2551065 -1.916916,6.1258174 z" Text { id: text1 x: 0 y: -12 width: 50 height: 11 - color: "#68cce0" - text: "≈" - font.bold: true +// color: "#68cce0" +// text: "≈" +// font.bold: true anchors.bottom: nButton8.top anchors.bottomMargin: 1 - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - font.pixelSize: 12 +// verticalAlignment: Text.AlignVCenter +// horizontalAlignment: Text.AlignHCenter +// font.pixelSize: 12 + NSvg{ + colorSvg: rectangle1.color_ctrl + svg: "M -20.28635,-0.69845671 V -9.1211712 q 4.202,-4.9303758 11.0229996,-4.9303758 2.38,0 4.958,0.698476 2.618,0.698475 7.496,2.876032 2.736,1.2326137 4.085,1.602375 1.388,0.3287144 2.7760004,0.3287144 2.578,0 5.315,-1.6023734 2.776,-1.602374 4.917,-4.026477 v 8.7103065 q -2.538,2.4651875 -5.155,3.5745086 -2.578,1.10935911 -5.8300004,1.10935911 -2.38,0 -4.522,-0.53413751 -2.141,-0.5752216 -6.861,-2.7527788 -4.72,-2.2186802 -7.853,-2.2186802 -2.5379996,0 -4.7989996,1.1504431 -2.221,1.1093211 -5.55,4.43732249 z m 0,14.87325671 V 5.7520858 q 4.202,-4.93037597 11.0229996,-4.93037597 2.38,0 4.958,0.69847567 2.618,0.6984757 7.496,2.8760329 2.736,1.1915292 4.085,1.5612896 1.388,0.3697994 2.7760004,0.3697994 2.578,0 5.315,-1.6023736 2.776,-1.6023746 4.917,-4.02647709 V 9.4087635 q -2.538,2.4651875 -5.155,3.5745085 -2.578,1.109321 -5.8300004,1.109321 -2.38,0 -4.522,-0.575183 -2.141,-0.575223 -6.861,-2.75278 -4.72,-2.1775963 -7.853,-2.1775963 -2.5379996,0 -4.7989996,1.1504441 -2.221,1.1093212 -5.55,4.4373222 z" + } + } } diff --git a/qml/MobileUIFront.qml b/qml/MobileUIFront.qml index dcb349c2..e37c2589 100644 --- a/qml/MobileUIFront.qml +++ b/qml/MobileUIFront.qml @@ -37,6 +37,20 @@ GridLayout { } } + Item { + visible: Emu.keypadFillMode !== Emu.FillWidth + Layout.fillHeight: true + Layout.fillWidth: true + Layout.columnSpan: 2 + + Keypad { + id: keypad2 + x: Emu.leftHanded ? 0 : parent.width - width + property double myScale: Math.min(parent.height/height, parent.width/width) + transform: Scale { origin.x: Emu.leftHanded ? 0 : keypad2.width; origin.y: 0; xScale: keypad2.myScale; yScale: keypad2.myScale } + } + } + Flickable { id: controls @@ -53,6 +67,7 @@ GridLayout { contentHeight: keypad.height*controls.width/keypad.width + iosmargin.height clip: true pixelAligned: true + visible: Emu.keypadFillMode === Emu.FillWidth Keypad { id: keypad @@ -79,6 +94,7 @@ GridLayout { Layout.fillWidth: true Layout.columnSpan: 2 color: keypad.color + visible: Emu.keypadFillMode === Emu.FillWidth } states: [ State { diff --git a/qml/NButton.qml b/qml/NButton.qml index 90e8886f..ea09bf0b 100644 --- a/qml/NButton.qml +++ b/qml/NButton.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQuick.Shapes 1.15 import Firebird.Emu 1.0 Rectangle { @@ -12,6 +13,10 @@ Rectangle { property bool fixed: false property int keymap_id: 1 + property alias svg: nsvg.svg + property alias colorSvg: nsvg.colorSvg + + signal clicked() border.width: active ? 2 : 1 @@ -51,6 +56,13 @@ Rectangle { horizontalAlignment: Text.AlignHCenter } + NSvg{ + id:nsvg + svg:"M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" + colorSvg: "blue" + } + + // This is needed to support pressing multiple buttons at once on multitouch MultiPointTouchArea { id: multiMouseArea diff --git a/qml/NDualButton.qml b/qml/NDualButton.qml index 1c7c186a..54468316 100644 --- a/qml/NDualButton.qml +++ b/qml/NDualButton.qml @@ -1,4 +1,5 @@ import QtQuick 2.0 +import QtQuick.Shapes 1.15 Rectangle { id: rectangle3 @@ -10,6 +11,14 @@ Rectangle { property alias button2: nbutton2 property alias id1: nbutton1.keymap_id property alias id2: nbutton2.keymap_id + property alias svg1: nbutton1.svg + property alias svg2: nbutton2.svg + property alias topSvg1: svgTop1.svg + property alias topSvg2: svgTop2.svg + property alias colorSvg1: nbutton1.colorSvg + property alias colorSvg2: nbutton2.colorSvg + property alias colorTopSvg1: svgTop1.colorSvg + property alias colorTopSvg2: svgTop2.colorSvg width: 50 height: 30 @@ -23,6 +32,9 @@ Rectangle { width: 25 height: 20 text: "a" + + colorSvg: "blue" + svg:"M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" } NButton { @@ -33,6 +45,9 @@ Rectangle { width: 25 height: 20 text: "b" + colorSvg: "red" + svg:"M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" + } Rectangle { @@ -76,6 +91,11 @@ Rectangle { z: -1 font.pixelSize: 8 font.bold: true + NSvg{ + id: svgTop1 + colorSvg: "green" + svg:"M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" + } } Text { @@ -91,6 +111,11 @@ Rectangle { font.pixelSize: 8 z: -2 font.bold: true + NSvg{ + id: svgTop2 + colorSvg: "pink" + svg:"M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" + } } } diff --git a/qml/NSvg.qml b/qml/NSvg.qml new file mode 100644 index 00000000..d25b8bc0 --- /dev/null +++ b/qml/NSvg.qml @@ -0,0 +1,19 @@ +import QtQuick 2.0 +import QtQuick.Shapes 1.15 + +Shape { + property alias svg: svg.path + property alias colorSvg: psvg.fillColor + + transform:Scale {xScale: 0.15;yScale: 0.15;} + anchors.centerIn: parent + ShapePath { + id:psvg + strokeWidth:-1 + fillColor: "blue" + PathSvg { + id:svg; + path: "M 2.13e-5,-32.828401 C -18.090394,-32.828371 -32.828751,-18.09081 -32.828751,-3.4049999e-4 -32.828711,18.090021 -18.090394,32.828401 2.13e-5,32.828401 18.090394,32.828401 32.828711,18.090057 32.828751,-3.4049999e-4 32.828751,-18.09081 18.090394,-32.828401 2.13e-5,-32.828401 Z" + } + } +} diff --git a/qml/Touchpad.qml b/qml/Touchpad.qml index 95b73955..1d2817ed 100644 --- a/qml/Touchpad.qml +++ b/qml/Touchpad.qml @@ -1,7 +1,10 @@ import QtQuick 2.0 +import QtQuick.Shapes 1.15 import Firebird.Emu 1.0 Rectangle { + + id: rectangle2 width: 100 height: 70 @@ -10,6 +13,11 @@ Rectangle { border.width: 2 border.color: "#eeeeee" + property color colorSvg1: "white" + property color colorSvg2: "blue" + + + Rectangle { id: rectangle1 x: 29 @@ -21,7 +29,129 @@ Rectangle { border.color: "#ffffff" anchors.horizontalCenter: parent.horizontalCenter anchors.verticalCenter: parent.verticalCenter + Rectangle { + anchors.top: parent.top + anchors.bottom: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.topMargin: 5 + NSvg{ + colorSvg: colorSvg2 + svg:"m 2.2079853,-25.056601 -17.1717093,0.18593 -2.697202,4.100588 h -2.214701 l -4.408602,7.507416 0.1221,0.0717 -5.336503,4.8025368 -0.1633,0.3831998 c -0.886201,2.0729088 -0.316801,4.6327173 1.511901,6.0228465 1.828701,1.39012924 4.489602,1.72445905 7.726604,0.99062947 0.4763,-0.0362 0.6488,-0.21936987 0.9582,-0.54765967 0,0 3.147302,-3.2335381 7.483004,-3.2429681 2.6390019,-0.006 4.563403,0.6928596 5.7713036,1.697859 1.2079007,1.0049894 1.811601,2.29510866 1.779701,4.05194764 -0.045,2.45429856 -0.8057004,3.56875796 -2.1082012,4.42616746 -1.3026007,0.8574095 -3.3831018,1.3165892 -5.8022034,1.3937492 -1.433001,0.0457 -3.217602,-0.7337496 -4.594502,-1.6351591 -1.377001,-0.9013995 -2.272302,-1.7958889 -2.272302,-1.7958889 -0.3236,-0.4344898 -0.5746,-0.4675398 -1.0799,-0.5367197 -2.160101,-0.2971699 -4.374103,0.0888 -6.030203,1.4800791 -1.656201,1.3912692 -2.376602,3.9244278 -1.562701,6.4960865 l 0.1386,0.43984 12.170006,12.169133 h 36.790421 v 1.651889 h 8.854505 V -4.4583724 H 23.438897 Z M 0.69258444,-21.260123 21.217796,-1.3466542 V 19.625204 h -35.22562 L -24.368329,9.2638797 c -0.291101,-1.1782494 -0.025,-1.6450291 0.4814,-2.0704988 0.4916,-0.4129598 1.498101,-0.6594397 2.613901,-0.6121097 0.493901,0.4412098 1.209101,1.0408994 2.267002,1.733389 1.716901,1.1239694 4.064902,2.3367588 6.784703,2.2499988 2.7845018,-0.0888 5.5200034,-0.53954 7.7598046,-2.0138589 2.2398012,-1.4743292 3.74710206,-4.1142977 3.80900209,-7.5148457 0.05,-2.7684884 -1.09320059,-5.3213469 -3.14100169,-7.0251859 -2.0479012,-1.7038391 -4.8866027,-2.5798586 -8.196705,-2.5726586 -5.093602,0.0111 -8.599104,2.9011484 -9.717605,3.9507778 -2.243501,0.4157897 -3.617702,0.028 -4.154502,-0.3800698 -0.4823,-0.3666098 -0.548801,-0.6985896 -0.3824,-1.2410193 l 6.438503,-5.7939466 15.4414086,-0.26796 7.5725042,6.0715766 c 2.7779016,1.0719894 5.6095031,0.5540097 4.1893023,-3.407358 L -2.4242173,-20.770083 H -13.137123 l 0.2256,-0.34317 z m -18.40471044,4.269528 h 13.6455078 l 0.8371005,0.896679 -15.1637083,0.26309 z" + } + } + Rectangle { + anchors.top: parent.verticalCenter + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottomMargin: 5 + NSvg{ + colorSvg: colorSvg1 + svg:"m -9.0560467,-33.276501 v 15.933074 h 3.8260346 V -33.276501 Z M 14.811816,-28.280437 0.97889372,-14.446774 3.9766785,-11.448985 17.810338,-25.28191 Z m -47.658217,18.7942947 v 3.8260345 h 15.933072 V -9.4861423 Z M -14.016677,0.54880308 -27.849599,14.381729 -24.851814,17.380251 -11.018893,3.5465885 Z M 27.095045,7.5177461 -7.4181129,-7.37404 7.4736632,27.139133 10.669632,18.09442 25.851709,33.276501 32.846401,26.281808 17.664323,11.099727 Z" + } + } + } + Rectangle{//up + anchors.top: parent.top + anchors.bottom: rectangle1.top + anchors.horizontalCenter: parent.horizontalCenter + Rectangle { + anchors.top: parent.top + anchors.bottom: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.topMargin: 5 + NSvg{ + colorSvg: colorSvg2 + svg:"M 9.555036,-3.7423981 H 28.370743 V 6.2189033 H 9.555036 Z m -21.509008,0 H 6.861835 V 6.2189033 H -11.953972 Z M 31.064044,-20.2299 h 18.815807 v 9.961301 H 31.064044 Z m -21.509008,0 h 18.815707 v 9.961301 H 9.555036 Z m -21.509008,0 H 6.861835 v 9.961301 h -18.815807 z m -33.568333,33.534804 c 2.734961,-6.2482006 9.207044,-13.5751016 16.167426,-17.4672022 l 3.828402,6.630701 6.930402,-16.3098028 -17.589826,-2.1529 3.420511,5.924401 c -8.633523,4.7942007 -15.944266,12.4489018 -16.867576,22.897103 -1.355781,15.342002 3.275961,2.384601 4.110661,0.4777 z" + } + } + Rectangle { + anchors.top: parent.verticalCenter + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottomMargin: 5 + NSvg{ + colorSvg: colorSvg1 + svg:"m 14.79145,9.8223502 h -29.5829 L 3.3966508e-7,-9.8223502 Z" + } + } + } + Rectangle{//down + anchors.top: rectangle1.bottom + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + Rectangle { + anchors.top: parent.top + anchors.bottom: parent.verticalCenter + anchors.horizontalCenter: parent.horizontalCenter + anchors.topMargin: 5 + NSvg{ + colorSvg: colorSvg1 + svg:"m -14.79145,-9.8223502 h 29.5829 L 0,9.8223502 Z" + } + } + Rectangle { + anchors.top: parent.verticalCenter + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + anchors.bottomMargin: 5 + NSvg{ + colorSvg: colorSvg2 + svg:"m 48.750202,-27.959877 c -1.078899,-0.0537 -3.171998,5.70298 -3.706698,6.924611 -2.734898,6.248241 -9.206995,13.5751016 -16.167392,17.4671921 L 25.047814,-10.198745 18.117317,6.1110275 35.707209,8.2639578 32.28671,2.339537 c 8.633496,-4.7941707 15.944193,-12.448862 16.867592,-22.897073 0.4872,-5.513531 0.2011,-7.372201 -0.4041,-7.402341 z m -98.151353,6.750001 v 3.40156 45.768567 h 62.73567 V -5.8827242 L -2.3511734,-21.209876 Z m 6.803297,6.803131 H -4.5521723 V -3.7885839 H 6.5314224 V 21.15712 H -42.597854 Z" + } + } + } + Rectangle{//left + anchors.left: parent.left + anchors.right: rectangle1.left + anchors.verticalCenter: parent.verticalCenter + Rectangle { + anchors.left: parent.left + anchors.right: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 5 + NSvg{ + colorSvg: colorSvg2 + svg:"M 9.9999939e-6,14.791456 V -14.791456 L -15.262051,-4.9999969e-6 Z M -31.367851,-24.585051 v 3.401578 45.768524 H 31.367851 V -9.2578896 L 15.68212,-24.585051 Z m 6.803346,6.803136 h 38.045657 v 10.6181542 h 11.083563 l 2e-5,24.9456758 h -49.12924 z" + } + } + Rectangle { + anchors.left: parent.horizontalCenter + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.rightMargin: 5 + NSvg{ + colorSvg: colorSvg1 + svg:"m 9.8223502,-14.79145 v 29.5829 L -9.8223502,0 Z" + } + } + } + Rectangle{//right + anchors.left: rectangle1.right + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + Rectangle { + anchors.left: parent.left + anchors.right: parent.horizontalCenter + anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 5 + NSvg{ + colorSvg: colorSvg1 + svg:"m -9.8223502,14.79145 v -29.5829 L 9.8223502,0 Z" + } + } + Rectangle { + anchors.left: parent.horizontalCenter + anchors.right: parent.right + anchors.verticalCenter: parent.verticalCenter + anchors.rightMargin: 5 + NSvg{ + colorSvg: colorSvg2 + svg:"M -5.0873001,-14.791466 V 14.791456 L 10.1747,-4.9999971e-6 Z m -26.2806009,-9.793585 v 3.401578 45.768524 H 31.367901 V -9.2579096 L 15.6821,-24.585051 Z m 6.8034,6.803136 H 13.4812 V -7.1637608 H 24.564701 V 17.781915 h -49.129202 z" + } + } + } + Rectangle { id: highlight diff --git a/qmlbridge.cpp b/qmlbridge.cpp index f1233f9e..29e03f6c 100644 --- a/qmlbridge.cpp +++ b/qmlbridge.cpp @@ -198,6 +198,20 @@ void QMLBridge::setDefaultKit(unsigned int id) emit defaultKitChanged(); } +QMLBridge::KeypadFillMode QMLBridge::getKeypadFillMode() +{ + return settings.value(QStringLiteral("keypadFillMode"), KeypadFillMode::FillWidth).value(); +} + +void QMLBridge::setKeypadFillMode(KeypadFillMode mode) +{ + if(getKeypadFillMode() == mode) + return; + + settings.setValue(QStringLiteral("keypadFillMode"), mode); + emit keypadFillModeChanged(); +} + bool QMLBridge::getLeftHanded() { return settings.value(QStringLiteral("leftHanded"), false).toBool(); diff --git a/qmlbridge.h b/qmlbridge.h index bac8576d..cd914392 100644 --- a/qmlbridge.h +++ b/qmlbridge.h @@ -13,6 +13,12 @@ class QMLBridge : public QObject explicit QMLBridge(QObject *parent = 0); ~QMLBridge(); + enum KeypadFillMode { + FillWidth = 0, + ResizeToFit + }; + Q_ENUM(KeypadFillMode); + Q_PROPERTY(unsigned int gdbPort READ getGDBPort WRITE setGDBPort NOTIFY gdbPortChanged) Q_PROPERTY(bool gdbEnabled READ getGDBEnabled WRITE setGDBEnabled NOTIFY gdbEnabledChanged) Q_PROPERTY(unsigned int rdbPort READ getRDBPort WRITE setRDBPort NOTIFY rdbPortChanged) @@ -23,6 +29,7 @@ class QMLBridge : public QObject Q_PROPERTY(bool autostart READ getAutostart WRITE setAutostart NOTIFY autostartChanged) Q_PROPERTY(unsigned int defaultKit READ getDefaultKit WRITE setDefaultKit NOTIFY defaultKitChanged) Q_PROPERTY(bool leftHanded READ getLeftHanded WRITE setLeftHanded NOTIFY leftHandedChanged) + Q_PROPERTY(KeypadFillMode keypadFillMode READ getKeypadFillMode WRITE setKeypadFillMode NOTIFY keypadFillModeChanged) Q_PROPERTY(bool suspendOnClose READ getSuspendOnClose WRITE setSuspendOnClose NOTIFY suspendOnCloseChanged) Q_PROPERTY(QString usbdir READ getUSBDir WRITE setUSBDir NOTIFY usbDirChanged) Q_PROPERTY(QString version READ getVersion CONSTANT) @@ -55,6 +62,8 @@ class QMLBridge : public QObject bool getAutostart(); unsigned int getDefaultKit(); void setDefaultKit(unsigned int id); + KeypadFillMode getKeypadFillMode(); + void setKeypadFillMode(KeypadFillMode mode); bool getLeftHanded(); void setLeftHanded(bool e); bool getSuspendOnClose(); @@ -146,6 +155,7 @@ public slots: void autostartChanged(); void defaultKitChanged(); void leftHandedChanged(); + void keypadFillModeChanged(); void suspendOnCloseChanged(); void usbDirChanged(); void isRunningChanged(); diff --git a/resources.qrc b/resources.qrc index 7008cea3..d0a1c524 100644 --- a/resources.qrc +++ b/resources.qrc @@ -60,6 +60,7 @@ qml/Firebird/UIComponents/VerticalSwipeBar.qml qml/FlashDialog.qml qml/Firebird/UIComponents/IconButton.qml + qml/NSvg.qml i18n/de_DE.qm