Skip to content

Fix empty tags being removed from tag selection #2602

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

Merged
merged 2 commits into from
Mar 11, 2025
Merged

Fix empty tags being removed from tag selection #2602

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
185fd34
Tag editor: Rename _modified_tag to _current_tag_values
phw Mar 11, 2025
ee26533
Tag editor: Ensure tags with only empty values get removed from tag list
phw Mar 11, 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
19 changes: 13 additions & 6 deletions picard/ui/edittagdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,14 +302,14 @@ def remove_value(self):
def on_rows_inserted(self, parent, first, last):
for row in range(first, last + 1):
item = self.value_list.item(row)
self._modified_tag().insert(row, item.text())
self._current_tag_values().insert(row, item.text())

def on_rows_removed(self, parent, first, last):
for row in range(first, last + 1):
del self._modified_tag()[row]
del self._current_tag_values()[row]

def on_rows_moved(self, parent, start, end, destination, row):
modified_tag = self._modified_tag()
modified_tag = self._current_tag_values()
moved_values = modified_tag[start:end + 1]
del modified_tag[start:end + 1]
for value in reversed(moved_values):
Expand Down Expand Up @@ -396,7 +396,7 @@ def _update_tag_combobox(self, tag):

# if the previous tag was new and has no value, remove it from the QComboBox.
# e.g. typing "XYZ" should not leave "X" or "XY" in the QComboBox.
if self.tag and self.tag not in self.default_tags and self._modified_tag() == [""]:
if self._current_tag_is_transient():
tag_names.removeItem(tag_names.findText(self.tag, flags))

row = tag_names.findText(tag, flags)
Expand Down Expand Up @@ -485,7 +485,7 @@ def value_edited(self, item):
self._group(False)
self._set_item_style(item)
else:
self._modified_tag()[row] = value
self._current_tag_values()[row] = value
# add tags to the completer model once they get values
cm = self.completer.model()
if self.tag not in cm.stringList():
Expand All @@ -509,7 +509,7 @@ def value_selection_changed(self):
enabled = bool(self.value_list.selectedItems())
self._update_button_states(enabled)

def _modified_tag(self):
def _current_tag_values(self):
"""Get or create the list of modified values for the current tag.

Returns:
Expand All @@ -520,6 +520,13 @@ def _modified_tag(self):
list(self.metadata_box.tag_diff.new[self.tag])
)

def _current_tag_is_transient(self):
"""Check if the current tag is a custom tag that can be removed from
the list of tags if empty.
"""
return (self.tag and self.tag not in self.default_tags
and not any(self._current_tag_values()))

def _modified_tags_without_empty_values(self):
"""Generate each modified tag and its non-empty values."""
for tag, values in self.modified_tags.items():
Expand Down
Loading