pytodo-qt 0.2.0__tar.gz → 0.2.1__tar.gz

{pytodo-qt-0.2.0/src/pytodo_qt.egg-info → pytodo-qt-0.2.1}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: pytodo-qt
-Version: 0.2.0
-Summary: A simple To-Do list app written in PyQt5
+Version: 0.2.1
+Summary: A simple To-Do list app written in PyQt6
 Author-email: Michael Berry <trismegustis@gmail.com>
 License: GPLv3
 Project-URL: Homepage, https://github.com/berrym/todo
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: PyQt5
+Requires-Dist: PyQt6
 Requires-Dist: pycryptodomex
 
 # To-Do

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/pyproject.toml

@@ -11,14 +11,14 @@ todo = ["*.png"]
 
 [project]
 name = "pytodo-qt"
-version = "0.2.0"
-description = "A simple To-Do list app written in PyQt5"
+version = "0.2.1"
+description = "A simple To-Do list app written in PyQt6"
 readme = "README.md"
 authors = [
     {name = "Michael Berry", email = "trismegustis@gmail.com"},
 ]
 dependencies = [
-    "PyQt5",
+    "PyQt6",
     "pycryptodomex",
 ]
 classifiers = [

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1/src/pytodo_qt.egg-info}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.1
 Name: pytodo-qt
-Version: 0.2.0
-Summary: A simple To-Do list app written in PyQt5
+Version: 0.2.1
+Summary: A simple To-Do list app written in PyQt6
 Author-email: Michael Berry <trismegustis@gmail.com>
 License: GPLv3
 Project-URL: Homepage, https://github.com/berrym/todo
@@ -11,7 +11,7 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: COPYING
-Requires-Dist: PyQt5
+Requires-Dist: PyQt6
 Requires-Dist: pycryptodomex
 
 # To-Do

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/pytodo_qt.egg-info/SOURCES.txt

@@ -10,7 +10,7 @@ src/pytodo_qt.egg-info/top_level.txt
 src/todo/__init__.py
 src/todo/__main__.py
 src/todo/core/Logger.py
-src/todo/core/TodoDataBase.py
+src/todo/core/TodoDatabase.py
 src/todo/core/__init__.py
 src/todo/core/json_helpers.py
 src/todo/core/settings.py

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/pytodo_qt.egg-info/requires.txt

@@ -1,2 +1,2 @@
-PyQt5
+PyQt6
 pycryptodomex

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/__main__.py

@@ -1,5 +1,3 @@
-#!/usr/bin/env python3
-
 """__main__.py
 
 A to-do list program written in Python using Qt5
@@ -23,11 +21,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import argparse
 import os
 import sys
-from PyQt5 import QtWidgets
 
-from todo.core.Logger import Logger
-from todo.core import settings, TodoDataBase
-from todo.gui import MainWindow
+from PyQt6.QtWidgets import QApplication
+
+from .core.Logger import Logger
+from .core import settings, TodoDatabase
+from .gui import MainWindow
 
 
 logger = Logger(__name__)
@@ -50,8 +49,8 @@ def main():
     # create a command line arg_parser
     arg_parser = argparse.ArgumentParser(
         prog="To-Do",
-        description="To-Do List Program",
-        epilog="Copyright Michael Berry 2020",
+        description="To-Do List Application written in Python with Qt6",
+        epilog="Copyright Michael Berry 2024",
     )
 
     # add network server command group
@@ -107,10 +106,10 @@ def main():
             settings.options[k] = v
 
     # create a to-do database
-    settings.db = TodoDataBase.CreateTodoDataBase()
+    settings.db = TodoDatabase.CreateTodoDatabase()
 
     # create a QApplication, the main window, then hand over control to Qt
-    app = QtWidgets.QApplication(sys.argv)
+    app = QApplication(sys.argv)
     _ = MainWindow.CreateMainWindow()
     sys.exit(app.exec())
 

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/core/Logger.py

@@ -7,6 +7,7 @@ import logging
 import os
 import sys
 
+
 home_dir = os.getenv("HOME")
 if home_dir is not None:
     todo_dir = os.path.join(home_dir, ".todo")

pytodo-qt-0.2.0/src/todo/core/TodoDataBase.py → pytodo-qt-0.2.1/src/todo/core/TodoDatabase.py

@@ -1,4 +1,4 @@
-"""TodoDataBase.py
+"""TodoDatabase.py
 
 This module implements the to-do database.
 """
@@ -8,15 +8,15 @@ import os
 import sys
 import threading
 
-from todo.core import settings
-from todo.core.Logger import Logger
-from todo.net import tcp_server_lib, tcp_client_lib
+from ..core import settings
+from ..core.Logger import Logger
+from ..net import tcp_server_lib, tcp_client_lib
 
 
 logger = Logger(__name__)
 
 
-class CreateTodoDataBase:
+class CreateTodoDatabase:
     """Maintains a database of to-do lists."""
 
     def __init__(self):

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/core/__init__.py

@@ -5,10 +5,10 @@ todo.core: A decorator to make security checks on the to-do database.
 
 import sys
 
-from PyQt5 import QtWidgets
+from PyQt6.QtWidgets import QMessageBox
 
-from todo.core import settings
-from todo.core.Logger import Logger
+from ..core import settings
+from ..core.Logger import Logger
 
 
 def error_on_none_db(func):
@@ -28,7 +28,7 @@ def error_on_none_db(func):
                 return
         else:
             msg = "Database does not exist, exiting"
-            QtWidgets.QMessageBox.critical(None, "Database Error", msg)
+            QMessageBox.critical(None, "Database Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
 

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/core/json_helpers.py

@@ -2,8 +2,8 @@ import json
 import os
 import sys
 
-from todo.core import error_on_none_db, settings
-from todo.core.Logger import Logger
+from ..core import error_on_none_db, settings
+from ..core.Logger import Logger
 
 
 logger = Logger(__name__)

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/core/settings.py

@@ -6,7 +6,7 @@ This module creates To-Do core global variables and functions.
 import sys
 import os
 
-__version__ = "0.2.0"
+__version__ = "0.2.1"
 options = {}
 db = None
 

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/crypto/AESCipher.py

@@ -10,7 +10,7 @@ from Cryptodome.Cipher import AES
 from Cryptodome.Random import get_random_bytes
 from Cryptodome.Util.Padding import pad, unpad
 
-from todo.core.Logger import Logger
+from ..core.Logger import Logger
 
 
 logger = Logger(__name__)

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/gui/AddTodoDialog.py

@@ -3,16 +3,24 @@
 Simple dialog to create a to-do.
 """
 
-from PyQt5 import QtWidgets
+from PyQt6.QtWidgets import (
+    QDialog,
+    QLabel,
+    QLineEdit,
+    QComboBox,
+    QPushButton,
+    QVBoxLayout,
+    QMessageBox,
+)
 
-from todo.core import error_on_none_db, settings
-from todo.core.Logger import Logger
+from ..core import error_on_none_db, settings
+from ..core.Logger import Logger
 
 
 logger = Logger(__name__)
 
 
-class AddTodoDialog(QtWidgets.QDialog):
+class AddTodoDialog(QDialog):
     """Create a new to-do."""
 
     def __init__(self):
@@ -25,20 +33,20 @@ class AddTodoDialog(QtWidgets.QDialog):
         super().__init__()
 
         # reminder
-        reminder_label = QtWidgets.QLabel("Reminder", self)
-        self.reminder_field = QtWidgets.QLineEdit(self)
+        reminder_label = QLabel("Reminder", self)
+        self.reminder_field = QLineEdit(self)
 
         # priority
-        priority_label = QtWidgets.QLabel("Priority", self)
-        self.priority_field = QtWidgets.QComboBox(self)
+        priority_label = QLabel("Priority", self)
+        self.priority_field = QComboBox(self)
         self.priority_field.addItems(["Low", "Normal", "High"])
 
         # add button
-        self.add_button = QtWidgets.QPushButton("Add to-do", self)
+        self.add_button = QPushButton("Add to-do", self)
         self.add_button.clicked.connect(self.get_todo)
 
         # create a vertical box layout
-        v_box = QtWidgets.QVBoxLayout()
+        v_box = QVBoxLayout()
         v_box.addWidget(reminder_label)
         v_box.addWidget(self.reminder_field)
         v_box.addWidget(priority_label)
@@ -53,13 +61,11 @@ class AddTodoDialog(QtWidgets.QDialog):
         logger.log.info("Add to-do dialog created")
 
     @error_on_none_db
-    def get_todo(self):
+    def get_todo(self, *args, **kwargs):
         """Get to-do information and append it to the current list."""
         reminder = self.reminder_field.text()
         if reminder == "":
-            QtWidgets.QMessageBox.information(
-                self, "Empty reminder", "Reminder cannot be empty"
-            )
+            QMessageBox.information(self, "Empty reminder", "Reminder cannot be empty")
             return
 
         # get to-do information

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/gui/MainWindow.py

@@ -6,134 +6,132 @@ This module implements the GUI for To-Do.
 import os
 import sys
 
-from PyQt5 import QtCore, QtGui, QtWidgets, QtPrintSupport
-
-from todo.core import error_on_none_db, settings, json_helpers
-from todo.core.Logger import Logger
-from todo.gui.AddTodoDialog import AddTodoDialog
-from todo.gui.SyncDialog import SyncDialog
-from todo.net.sync_operations import sync_operations
+from PyQt6.QtCore import QPersistentModelIndex
+from PyQt6.QtGui import QAction, QIcon, QFont
+from PyQt6.QtWidgets import (
+    QMainWindow,
+    QMenu,
+    QTableWidget,
+    QComboBox,
+    QToolTip,
+    QMessageBox,
+    QProgressBar,
+    QLabel,
+    QLineEdit,
+    QSystemTrayIcon,
+)
+from PyQt6.QtPrintSupport import QPrinter
+
+from ..core import error_on_none_db, settings, json_helpers
+from ..core.Logger import Logger
+from ..gui.AddTodoDialog import AddTodoDialog
+from ..gui.SyncDialog import SyncDialog
+from ..net.sync_operations import sync_operations
 
 
 logger = Logger(__name__)
 
 
-class CreateMainWindow(QtWidgets.QMainWindow):
+class CreateMainWindow(QMainWindow):
     """This class implements the bulk of the gui functionality in To-Do.
 
     It creates the main window, and helps to facilitate management of the
     list database for the user.
     """
 
-    def __init__(self, *args):
+    def __init__(self, *args, **kwargs):
         """Create the window, make a table, fill table with to-do data."""
         logger.log.info("Creating the main window")
 
         # create the window, set title and tooltip, resize and center window
-        QtWidgets.QMainWindow.__init__(self)
-        self.setWindowIcon(QtGui.QIcon("gui/icons/todo.png"))
+        # QMainWindow.__init__(self)
+        super().__init__()
+        self.setWindowIcon(QIcon("gui/icons/todo.png"))
         self.setWindowTitle("To-Do")
         self.setToolTip("Python3 + Qt5 = Happy <u>To-Do</u> Programmer!")
-        QtWidgets.QToolTip.setFont(QtGui.QFont("Helvetica", 10))
+        QToolTip.setFont(QFont("Helvetica", 10))
         self.resize(800, 500)
         self.center()
 
         # create our special font
-        self.complete_font = QtGui.QFont("Helvetica", 10, QtGui.QFont.Bold)
+        self.complete_font = QFont("Helvetica", 10)
+        self.complete_font.setBold(True)
         self.complete_font.setStrikeOut(True)
 
         # create our normal font
-        self.normal_font = QtGui.QFont("Helvetica", 10, QtGui.QFont.Normal)
+        self.normal_font = QFont("Helvetica", 10)
         self.normal_font.setStrikeOut(False)
 
         # create some actions
-        printer = QtWidgets.QAction(QtGui.QIcon(), "Print", self)
+        printer = QAction(QIcon(), "Print", self)
         printer.setShortcut("Ctrl+P")
-        printer.triggered.connect(self.print_list)
+        printer.triggered.connect(self.printlist)
 
-        export = QtWidgets.QAction(QtGui.QIcon(), "Export to Text File", self)
+        export = QAction(QIcon(), "Export to Text File", self)
         export.setShortcut("Ctrl+E")
         export.triggered.connect(self.export_list)
 
-        _quit = QtWidgets.QAction(QtGui.QIcon(), "Exit", self)
-        _quit.setShortcut("Ctrl+Q")
-        _quit.triggered.connect(self.close)
+        quit = QAction(QIcon(), "Exit", self)
+        quit.setShortcut("Ctrl+Q")
+        quit.triggered.connect(self.close)
 
         # to-do actions
-        add = QtWidgets.QAction(
-            QtGui.QIcon("gui/icons/plus.png"), "Add new to-do", self
-        )
+        add = QAction(QIcon("gui/icons/plus.png"), "Add new to-do", self)
         add.setShortcut("+")
         add.triggered.connect(self.add_todo)
 
-        delete = QtWidgets.QAction(
-            QtGui.QIcon("gui/icons/minus.png"), "Delete to-do", self
-        )
+        delete = QAction(QIcon("gui/icons/minus.png"), "Delete to-do", self)
         delete.setShortcut("-")
         delete.triggered.connect(self.delete_todo)
 
-        toggle = QtWidgets.QAction(
-            QtGui.QIcon("gui/icons/todo.png"), "Toggle to-do Status", self
-        )
+        toggle = QAction(QIcon("gui/icons/todo.png"), "Toggle to-do Status", self)
         toggle.setShortcut("%")
         toggle.triggered.connect(self.toggle_todo)
 
         # list actions
-        list_add = QtWidgets.QAction(QtGui.QIcon(), "Add new list", self)
+        list_add = QAction(QIcon(), "Add new list", self)
         list_add.setShortcut("Ctrl++")
         list_add.triggered.connect(self.add_list)
 
-        list_delete = QtWidgets.QAction(
-            QtGui.QIcon("gui/icons/minus.png"), "Delete list", self
-        )
+        list_delete = QAction(QIcon("gui/icons/minus.png"), "Delete list", self)
 
         list_delete.setShortcut("Ctrl+-")
         list_delete.triggered.connect(self.delete_list)
 
-        list_rename = QtWidgets.QAction(QtGui.QIcon(), "Rename list", self)
+        list_rename = QAction(QIcon(), "Rename list", self)
         list_rename.setShortcut("Ctrl+R")
         list_rename.triggered.connect(self.rename_list)
 
-        list_switch = QtWidgets.QAction(QtGui.QIcon(), "Switch List", self)
+        list_switch = QAction(QIcon(), "Switch List", self)
         list_switch.setShortcut("Ctrl+L")
         list_switch.triggered.connect(self.switch_list)
 
-        sync_pull = QtWidgets.QAction(
-            QtGui.QIcon(), "Get lists from another computer", self
-        )
+        sync_pull = QAction(QIcon(), "Get lists from another computer", self)
         sync_pull.setShortcut("F6")
         sync_pull.triggered.connect(self.db_sync_pull)
 
-        sync_push = QtWidgets.QAction(
-            QtGui.QIcon(), "Send lists to another computer", self
-        )
+        sync_push = QAction(QIcon(), "Send lists to another computer", self)
         sync_push.setShortcut("F7")
         sync_push.triggered.connect(self.db_sync_push)
 
         # network server actions
-        start_server = QtWidgets.QAction(
-            QtGui.QIcon(), "Start the network server", self
-        )
+        start_server = QAction(QIcon(), "Start the network server", self)
         start_server.triggered.connect(self.db_start_server)
 
-        stop_server = QtWidgets.QAction(QtGui.QIcon(), "Stop the network server", self)
+        stop_server = QAction(QIcon(), "Stop the network server", self)
         stop_server.triggered.connect(self.db_stop_server)
 
-        change_port = QtWidgets.QAction(
-            QtGui.QIcon(), "Change network server port", self
-        )
+        change_port = QAction(QIcon(), "Change network server port", self)
         change_port.triggered.connect(self.db_server_port)
 
-        change_bind_address = QtWidgets.QAction(
-            QtGui.QIcon(), "Change network server address", self
-        )
+        change_bind_address = QAction(QIcon(), "Change network server address", self)
         change_bind_address.triggered.connect(self.db_server_bind_address)
 
         # fanfare
-        about = QtWidgets.QAction(QtGui.QIcon(), "About To-Do", self)
+        about = QAction(QIcon(), "About To-Do", self)
         about.triggered.connect(self.about_todo)
 
-        about_qt = QtWidgets.QAction(QtGui.QIcon(), "About Qt", self)
+        about_qt = QAction(QIcon(), "About Qt", self)
         about_qt.triggered.connect(self.about_qt)
 
         # create a menu bar
@@ -143,18 +141,12 @@ class CreateMainWindow(QtWidgets.QMainWindow):
             if main_menu is not None:
                 main_menu.addAction(printer)
                 main_menu.addAction(export)
-                main_menu.addAction(_quit)
+                main_menu.addAction(quit)
             else:
                 msg = "Could not populate main menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+                QMessageBox.warning(self, "Creation Error", msg)
                 logger.log.exception(msg)
-        else:
-            msg = "Could not create menu bar, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
 
-        if menu_bar is not None:
             todo_menu = menu_bar.addMenu("&To-Do")
             if todo_menu is not None:
                 todo_menu.addAction(add)
@@ -162,16 +154,10 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                 todo_menu.addAction(toggle)
             else:
                 msg = "Could not populate to-do menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+                QMessageBox.warning(self, "Creation Error", msg)
                 logger.log.exception(msg)
                 sys.exit(1)
-        else:
-            msg = "Menu bar error, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
 
-        if menu_bar is not None:
             list_menu = menu_bar.addMenu("&List")
             if list_menu is not None:
                 list_menu.addAction(list_add)
@@ -180,80 +166,50 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                 list_menu.addAction(list_switch)
             else:
                 msg = "Could not populate list menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+                QMessageBox.warning(self, "Creation Error", msg)
                 logger.log.exception(msg)
                 sys.exit(1)
-        else:
-            msg = "Menu bar error, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
 
-        if menu_bar is not None:
             sync_menu = menu_bar.addMenu("&Sync")
             if sync_menu is not None:
                 sync_menu.addAction(sync_pull)
                 sync_menu.addAction(sync_push)
             else:
                 msg = "Could not populate sync menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-                logger.log.exception(msg)
-                sys.exit(1)
-        else:
-            msg = "Menu bar error, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
-
-        if menu_bar is not None:
-            server_menu = menu_bar.addMenu("&Server")
-            if server_menu is not None:
-                server_menu.addAction(start_server)
-                server_menu.addAction(stop_server)
-                server_menu.addAction(change_port)
-                server_menu.addAction(change_bind_address)
-            else:
-                msg = "Could not populate server menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+                QMessageBox.warning(self, "Creation Error", msg)
                 logger.log.exception(msg)
                 sys.exit(1)
-        else:
-            msg = "Menu bar error, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
 
-        if menu_bar is not None:
             help_menu = menu_bar.addMenu("&Help")
             if help_menu is not None:
                 help_menu.addAction(about)
                 help_menu.addAction(about_qt)
             else:
                 msg = "Could not populate help menu, exiting"
-                QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+                QMessageBox.warning(self, "Creation Error", msg)
                 logger.log.exception(msg)
                 sys.exit(1)
-        else:
-            msg = "Menu bar error, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
-            logger.log.exception(msg)
-            sys.exit(1)
 
-        # create action toolbar
-        toolbar = self.addToolBar("To-Do Actions")
-        if toolbar is not None:
-            toolbar.addAction(add)
-            toolbar.addAction(delete)
-            toolbar.addAction(toggle)
-            toolbar.addAction(_quit)
+            # create action toolbar
+            toolbar = self.addToolBar("To-Do Actions")
+            if toolbar is not None:
+                toolbar.addAction(add)
+                toolbar.addAction(delete)
+                toolbar.addAction(toggle)
+                toolbar.addAction(quit)
+            else:
+                msg = "Could not create toolbar, exiting"
+                QMessageBox.warning(self, "Creation Error", msg)
+                logger.log.exception(msg)
+                sys.exit(1)
         else:
-            msg = "Could not create toolbar, exiting"
-            QtWidgets.QMessageBox.warning(self, "Creation Error", msg)
+            msg = "Could not create menu bar, exiting"
+            QMessageBox.warning(self, "Creation Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
 
         # create table, set it as central widget
-        self.table = QtWidgets.QTableWidget(self)
+        self.table = QTableWidget(self)
         if self.table is not None:
             self.table.insertColumn(0)
             self.table.insertColumn(1)
@@ -263,45 +219,50 @@ class CreateMainWindow(QtWidgets.QMainWindow):
             self.setCentralWidget(self.table)
         else:
             msg = "Could not create to-do list table, exiting"
-            QtWidgets.QMessageBox.critical(self, "Creation Error", msg)
+            QMessageBox.critical(self, "Creation Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
 
         # create a status bar
-        self.progressBar = QtWidgets.QProgressBar()
-        self.statusBarLabel = QtWidgets.QLabel()
+        self.progressBar = QProgressBar()
+        self.statusBarLabel = QLabel()
         self.statusBar = self.statusBar()
         if self.statusBar is not None:
             self.statusBar.addPermanentWidget(self.progressBar)
             self.statusBar.addPermanentWidget(self.statusBarLabel, 1)
         else:
             msg = "Could not create status bar, exiting"
-            QtWidgets.QMessageBox.critical(self, "Creation Error", msg)
+            QMessageBox.critical(self, "Creation Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
 
-        # create a system tray icon
-        self.tray_icon = QtWidgets.QSystemTrayIcon(
-            QtGui.QIcon("gui/icons/todo.png"), self
-        )
-        self.tray_icon.activated.connect(self.tray_event)
+        # system tray icon
+        self.tray_icon = QSystemTrayIcon(self)
+        self.tray_icon.setIcon(QIcon("gui/icons/todo.png"))
 
-        tray_exit = QtWidgets.QAction(QtGui.QIcon(), "Exit", self.tray_icon)
-        tray_exit.triggered.connect(self.close)
+        # system tray menu actions
+        show_action = QAction("Show", self)
+        quit_action = QAction("Exit", self)
+        hide_action = QAction("Hide", self)
+        show_action.triggered.connect(self.show)
+        hide_action.triggered.connect(self.hide)
+        quit_action.triggered.connect(self.close)
 
-        tray_menu = QtWidgets.QMenu("&To-Do", self)
+        tray_menu = QMenu("&To-Do", self)
         if tray_menu is not None:
-            tray_menu.addAction(tray_exit)
+            tray_menu.addAction(show_action)
+            tray_menu.addAction(hide_action)
+            tray_menu.addAction(quit_action)
             self.tray_icon.setContextMenu(tray_menu)
             self.tray_icon.show()
         else:
             msg = "Could not create status tray menu, exiting"
-            QtWidgets.QMessageBox.critical(self, "Creation Error", msg)
+            QMessageBox.critical(self, "Creation Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
 
-        # create a printer if we can
-        self.printer = QtPrintSupport.QPrinter()
+        # create a printer
+        self.printer = QPrinter()
 
         # show the window
         self.show()
@@ -321,7 +282,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
             self.update_status_bar("Reading in JSON data")
             result, msg = json_helpers.read_json_data()
             if not result:
-                QtWidgets.QMessageBox.warning(self, "Read Error", str(msg))
+                QMessageBox.warning(self, "Read Error", str(msg))
                 self.update_progress_bar()
                 self.update_status_bar()
         else:
@@ -334,7 +295,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         """Write to-do lists to a JSON file."""
         if len(settings.db.todo_lists.keys()) == 0:
             msg = "No to-do information, aborting write"
-            QtWidgets.QMessageBox.warning(self, "Write Error", msg)
+            QMessageBox.warning(self, "Write Error", msg)
             return
 
         self.update_progress_bar(0)
@@ -342,7 +303,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         result, msg = json_helpers.write_json_data()
         if not result:
-            QtWidgets.QMessageBox.warning(self, "Write Error", msg)
+            QMessageBox.warning(self, "Write Error", msg)
             self.update_progress_bar()
             self.update_status_bar()
 
@@ -369,63 +330,55 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         settings.db.active_list = list_name
         result, msg = settings.db.write_config()
         if not result:
-            QtWidgets.QMessageBox.critical(self, "Write Error", msg)
+            QMessageBox.critical(self, "Write Error", msg)
             sys.exit(1)
         else:
-            QtWidgets.QMessageBox.information(self, "Write Success", msg)
+            QMessageBox.information(self, "Write Success", msg)
 
     @error_on_none_db
     def db_start_server(self, *args, **kwargs):
         """Start the database server."""
         if settings.db.server_running():
-            QtWidgets.QMessageBox.information(
+            QMessageBox.information(
                 self, "Info", "The database server is already running."
             )
         else:
             settings.db.start_server()
-            QtWidgets.QMessageBox.information(
-                self, "Info", "The database server was started."
-            )
+            QMessageBox.information(self, "Info", "The database server was started.")
             self.refresh()
 
     @error_on_none_db
     def db_stop_server(self, *args, **kwargs):
         """Stop the database server."""
         if not settings.db.server_running():
-            QtWidgets.QMessageBox.information(
-                self, "Info", "The database server is not running."
-            )
+            QMessageBox.information(self, "Info", "The database server is not running.")
         else:
             settings.db.stop_server()
-            QtWidgets.QMessageBox.information(
-                self, "Info", "The database server was stopped."
-            )
+            QMessageBox.information(self, "Info", "The database server was stopped.")
             self.refresh()
 
     @error_on_none_db
     def db_server_port(self, *args, **kwargs):
         """Change the port the database server listens too."""
-        port, ok = QtWidgets.QInputDialog.getInt(
-            self, "Change database server port", "Port: "
-        )
+        port, ok = QInputDialog.getInt(self, "Change database server port", "Port: ")
         if not ok:
             return
 
         if settings.options["port"] == port:
-            QtWidgets.QMessageBox.information(
+            QMessageBox.information(
                 self, "Info", f"Server is already using port {port}"
             )
         else:
             settings.options["port"] = port
             if settings.db.server_running():
-                reply = QtWidgets.QMessageBox.question(
+                reply = QMessageBox.question(
                     self,
                     "Restart Database Server?",
                     "The server needs to be restarted for changes to take effect, would you like to do that now?",
-                    QtWidgets.QMessageBox.Yes,
-                    QtWidgets.QMessageBox.No,
+                    QMessageBox.StandardButton.Yes,
+                    QMessageBox.StandardButton.No,
                 )
-                if reply == QtWidgets.QMessageBox.Yes:
+                if reply == QMessageBox.StandardButton.Yes:
                     settings.db.restart_server()
                     settings.db.write_config()
                     self.refresh()
@@ -433,27 +386,27 @@ class CreateMainWindow(QtWidgets.QMainWindow):
     @error_on_none_db
     def db_server_bind_address(self, *args, **kwargs):
         """Bind database server to an ip address."""
-        address, ok = QtWidgets.QInputDialog.getText(
+        address, ok = QInputDialog.getText(
             self, "Change server ip address", "IP Address: "
         )
         if not ok:
             return
 
         if settings.options["address"] == address:
-            QtWidgets.QMessageBox.information(
+            QMessageBox.information(
                 self, "Info", f"Server is already bound to {address}"
             )
         else:
             settings.options["address"] = address
             if settings.db.server_running():
-                reply = QtWidgets.QMessageBox.question(
+                reply = QMessageBox.question(
                     self,
                     "Restart Database Server?",
                     "The server needs to be restarted for changes to take effect, would you like to do that now?",
-                    QtWidgets.QMessageBox.Yes,
-                    QtWidgets.QMessageBox.No,
+                    QMessageBox.StandardButton.Yes,
+                    QMessageBox.StandardButton.No,
                 )
-                if reply == QtWidgets.QMessageBox.Yes:
+                if reply == QMessageBox.StandardButton.Yes:
                     settings.db.restart_server()
                     settings.db.write_config()
                     self.refresh()
@@ -464,7 +417,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         self.update_progress_bar(0)
         self.update_status_bar("Waiting for input")
 
-        list_name, ok = QtWidgets.QInputDialog.getText(
+        list_name, ok = QInputDialog.getText(
             self, "Add New List", "Enter a name for the new list: "
         )
         if ok:
@@ -480,7 +433,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                 settings.db.write_config()
                 self.write_todo_data()
             else:
-                QtWidgets.QMessageBox.warning(
+                QMessageBox.warning(
                     self,
                     "Duplicate List",
                     f'A list named "{list_name}" already exists.',
@@ -495,7 +448,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         # if there is more than one list, ask user which one to delete
         if len(settings.db.todo_lists.keys()) > 1:
-            list_entry, ok = QtWidgets.QInputDialog.getItem(
+            list_entry, ok = QInputDialog.getItem(
                 self,
                 "Select List",
                 "To-Do Lists: ",
@@ -517,14 +470,14 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                     self.write_todo_data()
                     break
         else:
-            reply = QtWidgets.QMessageBox.question(
+            reply = QMessageBox.question(
                 self,
                 "Confirm deletion",
                 f'Really delete list "{settings.db.active_list}"?',
-                QtWidgets.QMessageBox.Yes,
-                QtWidgets.QMessageBox.No,
+                QMessageBox.StandardButton.Yes,
+                QMessageBox.StandardButton.No,
             )
-            if reply == QtWidgets.QMessageBox.No:
+            if reply == QMessageBox.StandardButton.No:
                 self.update_progress_bar()
                 return
 
@@ -547,19 +500,19 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         """Rename the active list"""
         self.update_progress_bar(0)
 
-        list_name, ok = QtWidgets.QInputDialog.getText(
+        list_name, ok = QInputDialog.getText(
             self, "Rename to-do list", "Enter new name:"
         )
         if ok:
-            reply = QtWidgets.QMessageBox.question(
+            reply = QMessageBox.question(
                 self,
                 "Confirm rename",
                 f"Are you sure you want to rename list {settings.db.active_list} to {list_name}",
-                QtWidgets.QMessageBox.Yes,
-                QtWidgets.QMessageBox.No,
+                QMessageBox.StandardButton.Yes,
+                QMessageBox.StandardButton.No,
             )
 
-            if reply == QtWidgets.QMessageBox.No:
+            if reply == QMessageBox.StandardButton.No:
                 return
 
             settings.db.todo_lists[list_name] = settings.db.todo_lists[
@@ -583,7 +536,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         if len(settings.db.todo_lists.keys()) == 0:
             return
 
-        list_entry, ok = QtWidgets.QInputDialog.getItem(
+        list_entry, ok = QInputDialog.getItem(
             self, "Select List", "To-Do Lists: ", list(settings.db.todo_lists.keys())
         )
         if ok:
@@ -603,7 +556,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         if fn is None:
             # prompt user for fn
             self.update_status_bar("Waiting for input")
-            fn, ok = QtWidgets.QInputDialog.getText(
+            fn, ok = QInputDialog.getText(
                 self,
                 "Save list to text file",
                 "Enter name of file to write as text:",
@@ -616,7 +569,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         self.update_status_bar(f"finished exporting to {fn}.")
         self.update_progress_bar()
 
-    def print_list(self):
+    def printlist(self):
         """Print the active list."""
         self.update_progress_bar(0)
 
@@ -627,7 +580,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         tmp_fn = ".todo_printer.tmp"
 
-        accept = QtPrintSupport.QPrintDialog(self.printer).exec()
+        accept = QPrintDialog(self.printer).exec()
         if accept:
             self.update_status_bar("Printing")
 
@@ -646,8 +599,8 @@ class CreateMainWindow(QtWidgets.QMainWindow):
             os.remove(tmp_fn)
 
             # Open string as a QTextDocument and then print it
-            doc = QtGui.QTextDocument(string)
-            doc.print_(self.printer)
+            doc = QTextDocument(string)
+            doc.print(self.printer)
 
         self.update_progress_bar()
         self.update_status_bar("finished printing")
@@ -659,7 +612,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         if not settings.db.active_list:
             if settings.db.list_count == 0:
-                QtWidgets.QMessageBox.information(
+                QMessageBox.information(
                     self,
                     "No list",
                     "You need to create a list before you add a reminder",
@@ -670,17 +623,17 @@ class CreateMainWindow(QtWidgets.QMainWindow):
             else:
                 # ask the user if they would like to switch to an existing list
                 self.update_status_bar("Waiting for input")
-                reply = QtWidgets.QMessageBox.question(
+                reply = QMessageBox.question(
                     self,
                     "Set an active list",
                     "There is currently no active list set, but lists do exist,"
                     "would you like to switch to one of them?",
-                    QtWidgets.QMessageBox.Yes,
-                    QtWidgets.QMessageBox.No,
+                    QMessageBox.StandardButton.Yes,
+                    QMessageBox.StandardButton.No,
                 )
 
                 # check the user response
-                if reply == QtWidgets.QMessageBox.Yes:
+                if reply == QMessageBox.StandardButton.Yes:
                     self.switch_list()
                 else:
                     return
@@ -697,13 +650,13 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         if self.table is None:
             msg = "To-Do List Table is invalid, exiting"
-            QtWidgets.QMessageBox.critical(self, "To-Do List Error", msg)
+            QMessageBox.critical(self, "To-Do List Error", msg)
             logger.log.exception(msg)
             sys.exit(1)
         else:
             if self.table.selectionModel().hasSelection():
                 indices = [
-                    QtCore.QPersistentModelIndex(index)
+                    QPersistentModelIndex(index)
                     for index in self.table.selectionModel().selectedIndexes()
                 ]
                 for index in indices:
@@ -717,9 +670,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                     self.table.removeRow(index.row())
                 self.refresh()
             else:
-                QtWidgets.QMessageBox.warning(
-                    self, "Delete To-Do", "No reminders selected."
-                )
+                QMessageBox.warning(self, "Delete To-Do", "No reminders selected.")
 
     @error_on_none_db
     def toggle_todo(self, *args, **kwargs):
@@ -779,16 +730,16 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         <br><br>License: <a href="http://www.fsf.org/licenses/gpl.html">GPLv3</a>
         <br><br><b>Copyright (C) 2024 Michael Berry</b>
         """
-        QtWidgets.QMessageBox.about(self, "About To-Do", text)
+        QMessageBox.about(self, "About To-Do", text)
 
     def about_qt(self):
         """Display information about Qt."""
-        QtWidgets.QMessageBox.aboutQt(self, "About Qt")
+        QMessageBox.aboutQt(self, "About Qt")
 
     def center(self):
         """Place the main window in the center of the screen."""
         qt_rectangle = self.frameGeometry()
-        center_point = QtWidgets.QDesktopWidget().availableGeometry().center()
+        center_point = self.screen().availableGeometry().center()
         qt_rectangle.moveCenter(center_point)
         self.move(qt_rectangle.topLeft())
 
@@ -857,7 +808,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
 
         for todo in settings.db.todo_lists[settings.db.active_list]:
             # create priority table item
-            item_p = QtWidgets.QComboBox(self)
+            item_p = QComboBox(self)
             item_p.addItems(["Low", "Normal", "High"])
             item_p.currentIndexChanged.connect(self.change_priority)
             if todo["priority"] == 1:
@@ -868,7 +819,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
                 item_p.setCurrentIndex(0)
 
             # create reminder table item
-            item_r = QtWidgets.QLineEdit(todo["reminder"])
+            item_r = QLineEdit(todo["reminder"])
             item_r.returnPressed.connect(self.edit_reminder)
 
             # set the font
@@ -893,9 +844,9 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         self.update_progress_bar()
         self.update_status_bar()
 
-    def tray_event(self, reason=QtWidgets.QSystemTrayIcon.activated, *args, **kwargs):
+    def tray_event(self, reason=QSystemTrayIcon.activated, *args, **kwargs):
         """Hide the main window when the system tray icon is clicked."""
-        if reason == QtWidgets.QSystemTrayIcon.activated:
+        if reason == QSystemTrayIcon.activated:
             if self.isVisible():
                 self.hide()
             else:
@@ -907,7 +858,7 @@ class CreateMainWindow(QtWidgets.QMainWindow):
         # save configuration
         result, msg = settings.db.write_config()
         if not result:
-            QtWidgets.QMessageBox.warning(self, "Write Error", msg)
+            QMessageBox.warning(self, "Write Error", msg)
 
         # save todo lists
         self.write_todo_data()

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/gui/SyncDialog.py

@@ -3,19 +3,25 @@
 Simple dialog to collect information needed to perform a sync operation.
 """
 
-import sys
+from PyQt6.QtWidgets import (
+    QDialog,
+    QLabel,
+    QLineEdit,
+    QPushButton,
+    QVBoxLayout,
+    QMessageBox,
+)
+from PyQt6.QtGui import QIntValidator
 
-from PyQt5 import QtGui, QtWidgets
-
-from todo.core import error_on_none_db, settings
-from todo.core.Logger import Logger
-from todo.net.sync_operations import sync_operations
+from ..core import error_on_none_db, settings
+from ..core.Logger import Logger
+from ..net.sync_operations import sync_operations
 
 
 logger = Logger(__name__)
 
 
-class SyncDialog(QtWidgets.QDialog):
+class SyncDialog(QDialog):
     """Synchronize lists with remotes."""
 
     def __init__(self, operation=None):
@@ -30,21 +36,21 @@ class SyncDialog(QtWidgets.QDialog):
         self.operation = operation
 
         # address
-        address_label = QtWidgets.QLabel("Host Address", self)
-        self.address_field = QtWidgets.QLineEdit(self)
+        address_label = QLabel("Host Address", self)
+        self.address_field = QLineEdit(self)
 
         # port
-        port_label = QtWidgets.QLabel("Port", self)
-        self.port_field = QtWidgets.QLineEdit(self)
+        port_label = QLabel("Port", self)
+        self.port_field = QLineEdit(self)
         self.port_field.setText(str(settings.options["port"]))
-        self.port_field.setValidator(QtGui.QIntValidator())
+        self.port_field.setValidator(QIntValidator())
 
         # add button
-        self.get_button = QtWidgets.QPushButton("Synchronize", self)
+        self.get_button = QPushButton("Synchronize", self)
         self.get_button.clicked.connect(self.get_host)
 
         # create a vertical box layout
-        v_box = QtWidgets.QVBoxLayout()
+        v_box = QVBoxLayout()
         v_box.addWidget(address_label)
         v_box.addWidget(self.address_field)
         v_box.addWidget(port_label)
@@ -63,17 +69,13 @@ class SyncDialog(QtWidgets.QDialog):
         """Get host information."""
         address = self.address_field.text()
         if address == "":
-            QtWidgets.QMessageBox.information(
-                self, "Empty address", "Address cannot be empty"
-            )
+            QMessageBox.information(self, "Empty address", "Address cannot be empty")
             return
 
         # get remote port
         port = self.port_field.text()
         if port == "":
-            QtWidgets.QMessageBox.information(
-                self, "Empty port", "Port cannot be empty"
-            )
+            QMessageBox.information(self, "Empty port", "Port cannot be empty")
             return
 
         port = int(port)
@@ -82,7 +84,7 @@ class SyncDialog(QtWidgets.QDialog):
         if self.operation == sync_operations["PULL_REQUEST"].name:
             # try the pull, inform user of the results
             result, msg = settings.db.sync_pull((address, port))
-            QtWidgets.QMessageBox.information(self, "Sync Pull", msg)
+            QMessageBox.information(self, "Sync Pull", msg)
             if not result:
                 return
         elif self.operation == sync_operations["PUSH_REQUEST"].name:
@@ -93,7 +95,7 @@ class SyncDialog(QtWidgets.QDialog):
 
             # try the push, inform user of results
             result, msg = settings.db.sync_push((address, port))
-            QtWidgets.QMessageBox.information(self, "Sync Push", msg)
+            QMessageBox.information(self, "Sync Push", msg)
             if not pull_ok:
                 settings.options["pull"] = False
 

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/net/__init__.py

@@ -3,7 +3,7 @@
 A small TCP socket reader with a simple progress bar.
 """
 
-from PyQt5 import QtWidgets, QtCore
+from PyQt6 import QtWidgets, QtCore
 
 
 def recv_all(sock, size):

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/net/tcp_client_lib.py

@@ -8,12 +8,11 @@ import os
 import socket
 import time
 
-from todo.core import settings, json_helpers
-from todo.core.Logger import Logger
-from todo.crypto.AESCipher import AESCipher
-from todo.net.sync_operations import sync_operations
-
-from . import recv_all
+from ..core import settings, json_helpers
+from ..core.Logger import Logger
+from ..crypto.AESCipher import AESCipher
+from ..net import recv_all
+from ..net.sync_operations import sync_operations
 
 
 logger = Logger(__name__)

{pytodo-qt-0.2.0 → pytodo-qt-0.2.1}/src/todo/net/tcp_server_lib.py

@@ -9,11 +9,12 @@ import socketserver
 import sys
 import time
 
-from PyQt5 import QtWidgets
-from todo.core import error_on_none_db, settings
-from todo.core.Logger import Logger
-from todo.crypto.AESCipher import AESCipher
-from todo.net.sync_operations import sync_operations
+from PyQt6.QtWidgets import QMessageBox
+
+from ..core import error_on_none_db, settings
+from ..core.Logger import Logger
+from ..crypto.AESCipher import AESCipher
+from ..net.sync_operations import sync_operations
 
 
 logger = Logger(__name__)
@@ -115,7 +116,7 @@ class TCPRequestHandler(socketserver.StreamRequestHandler):
                 sync_operations["REJECT"].name
             )
             self.request.send(self.encrypted_reply)
-            QtWidgets.QMessageBox.warning(None, "Push Sync", msg)
+            QMessageBox.warning(None, "Push Sync", msg)
             logger.log.warning(msg)
             return
 
@@ -127,7 +128,7 @@ class TCPRequestHandler(socketserver.StreamRequestHandler):
             self.host = (self.peer_name[0], settings.options["port"])
         else:
             msg = "Not performing push sync, no host peer"
-            QtWidgets.QMessageBox.warning(None, "Push Sync", msg)
+            QMessageBox.warning(None, "Push Sync", msg)
             logger.log.warning(msg)
             return