Skip to content

Fix the version string for PEP440, and some Qt6 enum accesses #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ferdnyc wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix the version string for PEP440, and some Qt6 enum accesses #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
182b500
setup: Use legal version string
ferdnyc Dec 3, 2025
bcf0356
Fix some Qt enum accesses for PyQt6
ferdnyc Dec 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
6 changes: 3 additions & 3 deletions videomorph/forms/videomorph.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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."""
Expand Down
6 changes: 3 additions & 3 deletions videomorph/forms/vmwidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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):
Expand All @@ -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
)