From 73bfda7ea8493169e27a9452e8ea9b5b74e1f51a Mon Sep 17 00:00:00 2001 From: Travis Abendshien <46939827+CyanVoxel@users.noreply.github.com> Date: Fri, 3 Jan 2025 04:41:33 -0800 Subject: [PATCH] cleanup comments; rename tsp to tag_search_panel --- .../src/qt/widgets/preview/field_containers.py | 10 ++-------- .../src/qt/widgets/preview/file_attributes.py | 18 +----------------- tagstudio/src/qt/widgets/preview_panel.py | 15 ++++----------- 3 files changed, 7 insertions(+), 36 deletions(-) diff --git a/tagstudio/src/qt/widgets/preview/field_containers.py b/tagstudio/src/qt/widgets/preview/field_containers.py index ae00a6c0..d3482387 100644 --- a/tagstudio/src/qt/widgets/preview/field_containers.py +++ b/tagstudio/src/qt/widgets/preview/field_containers.py @@ -89,11 +89,11 @@ class FieldContainers(QWidget): self.scroll_area.setWidgetResizable(True) self.scroll_area.setFrameShadow(QFrame.Shadow.Plain) self.scroll_area.setFrameShape(QFrame.Shape.NoFrame) + # NOTE: I would rather have this style applied to the scroll_area # background and NOT the scroll container background, so that the # rounded corners are maintained when scrolling. I was unable to # find the right trick to only select that particular element. - self.scroll_area.setStyleSheet( "QWidget#entryScrollContainer{" f"background:{self.panel_bg_color};" @@ -437,15 +437,11 @@ class FieldContainers(QWidget): entry_ids = [e.id for e in self.cached_entries] self.lib.remove_entry_field(field, entry_ids) - # # if the field is meta tags, update the badges - # if field.type_key == _FieldID.TAGS_META.value: - # self.driver.update_badges(self.selected) - def update_field(self, field: BaseField, content: str) -> None: """Update a field in all selected Entries, given a field object.""" assert isinstance( field, - (TextField, DatetimeField), # , TagBoxField) + (TextField, DatetimeField), ), f"instance: {type(field)}" entry_ids = [e.id for e in self.cached_entries] @@ -466,11 +462,9 @@ class FieldContainers(QWidget): Translations["generic.cancel_alt"], QMessageBox.ButtonRole.DestructiveRole ) remove_mb.addButton("&Remove", QMessageBox.ButtonRole.RejectRole) - # remove_mb.setStandardButtons(QMessageBox.StandardButton.Cancel) remove_mb.setDefaultButton(cancel_button) remove_mb.setEscapeButton(cancel_button) result = remove_mb.exec_() - # logging.info(result) if result == 3: # TODO - what is this magic number? callback() diff --git a/tagstudio/src/qt/widgets/preview/file_attributes.py b/tagstudio/src/qt/widgets/preview/file_attributes.py index 6a99b945..43c76227 100644 --- a/tagstudio/src/qt/widgets/preview/file_attributes.py +++ b/tagstudio/src/qt/widgets/preview/file_attributes.py @@ -38,12 +38,6 @@ class FileAttributes(QWidget): def __init__(self, library: Library, driver: "QtDriver"): super().__init__() - # self.is_connected = False - # self.lib = library - # self.driver: QtDriver = driver - # self.initialized = False - # self.is_open: bool = False - root_layout = QVBoxLayout(self) root_layout.setContentsMargins(0, 0, 0, 0) root_layout.setSpacing(0) @@ -54,12 +48,6 @@ class FileAttributes(QWidget): else Theme.COLOR_DARK_LABEL.value ) - # panel_bg_color = ( - # Theme.COLOR_BG_DARK.value - # if QGuiApplication.styleHints().colorScheme() is Qt.ColorScheme.Dark - # else Theme.COLOR_BG_LIGHT.value - # ) - self.date_style = "font-size:12px;" self.file_label_style = "font-size: 12px" self.properties_style = ( @@ -168,11 +156,7 @@ class FileAttributes(QWidget): file_str += f"
{"\u200b".join(part_)}" self.file_label.setText(file_str) self.file_label.setCursor(Qt.CursorShape.PointingHandCursor) - self.opener = FileOpenerHelper(filepath) - # self.open_file_action = QAction(self) - # Translations.translate_qobject(self.open_file_action, "file.open_file") - # self.open_explorer_action = QAction(PlatformStrings.open_file_str, self) # Initialize the possible stat variables stats_label_text = "" @@ -237,7 +221,7 @@ class FileAttributes(QWidget): self.dimensions_label.setText(stats_label_text) def update_multi_selection(self, count: int): - # Multiple Selected Items + """Format attributes for multiple selected items.""" self.layout().setSpacing(0) self.file_label.setAlignment(Qt.AlignmentFlag.AlignCenter) self.file_label.setText(f"{count} Items Selected") diff --git a/tagstudio/src/qt/widgets/preview_panel.py b/tagstudio/src/qt/widgets/preview_panel.py index 89c73311..72fbca80 100644 --- a/tagstudio/src/qt/widgets/preview_panel.py +++ b/tagstudio/src/qt/widgets/preview_panel.py @@ -73,8 +73,8 @@ class PreviewPanel(QWidget): self.file_attrs = FileAttributes(library, driver) self.fields = FieldContainers(library, driver) - tsp = TagSearchPanel(self.driver.lib) - self.add_tag_modal = PanelModal(tsp, "Add Tags", "Add Tags") + tag_search_panel = TagSearchPanel(self.driver.lib) + self.add_tag_modal = PanelModal(tag_search_panel, "Add Tags", "Add Tags") self.add_field_modal = AddFieldModal(self.lib) @@ -121,7 +121,7 @@ class PreviewPanel(QWidget): splitter.addWidget(preview_section) splitter.addWidget(info_section) - # splitter.addWidget(self.libs_flow_container) + # splitter.addWidget(self.libs_flow_container) # TODO: Determine fate of this; Move to menu splitter.setStretchFactor(1, 2) root_layout = QVBoxLayout(self) @@ -160,23 +160,16 @@ class PreviewPanel(QWidget): # Multiple Selected Items elif len(self.driver.selected) > 1: # items: list[Entry] = [self.lib.get_entry_full(x) for x in self.driver.selected] - # TODO: Render mixed selection - self.thumb.hide_preview() # TODO: Allow for mixed editing + self.thumb.hide_preview() # TODO: Render mixed selection self.file_attrs.update_multi_selection(len(self.driver.selected)) self.file_attrs.update_date_label() self.fields.hide_containers() # TODO: Allow for mixed editing self.update_add_tag_button() self.update_add_field_button() - # self.fields.update_from_entries(items) - # self.file_attrs.update_selection_count() self.add_tag_button.setEnabled(True) self.add_field_button.setEnabled(True) - # self.thumb.update_widgets() - # # self.file_attrs.update_widgets() - # self.fields.update_widgets() - return True def update_add_field_button(self, entry: Entry | None = None):