Skip to content

Commit 3b23977

Browse files
committed
Rename btn to composer_dropwdown
1 parent 929d9af commit 3b23977

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

src/bitmessagekivy/baseclass/addressbook_widgets.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def compose_message(from_addr=None, to_addr=None):
4444
if from_addr:
4545
window_obj.id_create.children[1].ids.txt_input.text = from_addr
4646
window_obj.id_create.children[1].ids.ti.text = ''
47-
window_obj.id_create.children[1].ids.btn.text = 'Select'
47+
window_obj.id_create.children[1].ids.composer_dropdown.text = 'Select'
4848
window_obj.id_create.children[1].ids.subject.text = ''
4949
window_obj.id_create.children[1].ids.body.text = ''
5050
window_obj.scr_mngr.current = 'create'

src/bitmessagekivy/baseclass/login.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,8 +74,8 @@ def reset_address_spinner(self):
7474
if config.getboolean(str(addr), 'enabled')]
7575
self.manager.parent.ids.content_drawer.ids.identity_dropdown.values = []
7676
self.manager.parent.ids.content_drawer.ids.identity_dropdown.values = addresses
77-
self.manager.parent.ids.id_create.children[1].ids.btn.values = []
78-
self.manager.parent.ids.id_create.children[1].ids.btn.values = addresses
77+
self.manager.parent.ids.id_create.children[1].ids.composer_dropdown.values = []
78+
self.manager.parent.ids.id_create.children[1].ids.composer_dropdown.values = addresses
7979

8080
@staticmethod
8181
def add_validation(instance):

src/bitmessagekivy/baseclass/maildetail.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def get_message_details_to_reply(self, data):
193193
message_time = '\n\n --------------On '
194194
composer_obj = self.parent.screens[1].children[1].ids
195195
composer_obj.ti.text = data[0][0]
196-
composer_obj.btn.text = data[0][0]
196+
composer_obj.composer_dropdown.text = data[0][0]
197197
composer_obj.txt_input.text = data[0][1]
198198
split_subject = data[0][2].split('Re:', 1)
199199
composer_obj.subject.text = 'Re: ' + (split_subject[1] if len(split_subject) > 1 else split_subject[0])

src/bitmessagekivy/baseclass/msg_composer.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,8 @@ def __init__(self, **kwargs):
4848

4949
def check_scroll_y(self, instance, somethingelse): # pylint: disable=unused-argument
5050
"""show data on scroll down"""
51-
if self.children[1].ids.btn.is_open:
52-
self.children[1].ids.btn.is_open = False
51+
if self.children[1].ids.composer_dropdown.is_open:
52+
self.children[1].ids.composer_dropdown.is_open = False
5353

5454

5555
class RV(RecycleView):
@@ -91,15 +91,15 @@ def callback_for_msgsend(dt=0): # pylint: disable=unused-argument
9191
def reset_composer(self):
9292
"""Method will reset composer"""
9393
self.ids.ti.text = ""
94-
self.ids.btn.text = "Select"
94+
self.ids.composer_dropdown.text = "Select"
9595
self.ids.txt_input.text = ""
9696
self.ids.subject.text = ""
9797
self.ids.body.text = ""
9898
toast("Reset message")
9999

100100
def auto_fill_fromaddr(self):
101101
"""Fill the text automatically From Address"""
102-
self.ids.ti.text = self.ids.btn.text
102+
self.ids.ti.text = self.ids.composer_dropdown.text
103103
self.ids.ti.focus = True
104104

105105
def is_camara_attached(self):

src/bitmessagekivy/baseclass/myaddress.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def address_permision_callback(self, dt=0):
220220
addresses = [addr for addr in config.addresses()
221221
if config.getboolean(str(addr), 'enabled')]
222222
self.parent.parent.ids.content_drawer.ids.identity_dropdown.values = addresses
223-
self.parent.parent.ids.id_create.children[1].ids.btn.values = addresses
223+
self.parent.parent.ids.id_create.children[1].ids.composer_dropdown.values = addresses
224224
self.kivy_running_app.identity_list = addresses
225225

226226
def toggleAction(self, instance):

src/bitmessagekivy/baseclass/popup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def send_message_from(self):
153153
App.get_running_app().set_navbar_for_composer()
154154
window_obj = App.get_running_app().root.ids
155155
window_obj.id_create.children[1].ids.ti.text = self.address
156-
window_obj.id_create.children[1].ids.btn.text = self.address
156+
window_obj.id_create.children[1].ids.composer_dropdown.text = self.address
157157
window_obj.id_create.children[1].ids.txt_input.text = ''
158158
window_obj.id_create.children[1].ids.subject.text = ''
159159
window_obj.id_create.children[1].ids.body.text = ''

src/bitmessagekivy/kv/msg_composer.kv

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
size_hint_y: None
3636
height: dp(40)
3737
IdentitySpinner:
38-
id: btn
38+
id: composer_dropdown
3939
background_color: app.theme_cls.primary_dark
4040
values: app.identity_list
4141
on_text: root.auto_fill_fromaddr() if self.text != 'Select' else ''

0 commit comments

Comments
 (0)