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

Merge pull request #19 from cis-navjot-g/newwork

Browse Source 
fixed issues
This commit is contained in:
cis-navjot-g 2019-08-23 16:12:21 +05:30 committed by GitHub
commit 5829ab653c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/bitmessagekivy/main.kv
View File

@ -828,7 +828,7 @@ NavigationLayout:
MDRaisedButton: MDRaisedButton:
size_hint: 1, None size_hint: 1, None
height: dp(40) height: dp(40)
on_press: root.inbox_reply() if root.page_type == 'inbox' else root.copy_sent_mail() if root.page_type == 'sent' else root.write_msg() on_press: root.inbox_reply() if root.page_type == 'inbox' else root.copy_sent_mail() if root.page_type == 'sent' else root.write_msg(app)
MDLabel: MDLabel:
font_style: 'Title' font_style: 'Title'
text: 'Reply' if root.page_type == 'inbox' else 'Copy' if root.page_type == 'sent' else 'Write' text: 'Reply' if root.page_type == 'inbox' else 'Copy' if root.page_type == 'sent' else 'Write'

8
src/bitmessagekivy/mpybit.py
View File

@ -494,7 +494,8 @@ class DropDownWidget(BoxLayout):
state.send_draft_mail)) state.send_draft_mail))
self.parent.parent.screens[15].clear_widgets() self.parent.parent.screens[15].clear_widgets()
self.parent.parent.screens[15].add_widget(Draft()) self.parent.parent.screens[15].add_widget(Draft())
state.detailPageType = 'draft' state.detailPageType = ''
state.send_draft_mail = None
else: else:
from addresses import addBMIfNotPresent from addresses import addBMIfNotPresent
toAddress = addBMIfNotPresent(toAddress) toAddress = addBMIfNotPresent(toAddress)
@ -1139,6 +1140,7 @@ class NavigateApp(App):
composer_obj.btn.text = 'Select' composer_obj.btn.text = 'Select'
composer_obj.txt_input.text = '' composer_obj.txt_input.text = ''
composer_obj.subject.text = '' composer_obj.subject.text = ''
composer_obj.body.text = ''
def back_press(self): def back_press(self):
"""Method used for going back from composer to previous page.""" """Method used for going back from composer to previous page."""
@ -1150,6 +1152,7 @@ class NavigateApp(App):
self.root.ids.scr_mngr.transition.direction = 'right' self.root.ids.scr_mngr.transition.direction = 'right'
self.root.ids.scr_mngr.transition.bind(on_complete=self.reset) self.root.ids.scr_mngr.transition.bind(on_complete=self.reset)
self.add_search_bar() self.add_search_bar()
state.detailPageType = ''
@staticmethod @staticmethod
def on_stop(): def on_stop():
@ -1457,7 +1460,7 @@ class MailDetail(Screen):
"""Method used for copying sent mail to the composer.""" """Method used for copying sent mail to the composer."""
pass pass
def write_msg(self): def write_msg(self, navApp):
"""Method used to write on draft mail.""" """Method used to write on draft mail."""
state.send_draft_mail = state.sentMailTime state.send_draft_mail = state.sentMailTime
composer_ids = \ composer_ids = \
@ -1469,6 +1472,7 @@ class MailDetail(Screen):
if self.subject == '(no subject)' else self.subject.lower() if self.subject == '(no subject)' else self.subject.lower()
composer_ids.body.text = self.message composer_ids.body.text = self.message
self.parent.parent.current = 'create' self.parent.parent.current = 'create'
navApp.clear_composer()
class MyaddDetailPopup(Popup): class MyaddDetailPopup(Popup):