Cosmetic changes to edit tags (edit items): use toolbuttons instead of pushbuttons.

This commit is contained in:
Charles Haley 2020-05-24 09:42:20 +01:00
parent d909d2effc
commit 1584a4751e
2 changed files with 132 additions and 81 deletions

View File

@ -5,6 +5,7 @@ __copyright__ = '2008, Kovid Goyal <kovid at kovidgoyal.net>'
from PyQt5.Qt import Qt, QDialog, QAbstractItemView, QApplication
from calibre.gui2.dialogs.confirm_delete import confirm
from calibre.gui2.dialogs.tag_editor_ui import Ui_TagEditor
from calibre.gui2 import question_dialog, error_dialog, gprefs
from calibre.constants import islinux
@ -118,6 +119,10 @@ class TagEditor(QDialog, Ui_TagEditor):
if not items:
error_dialog(self, 'No tags selected', 'You must select at least one tag from the list of Available tags.').exec_()
return
if not confirm(
_('Deleting tags is done immediately and there is no undo.'),
'tag_editor_delete'):
return
pos = self.available_tags.verticalScrollBar().value()
for item in items:
used = self.db.is_tag_used(unicode_type(item.text())) \

View File

@ -82,10 +82,8 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="1" column="0">
<layout class="QGridLayout" name="middleBoxLayout">
<item row="1" column="1">
<widget class="QLineEdit" name="available_filter_input">
<property name="placeholderText">
<string>Filter the available items</string>
@ -95,7 +93,7 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="2" column="1">
<widget class="QListWidget" name="available_tags">
<property name="alternatingRowColors">
<bool>true</bool>
@ -108,21 +106,48 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="delete_button">
<item row="2" column="0">
<layout class="QVBoxLayout" name="buttonverticalLayout">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vorizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="delete_button">
<property name="toolTip">
<string>Delete the item from database. This will unapply the item from all books and then remove it from the database.</string>
</property>
<property name="text">
<string>&amp;Delete item(s)</string>
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/trash.png</normaloff>:/images/trash.png</iconset>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<item>
<spacer name="verticalSpacer2">
<property name="orientation">
<enum>Qt::Vorizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="0" column="1" colspan="2">
<widget class="QLabel" name="label">
<property name="text">
<string>Ava&amp;ilable items</string>
@ -132,7 +157,20 @@
</property>
</widget>
</item>
</layout>
<item row="2" column="2">
<layout class="QVBoxLayout" name="buttonverticalLayout">
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vorizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QToolButton" name="apply_button">
@ -146,8 +184,32 @@
</widget>
</item>
<item>
<layout class="QGridLayout" name="gridLayout_2">
<item row="1" column="0">
<widget class="QToolButton" name="unapply_button">
<property name="toolTip">
<string>Unapply (remove) the item from current book</string>
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/back.png</normaloff>:/images/back.png</iconset>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer2">
<property name="orientation">
<enum>Qt::Vorizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>10</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="3">
<widget class="QLineEdit" name="applied_filter_input">
<property name="placeholderText">
<string>Filter the applied items</string>
@ -157,7 +219,7 @@
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<item row="2" column="3">
<widget class="QListWidget" name="applied_tags">
<property name="alternatingRowColors">
<bool>true</bool>
@ -170,7 +232,7 @@
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<item row="0" column="3">
<widget class="QLabel" name="label_2">
<property name="text">
<string>Applied &amp;items</string>
@ -180,22 +242,6 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2">
<widget class="QPushButton" name="unapply_button">
<property name="toolTip">
<string>Unapply (remove) the item from current book</string>
</property>
<property name="text">
<string>&amp;Unapply item(s)</string>
</property>
<property name="icon">
<iconset resource="../../../../resources/images.qrc">
<normaloff>:/images/minus.png</normaloff>:/images/minus.png</iconset>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</item>
<item>