emdee/toxygen
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

utils refactoring

Browse source
This commit is contained in:
ingvar1995 2018-05-10 20:47:34 +03:00
parent ae903cf405
commit 729bd84d2b
39 changed files with 97 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

10
toxygen/ui/av_widgets.py
View file

@ -1,11 +1,11 @@
from PyQt5 import QtCore, QtGui, QtWidgets
from ui import widgets
from contacts import profile
import util
import utils
import pyaudio
import wave
from user_data import settings
from util.util import *
from utils.util import *
class IncomingCallWidget(widgets.CenteredWidget):
@ -34,13 +34,13 @@ class IncomingCallWidget(widgets.CenteredWidget):
self.accept_video.setGeometry(QtCore.QRect(170, 100, 150, 150))
self.decline = QtWidgets.QPushButton(self)
self.decline.setGeometry(QtCore.QRect(320, 100, 150, 150))
pixmap = QtGui.QPixmap(util.curr_directory() + '/images/accept_audio.png')
pixmap = QtGui.QPixmap(utils.curr_directory() + '/images/accept_audio.png')
icon = QtGui.QIcon(pixmap)
self.accept_audio.setIcon(icon)
pixmap = QtGui.QPixmap(util.curr_directory() + '/images/accept_video.png')
pixmap = QtGui.QPixmap(utils.curr_directory() + '/images/accept_video.png')
icon = QtGui.QIcon(pixmap)
self.accept_video.setIcon(icon)
pixmap = QtGui.QPixmap(util.curr_directory() + '/images/decline_call.png')
pixmap = QtGui.QPixmap(utils.curr_directory() + '/images/decline_call.png')
icon = QtGui.QIcon(pixmap)
self.decline.setIcon(icon)
self.accept_audio.setIconSize(QtCore.QSize(150, 150))

4
toxygen/ui/create_profile_screen.py
View file

@ -1,7 +1,7 @@
from ui.widgets import *
from PyQt5 import uic
import util.util as util
import util.ui as util_ui
import utils.util as util
import utils.ui as util_ui
class CreateProfileScreenResult:

2
toxygen/ui/list_items.py
View file

@ -2,7 +2,7 @@ from wrapper.toxcore_enums_and_consts import *
from PyQt5 import QtCore, QtGui, QtWidgets
from contacts import profile
from file_transfers.file_transfers import TOX_FILE_TRANSFER_STATE, PAUSED_FILE_TRANSFERS, DO_NOT_SHOW_ACCEPT_BUTTON, ACTIVE_FILE_TRANSFERS, SHOW_PROGRESS_BAR
from util.util import *
from utils.util import *
from ui.widgets import DataLabel, create_menu
import html as h
import smileys

4
toxygen/ui/main_screen.py
View file

@ -2,8 +2,8 @@ from contacts.profile import *
from ui.list_items import *
from ui.widgets import MultilineEdit, ComboBox
from ui.main_screen_widgets import *
import util.util as util
import util.ui as util_ui
import utils.util as util
import utils.ui as util_ui
class MainWindow(QtWidgets.QMainWindow):

4
toxygen/ui/main_screen_widgets.py
View file

@ -2,8 +2,8 @@ from PyQt5 import QtCore, QtGui, QtWidgets
from ui.widgets import RubberBandWindow, create_menu, QRightClickButton, CenteredWidget, LineEdit
from contacts.profile import Profile
import urllib
import util.util as util
import util.ui as util_ui
import utils.util as util
import utils.ui as util_ui
from stickers.stickers import load_stickers

4
toxygen/ui/menu.py
View file

@ -1,12 +1,12 @@
from PyQt5 import QtCore, QtGui, QtWidgets
from user_data.settings import *
from contacts.profile import Profile
from util.util import *
from utils.util import *
from ui.widgets import CenteredWidget, DataLabel, LineEdit, RubberBandWindow
import pyaudio
from user_data import toxes
import updater.updater as updater
import util.ui as util_ui
import utils.ui as util_ui
class AddContact(CenteredWidget):

4
toxygen/ui/messages_widgets.py
View file

@ -1,8 +1,8 @@
from PyQt5 import QtWidgets, QtGui, QtCore
from wrapper.toxcore_enums_and_consts import *
import ui.widgets as widgets
import util.ui as util_ui
import util.util as util
import utils.ui as util_ui
import utils.util as util
import ui.menu as menu
import html as h
import re

4
toxygen/ui/tray.py
View file

@ -1,6 +1,6 @@
from PyQt5 import QtWidgets, QtGui, QtCore
from util.ui import tr
from util.util import *
from utils.ui import tr
from utils.util import *
import os.path

2
toxygen/ui/widgets.py
View file

@ -1,5 +1,5 @@
from PyQt5 import QtCore, QtGui, QtWidgets
import util.ui as util_ui
import utils.ui as util_ui
class DataLabel(QtWidgets.QLabel):