From 67b6fd4178fb64ea2e8b9374e5f10668406b4c81 Mon Sep 17 00:00:00 2001 From: osamacis Date: Wed, 16 Nov 2022 18:17:05 +0530 Subject: [PATCH] Update id sc3 to ic_create and sc4 to id_sent --- src/bitmessagekivy/baseclass/addressbook_widgets.py | 12 ++++++------ src/bitmessagekivy/baseclass/login.py | 2 ++ src/bitmessagekivy/baseclass/maildetail.py | 4 ++-- src/bitmessagekivy/baseclass/myaddress.py | 2 +- src/bitmessagekivy/baseclass/popup.py | 10 +++++----- 5 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/bitmessagekivy/baseclass/addressbook_widgets.py b/src/bitmessagekivy/baseclass/addressbook_widgets.py index bd844d6d..73cc8828 100644 --- a/src/bitmessagekivy/baseclass/addressbook_widgets.py +++ b/src/bitmessagekivy/baseclass/addressbook_widgets.py @@ -40,11 +40,11 @@ class HelperAddressBook(object): """This UI independent method for message sending to reciever""" window_obj = App.get_runnint_app().root.ids if to_addr: - window_obj.sc3.children[1].ids.txt_input.text = to_addr + window_obj.id_create.children[1].ids.txt_input.text = to_addr if from_addr: - window_obj.sc3.children[1].ids.txt_input.text = from_addr - window_obj.sc3.children[1].ids.ti.text = '' - window_obj.sc3.children[1].ids.btn.text = 'Select' - window_obj.sc3.children[1].ids.subject.text = '' - window_obj.sc3.children[1].ids.body.text = '' + window_obj.id_create.children[1].ids.txt_input.text = from_addr + window_obj.id_create.children[1].ids.ti.text = '' + window_obj.id_create.children[1].ids.btn.text = 'Select' + window_obj.id_create.children[1].ids.subject.text = '' + window_obj.id_create.children[1].ids.body.text = '' window_obj.scr_mngr.current = 'create' diff --git a/src/bitmessagekivy/baseclass/login.py b/src/bitmessagekivy/baseclass/login.py index 09428d2f..e1c948bc 100644 --- a/src/bitmessagekivy/baseclass/login.py +++ b/src/bitmessagekivy/baseclass/login.py @@ -74,6 +74,8 @@ class Random(Screen): if config.getboolean(str(addr), 'enabled')] self.manager.parent.ids.content_drawer.ids.identity_dropdown.values = [] self.manager.parent.ids.content_drawer.ids.identity_dropdown.values = addresses + self.manager.parent.ids.id_create.children[1].ids.btn.values = [] + self.manager.parent.ids.id_create.children[1].ids.btn.values = addresses @staticmethod def add_validation(instance): diff --git a/src/bitmessagekivy/baseclass/maildetail.py b/src/bitmessagekivy/baseclass/maildetail.py index 23f50f3e..a1804c20 100644 --- a/src/bitmessagekivy/baseclass/maildetail.py +++ b/src/bitmessagekivy/baseclass/maildetail.py @@ -217,14 +217,14 @@ class MailDetail(Screen): # pylint: disable=too-many-instance-attributes self.kivy_state.in_composer = True data = retrieve_message_details(self.kivy_state.mail_id) self.get_message_details_to_reply(data) - App.get_running_app().root.ids.sc3.children[1].ids.rv.data = '' + App.get_running_app().root.ids.id_create.children[1].ids.rv.data = '' self.parent.current = 'create' App.get_running_app().set_navbar_for_composer() def get_message_details_for_draft_reply(self, data): """Getting and setting message details fill into fields when draft reply""" composer_ids = ( - self.parent.parent.ids.sc3.children[1].ids) + self.parent.parent.ids.id_create.children[1].ids) composer_ids.ti.text = data[0][1] composer_ids.btn.text = data[0][1] composer_ids.txt_input.text = data[0][0] diff --git a/src/bitmessagekivy/baseclass/myaddress.py b/src/bitmessagekivy/baseclass/myaddress.py index 13a68272..5c90121f 100644 --- a/src/bitmessagekivy/baseclass/myaddress.py +++ b/src/bitmessagekivy/baseclass/myaddress.py @@ -220,7 +220,7 @@ class MyAddress(Screen, HelperMyAddress): addresses = [addr for addr in config.addresses() if config.getboolean(str(addr), 'enabled')] self.parent.parent.ids.content_drawer.ids.identity_dropdown.values = addresses - # self.parent.parent.ids.sc3.children[1].ids.btn.values = addresses + self.parent.parent.ids.id_create.children[1].ids.btn.values = addresses self.kivy_running_app.identity_list = addresses def toggleAction(self, instance): diff --git a/src/bitmessagekivy/baseclass/popup.py b/src/bitmessagekivy/baseclass/popup.py index c6a33056..2425684b 100644 --- a/src/bitmessagekivy/baseclass/popup.py +++ b/src/bitmessagekivy/baseclass/popup.py @@ -152,11 +152,11 @@ class MyaddDetailPopup(BoxLayout): """Method used to fill from address of composer autofield""" App.get_running_app().set_navbar_for_composer() window_obj = App.get_running_app().root.ids - window_obj.sc3.children[1].ids.ti.text = self.address - window_obj.sc3.children[1].ids.btn.text = self.address - window_obj.sc3.children[1].ids.txt_input.text = '' - window_obj.sc3.children[1].ids.subject.text = '' - window_obj.sc3.children[1].ids.body.text = '' + window_obj.id_create.children[1].ids.ti.text = self.address + window_obj.id_create.children[1].ids.btn.text = self.address + window_obj.id_create.children[1].ids.txt_input.text = '' + window_obj.id_create.children[1].ids.subject.text = '' + window_obj.id_create.children[1].ids.body.text = '' window_obj.scr_mngr.current = 'create' self.parent.parent.parent.dismiss()