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

Fixed kivy variable, fixed draft msg count

Browse Source
This commit is contained in:
shekhar-cis 2022-05-10 15:49:05 +05:30
parent cce69bd307
commit 38196a49b2
Signed by untrusted user: shekhar-cis
GPG Key ID: F4F00AB04E83F9A7
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/bitmessagekivy/baseclass/draft.py
View File

@ -26,6 +26,8 @@ from bitmessagekivy.baseclass.common import (
showLimitedCnt, toast, ThemeClsColor, mdlist_message_content, showLimitedCnt, toast, ThemeClsColor, mdlist_message_content,
SwipeToDeleteItem, ShowTimeHistoy, empty_screen_label SwipeToDeleteItem, ShowTimeHistoy, empty_screen_label
) )
from kivy.app import App
from bitmessagekivy.baseclass.maildetail import MailDetail from bitmessagekivy.baseclass.maildetail import MailDetail
from bitmessagekivy.baseclass.draft_widgets import HelperDraft from bitmessagekivy.baseclass.draft_widgets import HelperDraft
@ -48,9 +50,11 @@ class Draft(Screen, HelperDraft):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
"""Method used for storing draft messages""" """Method used for storing draft messages"""
super(Draft, self).__init__(*args, **kwargs) super(Draft, self).__init__(*args, **kwargs)
if state.association == '': self.kivy_running_app = App.get_running_app()
self.kivy_state = self.kivy_running_app.kivy_state_obj
if self.kivy_state.association == '':
if state.kivyapp.variable_1: if state.kivyapp.variable_1:
state.association = state.kivyapp.variable_1[0] self.kivy_state.association = state.kivyapp.variable_1[0]
Clock.schedule_once(self.init_ui, 0) Clock.schedule_once(self.init_ui, 0)
def init_ui(self, dt=0): def init_ui(self, dt=0):
@ -65,7 +69,7 @@ class Draft(Screen, HelperDraft):
def loadDraft(self, where="", what=""): def loadDraft(self, where="", what=""):
"""Load draft list for Draft messages""" """Load draft list for Draft messages"""
self.account = state.association self.account = self.kivy_state.association
xAddress = 'fromaddress' xAddress = 'fromaddress'
self.ids.tag_label.text = '' self.ids.tag_label.text = ''
self.draftDataQuery(xAddress, where, what) self.draftDataQuery(xAddress, where, what)
@ -74,7 +78,7 @@ class Draft(Screen, HelperDraft):
if self.queryreturn: if self.queryreturn:
self.ids.tag_label.text = 'Draft' self.ids.tag_label.text = 'Draft'
self.set_draftCnt(state.draft_count) self.set_draftCnt(self.kivy_state.draft_count)
self.set_mdList() self.set_mdList()
self.ids.scroll_y.bind(scroll_y=self.check_scroll_y) self.ids.scroll_y.bind(scroll_y=self.check_scroll_y)
else: else:
@ -139,8 +143,8 @@ class Draft(Screen, HelperDraft):
if instance.state == 'closed': if instance.state == 'closed':
instance.ids.delete_msg.disabled = True instance.ids.delete_msg.disabled = True
if instance.open_progress == 0.0: if instance.open_progress == 0.0:
state.detailPageType = 'draft' self.kivy_state.detailPageType = 'draft'
state.mail_id = ackdata self.kivy_state.mail_id = ackdata
if self.manager: if self.manager:
src_mng_obj = self.manager src_mng_obj = self.manager
else: else:
@ -154,10 +158,10 @@ class Draft(Screen, HelperDraft):
def delete_draft(self, data_index, instance, *args): def delete_draft(self, data_index, instance, *args):
"""Delete draft message permanently""" """Delete draft message permanently"""
helper_sent.delete(data_index) helper_sent.delete(data_index)
if int(state.draft_count) > 0: if int(self.kivy_state.draft_count) > 0:
state.draft_count = str(int(state.draft_count) - 1) self.kivy_state.draft_count = str(int(self.kivy_state.draft_count) - 1)
self.set_draftCnt(state.draft_count) self.set_draftCnt(self.kivy_state.draft_count)
if int(state.draft_count) <= 0: if int(self.kivy_state.draft_count) <= 0:
# self.ids.identi_tag.children[0].text = '' # self.ids.identi_tag.children[0].text = ''
self.ids.tag_label.text = '' self.ids.tag_label.text = ''
self.ids.ml.remove_widget(instance.parent.parent) self.ids.ml.remove_widget(instance.parent.parent)
@ -199,9 +203,10 @@ class Draft(Screen, HelperDraft):
'draft', 'draft',
encoding, encoding,
BMConfigParser().safeGetInt('bitmessagesettings', 'ttl')) BMConfigParser().safeGetInt('bitmessagesettings', 'ttl'))
state.msg_counter_objs = src_object.children[2].children[0].ids
state.draft_count = str(int(state.draft_count) + 1) \ # state.msg_counter_objs = src_object.children[2].children[0].ids
if state.association == fromAddress else state.draft_count Draft().kivy_state.draft_count = str(int(Draft().kivy_state.draft_count) + 1) \
if state.association == fromAddress else Draft().kivy_state.draft_count
src_object.ids.sc16.clear_widgets() src_object.ids.sc16.clear_widgets()
src_object.ids.sc16.add_widget(Draft()) src_object.ids.sc16.add_widget(Draft())
toast('Save draft') toast('Save draft')