calvin.erfmann/TagStudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2026-02-01 07:39:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ui): properly unset container callbacks

Browse Source
This commit is contained in:
Travis Abendshien
2025-01-03 04:58:55 -08:00
parent 73bfda7ea8
commit b867bc26e9
2 changed files with 21 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
tagstudio/src/qt/widgets/fields.py
View File

@@ -5,14 +5,13 @@
import math
from pathlib import Path
from types import MethodType
from typing import Callable, Optional
from typing import Callable
from warnings import catch_warnings
from PIL import Image, ImageQt
from PySide6.QtCore import QEvent, Qt
from PySide6.QtGui import QEnterEvent, QPixmap
from PySide6.QtWidgets import QHBoxLayout, QLabel, QVBoxLayout, QWidget
from src.qt.helpers.qbutton_wrapper import QPushButtonWrapper
from PySide6.QtWidgets import QHBoxLayout, QLabel, QPushButton, QVBoxLayout, QWidget
class FieldContainer(QWidget):
@@ -72,7 +71,7 @@ class FieldContainer(QWidget):
self.title_layout.addWidget(self.title_widget)
self.title_layout.addStretch(2)
self.copy_button = QPushButtonWrapper()
self.copy_button = QPushButton()
self.copy_button.setMinimumSize(button_size, button_size)
self.copy_button.setMaximumSize(button_size, button_size)
self.copy_button.setFlat(True)
@@ -81,7 +80,7 @@ class FieldContainer(QWidget):
self.title_layout.addWidget(self.copy_button)
self.copy_button.setHidden(True)
self.edit_button = QPushButtonWrapper()
self.edit_button = QPushButton()
self.edit_button.setMinimumSize(button_size, button_size)
self.edit_button.setMaximumSize(button_size, button_size)
self.edit_button.setFlat(True)
@@ -90,7 +89,7 @@ class FieldContainer(QWidget):
self.title_layout.addWidget(self.edit_button)
self.edit_button.setHidden(True)
self.remove_button = QPushButtonWrapper()
self.remove_button = QPushButton()
self.remove_button.setMinimumSize(button_size, button_size)
self.remove_button.setMaximumSize(button_size, button_size)
self.remove_button.setFlat(True)
@@ -107,29 +106,29 @@ class FieldContainer(QWidget):
self.field_container.setLayout(self.field_layout)
self.inner_layout.addWidget(self.field_container)
def set_copy_callback(self, callback: Optional[MethodType]):
if self.copy_button.is_connected:
def set_copy_callback(self, callback: Callable | None = None):
with catch_warnings(record=True):
self.copy_button.clicked.disconnect()
self.copy_callback = callback
self.copy_button.clicked.connect(callback)
self.copy_button.is_connected = callable(callback)
if callback:
self.copy_button.clicked.connect(callback)
def set_edit_callback(self, callback: Callable):
if self.edit_button.is_connected:
def set_edit_callback(self, callback: Callable | None = None):
with catch_warnings(record=True):
self.edit_button.clicked.disconnect()
self.edit_callback = callback
self.edit_button.clicked.connect(callback)
self.edit_button.is_connected = callable(callback)
if callback:
self.edit_button.clicked.connect(callback)
def set_remove_callback(self, callback: Callable):
if self.remove_button.is_connected:
def set_remove_callback(self, callback: Callable | None = None):
with catch_warnings(record=True):
self.remove_button.clicked.disconnect()
self.remove_callback = callback
self.remove_button.clicked.connect(callback)
self.remove_button.is_connected = callable(callback)
if callback:
self.remove_button.clicked.connect(callback)
def set_inner_widget(self, widget: "FieldWidget"):
if self.field_layout.itemAt(0):

7
tagstudio/src/qt/widgets/preview/field_containers.py
View File

@@ -321,7 +321,6 @@ class FieldContainers(QWidget):
if not is_mixed:
try:
container.set_title(field.type.name)
# container.set_editable(False)
container.set_inline(False)
# TODO: Localize this and/or add preferences.
date = dt.strptime(field.value, "%Y-%m-%d %H:%M:%S")
@@ -330,12 +329,12 @@ class FieldContainers(QWidget):
container.set_inner_widget(inner_widget)
except Exception:
container.set_title(field.type.name)
# container.set_editable(False)
container.set_inline(False)
title = f"{field.type.name} (Date) (Unknown Format)"
inner_widget = TextWidget(title, str(field.value))
container.set_inner_widget(inner_widget)
container.set_edit_callback()
container.set_remove_callback(
lambda: self.remove_message_box(
prompt=self.remove_field_prompt(field.type.name),
@@ -367,7 +366,6 @@ class FieldContainers(QWidget):
)
)
container.edit_button.setHidden(True)
container.setHidden(False)
def write_tag_container(
@@ -424,7 +422,8 @@ class FieldContainers(QWidget):
container.set_inner_widget(inner_widget)
self.tags_updated.emit()
container.edit_button.setHidden(True)
container.set_edit_callback()
container.set_remove_callback()
container.setHidden(False)
def remove_field(self, field: BaseField):