Skip to content

Commit

Permalink
added currency window, filled tables with data
Browse files Browse the repository at this point in the history
  • Loading branch information
MakzaR committed Jun 18, 2020
1 parent f8ea6d8 commit 71d45ae
Show file tree
Hide file tree
Showing 9 changed files with 500 additions and 7 deletions.
191 changes: 190 additions & 1 deletion poetry.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,11 @@ pylint = "^2.4.4"
mypy = "^0.761"
pydantic = "^1.4"
pyqt5 = "^5.15.0"
black = "^19.10b0"
flake8 = "^3.8.3"
isort = "^4.3.21"
autoflake = "^1.3.1"
unify = "^0.5"

[tool.poetry.dev-dependencies]

Expand Down
15 changes: 15 additions & 0 deletions src/currency_window.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import (
QMainWindow,
)

from ui.currency import Ui_CurrencyWindow


class CurrencyWindow(Ui_CurrencyWindow, QMainWindow):
def __init__(self, parent):
super().__init__(parent, Qt.WindowCloseButtonHint | Qt.WindowMinimizeButtonHint)
self.setupUi(self)

def init(self):
self.show()
9 changes: 6 additions & 3 deletions src/login_window.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from PyQt5 import QtWidgets, QtCore
from PyQt5.QtCore import Qt
from PyQt5.QtWidgets import QLineEdit, QPushButton, QVBoxLayout, QHBoxLayout, QWidget, QMainWindow
from PyQt5.QtWidgets import (
QMainWindow,
)

from src.main_window import MainWindow
from ui.auth_form import Ui_AuthorizationForm
Expand All @@ -19,6 +20,8 @@ def __init__(self):
def init(self):
self.show()

"""Тут нужно добавить валидацию, возможно добавить обработку исключений сервера"""

def auth(self):
self.close()
self.mainWindow.show()
self.mainWindow.init()
1 change: 0 additions & 1 deletion src/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
from PyQt5.QtWidgets import QApplication

from src.login_window import LoginForm
from src.main_window import MainWindow


class Main:
Expand Down
Loading

0 comments on commit 71d45ae

Please sign in to comment.