Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/cbhaley/calibre

Browse Source
This commit is contained in:
Kovid Goyal 2022-06-06 07:39:33 +05:30
commit 0a6dbad59e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/calibre/gui2/preferences/create_custom_column.py
View File

@ -177,11 +177,11 @@ class CreateCustomColumn(QDialog):
icon = bool(c['display'].get('bools_show_icons', True)) icon = bool(c['display'].get('bools_show_icons', True))
txt = bool(c['display'].get('bools_show_text', False)) txt = bool(c['display'].get('bools_show_text', False))
if icon and txt: if icon and txt:
self.bool_show_both_button.setChecked(True) self.bool_show_both_button.click()
elif icon: elif icon:
self.bool_show_icon_button.setChecked(True) self.bool_show_icon_button.click()
else: else:
self.bool_show_text_button.setChecked(True) self.bool_show_text_button.click()
# Default values # Default values
dv = c['display'].get('default_value', None) dv = c['display'].get('default_value', None)
@ -326,13 +326,16 @@ class CreateCustomColumn(QDialog):
# bool formatting # bool formatting
h1 = QHBoxLayout() h1 = QHBoxLayout()
self.bool_show_icon_button = QRadioButton(_('&Icon')) def add_bool_radio_button(txt):
h1.addWidget(self.bool_show_icon_button) b = QRadioButton(txt)
self.bool_show_text_button = QRadioButton(_('&Text')) b.clicked.connect(partial(self.bool_radio_button_clicked, b))
h1.addWidget(self.bool_show_text_button) h1.addWidget(b)
self.bool_show_both_button = QRadioButton(_('&Both')) return b
h1.addWidget(self.bool_show_both_button) self.bool_show_icon_button = add_bool_radio_button(_('&Icon'))
self.bool_show_text_button = add_bool_radio_button(_('&Text'))
self.bool_show_both_button = add_bool_radio_button(_('&Both'))
self.bool_button_group = QGroupBox() self.bool_button_group = QGroupBox()
self.bool_button_group.setFocusPolicy(Qt.FocusPolicy.StrongFocus)
self.bool_button_group.setLayout(h1) self.bool_button_group.setLayout(h1)
h = QHBoxLayout() h = QHBoxLayout()
h.addWidget(self.bool_button_group) h.addWidget(self.bool_button_group)
@ -452,6 +455,10 @@ class CreateCustomColumn(QDialog):
self.resize(self.sizeHint()) self.resize(self.sizeHint())
# }}} # }}}
def bool_radio_button_clicked(self, button, clicked):
if clicked:
self.bool_button_group.setFocusProxy(button)
def datatype_changed(self, *args): def datatype_changed(self, *args):
try: try:
col_type = self.column_types[self.column_type_box.currentIndex()]['datatype'] col_type = self.column_types[self.column_type_box.currentIndex()]['datatype']