Bitmessage/PyBitmessage-2024-12-10
Archived
2
0
Fork 0
Code Issues 168 Pull Requests 53 Actions Packages Projects Releases 5 Wiki Activity

Resolve conflicts

Browse Source
This commit is contained in:
shekhar-cis 2022-10-03 13:22:59 +05:30
parent 8448e93709
commit e365144109
Signed by untrusted user: shekhar-cis
GPG Key ID: F4F00AB04E83F9A7
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitmessagekivy/baseclass/common.py
View File

@ -44,7 +44,7 @@ data_screens = {
def load_image_path(): def load_image_path():
"""Return the path of kivy images""" """Return the path of kivy images"""
image_path = os.path.abspath(os.path.join('images', 'kivy')) image_path = os.path.abspath(os.path.join('pybitmessage', 'images', 'kivy'))
return image_path return image_path

2
src/bitmessagekivy/main.kv
View File

@ -216,6 +216,8 @@ MDNavigationLayout:
id:id_myaddress id:id_myaddress
ScanScreen: ScanScreen:
id:id_scanscreen id:id_scanscreen
Payment:
id:id_payment
MDNavigationDrawer: MDNavigationDrawer:
id: nav_drawer id: nav_drawer

5
src/bitmessagekivy/screens_data.json
View File

@ -11,5 +11,10 @@
"Scanner": { "Scanner": {
"kv_string": "scan_screen", "kv_string": "scan_screen",
"Import": "from pybitmessage.bitmessagekivy.baseclass.scan_screen import ScanScreen" "Import": "from pybitmessage.bitmessagekivy.baseclass.scan_screen import ScanScreen"
},
"Payment": {
"kv_string": "payment",
"name_screen": "payment",
"Import": "from pybitmessage.bitmessagekivy.baseclass.payment import Payment"
} }
} }