diff --git a/.gitignore b/.gitignore index 51bed48..2db3c62 100644 --- a/.gitignore +++ b/.gitignore @@ -62,17 +62,28 @@ compile_commands.json *_qmlcache.qrc -# Python +# IDE files +.vscode/ +.idea/ +*.swp +*.swo +.DS_Store + + +# Bytecode & cache __pycache__/ *.py[cod] +*.pyo +*.pyd +.Python # Virtual environments -.venv/ venv/ - -# IDEs -.idea/ -.vscode/ +env/ +ENV/ +.venv +pip-log.txt +pip-delete-this-directory.txt # Runtime data .local_data/ diff --git a/__pycache__/app_settings.cpython-310.pyc b/__pycache__/app_settings.cpython-310.pyc deleted file mode 100644 index e1d214d..0000000 Binary files a/__pycache__/app_settings.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/database.cpython-310.pyc b/__pycache__/database.cpython-310.pyc deleted file mode 100644 index 2579ca9..0000000 Binary files a/__pycache__/database.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/notifications.cpython-310.pyc b/__pycache__/notifications.cpython-310.pyc deleted file mode 100644 index ef129c9..0000000 Binary files a/__pycache__/notifications.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/rss_service.cpython-310.pyc b/__pycache__/rss_service.cpython-310.pyc deleted file mode 100644 index a5736d7..0000000 Binary files a/__pycache__/rss_service.cpython-310.pyc and /dev/null differ diff --git a/__pycache__/settings.cpython-310.pyc b/__pycache__/settings.cpython-310.pyc deleted file mode 100644 index ce7e0f4..0000000 Binary files a/__pycache__/settings.cpython-310.pyc and /dev/null differ diff --git a/data/assets/UniNewsIcon.jpeg b/data/assets/UniNewsIcon.jpeg new file mode 100644 index 0000000..2193379 Binary files /dev/null and b/data/assets/UniNewsIcon.jpeg differ diff --git a/scrapers/__pycache__/__init__.cpython-312.pyc b/scrapers/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..1583650 Binary files /dev/null and b/scrapers/__pycache__/__init__.cpython-312.pyc differ diff --git a/scrapers/__pycache__/base_scraper.cpython-310.pyc b/scrapers/__pycache__/base_scraper.cpython-310.pyc index 995af45..11793e8 100644 Binary files a/scrapers/__pycache__/base_scraper.cpython-310.pyc and b/scrapers/__pycache__/base_scraper.cpython-310.pyc differ diff --git a/scrapers/__pycache__/base_scraper.cpython-312.pyc b/scrapers/__pycache__/base_scraper.cpython-312.pyc new file mode 100644 index 0000000..089f38f Binary files /dev/null and b/scrapers/__pycache__/base_scraper.cpython-312.pyc differ diff --git a/scrapers/__pycache__/scraper_service.cpython-310.pyc b/scrapers/__pycache__/scraper_service.cpython-310.pyc index d3388b8..337a3d5 100644 Binary files a/scrapers/__pycache__/scraper_service.cpython-310.pyc and b/scrapers/__pycache__/scraper_service.cpython-310.pyc differ diff --git a/scrapers/__pycache__/scraper_service.cpython-312.pyc b/scrapers/__pycache__/scraper_service.cpython-312.pyc new file mode 100644 index 0000000..f0fc71c Binary files /dev/null and b/scrapers/__pycache__/scraper_service.cpython-312.pyc differ diff --git a/scrapers/__pycache__/uom_scraper.cpython-310.pyc b/scrapers/__pycache__/uom_scraper.cpython-310.pyc index 41aaae4..586d129 100644 Binary files a/scrapers/__pycache__/uom_scraper.cpython-310.pyc and b/scrapers/__pycache__/uom_scraper.cpython-310.pyc differ diff --git a/scrapers/__pycache__/uom_scraper.cpython-312.pyc b/scrapers/__pycache__/uom_scraper.cpython-312.pyc new file mode 100644 index 0000000..e162845 Binary files /dev/null and b/scrapers/__pycache__/uom_scraper.cpython-312.pyc differ diff --git a/ui/__pycache__/__init__.cpython-310.pyc b/ui/__pycache__/__init__.cpython-310.pyc index 2f152cd..7d4a05d 100644 Binary files a/ui/__pycache__/__init__.cpython-310.pyc and b/ui/__pycache__/__init__.cpython-310.pyc differ diff --git a/ui/__pycache__/__init__.cpython-312.pyc b/ui/__pycache__/__init__.cpython-312.pyc new file mode 100644 index 0000000..5b8660c Binary files /dev/null and b/ui/__pycache__/__init__.cpython-312.pyc differ diff --git a/ui/__pycache__/main_window.cpython-310.pyc b/ui/__pycache__/main_window.cpython-310.pyc index 3339a15..495ed66 100644 Binary files a/ui/__pycache__/main_window.cpython-310.pyc and b/ui/__pycache__/main_window.cpython-310.pyc differ diff --git a/ui/__pycache__/main_window.cpython-312.pyc b/ui/__pycache__/main_window.cpython-312.pyc new file mode 100644 index 0000000..3245980 Binary files /dev/null and b/ui/__pycache__/main_window.cpython-312.pyc differ diff --git a/ui/__pycache__/settings_dialog.cpython-310.pyc b/ui/__pycache__/settings_dialog.cpython-310.pyc index 98901a8..df79896 100644 Binary files a/ui/__pycache__/settings_dialog.cpython-310.pyc and b/ui/__pycache__/settings_dialog.cpython-310.pyc differ diff --git a/ui/__pycache__/settings_dialog.cpython-312.pyc b/ui/__pycache__/settings_dialog.cpython-312.pyc new file mode 100644 index 0000000..94cf1db Binary files /dev/null and b/ui/__pycache__/settings_dialog.cpython-312.pyc differ diff --git a/ui/data.code-workspace b/ui/data.code-workspace new file mode 100644 index 0000000..41cc81e --- /dev/null +++ b/ui/data.code-workspace @@ -0,0 +1,19 @@ +{ + "folders": [ + { + "path": "../data" + }, + { + "path": "../local_data" + }, + { + "path": "../__pycache__" + }, + { + "path": "../scrapers" + }, + { + "path": "." + } + ] +} \ No newline at end of file diff --git a/ui/main_window.py b/ui/main_window.py index dcb9a1c..9b952b9 100644 --- a/ui/main_window.py +++ b/ui/main_window.py @@ -1,4 +1,5 @@ import json +from pathlib import Path from PyQt6.QtCore import Qt, QUrl from PyQt6.QtWidgets import ( @@ -13,7 +14,7 @@ QVBoxLayout, QWidget, QScrollArea, QLineEdit, ) -from PyQt6.QtGui import QDesktopServices, QPixmap +from PyQt6.QtGui import QDesktopServices, QPixmap, QIcon from database import Database from settings import FEEDS_FILE @@ -32,6 +33,8 @@ def __init__(self): super().__init__() self.setWindowTitle("UniNews") + icon_path = Path(__file__).resolve().parent.parent / "data" / "assets" / "UniNewsIcon.jpeg" + self.setWindowIcon(QIcon(str(icon_path))) self.resize(1050, 720) self.settings_button = QPushButton("Settings")