Skip to content

Commit 001ff14

Browse files
recator: fixes to preview_panel.py, progress.py, tag.py and tag_box.py (#961)
* preview_panel.py * progress.py * tag.py * tag_box.py * Revert "preview_panel.py" This reverts commit bcb4515.
1 parent 57ab919 commit 001ff14

File tree

3 files changed

+20
-13
lines changed

3 files changed

+20
-13
lines changed

src/tagstudio/qt/widgets/progress.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ def __init__(
2929
self.pb = QProgressDialog(
3030
labelText=label_text,
3131
minimum=minimum,
32-
cancelButtonText=cancel_button_text,
32+
cancelButtonText=cancel_button_text or "",
3333
maximum=maximum,
3434
)
3535
self.root.addWidget(self.pb)

src/tagstudio/qt/widgets/tag.py

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
# Created for TagStudio: https://github.com/CyanVoxel/TagStudio
44

55

6-
import typing
7-
from types import FunctionType
6+
from collections.abc import Callable
7+
from typing import TYPE_CHECKING, override
88

99
import structlog
1010
from PySide6.QtCore import QEvent, Qt, Signal
@@ -20,7 +20,7 @@
2020
logger = structlog.get_logger(__name__)
2121

2222
# Only import for type checking/autocompletion, will not be imported at runtime.
23-
if typing.TYPE_CHECKING:
23+
if TYPE_CHECKING:
2424
from tagstudio.core.library.alchemy.library import Library
2525

2626

@@ -31,7 +31,7 @@ def __init__(
3131
self,
3232
id: int | None = 0,
3333
alias: str | None = None,
34-
on_remove_callback=None,
34+
on_remove_callback: Callable[[], None] | None = None,
3535
) -> None:
3636
super().__init__()
3737

@@ -84,11 +84,13 @@ def _adjust_width(self):
8484
self.text_field.setMinimumWidth(text_width)
8585
self.text_field.adjustSize()
8686

87-
def enterEvent(self, event: QEnterEvent) -> None: # noqa: N802
87+
@override
88+
def enterEvent(self, event: QEnterEvent) -> None:
8889
self.update()
8990
return super().enterEvent(event)
9091

91-
def leaveEvent(self, event: QEvent) -> None: # noqa: N802
92+
@override
93+
def leaveEvent(self, event: QEvent) -> None:
9294
self.update()
9395
return super().leaveEvent(event)
9496

@@ -106,9 +108,9 @@ def __init__(
106108
has_edit: bool,
107109
has_remove: bool,
108110
library: "Library | None" = None,
109-
on_remove_callback: FunctionType | None = None,
110-
on_click_callback: FunctionType | None = None,
111-
on_edit_callback: FunctionType | None = None,
111+
on_remove_callback: Callable[[], None] | None = None,
112+
on_click_callback: Callable[[], None] | None = None,
113+
on_edit_callback: Callable[[], None] | None = None,
112114
) -> None:
113115
super().__init__()
114116
self.tag = tag
@@ -271,13 +273,15 @@ def set_tag(self, tag: Tag | None) -> None:
271273
def set_has_remove(self, has_remove: bool):
272274
self.has_remove = has_remove
273275

274-
def enterEvent(self, event: QEnterEvent) -> None: # noqa: N802
276+
@override
277+
def enterEvent(self, event: QEnterEvent) -> None:
275278
if self.has_remove:
276279
self.remove_button.setHidden(False)
277280
self.update()
278281
return super().enterEvent(event)
279282

280-
def leaveEvent(self, event: QEvent) -> None: # noqa: N802
283+
@override
284+
def leaveEvent(self, event: QEvent) -> None:
281285
if self.has_remove:
282286
self.remove_button.setHidden(True)
283287
self.update()

src/tagstudio/qt/widgets/tag_box.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44

55

66
import typing
7+
from collections.abc import Iterable
78

89
import structlog
910
from PySide6.QtCore import Signal
@@ -37,6 +38,8 @@ def __init__(
3738
) -> None:
3839
super().__init__(title)
3940

41+
self.edit_modal: PanelModal
42+
4043
self.tags: set[Tag] = tags
4144
self.driver = (
4245
driver # Used for creating tag click callbacks that search entries for that tag.
@@ -49,7 +52,7 @@ def __init__(
4952

5053
self.set_tags(self.tags)
5154

52-
def set_tags(self, tags: typing.Iterable[Tag]):
55+
def set_tags(self, tags: Iterable[Tag]) -> None:
5356
tags_ = sorted(list(tags), key=lambda tag: self.driver.lib.tag_display_name(tag.id))
5457
logger.info("[TagBoxWidget] Tags:", tags=tags)
5558
while self.base_layout.itemAt(0):

0 commit comments

Comments
 (0)