navjotcis
GitHub
commit
33cc400219
|
|
@ -1,42 +1,18 @@
|
|||
|
||||
#:import Toolbar kivymd.toolbar.Toolbar
|
||||
#:import ThemeManager kivymd.theming.ThemeManager
|
||||
#:import MDNavigationDrawer kivymd.navigationdrawer.MDNavigationDrawer
|
||||
#:import NavigationLayout kivymd.navigationdrawer.NavigationLayout
|
||||
#:import NavigationDrawerDivider kivymd.navigationdrawer.NavigationDrawerDivider
|
||||
#:import NavigationDrawerToolbar kivymd.navigationdrawer.NavigationDrawerToolbar
|
||||
#:import NavigationDrawerSubheader kivymd.navigationdrawer.NavigationDrawerSubheader
|
||||
#:import MDCheckbox kivymd.selectioncontrols.MDCheckbox
|
||||
#:import MDSwitch kivymd.selectioncontrols.MDSwitch
|
||||
#:import MDList kivymd.list.MDList
|
||||
#:import OneLineListItem kivymd.list.OneLineListItem
|
||||
#:import TwoLineListItem kivymd.list.TwoLineListItem
|
||||
#:import ThreeLineListItem kivymd.list.ThreeLineListItem
|
||||
#:import OneLineAvatarListItem kivymd.list.OneLineAvatarListItem
|
||||
#:import OneLineIconListItem kivymd.list.OneLineIconListItem
|
||||
#:import OneLineAvatarIconListItem kivymd.list.OneLineAvatarIconListItem
|
||||
#:import MDTextField kivymd.textfields.MDTextField
|
||||
#:import MDSpinner kivymd.spinner.MDSpinner
|
||||
#:import MDCard kivymd.card.MDCard
|
||||
#:import MDSeparator kivymd.card.MDSeparator
|
||||
#:import MDDropdownMenu kivymd.menu.MDDropdownMenu
|
||||
#:import get_color_from_hex kivy.utils.get_color_from_hex
|
||||
#:import colors kivymd.color_definitions.colors
|
||||
#:import SmartTile kivymd.grid.SmartTile
|
||||
#:import MDSlider kivymd.slider.MDSlider
|
||||
#:import MDTabbedPanel kivymd.tabs.MDTabbedPanel
|
||||
#:import MDTab kivymd.tabs.MDTab
|
||||
#:import MDProgressBar kivymd.progressbar.MDProgressBar
|
||||
#:import MDAccordion kivymd.accordion.MDAccordion
|
||||
#:import MDAccordionItem kivymd.accordion.MDAccordionItem
|
||||
#:import MDAccordionSubItem kivymd.accordion.MDAccordionSubItem
|
||||
#:import MDThemePicker kivymd.theme_picker.MDThemePicker
|
||||
#:import MDBottomNavigation kivymd.tabs.MDBottomNavigation
|
||||
#:import MDBottomNavigationItem kivymd.tabs.MDBottomNavigationItem
|
||||
#:import MDFloatingActionButton kivymd.button.MDFloatingActionButton
|
||||
#:import Factory kivy.factory.Factory
|
||||
#:import MDTextButton kivymd.button.MDTextButton
|
||||
#:import FadeTransition kivy.uix.screenmanager.FadeTransition
|
||||
#:import MDScrollViewRefreshLayout kivymd.refreshlayout.MDScrollViewRefreshLayout
|
||||
|
||||
#:set color_button (0.784, 0.443, 0.216, 1) # brown
|
||||
|
|
@ -55,8 +31,7 @@
|
|||
<ContentNavigationDrawer@Navigatorss>:
|
||||
drawer_logo: app.address_identicon()
|
||||
NavigationDrawerDivider:
|
||||
|
||||
NavigationDrawerTwoLineListItem:
|
||||
NavigationDrawerSubheader:
|
||||
text: "Accounts"
|
||||
NavigationDrawerIconButton:
|
||||
CustomSpinner:
|
||||
|
|
@ -143,7 +118,7 @@
|
|||
on_press: app.refreshScreen(self)
|
||||
NavigationDrawerIconButton:
|
||||
text: "Subscriptions/Payment"
|
||||
icon:'wallet'
|
||||
icon:'bell'
|
||||
on_release: app.root.ids.scr_mngr.current = 'payment'
|
||||
on_press: app.refreshScreen(self)
|
||||
NavigationDrawerIconButton:
|
||||
|
|
@ -417,17 +392,6 @@ NavigationLayout:
|
|||
helper_text_mode: "on_error"
|
||||
BoxLayout:
|
||||
spacing:50
|
||||
AnchorLayout:
|
||||
MDRaisedButton:
|
||||
size_hint: 1, None
|
||||
height: dp(40)
|
||||
on_press: root.reset_composer()
|
||||
MDLabel:
|
||||
font_style: 'Title'
|
||||
text: 'reset'
|
||||
font_size: '13sp'
|
||||
color: (1,1,1,1)
|
||||
halign: 'center'
|
||||
|
||||
<MyTextInput>:
|
||||
readonly: False
|
||||
|
|
|
|||
|
|
@ -61,9 +61,8 @@ import identiconGeneration
|
|||
|
||||
def toast(text):
|
||||
"""Method will display the toast message."""
|
||||
if platform == 'linux':
|
||||
from kivymd.toast.kivytoast import toast # pylint: disable=redefined-outer-name
|
||||
toast(text)
|
||||
from kivymd.toast.kivytoast import toast # pylint: disable=redefined-outer-name
|
||||
toast(text)
|
||||
return
|
||||
|
||||
|
||||
|
|
@ -379,8 +378,9 @@ class AddressBook(Screen):
|
|||
@staticmethod
|
||||
def refreshs(*args):
|
||||
"""Refresh the Widget."""
|
||||
state.navinstance.ids.sc11.ids.ml.clear_widgets()
|
||||
state.navinstance.ids.sc11.loadAddresslist(None, 'All', '')
|
||||
# state.navinstance.ids.sc11.ids.ml.clear_widgets()
|
||||
# state.navinstance.ids.sc11.loadAddresslist(None, 'All', '')
|
||||
pass
|
||||
|
||||
@staticmethod
|
||||
def addBook_detail(address, label, *args):
|
||||
|
|
@ -558,6 +558,7 @@ class DropDownWidget(BoxLayout):
|
|||
self.ids.txt_input.text = ''
|
||||
self.ids.subject.text = ''
|
||||
self.ids.body.text = ''
|
||||
toast("Reset message")
|
||||
|
||||
def auto_fill_fromaddr(self):
|
||||
"""Mehtod used to fill the text automatically From Address."""
|
||||
|
|
@ -694,6 +695,7 @@ class Random(Screen):
|
|||
self.parent.parent.parent.parent.ids.toolbar.opacity = 1
|
||||
self.parent.parent.parent.parent.ids.toolbar.disabled = False
|
||||
self.parent.parent.parent.parent.ids.sc10.ids.ml.clear_widgets()
|
||||
self.manager.current = 'myaddress'
|
||||
self.parent.parent.parent.parent.ids.sc10.init_ui()
|
||||
self.manager.current = 'myaddress'
|
||||
toast('New address created')
|
||||
|
|
@ -1094,7 +1096,7 @@ class NavigateApp(App): # pylint: disable=too-many-public-methods
|
|||
"""Getting default image on address"""
|
||||
if BMConfigParser().addresses():
|
||||
return './images/default_identicon/{}.png'.format(BMConfigParser().addresses()[0])
|
||||
return ''
|
||||
return './images/no_identicons.png'
|
||||
|
||||
@staticmethod
|
||||
def addressexist():
|
||||
|
|
@ -1158,6 +1160,7 @@ class NavigateApp(App): # pylint: disable=too-many-public-methods
|
|||
self.root.ids.toolbar.left_action_items = [
|
||||
['arrow-left', lambda x: self.back_press()]]
|
||||
self.root.ids.toolbar.right_action_items = [
|
||||
['refresh', lambda x: self.root.ids.sc3.children[0].reset_composer()],
|
||||
['send', lambda x: self.root.ids.sc3.children[0].send(self)]]
|
||||
|
||||
def back_press(self):
|
||||
|
|
@ -1167,7 +1170,9 @@ class NavigateApp(App): # pylint: disable=too-many-public-methods
|
|||
self.root.ids.toolbar.left_action_items = \
|
||||
[['menu', lambda x: self.root.toggle_nav_drawer()]]
|
||||
self.root.ids.scr_mngr.current = 'inbox' \
|
||||
if state.in_composer else 'allmails' if state.is_allmail else state.detailPageType
|
||||
if state.in_composer else 'allmails'\
|
||||
if state.is_allmail else state.detailPageType\
|
||||
if state.detailPageType else 'inbox'
|
||||
self.root.ids.scr_mngr.transition.direction = 'right'
|
||||
self.root.ids.scr_mngr.transition.bind(on_complete=self.reset)
|
||||
if state.is_allmail or state.detailPageType == 'draft':
|
||||
|
|
@ -1299,10 +1304,12 @@ class GrashofPopup(Popup):
|
|||
stored_address = [addr[1] for addr in kivy_helper_search.search_sql(
|
||||
folder="addressbook")]
|
||||
if label and address and address not in stored_address:
|
||||
state.navinstance = self.parent.children[1]
|
||||
# state.navinstance = self.parent.children[1]
|
||||
queues.UISignalQueue.put(('rerenderAddressBook', ''))
|
||||
self.dismiss()
|
||||
sqlExecute("INSERT INTO addressbook VALUES(?,?)", label, address)
|
||||
state.kivyapp.root.ids.sc11.ids.ml.clear_widgets()
|
||||
state.kivyapp.root.ids.sc11.loadAddresslist(None, 'All', '')
|
||||
self.parent.children[1].ids.scr_mngr.current = 'addressbook'
|
||||
toast('Saved')
|
||||
|
||||
|
|
@ -1463,6 +1470,8 @@ class MailDetail(Screen):
|
|||
sqlExecute(
|
||||
"UPDATE inbox SET folder = 'trash' WHERE \
|
||||
msgid = ?;", str(state.mail_id))
|
||||
msg_count_objs.inbox_cnt.badge_text = str(int(state.inbox_count) - 1)
|
||||
state.inbox_count = str(int(state.inbox_count) - 1)
|
||||
self.parent.screens[0].ids.ml.clear_widgets()
|
||||
self.parent.screens[0].loadMessagelist(state.association)
|
||||
elif state.detailPageType == 'draft':
|
||||
|
|
@ -1591,7 +1600,7 @@ class AddbookDetailPopup(Popup):
|
|||
window_obj = self.parent.children[1].ids
|
||||
window_obj.sc3.children[0].ids.txt_input.text = self.address
|
||||
window_obj.sc3.children[0].ids.ti.text = ''
|
||||
window_obj.sc3.children[0].ids.btn.text = ''
|
||||
window_obj.sc3.children[0].ids.btn.text = 'Select'
|
||||
window_obj.sc3.children[0].ids.subject.text = ''
|
||||
window_obj.sc3.children[0].ids.body.text = ''
|
||||
window_obj.scr_mngr.current = 'create'
|
||||
|
|
@ -1809,16 +1818,11 @@ class Allmails(Screen):
|
|||
|
||||
def loadMessagelist(self, account, where="", what=""):
|
||||
"""Load Inbox, Sent anf Draft list of messages."""
|
||||
inbox = sqlQuery(
|
||||
"SELECT toaddress, fromaddress, subject, message, folder, msgid from\
|
||||
inbox WHERE folder = 'inbox' and toaddress = '{}';".format(
|
||||
account))
|
||||
sent_and_draft = sqlQuery(
|
||||
"SELECT toaddress, fromaddress, subject, message, folder, ackdata from sent \
|
||||
WHERE folder = 'sent' and fromaddress = '{}';".format(
|
||||
account))
|
||||
|
||||
all_mails = inbox + sent_and_draft
|
||||
all_mails = sqlQuery(
|
||||
"SELECT toaddress, fromaddress, subject, message, folder, ackdata As id, DATE(lastactiontime)"
|
||||
" As actionTime FROM sent WHERE folder = 'sent' UNION"
|
||||
" SELECT toaddress, fromaddress, subject, message, folder, msgid As id, DATE(received) As"
|
||||
" actionTime FROM inbox WHERE folder = 'inbox' ORDER BY actionTime DESC")
|
||||
if all_mails:
|
||||
state.kivyapp.root.children[2].children[0].ids.allmail_cnt.badge_text = str(len(all_mails))
|
||||
state.all_count = str(len(all_mails))
|
||||
|
|
|
|||
|
|
@ -16,8 +16,9 @@ class UIkivySignaler(Thread):
|
|||
if command == 'writeNewAddressToTable':
|
||||
label, address, streamNumber = data
|
||||
state.kivyapp.variable_1.append(address)
|
||||
elif command == 'rerenderAddressBook':
|
||||
state.kivyapp.obj_1.refreshs()
|
||||
# elif command == 'rerenderAddressBook':
|
||||
# state.kivyapp.obj_1.refreshs()
|
||||
# Need to discuss this
|
||||
elif command == 'updateSentItemStatusByAckdata':
|
||||
state.kivyapp.status_dispatching(data)
|
||||
|
||||
|
|
|
|||
Reference in New Issue
Block a user