seika/tagstudio
1
0
Fork 0
mirror of https://github.com/TagStudioDev/TagStudio.git synced 2024-07-30 21:27:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

show all tags in tag panel by default

Browse source
This commit is contained in:
yedpodtrzitko 2024-05-01 00:04:37 +08:00
parent a10478bc8b
commit d478116094
2 changed files with 46 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tagstudio/src/core/library.py
View file

@ -1577,7 +1577,8 @@ class Library:
# NOTE: I'd expect a blank query to return all with the other implementation, but # NOTE: I'd expect a blank query to return all with the other implementation, but
# it misses stuff like Archive (id 0) so here's this as a catch-all. # it misses stuff like Archive (id 0) so here's this as a catch-all.
if query == '': query = query.strip()
if not query:
all: list[int] = [] all: list[int] = []
for tag in self.tags: for tag in self.tags:
if ignore_builtin and tag.id >= 1000: if ignore_builtin and tag.id >= 1000:

92
tagstudio/src/qt/modals/tag_search.py
View file

@ -27,7 +27,7 @@ class TagSearchPanel(PanelWidget):
super().__init__() super().__init__()
self.lib: Library = library self.lib: Library = library
# self.callback = callback # self.callback = callback
self.first_tag_id = -1 self.first_tag_id = None
self.tag_limit = 30 self.tag_limit = 30
# self.selected_tag: int = 0 # self.selected_tag: int = 0
self.setMinimumSize(300, 400) self.setMinimumSize(300, 400)
@ -68,6 +68,7 @@ class TagSearchPanel(PanelWidget):
self.root_layout.addWidget(self.search_field) self.root_layout.addWidget(self.search_field)
self.root_layout.addWidget(self.scroll_area) self.root_layout.addWidget(self.scroll_area)
self.update_tags('')
# def reset(self): # def reset(self):
# self.search_field.setText('') # self.search_field.setText('')
@ -75,7 +76,7 @@ class TagSearchPanel(PanelWidget):
# self.search_field.setFocus() # self.search_field.setFocus()
def on_return(self, text:str): def on_return(self, text:str):
if text and self.first_tag_id >= 0: if text and self.first_tag_id is not None:
# callback(self.first_tag_id) # callback(self.first_tag_id)
self.tag_chosen.emit(self.first_tag_id) self.tag_chosen.emit(self.first_tag_id)
self.search_field.setText('') self.search_field.setText('')
@ -87,57 +88,52 @@ class TagSearchPanel(PanelWidget):
def update_tags(self, query:str): def update_tags(self, query:str):
# for c in self.scroll_layout.children(): # for c in self.scroll_layout.children():
# c.widget().deleteLater() # c.widget().deleteLater()
while self.scroll_layout.itemAt(0): while self.scroll_layout.count():
# logging.info(f"I'm deleting { self.scroll_layout.itemAt(0).widget()}") # logging.info(f"I'm deleting { self.scroll_layout.itemAt(0).widget()}")
self.scroll_layout.takeAt(0).widget().deleteLater() self.scroll_layout.takeAt(0).widget().deleteLater()
if query:
first_id_set = False
for tag_id in self.lib.search_tags(query, include_cluster=True)[:self.tag_limit-1]:
if not first_id_set:
self.first_tag_id = tag_id
first_id_set = True
c = QWidget() found_tags = self.lib.search_tags(query, include_cluster=True)[:self.tag_limit - 1]
l = QHBoxLayout(c) self.first_tag_id = found_tags[0] if found_tags else None
l.setContentsMargins(0,0,0,0)
l.setSpacing(3)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, False)
ab = QPushButton()
ab.setMinimumSize(23, 23)
ab.setMaximumSize(23, 23)
ab.setText('+')
ab.setStyleSheet(
f'QPushButton{{'
f'background: {get_tag_color(ColorType.PRIMARY, self.lib.get_tag(tag_id).color)};'
# f'background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 {get_tag_color(ColorType.PRIMARY, tag.color)}, stop:1.0 {get_tag_color(ColorType.BORDER, tag.color)});'
# f"border-color:{get_tag_color(ColorType.PRIMARY, tag.color)};"
f"color: {get_tag_color(ColorType.TEXT, self.lib.get_tag(tag_id).color)};"
f'font-weight: 600;'
f"border-color:{get_tag_color(ColorType.BORDER, self.lib.get_tag(tag_id).color)};"
f'border-radius: 6px;'
f'border-style:solid;'
f'border-width: {math.ceil(1*self.devicePixelRatio())}px;'
# f'padding-top: 1.5px;'
# f'padding-right: 4px;'
f'padding-bottom: 5px;'
# f'padding-left: 4px;'
f'font-size: 20px;'
f'}}'
f'QPushButton::hover'
f'{{'
f"border-color:{get_tag_color(ColorType.LIGHT_ACCENT, self.lib.get_tag(tag_id).color)};"
f"color: {get_tag_color(ColorType.DARK_ACCENT, self.lib.get_tag(tag_id).color)};"
f'background: {get_tag_color(ColorType.LIGHT_ACCENT, self.lib.get_tag(tag_id).color)};'
f'}}')
ab.clicked.connect(lambda checked=False, x=tag_id: self.tag_chosen.emit(x)) for tag_id in found_tags:
c = QWidget()
l = QHBoxLayout(c)
l.setContentsMargins(0, 0, 0, 0)
l.setSpacing(3)
tw = TagWidget(self.lib, self.lib.get_tag(tag_id), False, False)
ab = QPushButton()
ab.setMinimumSize(23, 23)
ab.setMaximumSize(23, 23)
ab.setText('+')
ab.setStyleSheet(
f'QPushButton{{'
f'background: {get_tag_color(ColorType.PRIMARY, self.lib.get_tag(tag_id).color)};'
# f'background-color: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 {get_tag_color(ColorType.PRIMARY, tag.color)}, stop:1.0 {get_tag_color(ColorType.BORDER, tag.color)});'
# f"border-color:{get_tag_color(ColorType.PRIMARY, tag.color)};"
f"color: {get_tag_color(ColorType.TEXT, self.lib.get_tag(tag_id).color)};"
f'font-weight: 600;'
f"border-color:{get_tag_color(ColorType.BORDER, self.lib.get_tag(tag_id).color)};"
f'border-radius: 6px;'
f'border-style:solid;'
f'border-width: {math.ceil(1*self.devicePixelRatio())}px;'
# f'padding-top: 1.5px;'
# f'padding-right: 4px;'
f'padding-bottom: 5px;'
# f'padding-left: 4px;'
f'font-size: 20px;'
f'}}'
f'QPushButton::hover'
f'{{'
f"border-color:{get_tag_color(ColorType.LIGHT_ACCENT, self.lib.get_tag(tag_id).color)};"
f"color: {get_tag_color(ColorType.DARK_ACCENT, self.lib.get_tag(tag_id).color)};"
f'background: {get_tag_color(ColorType.LIGHT_ACCENT, self.lib.get_tag(tag_id).color)};'
f'}}')
l.addWidget(tw) ab.clicked.connect(lambda checked=False, x=tag_id: self.tag_chosen.emit(x))
l.addWidget(ab)
self.scroll_layout.addWidget(c) l.addWidget(tw)
else: l.addWidget(ab)
self.first_tag_id = -1 self.scroll_layout.addWidget(c)
self.search_field.setFocus() self.search_field.setFocus()