Skip to content
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

Jump to bottom

Add "Delete Tag" menu option to tags in the Tag Database and tag box #105

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add "Delete Tag" menu option to tags in the Tag Database and tag box #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion tagstudio/src/qt/modals/build_tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ def set_subtags(self):
l.setContentsMargins(0,0,0,0)
l.setSpacing(3)
for tag_id in self.tag.subtag_ids:
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, True)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, True, False)
tw.on_remove.connect(lambda checked=False, t=tag_id: self.remove_subtag_callback(t))
l.addWidget(tw)
self.scroll_layout.addWidget(c)
Expand Down
27 changes: 24 additions & 3 deletions tagstudio/src/qt/modals/tag_database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@


from PySide6.QtCore import Signal, Qt, QSize
from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QScrollArea, QFrame
from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLineEdit, QScrollArea, QFrame, QMessageBox, QApplication

from src.core.library import Library
from src.qt.widgets import PanelWidget, PanelModal, TagWidget
Expand Down Expand Up @@ -92,8 +92,10 @@ def update_tags(self, query:str):
l = QHBoxLayout(c)
l.setContentsMargins(0,0,0,0)
l.setSpacing(3)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), True, False)
tag_deletable = tag_id not in [0, 1] # [0, 1] should probably be extracted as a constant during refactor
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), True, False, tag_deletable)
tw.on_edit.connect(lambda checked=False, t=self.lib.get_tag(tag_id): (self.edit_tag(t.id)))
tw.on_delete.connect(lambda checked=False, t=self.lib.get_tag(tag_id): (self.delete_tag(t.id)))
l.addWidget(tw)
self.scroll_layout.addWidget(c)
else:
Expand All @@ -106,8 +108,10 @@ def update_tags(self, query:str):
l = QHBoxLayout(c)
l.setContentsMargins(0,0,0,0)
l.setSpacing(3)
tw = TagWidget(self.lib, tag, True, False)
tag_deletable = tag_id not in [0, 1] # [0, 1] should probably be extracted as a constant during refactor
tw = TagWidget(self.lib, tag, True, False, tag_deletable)
tw.on_edit.connect(lambda checked=False, t=tag: (self.edit_tag(t.id)))
tw.on_delete.connect(lambda checked=False, t=tag: (self.delete_tag(t.id)))
l.addWidget(tw)
self.scroll_layout.addWidget(c)

Expand All @@ -128,6 +132,23 @@ def edit_tag(self, tag_id:int):
# panel.tag_updated.connect(lambda tag: self.lib.update_tag(tag))
self.edit_modal.show()

def delete_tag(self, tag_id:int):
def show_delete_prompt() -> bool:
result = QMessageBox.question(self, "Delete Tag", f"Are you sure you want to delete Tag {tag.name}?",
QMessageBox.Yes | QMessageBox.No)

return result == QMessageBox.Yes

tag = self.lib.get_tag(tag_id)
shift_held = Qt.KeyboardModifier.ShiftModifier in QApplication.keyboardModifiers()

if shift_held or show_delete_prompt():
self.lib.remove_tag(tag_id)
self.update_tags(self.search_field.text())

if not shift_held:
QMessageBox.information(self, "Delete Tag", "Tag deleted.")

def edit_tag_callback(self, btp:BuildTagPanel):
self.lib.update_tag(btp.build_tag())
self.update_tags(self.search_field.text())
Expand Down
2 changes: 1 addition & 1 deletion tagstudio/src/qt/modals/tag_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@ def update_tags(self, query:str):
l = QHBoxLayout(c)
l.setContentsMargins(0, 0, 0, 0)
l.setSpacing(3)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, False)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, False, False)
ab = QPushButton()
ab.setMinimumSize(23, 23)
ab.setMaximumSize(23, 23)
Expand Down
8 changes: 7 additions & 1 deletion tagstudio/src/qt/widgets/tag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ class TagWidget(QWidget):
on_remove = Signal()
on_click = Signal()
on_edit = Signal()
on_delete = Signal()

def __init__(self, library:Library, tag:Tag, has_edit:bool, has_remove:bool, on_remove_callback:FunctionType=None, on_click_callback:FunctionType=None, on_edit_callback:FunctionType=None) -> None:
def __init__(self, library:Library, tag:Tag, has_edit:bool, has_remove:bool, has_delete:bool, on_remove_callback:FunctionType=None, on_click_callback:FunctionType=None, on_edit_callback:FunctionType=None) -> None:
super().__init__()
self.lib = library
self.tag = tag
Expand Down Expand Up @@ -66,6 +67,11 @@ def __init__(self, library:Library, tag:Tag, has_edit:bool, has_remove:bool, on_
self.bg_button.addAction(search_for_tag_action)
add_to_search_action = QAction('Add to Search', self)
self.bg_button.addAction(add_to_search_action)

if has_delete:
delete_action = QAction('Delete Tag', self)
delete_action.triggered.connect(self.on_delete.emit)
self.bg_button.addAction(delete_action)

self.inner_layout = QHBoxLayout()
self.inner_layout.setObjectName('innerLayout')
Expand Down
49 changes: 37 additions & 12 deletions tagstudio/src/qt/widgets/tag_box.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import typing

from PySide6.QtCore import Signal, Qt
from PySide6.QtWidgets import QPushButton
from PySide6.QtWidgets import QPushButton, QMessageBox, QApplication

from src.core.library import Library, Tag
from src.qt.flowlayout import FlowLayout
Expand Down Expand Up @@ -71,36 +71,43 @@ def __init__(self, item, title, field_index, library:Library, tags:list[int], dr

def set_item(self, item):
self.item = item

def set_tags(self, tags:list[int]):
logging.info(f'[TAG BOX WIDGET] SET TAGS: T:{tags} for E:{self.item.id}')

def update_tags(self):
is_recycled = False

if self.base_layout.itemAt(0):
# logging.info(type(self.base_layout.itemAt(0).widget()))
is_recycled = True
while self.base_layout.itemAt(0) and self.base_layout.itemAt(1):
# logging.info(f"I'm deleting { self.base_layout.itemAt(0).widget()}")
self.base_layout.takeAt(0).widget().deleteLater()
is_recycled = True
for tag in tags:

for tag_id in self.tags:
# TODO: Remove space from the special search here (tag_id:x) once that system is finalized.
# tw = TagWidget(self.lib, self.lib.get_tag(tag), True, True,
# on_remove_callback=lambda checked=False, t=tag: (self.lib.get_entry(self.item.id).remove_tag(self.lib, t, self.field_index), self.updated.emit()),
# on_click_callback=lambda checked=False, q=f'tag_id: {tag}': (self.driver.main_window.searchField.setText(q), self.driver.filter_items(q)),
# on_edit_callback=lambda checked=False, t=tag: (self.edit_tag(t))
# )
tw = TagWidget(self.lib, self.lib.get_tag(tag), True, True)
tw.on_click.connect(lambda checked=False, q=f'tag_id: {tag}': (self.driver.main_window.searchField.setText(q), self.driver.filter_items(q)))
tw.on_remove.connect(lambda checked=False, t=tag: (self.remove_tag(t)))
tw.on_edit.connect(lambda checked=False, t=tag: (self.edit_tag(t)))
tag_deletable = tag_id not in [0, 1] # [0, 1] should probably be extracted as a constant during refactor
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), True, True, tag_deletable)
tw.on_click.connect(lambda checked=False, q=f'tag_id: {tag_id}': (self.driver.main_window.searchField.setText(q), self.driver.filter_items(q)))
tw.on_remove.connect(lambda checked=False, t=tag_id: (self.remove_tag(t)))
tw.on_edit.connect(lambda checked=False, t=tag_id: (self.edit_tag(t)))
tw.on_delete.connect(lambda checked=False, t=tag_id: (self.delete_tag(t)))
self.base_layout.addWidget(tw)
self.tags = tags


# Move or add the '+' button.
if is_recycled:
self.base_layout.addWidget(self.base_layout.takeAt(0).widget())
else:
self.base_layout.addWidget(self.add_button)

def set_tags(self, tags:list[int]):
logging.info(f'[TAG BOX WIDGET] SET TAGS: T:{tags} for E:{self.item.id}')
self.tags = tags
self.update_tags()

# Handles an edge case where there are no more tags and the '+' button
# doesn't move all the way to the left.
if self.base_layout.itemAt(0) and not self.base_layout.itemAt(1):
Expand All @@ -120,6 +127,24 @@ def edit_tag(self, tag_id:int):
self.edit_modal.saved.connect(lambda: self.lib.update_tag(btp.build_tag()))
# panel.tag_updated.connect(lambda tag: self.lib.update_tag(tag))
self.edit_modal.show()


def delete_tag(self, tag_id:int):
def show_delete_prompt() -> bool:
result = QMessageBox.question(self, "Delete Tag", f"Are you sure you want to delete Tag {tag.name}?",
QMessageBox.Yes | QMessageBox.No)

return result == QMessageBox.Yes

tag = self.lib.get_tag(tag_id)
shift_held = Qt.KeyboardModifier.ShiftModifier in QApplication.keyboardModifiers()

if shift_held or show_delete_prompt():
self.lib.remove_tag(tag_id)
self.update_tags()

if not shift_held:
QMessageBox.information(self, "Delete Tag", "Tag deleted.")
Comment on lines +132 to +147
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Having to replicate this here and in tag_database makes me think there should be a more reusable way to implement these dialogs but I think that will be a whole codebase sweep that needs to happen so I don't think that's an issue for this PR.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I considered putting this function in a place where I could reuse it without repeating myself. the other event listeners don't do this either though so I chose to be consistent with them



def add_tag_callback(self, tag_id):
Expand Down