big update: ui now show all info about user's profile. callbacks update. singleton added
This commit is contained in:
parent
4d4c0cb56a
commit
92635a7c89
6 changed files with 73 additions and 31 deletions
|
@ -1,4 +1,5 @@
|
||||||
from PySide import QtCore
|
from PySide import QtCore
|
||||||
|
from toxcore_enums_and_consts import TOX_USER_CONNECTION_STATUS, TOX_CONNECTION
|
||||||
# TODO: add all callbacks (replace test callbacks and use wrappers)
|
# TODO: add all callbacks (replace test callbacks and use wrappers)
|
||||||
|
|
||||||
|
|
||||||
|
@ -29,10 +30,13 @@ def repaint_widget(widget):
|
||||||
return widget.repaint
|
return widget.repaint
|
||||||
|
|
||||||
|
|
||||||
def self_connection_status(st):
|
def self_connection_status(st, tox_link):
|
||||||
def wrapped(tox, connection, user_data):
|
def wrapped(tox, connection, user_data):
|
||||||
print 'Connection status: ', str(connection)
|
print 'Connection status: ', str(connection)
|
||||||
st.status = connection
|
if connection == TOX_CONNECTION['NONE']:
|
||||||
|
st.status = TOX_USER_CONNECTION_STATUS['OFFLINE']
|
||||||
|
else:
|
||||||
|
st.status = int(tox_link.self_get_status())
|
||||||
invoke_in_main_thread(repaint_widget(st))
|
invoke_in_main_thread(repaint_widget(st))
|
||||||
return wrapped
|
return wrapped
|
||||||
|
|
||||||
|
@ -53,4 +57,4 @@ def init_callbacks(tox, window):
|
||||||
"""
|
"""
|
||||||
tox.callback_friend_status(friend_status, 0)
|
tox.callback_friend_status(friend_status, 0)
|
||||||
tox.callback_friend_message(friend_message, 0)
|
tox.callback_friend_message(friend_message, 0)
|
||||||
tox.callback_self_connection_status(self_connection_status(window.connection_status), 0)
|
tox.callback_self_connection_status(self_connection_status(window.connection_status, tox), 0)
|
||||||
|
|
|
@ -68,7 +68,8 @@ def main():
|
||||||
data = Profile.open_profile(path, name)
|
data = Profile.open_profile(path, name)
|
||||||
tox = tox_factory(data, settings)
|
tox = tox_factory(data, settings)
|
||||||
|
|
||||||
ms = MainWindow()
|
ms = MainWindow(tox)
|
||||||
|
ms.setup_info_from_tox()
|
||||||
ms.show()
|
ms.show()
|
||||||
# bootstrap
|
# bootstrap
|
||||||
for data in node_generator():
|
for data in node_generator():
|
||||||
|
|
|
@ -8,25 +8,35 @@ from toxcore_enums_and_consts import *
|
||||||
|
|
||||||
class StatusCircle(QtGui.QWidget):
|
class StatusCircle(QtGui.QWidget):
|
||||||
|
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent):
|
||||||
QtGui.QWidget.__init__(self, parent)
|
QtGui.QWidget.__init__(self, parent)
|
||||||
# setGeometry(x_pos, y_pos, width, height)
|
|
||||||
self.setGeometry(0, 0, 32, 32)
|
self.setGeometry(0, 0, 32, 32)
|
||||||
self.status = 0
|
self.status = TOX_USER_CONNECTION_STATUS['OFFLINE']
|
||||||
|
self.tox = parent.tox
|
||||||
|
|
||||||
|
def mouseClick(self, event):
|
||||||
|
if self.status != TOX_USER_CONNECTION_STATUS['OFFLINE']:
|
||||||
|
self.status += 1
|
||||||
|
self.status %= TOX_USER_CONNECTION_STATUS['OFFLINE']
|
||||||
|
self.tox.self_set_status(self.status)
|
||||||
|
self.repaint()
|
||||||
|
|
||||||
def paintEvent(self, event):
|
def paintEvent(self, event):
|
||||||
paint = QtGui.QPainter()
|
paint = QtGui.QPainter()
|
||||||
paint.begin(self)
|
paint.begin(self)
|
||||||
paint.setRenderHint(QtGui.QPainter.Antialiasing)
|
paint.setRenderHint(QtGui.QPainter.Antialiasing)
|
||||||
# make a white drawing background
|
|
||||||
paint.setBrush(QtCore.Qt.white)
|
paint.setBrush(QtCore.Qt.white)
|
||||||
paint.drawRect(event.rect())
|
paint.drawRect(event.rect())
|
||||||
k = 16
|
k = 16
|
||||||
rad_x = rad_y = 10
|
rad_x = rad_y = 10
|
||||||
if not self.status: # offline
|
if self.status == TOX_USER_CONNECTION_STATUS['OFFLINE']:
|
||||||
color = QtCore.Qt.red
|
color = QtCore.Qt.black
|
||||||
else:
|
elif self.status == TOX_USER_CONNECTION_STATUS['ONLINE']:
|
||||||
color = QtCore.Qt.green
|
color = QtCore.Qt.green
|
||||||
|
elif self.status == TOX_USER_CONNECTION_STATUS['AWAY']:
|
||||||
|
color = QtCore.Qt.yellow
|
||||||
|
else: # self.status == TOX_USER_CONNECTION_STATUS['BUSY']:
|
||||||
|
color = QtCore.Qt.red
|
||||||
|
|
||||||
paint.setPen(color)
|
paint.setPen(color)
|
||||||
center = QtCore.QPoint(k, k)
|
center = QtCore.QPoint(k, k)
|
||||||
|
@ -37,21 +47,23 @@ class StatusCircle(QtGui.QWidget):
|
||||||
|
|
||||||
class MainWindow(QtGui.QMainWindow):
|
class MainWindow(QtGui.QMainWindow):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self, tox):
|
||||||
super(MainWindow, self).__init__()
|
super(MainWindow, self).__init__()
|
||||||
|
self.tox = tox
|
||||||
self.initUI()
|
self.initUI()
|
||||||
|
|
||||||
def setup_menu(self, MainWindow):
|
def setup_menu(self, MainWindow):
|
||||||
self.menubar = QtGui.QMenuBar(MainWindow)
|
self.menubar = QtGui.QMenuBar(MainWindow)
|
||||||
self.menubar.setObjectName("menubar")
|
self.menubar.setObjectName("menubar")
|
||||||
|
self.menubar.setHidden(True)
|
||||||
self.menuProfile = QtGui.QMenu(self.menubar)
|
self.menuProfile = QtGui.QMenu(self.menubar)
|
||||||
self.menuProfile.setObjectName("menuProfile")
|
self.menuProfile.setObjectName("menuProfile")
|
||||||
self.menuSettings = QtGui.QMenu(self.menubar)
|
self.menuSettings = QtGui.QMenu(self.menubar)
|
||||||
self.menuSettings.setObjectName("menuSettings")
|
self.menuSettings.setObjectName("menuSettings")
|
||||||
self.menuAbout = QtGui.QMenu(self.menubar)
|
self.menuAbout = QtGui.QMenu(self.menubar)
|
||||||
self.menuAbout.setObjectName("menuAbout")
|
self.menuAbout.setObjectName("menuAbout")
|
||||||
self.statusbar = QtGui.QStatusBar(MainWindow)
|
#self.statusbar = QtGui.QStatusBar(MainWindow)
|
||||||
self.statusbar.setObjectName("statusbar")
|
#self.statusbar.setObjectName("statusbar")
|
||||||
self.actionAdd_friend = QtGui.QAction(MainWindow)
|
self.actionAdd_friend = QtGui.QAction(MainWindow)
|
||||||
self.actionAdd_friend.setObjectName("actionAdd_friend")
|
self.actionAdd_friend.setObjectName("actionAdd_friend")
|
||||||
self.actionProfile_settings = QtGui.QAction(MainWindow)
|
self.actionProfile_settings = QtGui.QAction(MainWindow)
|
||||||
|
@ -145,30 +157,31 @@ class MainWindow(QtGui.QMainWindow):
|
||||||
self.graphicsView.setMaximumSize(QtCore.QSize(64, 64))
|
self.graphicsView.setMaximumSize(QtCore.QSize(64, 64))
|
||||||
self.graphicsView.setBaseSize(QtCore.QSize(64, 64))
|
self.graphicsView.setBaseSize(QtCore.QSize(64, 64))
|
||||||
self.graphicsView.setObjectName("graphicsView")
|
self.graphicsView.setObjectName("graphicsView")
|
||||||
self.label = QtGui.QLabel(Form)
|
self.name = QtGui.QLabel(Form)
|
||||||
self.label.setGeometry(QtCore.QRect(80, 30, 191, 17))
|
self.name.setGeometry(QtCore.QRect(80, 30, 191, 25))
|
||||||
font = QtGui.QFont()
|
|
||||||
font.setFamily("Times New Roman")
|
|
||||||
font.setPointSize(18)
|
|
||||||
font.setWeight(75)
|
|
||||||
font.setBold(True)
|
|
||||||
self.label.setFont(font)
|
|
||||||
self.label.setObjectName("label")
|
|
||||||
self.label_2 = QtGui.QLabel(Form)
|
|
||||||
self.label_2.setGeometry(QtCore.QRect(80, 60, 191, 17))
|
|
||||||
font = QtGui.QFont()
|
font = QtGui.QFont()
|
||||||
font.setFamily("Times New Roman")
|
font.setFamily("Times New Roman")
|
||||||
font.setPointSize(16)
|
font.setPointSize(16)
|
||||||
font.setWeight(50)
|
#font.setWeight(75)
|
||||||
|
font.setBold(True)
|
||||||
|
self.name.setFont(font)
|
||||||
|
self.name.setObjectName("name")
|
||||||
|
self.status_message = QtGui.QLabel(Form)
|
||||||
|
self.status_message.setGeometry(QtCore.QRect(80, 60, 191, 17))
|
||||||
|
font = QtGui.QFont()
|
||||||
|
font.setFamily("Times New Roman")
|
||||||
|
font.setPointSize(14)
|
||||||
|
#font.setWeight(50)
|
||||||
font.setBold(False)
|
font.setBold(False)
|
||||||
self.label_2.setFont(font)
|
self.status_message.setFont(font)
|
||||||
self.label_2.setObjectName("label_2")
|
self.status_message.setObjectName("status_message")
|
||||||
self.connection_status = StatusCircle(self)
|
self.connection_status = StatusCircle(self)
|
||||||
self.connection_status.setGeometry(QtCore.QRect(200, 34, 64, 64))
|
self.connection_status.setGeometry(QtCore.QRect(200, 34, 64, 64))
|
||||||
self.connection_status.setMinimumSize(QtCore.QSize(32, 32))
|
self.connection_status.setMinimumSize(QtCore.QSize(32, 32))
|
||||||
self.connection_status.setMaximumSize(QtCore.QSize(32, 32))
|
self.connection_status.setMaximumSize(QtCore.QSize(32, 32))
|
||||||
self.connection_status.setBaseSize(QtCore.QSize(32, 32))
|
self.connection_status.setBaseSize(QtCore.QSize(32, 32))
|
||||||
self.connection_status.setObjectName("connection_status")
|
self.connection_status.setObjectName("connection_status")
|
||||||
|
self.connect(self.connection_status, QtCore.SIGNAL('clicked()'), self.connection_status.mouseClick)
|
||||||
|
|
||||||
def setup_right_top(self, Form):
|
def setup_right_top(self, Form):
|
||||||
Form.setObjectName("Form")
|
Form.setObjectName("Form")
|
||||||
|
@ -198,6 +211,10 @@ class MainWindow(QtGui.QMainWindow):
|
||||||
self.callButton.setText(QtGui.QApplication.translate("Form", "Start call", None, QtGui.QApplication.UnicodeUTF8))
|
self.callButton.setText(QtGui.QApplication.translate("Form", "Start call", None, QtGui.QApplication.UnicodeUTF8))
|
||||||
QtCore.QMetaObject.connectSlotsByName(Form)
|
QtCore.QMetaObject.connectSlotsByName(Form)
|
||||||
|
|
||||||
|
def setup_info_from_tox(self):
|
||||||
|
self.name.setText(str(self.tox.self_get_name().value))
|
||||||
|
self.status_message.setText(str(self.tox.self_get_status_message().value))
|
||||||
|
|
||||||
def initUI(self):
|
def initUI(self):
|
||||||
main = QtGui.QWidget()
|
main = QtGui.QWidget()
|
||||||
grid = QtGui.QGridLayout()
|
grid = QtGui.QGridLayout()
|
||||||
|
|
|
@ -1,13 +1,14 @@
|
||||||
from platform import system
|
from platform import system
|
||||||
import json
|
import json
|
||||||
import os
|
import os
|
||||||
|
from util import Singleton
|
||||||
|
|
||||||
|
|
||||||
class Settings(dict):
|
class Settings(dict, Singleton):
|
||||||
|
|
||||||
def __init__(self):
|
def __init__(self):
|
||||||
self.path = Settings.get_default_path() + 'toxygen.json'
|
self.path = Settings.get_default_path() + 'toxygen.json'
|
||||||
if os.path.exists(self.path):
|
if os.path.isfile(self.path):
|
||||||
with open(self.path) as fl:
|
with open(self.path) as fl:
|
||||||
data = fl.read()
|
data = fl.read()
|
||||||
super(self.__class__, self).__init__(json.loads(data))
|
super(self.__class__, self).__init__(json.loads(data))
|
||||||
|
@ -51,4 +52,3 @@ class Settings(dict):
|
||||||
return os.getenv('HOME') + '/.config/tox/'
|
return os.getenv('HOME') + '/.config/tox/'
|
||||||
elif system() == 'Windows':
|
elif system() == 'Windows':
|
||||||
return os.getenv('APPDATA') + '/Tox/'
|
return os.getenv('APPDATA') + '/Tox/'
|
||||||
|
|
||||||
|
|
|
@ -199,3 +199,15 @@ TOX_MAX_MESSAGE_LENGTH = 1372
|
||||||
TOX_MAX_NAME_LENGTH = 128
|
TOX_MAX_NAME_LENGTH = 128
|
||||||
|
|
||||||
TOX_MAX_STATUS_MESSAGE_LENGTH = 1007
|
TOX_MAX_STATUS_MESSAGE_LENGTH = 1007
|
||||||
|
|
||||||
|
# -----------------------------------------------------------------------------------------------------------------
|
||||||
|
# Other enums
|
||||||
|
# -----------------------------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
||||||
|
TOX_USER_CONNECTION_STATUS = {
|
||||||
|
'ONLINE': 0,
|
||||||
|
'AWAY': 1,
|
||||||
|
'BUSY': 2,
|
||||||
|
'OFFLINE': 3
|
||||||
|
}
|
||||||
|
|
|
@ -19,3 +19,11 @@ def bin_to_string(raw_id):
|
||||||
|
|
||||||
def curr_directory():
|
def curr_directory():
|
||||||
return os.path.dirname(os.path.realpath(__file__))
|
return os.path.dirname(os.path.realpath(__file__))
|
||||||
|
|
||||||
|
|
||||||
|
class Singleton(object):
|
||||||
|
|
||||||
|
def __new__(cls):
|
||||||
|
if not hasattr(cls, 'instance'):
|
||||||
|
cls.instance = super(Singleton, cls).__new__(cls)
|
||||||
|
return cls.instance
|
||||||
|
|
Loading…
Reference in a new issue