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

Fix import from common_mail_detail file

Browse Source
This commit is contained in:
shekhar-cis 2022-07-11 20:10:01 +05:30
parent 12675ceefb
commit ac0546c4f9
Signed by untrusted user: shekhar-cis
GPG Key ID: F4F00AB04E83F9A7
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bitmessagekivy/baseclass/allmail.py
View File

@ -14,8 +14,10 @@ import state
from bitmessagekivy.baseclass.common import ( from bitmessagekivy.baseclass.common import (
showLimitedCnt, toast, ThemeClsColor, showLimitedCnt, toast, ThemeClsColor,
avatarImageFirstLetter, CutsomSwipeToDeleteItem, avatarImageFirstLetter, CutsomSwipeToDeleteItem,
ShowTimeHistoy, mail_detail_screen ShowTimeHistoy
) )
from bitmessagekivy.baseclass.common_mail_detail import mail_detail_screen
from bitmessagekivy.baseclass.maildetail import MailDetail from bitmessagekivy.baseclass.maildetail import MailDetail
# from bitmessagekivy.baseclass.trash import Trash # from bitmessagekivy.baseclass.trash import Trash

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

@ -25,10 +25,10 @@ from bitmessagekivy import kivy_helper_search
from bitmessagekivy.baseclass.common import ( 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,
mail_detail_screen
) )
from kivy.app import App from kivy.app import App
from bitmessagekivy.baseclass.common_mail_detail import mail_detail_screen
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

8
src/bitmessagekivy/baseclass/trash.py
View File

@ -66,13 +66,13 @@ class Trash(Screen):
"SELECT toaddress, fromaddress, subject, message," "SELECT toaddress, fromaddress, subject, message,"
" folder ||',' || 'sent' as folder, ackdata As" " folder ||',' || 'sent' as folder, ackdata As"
" id, DATE(senttime) As actionTime, senttime as msgtime FROM sent" " id, DATE(senttime) As actionTime, senttime as msgtime FROM sent"
" WHERE folder = 'trash' and fromaddress = '{0}' UNION" " WHERE folder = 'trash' and fromaddress = ? UNION"
" SELECT toaddress, fromaddress, subject, message," " SELECT toaddress, fromaddress, subject, message,"
" folder ||',' || 'inbox' as folder, msgid As id," " folder ||',' || 'inbox' as folder, msgid As id,"
" DATE(received) As actionTime, received as msgtime FROM inbox" " DATE(received) As actionTime, received as msgtime FROM inbox"
" WHERE folder = 'trash' and toaddress = '{0}'" " WHERE folder = 'trash' and toaddress = ?"
" ORDER BY actionTime DESC limit {1}, {2}".format( " ORDER BY actionTime DESC limit ?, ?",
state.association, start_indx, end_indx)) state.association, state.association, start_indx, end_indx)
def set_TrashCnt(self, Count): # pylint: disable=no-self-use def set_TrashCnt(self, Count): # pylint: disable=no-self-use
"""This method is used to set trash message count""" """This method is used to set trash message count"""