From 1474957e99c8de10f8c02da4c543342b3803dd4c Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 5 Nov 2023 17:07:31 +0000 Subject: [PATCH] Added the third radio button and made them exclusive. I solved the vertical space problem by eliminating the content margins. --- .../gui2/dialogs/edit_authors_dialog.py | 12 +-- .../gui2/dialogs/edit_authors_dialog.ui | 73 +++++++++++-------- src/calibre/gui2/dialogs/tag_list_editor.py | 11 ++- src/calibre/gui2/dialogs/tag_list_editor.ui | 73 +++++++++++-------- 4 files changed, 95 insertions(+), 74 deletions(-) diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.py b/src/calibre/gui2/dialogs/edit_authors_dialog.py index f0e5104987..08f358cf11 100644 --- a/src/calibre/gui2/dialogs/edit_authors_dialog.py +++ b/src/calibre/gui2/dialogs/edit_authors_dialog.py @@ -108,9 +108,13 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog): self.buttonBox.button(QDialogButtonBox.StandardButton.Cancel).setText(_('&Cancel')) self.buttonBox.accepted.connect(self.accepted) self.buttonBox.rejected.connect(self.rejected) - self.apply_vl_checkbox.setAutoExclusive(False) + self.show_button_layout.setSpacing(0) + self.show_button_layout.setContentsMargins(0, 0, 0, 0) + self.apply_all_checkbox.setContentsMargins(0, 0, 0, 0) + self.apply_all_checkbox.setChecked(True) + self.apply_vl_checkbox.setContentsMargins(0, 0, 0, 0) self.apply_vl_checkbox.toggled.connect(self.use_vl_changed) - self.apply_selection_checkbox.setAutoExclusive(False) + self.apply_selection_checkbox.setContentsMargins(0, 0, 0, 0) self.apply_selection_checkbox.toggled.connect(self.apply_selection_box_changed) self.table.setAlternatingRowColors(True) @@ -214,13 +218,9 @@ class EditAuthorsDialog(QDialog, Ui_EditAuthorsDialog): self.ignore_cell_changed = orig def use_vl_changed(self, x): - if self.apply_vl_checkbox.isChecked(): - self.apply_selection_checkbox.setChecked(False) self.show_table(None, None, None, False) def apply_selection_box_changed(self, x): - if self.apply_selection_checkbox.isChecked(): - self.apply_vl_checkbox.setChecked(False) self.show_table(None, None, None, False) def selection_to_apply(self): diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.ui b/src/calibre/gui2/dialogs/edit_authors_dialog.ui index 6427e171ef..5a17f81394 100644 --- a/src/calibre/gui2/dialogs/edit_authors_dialog.ui +++ b/src/calibre/gui2/dialogs/edit_authors_dialog.ui @@ -65,37 +65,48 @@ - - - - <p>Show authors only if they appear in the - current Virtual library. Edits already done may be hidden but will - not be forgotten. - </p><p> - Note that this box affects only what is displayed. Changes - will affect all books in your library even if this box - is checked.</p>< - - - Only show authors in the current &Virtual library - - - - - - - <p>Show items only if they appear in the - currently selected books. Edits already done may be hidden but will - not be forgotten. - </p><p> - Note that this box affects only what is displayed. Changes - will affect all books in your library even if this box - is checked.</p>< - - - O&nly show authors in the currently selected books - - + + + + + + Show &all authors + + + + + + + <p>Show authors only if they appear in the + current Virtual library. Edits already done may be hidden but will + not be forgotten. + </p><p> + Note that this box affects only what is displayed. Changes + will affect all books in your library even if this box + is checked.</p>< + + + Only show authors in the current &Virtual library + + + + + + + <p>Show items only if they appear in the + currently selected books. Edits already done may be hidden but will + not be forgotten. + </p><p> + Note that this box affects only what is displayed. Changes + will affect all books in your library even if this box + is checked.</p>< + + + O&nly show authors in the currently selected books + + + + diff --git a/src/calibre/gui2/dialogs/tag_list_editor.py b/src/calibre/gui2/dialogs/tag_list_editor.py index 983d05ce61..b6afaddd7e 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.py +++ b/src/calibre/gui2/dialogs/tag_list_editor.py @@ -372,9 +372,12 @@ class TagListEditor(QDialog, Ui_TagListEditor): ac.triggered.connect(self.clear_filter) le.returnPressed.connect(self.do_filter) self.filter_button.clicked.connect(self.do_filter) - self.apply_vl_checkbox.setAutoExclusive(False) + self.show_button_layout.setSpacing(0) + self.show_button_layout.setContentsMargins(0, 0, 0, 0) + self.apply_all_checkbox.setContentsMargins(0, 0, 0, 0) + self.apply_all_checkbox.setChecked(True) self.apply_vl_checkbox.toggled.connect(self.vl_box_changed) - self.apply_selection_checkbox.setAutoExclusive(False) + self.apply_selection_checkbox.setContentsMargins(0, 0, 0, 0) self.apply_selection_checkbox.toggled.connect(self.apply_selection_box_changed) self.is_enumerated = False @@ -540,14 +543,10 @@ class TagListEditor(QDialog, Ui_TagListEditor): return txt.swapcase() def vl_box_changed(self): - if self.apply_vl_checkbox.isChecked(): - self.apply_selection_checkbox.setChecked(False) self.search_item_row = -1 self.fill_in_table(None, None, False) def apply_selection_box_changed(self): - if self.apply_selection_checkbox.isChecked(): - self.apply_vl_checkbox.setChecked(False) self.search_item_row = -1 self.fill_in_table(None, None, False) diff --git a/src/calibre/gui2/dialogs/tag_list_editor.ui b/src/calibre/gui2/dialogs/tag_list_editor.ui index 5589613ef2..a075f7ee9d 100644 --- a/src/calibre/gui2/dialogs/tag_list_editor.ui +++ b/src/calibre/gui2/dialogs/tag_list_editor.ui @@ -71,37 +71,48 @@ - - - - <p>Show items only if they appear in the - current Virtual library. Edits already done may be hidden but will - not be forgotten. - </p><p> - Note that this box affects only what is displayed. Changes - will affect all books in your library even if this box - is checked.</p> - - - Only show items in the current &Virtual library - - - - - - - <p>Show items only if they appear in the - currently selected books. Edits already done may be hidden but will - not be forgotten. - </p><p> - Note that this box affects only what is displayed. Changes - will affect all books in your library even if this box - is checked.</p> - - - O&nly show items in the currently selected books - - + + + + + + Show &all items + + + + + + + <p>Show items only if they appear in the + current Virtual library. Edits already done may be hidden but will + not be forgotten. + </p><p> + Note that this box affects only what is displayed. Changes + will affect all books in your library even if this box + is checked.</p> + + + Only show items in the current &Virtual library + + + + + + + <p>Show items only if they appear in the + currently selected books. Edits already done may be hidden but will + not be forgotten. + </p><p> + Note that this box affects only what is displayed. Changes + will affect all books in your library even if this box + is checked.</p> + + + O&nly show items in the currently selected books + + + +