Browse Source
For the "qml" gui (used on Android), this upgrades the qt version from 5.15 to 6.4. PR https://github.com/spesmilo/electrum/pull/8545master
SomberNight
2 years ago
168 changed files with 1349 additions and 923 deletions
@ -1,2 +1,2 @@
|
||||
deb https://snapshot.debian.org/archive/debian/20230317T205011Z/ bullseye main |
||||
deb-src https://snapshot.debian.org/archive/debian/20230317T205011Z/ bullseye main |
||||
deb https://snapshot.debian.org/archive/debian/20230629T090352Z/ bookworm main |
||||
deb-src https://snapshot.debian.org/archive/debian/20230629T090352Z/ bookworm main |
||||
|
||||
@ -1,18 +0,0 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.pyqt5 import PyQt5Recipe |
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
|
||||
assert PyQt5Recipe._version == "5.15.9" |
||||
assert PyQt5Recipe.depends == ['qt5', 'pyjnius', 'setuptools', 'pyqt5sip', 'hostpython3', 'pyqt_builder'] |
||||
assert PyQt5Recipe.python_depends == [] |
||||
|
||||
|
||||
class PyQt5RecipePinned(util.InheritedRecipeMixin, PyQt5Recipe): |
||||
sha512sum = "1c07d93aefe1c24e80851eb4631b80a99e7ba06e823181325456edb90285d3d22417a9f7d4c3ff9c6195bd801e7dc2bbabf0587af844a5e4b0a410c4611d119e" |
||||
|
||||
|
||||
recipe = PyQt5RecipePinned() |
||||
@ -1,18 +0,0 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.pyqt5sip import PyQt5SipRecipe |
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
|
||||
assert PyQt5SipRecipe._version == "12.11.1" |
||||
assert PyQt5SipRecipe.depends == ['setuptools', 'python3'] |
||||
assert PyQt5SipRecipe.python_depends == [] |
||||
|
||||
|
||||
class PyQt5SipRecipePinned(util.InheritedRecipeMixin, PyQt5SipRecipe): |
||||
sha512sum = "9a24b6e8356fdb1070672ee37e5f4259d72a75bb60376ad0946274331ae29a6cceb98a6c5a278bf5e8015a3d493c925bacab8593ef02c310ff3773bd3ee46a5d" |
||||
|
||||
|
||||
recipe = PyQt5SipRecipePinned() |
||||
@ -0,0 +1,18 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.pyqt6 import PyQt6Recipe |
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
|
||||
assert PyQt6Recipe._version == "6.4.2" |
||||
assert PyQt6Recipe.depends == ['qt6', 'pyjnius', 'setuptools', 'pyqt6sip', 'hostpython3', 'pyqt_builder'] |
||||
assert PyQt6Recipe.python_depends == [] |
||||
|
||||
|
||||
class PyQt6RecipePinned(util.InheritedRecipeMixin, PyQt6Recipe): |
||||
sha512sum = "51e5f0d028ee7984876da1653cb135d61e2c402f18b939a92477888cc7c86d3bc2889477403dee6b3d9f66519ee3236d344323493b4c2c2e658e1637b10e53bf" |
||||
|
||||
|
||||
recipe = PyQt6RecipePinned() |
||||
@ -0,0 +1,18 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.pyqt6sip import PyQt6SipRecipe |
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
|
||||
assert PyQt6SipRecipe._version == "13.5.1" |
||||
assert PyQt6SipRecipe.depends == ['setuptools', 'python3'] |
||||
assert PyQt6SipRecipe.python_depends == [] |
||||
|
||||
|
||||
class PyQt6SipRecipePinned(util.InheritedRecipeMixin, PyQt6SipRecipe): |
||||
sha512sum = "1e4170d167a326afe6df86e4a35e209299548054981cb2e5d56da234ef9db4d8594bcb05b6be363c3bc6252776ae9de63d589a3d9f33fba8250d39cdb5e9061a" |
||||
|
||||
|
||||
recipe = PyQt6SipRecipePinned() |
||||
@ -1,13 +1,13 @@
|
||||
from pythonforandroid.recipes.pyqt_builder import PyQtBuilderRecipe |
||||
|
||||
|
||||
assert PyQtBuilderRecipe._version == "1.14.1" |
||||
assert PyQtBuilderRecipe._version == "1.15.1" |
||||
assert PyQtBuilderRecipe.depends == ["sip", "packaging", "python3"] |
||||
assert PyQtBuilderRecipe.python_depends == [] |
||||
|
||||
|
||||
class PyQtBuilderRecipePinned(PyQtBuilderRecipe): |
||||
sha512sum = "4de9be2c42f38fbc22d46a31dd6da37c02620bb112a674ef846a4eb7f862715852e1d7328da1e0d0e33f78475166fe3c690e710e18bfeb48f840f137831a2182" |
||||
sha512sum = "61ee73b6bb922c04739da60025ab50d35d345d2e298943305fcbd3926cda31d732cc5e5b0dbfc39f5eb85c0f0b091b8c3f5fee00dcc240d7849c5c4191c1368a" |
||||
|
||||
|
||||
recipe = PyQtBuilderRecipePinned() |
||||
|
||||
@ -1,16 +0,0 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.qt5 import Qt5Recipe |
||||
|
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
assert Qt5Recipe._version == "95254e52c658729e80f741324045034c15ce9cb0" |
||||
assert Qt5Recipe.depends == ['python3'] |
||||
assert Qt5Recipe.python_depends == [] |
||||
|
||||
class Qt5RecipePinned(util.InheritedRecipeMixin, Qt5Recipe): |
||||
pass |
||||
|
||||
recipe = Qt5RecipePinned() |
||||
@ -0,0 +1,19 @@
|
||||
import os |
||||
|
||||
from pythonforandroid.recipes.qt6 import Qt6Recipe |
||||
|
||||
from pythonforandroid.util import load_source |
||||
|
||||
util = load_source('util', os.path.join(os.path.dirname(os.path.dirname(__file__)), 'util.py')) |
||||
|
||||
assert Qt6Recipe._version == "6.4.3" |
||||
# assert Qt6Recipe._version == "6.5.3" |
||||
assert Qt6Recipe.depends == ['python3', 'hostqt6'] |
||||
assert Qt6Recipe.python_depends == [] |
||||
|
||||
class Qt6RecipePinned(util.InheritedRecipeMixin, Qt6Recipe): |
||||
sha512sum = "0bdbe8b9a43390c98cf19e851ec5394bc78438d227cf9d0d7a3748aee9a32a7f14fc46f52d4fa283819f21413567080aee7225c566af5278557f5e1992674da3" |
||||
# sha512sum = "ca8ea3b81c121886636988275f7fa8ae6d19f7be02669e63ab19b4285b611057a41279db9532c25ae87baa3904b010e1db68b899cd0eda17a5a8d3d87098b4d5" |
||||
|
||||
|
||||
recipe = Qt6RecipePinned() |
||||
@ -1,13 +1,13 @@
|
||||
from pythonforandroid.recipes.sip import SipRecipe |
||||
|
||||
|
||||
assert SipRecipe._version == "6.7.7" |
||||
assert SipRecipe.depends == ["setuptools", "packaging", "toml", "ply", "python3"], SipRecipe.depends |
||||
assert SipRecipe._version == "6.7.9" |
||||
assert SipRecipe.depends == ["setuptools", "packaging", "tomli", "ply", "python3"], SipRecipe.depends |
||||
assert SipRecipe.python_depends == [] |
||||
|
||||
|
||||
class SipRecipePinned(SipRecipe): |
||||
sha512sum = "b41a1e53e8bad1fca08eda2c89b8a7cabe6cb9e54d0ddeba0c718499b0288633fb6b90128d54f3df2420e20bb217d3df224750d30e865487d2b0a640fba82444" |
||||
sha512sum = "bb9d0d0d92002b6fd33f7e8ebe8cd62456dacc16b5734b73760b1ba14fb9b1f2b9b6640b40196c6cf5f345e1afde48bdef39675c4d3480041771325d4cf3c233" |
||||
|
||||
|
||||
recipe = SipRecipePinned() |
||||
|
||||
@ -0,0 +1,13 @@
|
||||
from pythonforandroid.recipes.tomli import TomliRecipe |
||||
|
||||
|
||||
assert TomliRecipe._version == "2.0.1" |
||||
assert TomliRecipe.depends == ["setuptools", "python3"] |
||||
assert TomliRecipe.python_depends == [] |
||||
|
||||
|
||||
class TomliRecipePinned(TomliRecipe): |
||||
sha512sum = "fd410039e255e2b3359e999d69a5a2d38b9b89b77e8557f734f2621dfbd5e1207e13aecc11589197ec22594c022f07f41b4cfe486a3a719281a595c95fd19ecf" |
||||
|
||||
|
||||
recipe = TomliRecipePinned() |
||||
@ -0,0 +1,36 @@
|
||||
<?xml version="1.0" encoding="utf-8"?> |
||||
|
||||
<FrameLayout |
||||
xmlns:android="http://schemas.android.com/apk/res/android" |
||||
xmlns:app="http://schemas.android.com/apk/res-auto" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent"> |
||||
|
||||
<FrameLayout |
||||
android:id="@+id/content_frame" |
||||
android:layout_width="match_parent" |
||||
android:layout_height="match_parent" /> |
||||
|
||||
<TextView |
||||
android:id="@+id/hint" |
||||
android:layout_gravity="center|top" |
||||
android:gravity="center" |
||||
android:text="Scan a QR code." |
||||
android:layout_width="wrap_content" |
||||
android:textColor="#ffffff" |
||||
android:shadowColor="#000000" |
||||
android:shadowDx="1" |
||||
android:shadowDy="1" |
||||
android:shadowRadius="2" |
||||
android:textSize="15sp" |
||||
android:padding="14dp" |
||||
android:layout_height="wrap_content" /> |
||||
|
||||
<Button |
||||
android:id="@+id/paste_btn" |
||||
android:layout_gravity="center|bottom" |
||||
android:layout_width="wrap_content" |
||||
android:layout_height="wrap_content" |
||||
android:text="Paste from clipboard" /> |
||||
|
||||
</FrameLayout> |
||||
@ -1,40 +1,27 @@
|
||||
import QtQuick 2.6 |
||||
import QtQuick.Layouts 1.0 |
||||
import QtQuick.Controls 2.0 |
||||
import QtQuick.Controls.Material 2.0 |
||||
import QtQuick |
||||
import QtQuick.Layouts |
||||
import QtQuick.Controls |
||||
import QtQuick.Controls.Material |
||||
|
||||
ListView { |
||||
id: root |
||||
|
||||
property int width_left_exclusion_zone: 0 |
||||
property int width_right_exclusion_zone: 0 |
||||
// avoid interference with android back-gesture by defining deadzones |
||||
// you can override to 0 if listview is away from left or right edge. |
||||
property int exclusionZone: constants.fingerWidth / 2 |
||||
property int leftExclusionZone: exclusionZone |
||||
property int rightExclusionZone: exclusionZone |
||||
|
||||
MouseArea { |
||||
anchors {top: root.top; left: root.left; bottom: root.bottom } |
||||
visible: width_left_exclusion_zone > 0 |
||||
width: width_left_exclusion_zone |
||||
visible: leftExclusionZone > 0 |
||||
width: leftExclusionZone |
||||
} |
||||
|
||||
MouseArea { |
||||
anchors { top: root.top; right: root.right; bottom: root.bottom } |
||||
visible: width_right_exclusion_zone > 0 |
||||
width: width_right_exclusion_zone |
||||
visible: rightExclusionZone > 0 |
||||
width: rightExclusionZone |
||||
} |
||||
|
||||
// determine distance from sides of window and reserve some |
||||
// space using noop mouseareas in order to not emit clicks when |
||||
// android back gesture is used |
||||
function layoutExclusionZones() { |
||||
var reserve = constants.fingerWidth / 2 |
||||
var p = root.mapToGlobal(0, 0) // note: coords on whole *screen*, not just window |
||||
width_left_exclusion_zone = Math.max(0, reserve - p.x) |
||||
p = root.mapToGlobal(width, 0) |
||||
width_right_exclusion_zone = Math.max(0, reserve - (app.width - p.x)) |
||||
} |
||||
|
||||
Component.onCompleted: { |
||||
if (AppController.isAndroid()) { |
||||
layoutExclusionZones() |
||||
} |
||||
} |
||||
} |
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue