some ui fixes. todo added
This commit is contained in:
parent
f3ae1dd7ca
commit
7329f5f46c
3 changed files with 19 additions and 4 deletions
|
@ -368,9 +368,7 @@ class MainWindow(QtGui.QMainWindow):
|
||||||
|
|
||||||
def send_message(self):
|
def send_message(self):
|
||||||
text = self.messageEdit.toPlainText()
|
text = self.messageEdit.toPlainText()
|
||||||
if self.profile.isActiveOnline() and text:
|
if self.profile.sendMessage(text):
|
||||||
num = self.profile.getActiveNumber()
|
|
||||||
self.tox.friend_send_message(num, TOX_MESSAGE_TYPE['NORMAL'], text)
|
|
||||||
self.messageEdit.clear()
|
self.messageEdit.clear()
|
||||||
|
|
||||||
# -----------------------------------------------------------------------------------------------------------------
|
# -----------------------------------------------------------------------------------------------------------------
|
||||||
|
|
|
@ -120,6 +120,7 @@ class Profile(Contact):
|
||||||
Profile of current toxygen user. Contains friends list, tox instance
|
Profile of current toxygen user. Contains friends list, tox instance
|
||||||
"""
|
"""
|
||||||
# TODO: add slices
|
# TODO: add slices
|
||||||
|
# TODO: add unicode support
|
||||||
def __init__(self, tox, widgets, widget, messages_list):
|
def __init__(self, tox, widgets, widget, messages_list):
|
||||||
self._widget = widget
|
self._widget = widget
|
||||||
self._messages = messages_list
|
self._messages = messages_list
|
||||||
|
@ -165,6 +166,7 @@ class Profile(Contact):
|
||||||
return status is not None
|
return status is not None
|
||||||
|
|
||||||
def newMessage(self, id, message_type, message):
|
def newMessage(self, id, message_type, message):
|
||||||
|
# TODO: add support of action (/me) messages
|
||||||
if id == self._active_friend: # add message to list
|
if id == self._active_friend: # add message to list
|
||||||
user_name = Profile.getInstance().getActiveName()
|
user_name = Profile.getInstance().getActiveName()
|
||||||
item = mainscreen.MessageItem(message, curr_time(), user_name)
|
item = mainscreen.MessageItem(message, curr_time(), user_name)
|
||||||
|
@ -173,11 +175,26 @@ class Profile(Contact):
|
||||||
elem.setSizeHint(QtCore.QSize(500, 100))
|
elem.setSizeHint(QtCore.QSize(500, 100))
|
||||||
self._messages.addItem(elem)
|
self._messages.addItem(elem)
|
||||||
self._messages.setItemWidget(elem, item)
|
self._messages.setItemWidget(elem, item)
|
||||||
|
self._messages.scrollToBottom()
|
||||||
self._messages.repaint()
|
self._messages.repaint()
|
||||||
else:
|
else:
|
||||||
friend = filter(lambda x: x.getNumber() == id, self.friends)[0]
|
friend = filter(lambda x: x.getNumber() == id, self.friends)[0]
|
||||||
friend.setMessages(True)
|
friend.setMessages(True)
|
||||||
|
|
||||||
|
def sendMessage(self, text):
|
||||||
|
if self.isActiveOnline() and text:
|
||||||
|
self.tox.friend_send_message(self._active_friend, TOX_MESSAGE_TYPE['NORMAL'], text)
|
||||||
|
item = mainscreen.MessageItem(text, curr_time(), self._name)
|
||||||
|
elem = QtGui.QListWidgetItem(self._messages)
|
||||||
|
elem.setSizeHint(QtCore.QSize(500, 100))
|
||||||
|
self._messages.addItem(elem)
|
||||||
|
self._messages.setItemWidget(elem, item)
|
||||||
|
self._messages.scrollToBottom()
|
||||||
|
self._messages.repaint()
|
||||||
|
return True
|
||||||
|
else:
|
||||||
|
return False
|
||||||
|
|
||||||
def changeStatus(self):
|
def changeStatus(self):
|
||||||
if self._status is not None:
|
if self._status is not None:
|
||||||
self._status += 1
|
self._status += 1
|
||||||
|
|
|
@ -14,7 +14,7 @@ def curr_directory():
|
||||||
|
|
||||||
|
|
||||||
def curr_time():
|
def curr_time():
|
||||||
return time.strftime("%H:%M:")
|
return time.strftime("%H:%M")
|
||||||
|
|
||||||
|
|
||||||
class Singleton(object):
|
class Singleton(object):
|
||||||
|
|
Loading…
Reference in a new issue