From 182b50054841266567763adf8e5ae844c8c12ecc Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 3 Dec 2025 09:07:13 -0500 Subject: [PATCH 1/2] setup: Use legal version string `1.5-canelo` isn't a legal PEP440 Python version, but `1.5+canelo` is, so use that instead. Prevents `pip install` failing with a `packaging.version.InvalidVersion` exception. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 728f5178..cb3698c7 100644 --- a/setup.py +++ b/setup.py @@ -53,7 +53,7 @@ COMMONS = dict( name=APP_NAME.lower(), - version=VERSION + "-" + CODENAME.lower(), + version=VERSION + "+" + CODENAME.lower(), description="Video Converter based on ffmpeg, " "Python 3 and Qt6, focused on usability.", long_description=LONG_DESCRIPTION, From bcf03566472fbc144c8fd6826d01b328f056dc7e Mon Sep 17 00:00:00 2001 From: "FeRD (Frank Dana)" Date: Wed, 3 Dec 2025 09:10:37 -0500 Subject: [PATCH 2/2] Fix some Qt enum accesses for PyQt6 --- videomorph/forms/videomorph.py | 6 +++--- videomorph/forms/vmwidgets.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/videomorph/forms/videomorph.py b/videomorph/forms/videomorph.py index 1d3c7a26..c285d964 100644 --- a/videomorph/forms/videomorph.py +++ b/videomorph/forms/videomorph.py @@ -549,9 +549,9 @@ def _update_edit_triggers(self): int(self.tasks_table.currentColumn()) == COLUMNS.QUALITY and not self.library.converter_is_running ): - self.tasks_table.setEditTriggers(QAbstractItemView.AllEditTriggers) + self.tasks_table.setEditTriggers(QAbstractItemView.EditTrigger.AllEditTriggers) else: - self.tasks_table.setEditTriggers(QAbstractItemView.NoEditTriggers) + self.tasks_table.setEditTriggers(QAbstractItemView.EditTrigger.NoEditTriggers) if int(self.tasks_table.currentColumn()) == COLUMNS.NAME: self.play_video() @@ -618,7 +618,7 @@ def _write_app_settings(self, **app_settings): settings_file.setValue(key, setting) def _show_message_box(self, type_, title, msg): - QMessageBox(type_, title, msg, QMessageBox.Icon.Ok, self).show() + QMessageBox(type_, title, msg, QMessageBox.StandardButton.Ok, self).show() def about(self): """Show About dialog.""" diff --git a/videomorph/forms/vmwidgets.py b/videomorph/forms/vmwidgets.py index a66f3165..6cc21778 100644 --- a/videomorph/forms/vmwidgets.py +++ b/videomorph/forms/vmwidgets.py @@ -118,7 +118,7 @@ def createEditor(self, parent, option, index): def setEditorData(self, editor, index): """Set Target Quality.""" - text = index.model().data(index, Qt.DisplayRole) + text = index.model().data(index, Qt.ItemDataRole.DisplayRole) if index.column() == COLUMNS.QUALITY: i = editor.findText(text) if i == -1: @@ -128,7 +128,7 @@ def setEditorData(self, editor, index): QItemDelegate.setEditorData(self, editor, index) self.parent.tasks_table.setEditTriggers( - QAbstractItemView.NoEditTriggers + QAbstractItemView.EditTrigger.NoEditTriggers ) def update(self, editor, index): @@ -140,5 +140,5 @@ def update(self, editor, index): self.parent.total_duration = self.parent.task_list.duration self.parent.update_ui_when_ready() self.parent.tasks_table.setEditTriggers( - QAbstractItemView.NoEditTriggers + QAbstractItemView.EditTrigger.NoEditTriggers )