fixing state import
This commit is contained in:
parent
d859db4004
commit
ec77ea9fa6
|
@ -1,7 +1,7 @@
|
||||||
from turtle import pd
|
from turtle import pd
|
||||||
from pybitmessage.get_platform import platform
|
from pybitmessage.get_platform import platform
|
||||||
from pybitmessage import kivy_helper_search
|
from pybitmessage import kivy_helper_search
|
||||||
from helper_sql import sqlExecute
|
from pybitmessage.helper_sql import sqlExecute
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.properties import (
|
from kivy.properties import (
|
||||||
|
@ -13,7 +13,7 @@ from kivymd.uix.dialog import MDDialog
|
||||||
from kivymd.uix.label import MDLabel
|
from kivymd.uix.label import MDLabel
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import (
|
from pybitmessage.baseclass.common import (
|
||||||
avatarImageFirstLetter, toast,
|
avatarImageFirstLetter, toast,
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
from bmconfigparser import BMConfigParser
|
from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
from helper_sql import sqlExecute, sqlQuery
|
from pybitmessage.helper_sql import sqlExecute, sqlQuery
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.properties import (
|
from kivy.properties import (
|
||||||
|
@ -9,14 +9,14 @@ from kivy.properties import (
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
from kivymd.uix.label import MDLabel
|
from kivymd.uix.label import MDLabel
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import (
|
from pybitmessage.baseclass.common import (
|
||||||
showLimitedCnt, toast, ThemeClsColor,
|
showLimitedCnt, toast, ThemeClsColor,
|
||||||
avatarImageFirstLetter, CutsomSwipeToDeleteItem,
|
avatarImageFirstLetter, CutsomSwipeToDeleteItem,
|
||||||
ShowTimeHistoy
|
ShowTimeHistoy
|
||||||
)
|
)
|
||||||
from pybitmessage.baseclass.maildetail import MailDetail
|
# from pybitmessage.baseclass.maildetail import MailDetail
|
||||||
# from pybitmessage.baseclass.trash import Trash
|
# from pybitmessage.baseclass.trash import Trash
|
||||||
|
|
||||||
|
|
||||||
|
@ -155,7 +155,7 @@ class Allmails(Screen):
|
||||||
else:
|
else:
|
||||||
src_mng_obj = self.parent.parent
|
src_mng_obj = self.parent.parent
|
||||||
src_mng_obj.screens[11].clear_widgets()
|
src_mng_obj.screens[11].clear_widgets()
|
||||||
src_mng_obj.screens[11].add_widget(MailDetail())
|
# src_mng_obj.screens[11].add_widget(MailDetail())
|
||||||
src_mng_obj.current = 'mailDetail'
|
src_mng_obj.current = 'mailDetail'
|
||||||
else:
|
else:
|
||||||
instance.ids.delete_msg.disabled = False
|
instance.ids.delete_msg.disabled = False
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from pybitmessage import kivy_helper_search
|
from pybitmessage import kivy_helper_search
|
||||||
from bmconfigparser import BMConfigParser
|
from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
from helper_sql import sqlExecute
|
from pybitmessage.helper_sql import sqlExecute
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from addresses import decodeAddress
|
from pybitmessage.addresses import decodeAddress
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.properties import (
|
from kivy.properties import (
|
||||||
ListProperty,
|
ListProperty,
|
||||||
|
@ -13,13 +13,13 @@ from kivy.properties import (
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
from kivymd.uix.label import MDLabel
|
from kivymd.uix.label import MDLabel
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import (
|
from pybitmessage.baseclass.common import (
|
||||||
showLimitedCnt, toast, ThemeClsColor,
|
showLimitedCnt, toast, ThemeClsColor,
|
||||||
SwipeToDeleteItem, ShowTimeHistoy
|
SwipeToDeleteItem, ShowTimeHistoy
|
||||||
)
|
)
|
||||||
from pybitmessage.baseclass.maildetail import MailDetail
|
# from pybitmessage.baseclass.maildetail import MailDetail
|
||||||
|
|
||||||
|
|
||||||
class Draft(Screen):
|
class Draft(Screen):
|
||||||
|
@ -137,7 +137,7 @@ class Draft(Screen):
|
||||||
else:
|
else:
|
||||||
src_mng_obj = self.parent.parent
|
src_mng_obj = self.parent.parent
|
||||||
src_mng_obj.screens[11].clear_widgets()
|
src_mng_obj.screens[11].clear_widgets()
|
||||||
src_mng_obj.screens[11].add_widget(MailDetail())
|
# src_mng_obj.screens[11].add_widget(MailDetail())
|
||||||
src_mng_obj.current = 'mailDetail'
|
src_mng_obj.current = 'mailDetail'
|
||||||
else:
|
else:
|
||||||
instance.ids.delete_msg.disabled = False
|
instance.ids.delete_msg.disabled = False
|
||||||
|
|
|
@ -16,13 +16,13 @@ from kivymd.uix.label import MDLabel
|
||||||
|
|
||||||
from pybitmessage import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from common import (
|
from pybitmessage.baseclass.common import (
|
||||||
showLimitedCnt, avatarImageFirstLetter,
|
showLimitedCnt, avatarImageFirstLetter,
|
||||||
ThemeClsColor, toast, SwipeToDeleteItem,
|
ThemeClsColor, toast, SwipeToDeleteItem,
|
||||||
ShowTimeHistoy
|
ShowTimeHistoy
|
||||||
)
|
)
|
||||||
from maildetail import MailDetail
|
# from maildetail import MailDetail
|
||||||
from trash import Trash
|
# from trash import Trash
|
||||||
|
|
||||||
|
|
||||||
class Inbox(Screen):
|
class Inbox(Screen):
|
||||||
|
@ -182,7 +182,7 @@ class Inbox(Screen):
|
||||||
else:
|
else:
|
||||||
src_mng_obj = self.parent.parent
|
src_mng_obj = self.parent.parent
|
||||||
src_mng_obj.screens[11].clear_widgets()
|
src_mng_obj.screens[11].clear_widgets()
|
||||||
src_mng_obj.screens[11].add_widget(MailDetail())
|
# src_mng_obj.screens[11].add_widget(MailDetail())
|
||||||
src_mng_obj.current = "mailDetail"
|
src_mng_obj.current = "mailDetail"
|
||||||
else:
|
else:
|
||||||
instance.ids.delete_msg.disabled = False
|
instance.ids.delete_msg.disabled = False
|
||||||
|
@ -223,7 +223,7 @@ class Inbox(Screen):
|
||||||
def update_trash(self):
|
def update_trash(self):
|
||||||
"""Update trash screen mails which is deleted from inbox"""
|
"""Update trash screen mails which is deleted from inbox"""
|
||||||
self.manager.parent.ids.sc5.clear_widgets()
|
self.manager.parent.ids.sc5.clear_widgets()
|
||||||
self.manager.parent.ids.sc5.add_widget(Trash())
|
# self.manager.parent.ids.sc5.add_widget(Trash())
|
||||||
# try:
|
# try:
|
||||||
# self.parent.screens[4].clear_widgets()
|
# self.parent.screens[4].clear_widgets()
|
||||||
# self.parent.screens[4].add_widget(Trash())
|
# self.parent.screens[4].add_widget(Trash())
|
||||||
|
|
|
@ -1,10 +1,10 @@
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.properties import StringProperty
|
from kivy.properties import StringProperty
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
|
|
||||||
from network import objectracker, stats
|
from pybitmessage.network import objectracker, stats
|
||||||
|
|
||||||
|
|
||||||
class NetworkStat(Screen):
|
class NetworkStat(Screen):
|
||||||
|
|
|
@ -15,7 +15,7 @@ from kivymd.uix.list import (
|
||||||
from pybitmessage.baseclass.common import toast
|
from pybitmessage.baseclass.common import toast
|
||||||
|
|
||||||
# import queues
|
# import queues
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
|
|
||||||
class Payment(Screen):
|
class Payment(Screen):
|
||||||
|
|
|
@ -13,7 +13,7 @@ from pybitmessage import state
|
||||||
from pybitmessage.addresses import decodeAddress
|
from pybitmessage.addresses import decodeAddress
|
||||||
from datetime import datetime
|
from datetime import datetime
|
||||||
|
|
||||||
from common import toast
|
from pybitmessage.baseclass.common import toast
|
||||||
|
|
||||||
|
|
||||||
class LoadingPopup(Popup):
|
class LoadingPopup(Popup):
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
# from pybitmessage import identiconGeneration
|
# from pybitmessage import identiconGeneration
|
||||||
from pybitmessage import kivy_helper_search
|
from pybitmessage import kivy_helper_search
|
||||||
from bmconfigparser import BMConfigParser
|
from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from helper_sql import sqlExecute
|
from pybitmessage.helper_sql import sqlExecute
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.factory import Factory
|
from kivy.factory import Factory
|
||||||
from kivy.properties import StringProperty, ListProperty
|
from kivy.properties import StringProperty, ListProperty
|
||||||
|
@ -10,13 +10,13 @@ from kivy.properties import StringProperty, ListProperty
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
from kivymd.uix.label import MDLabel
|
from kivymd.uix.label import MDLabel
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import (
|
from pybitmessage.baseclass.common import (
|
||||||
showLimitedCnt, ThemeClsColor, avatarImageFirstLetter,
|
showLimitedCnt, ThemeClsColor, avatarImageFirstLetter,
|
||||||
toast, SwipeToDeleteItem, ShowTimeHistoy
|
toast, SwipeToDeleteItem, ShowTimeHistoy
|
||||||
)
|
)
|
||||||
from pybitmessage.baseclass.maildetail import MailDetail
|
# from pybitmessage.baseclass.maildetail import MailDetail
|
||||||
|
|
||||||
|
|
||||||
class Sent(Screen):
|
class Sent(Screen):
|
||||||
|
@ -189,7 +189,7 @@ class Sent(Screen):
|
||||||
else:
|
else:
|
||||||
src_mng_obj = self.parent.parent
|
src_mng_obj = self.parent.parent
|
||||||
src_mng_obj.screens[11].clear_widgets()
|
src_mng_obj.screens[11].clear_widgets()
|
||||||
src_mng_obj.screens[11].add_widget(MailDetail())
|
# src_mng_obj.screens[11].add_widget(MailDetail())
|
||||||
src_mng_obj.current = 'mailDetail'
|
src_mng_obj.current = 'mailDetail'
|
||||||
else:
|
else:
|
||||||
instance.ids.delete_msg.disabled = False
|
instance.ids.delete_msg.disabled = False
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
from pybitmessage.get_platform import platform
|
from pybitmessage.get_platform import platform
|
||||||
from bmconfigparser import BMConfigParser
|
# from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
from helper_sql import sqlExecute, sqlQuery
|
from pybitmessage.helper_sql import sqlExecute, sqlQuery
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.properties import (
|
from kivy.properties import (
|
||||||
|
@ -12,7 +12,7 @@ from kivymd.uix.dialog import MDDialog
|
||||||
from kivymd.uix.label import MDLabel
|
from kivymd.uix.label import MDLabel
|
||||||
from kivy.uix.screenmanager import Screen
|
from kivy.uix.screenmanager import Screen
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import (
|
from pybitmessage.baseclass.common import (
|
||||||
toast, showLimitedCnt, ThemeClsColor,
|
toast, showLimitedCnt, ThemeClsColor,
|
||||||
|
|
|
@ -18,7 +18,7 @@ from pybitmessage.bmconfigparser import BMConfigParser
|
||||||
# from debug import logger
|
# from debug import logger
|
||||||
from functools import partial
|
from functools import partial
|
||||||
from pybitmessage.helper_sql import sqlExecute, sqlQuery
|
from pybitmessage.helper_sql import sqlExecute, sqlQuery
|
||||||
from pybitmessage.kivymd.app import MDApp
|
from kivymd.app import MDApp
|
||||||
from kivy.clock import Clock
|
from kivy.clock import Clock
|
||||||
from kivy.core.clipboard import Clipboard
|
from kivy.core.clipboard import Clipboard
|
||||||
from kivy.core.window import Window
|
from kivy.core.window import Window
|
||||||
|
@ -47,7 +47,7 @@ from kivy.uix.screenmanager import RiseInTransition, SlideTransition, FallOutTra
|
||||||
from pybitmessage import queues
|
from pybitmessage import queues
|
||||||
from pybitmessage.semaphores import kivyuisignaler
|
from pybitmessage.semaphores import kivyuisignaler
|
||||||
|
|
||||||
import state
|
from pybitmessage import state
|
||||||
from kivymd.uix.bottomsheet import MDCustomBottomSheet
|
from kivymd.uix.bottomsheet import MDCustomBottomSheet
|
||||||
|
|
||||||
from kivy.lang import Observable
|
from kivy.lang import Observable
|
||||||
|
@ -58,8 +58,8 @@ import ast
|
||||||
|
|
||||||
from pybitmessage.baseclass.common import toast
|
from pybitmessage.baseclass.common import toast
|
||||||
|
|
||||||
from qr_scanner.zbarcam import ZBarCam
|
# from qr_scanner.zbarcam import ZBarCam
|
||||||
from pyzbar.pyzbar import ZBarSymbol
|
# from pyzbar.pyzbar import ZBarSymbol
|
||||||
|
|
||||||
if platform != "android":
|
if platform != "android":
|
||||||
from kivy.config import Config
|
from kivy.config import Config
|
||||||
|
|
Reference in New Issue
Block a user