diff --git a/lib/__init__.py b/lib/__init__.py index a3b85a6..a76f3eb 100644 --- a/lib/__init__.py +++ b/lib/__init__.py @@ -1,5 +1,5 @@ -from .utils import query_error from .books import Book from .person import PersonDialog from .read import ReadDialog from .session import SessionDialog +from .utils import query_error diff --git a/lib/books.py b/lib/books.py index 5291a3a..d44f699 100644 --- a/lib/books.py +++ b/lib/books.py @@ -1,4 +1,3 @@ - import xml.dom.minidom from typing import Dict, List, cast diff --git a/lib/person.py b/lib/person.py index 4724dfb..e1494ed 100644 --- a/lib/person.py +++ b/lib/person.py @@ -10,12 +10,13 @@ from io import StringIO from typing import Any, List import css_inline -from lib import query_error from PyQt6.QtCore import QResource, Qt, QUrl, pyqtSlot from PyQt6.QtGui import QStandardItem, QStandardItemModel from PyQt6.QtMultimedia import QMediaDevices, QSoundEffect from PyQt6.QtSql import QSqlQuery, QSqlQueryModel from PyQt6.QtWidgets import QDialog, QDialogButtonBox + +from lib import query_error from ui.PersonDialog import Ui_PersonDialog diff --git a/lib/read.py b/lib/read.py index 97a6f74..334bbe3 100644 --- a/lib/read.py +++ b/lib/read.py @@ -2,17 +2,25 @@ import json from typing import Any, Dict, List, Optional, cast import requests -from lib import query_error from PyQt6.QtCore import QPoint, QResource, Qt, QTimer, pyqtSignal, pyqtSlot -from PyQt6.QtGui import (QBrush, QColor, QKeyEvent, QPainter, QPainterPath, - QPaintEvent, QTextCharFormat, QTextCursor) +from PyQt6.QtGui import ( + QBrush, + QColor, + QKeyEvent, + QPainter, + QPainterPath, + QPaintEvent, + QTextCharFormat, + QTextCursor, +) from PyQt6.QtSql import QSqlQuery from PyQt6.QtWidgets import QDialog, QTextEdit, QWidget -from ui.ReadDialog import Ui_ReadDialog +from lib import query_error from lib.preferences import Preferences from lib.session import SessionDialog from lib.sounds import SoundOff +from ui.ReadDialog import Ui_ReadDialog class ReadDialog(QDialog, Ui_ReadDialog): diff --git a/lib/session.py b/lib/session.py index 3284aae..3780f9a 100644 --- a/lib/session.py +++ b/lib/session.py @@ -1,12 +1,18 @@ from datetime import datetime, timedelta from typing import cast -from lib import query_error from PyQt6.QtCore import QModelIndex, Qt, QTimer, pyqtSlot -from PyQt6.QtGui import (QStandardItem, QStandardItemModel, QTextBlockFormat, - QTextCursor, QTextDocument) +from PyQt6.QtGui import ( + QStandardItem, + QStandardItemModel, + QTextBlockFormat, + QTextCursor, + QTextDocument, +) from PyQt6.QtSql import QSqlQuery from PyQt6.QtWidgets import QDialog, QMessageBox + +from lib import query_error from ui.SessionDialog import Ui_SessionDialog diff --git a/main.py b/main.py index e715cee..25823c5 100755 --- a/main.py +++ b/main.py @@ -11,15 +11,19 @@ import re import sys from typing import Optional -from PyQt6.QtCore import (QCoreApplication, QEvent, QModelIndex, QResource, - pyqtSignal, pyqtSlot) +from PyQt6.QtCore import ( + QCoreApplication, + QEvent, + QModelIndex, + QResource, + pyqtSignal, + pyqtSlot, +) from PyQt6.QtSql import QSqlDatabase, QSqlQuery, QSqlQueryModel from PyQt6.QtWidgets import QApplication, QFileDialog, QMainWindow - +from lib import Book, PersonDialog, ReadDialog, SessionDialog, query_error from lib.preferences import Preferences -from lib import PersonDialog, Book, SessionDialog, ReadDialog, query_error - from ui.MainWindow import Ui_MainWindow translate = QCoreApplication.translate