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

1) fix tab order (bug #5480)

Browse Source 
2) mark tags to add/remove strings as translatable
3) add ':' to boolean label
4) refactor widget creation loop
This commit is contained in:
Charles Haley 2010-05-07 14:57:46 +01:00
parent 35e9d8d387
commit a7a20a5e1c
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/calibre/gui2/custom_column_widgets.py
View File

@ -46,7 +46,7 @@ class Base(object):
class Bool(Base): class Bool(Base):
def setup_ui(self, parent): def setup_ui(self, parent):
self.widgets = [QLabel('&'+self.col_metadata['name'], parent), self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent),
QComboBox(parent)] QComboBox(parent)]
w = self.widgets[1] w = self.widgets[1]
items = [_('Yes'), _('No'), _('Undefined')] items = [_('Yes'), _('No'), _('Undefined')]
@ -57,7 +57,6 @@ class Bool(Base):
for icon, text in zip(icons, items): for icon, text in zip(icons, items):
w.addItem(QIcon(icon), text) w.addItem(QIcon(icon), text)
def setter(self, val): def setter(self, val):
val = {None: 2, False: 1, True: 0}[val] val = {None: 2, False: 1, True: 0}[val]
if tweaks['bool_custom_columns_are_tristate'] == 'no' and val == 2: if tweaks['bool_custom_columns_are_tristate'] == 'no' and val == 2:
@ -338,12 +337,14 @@ class BulkText(BulkBase):
if self.col_metadata['is_multiple']: if self.col_metadata['is_multiple']:
w = TagsLineEdit(parent, values) w = TagsLineEdit(parent, values)
w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.widgets = [QLabel('&'+self.col_metadata['name']+': (tags to add)', parent), w] self.widgets = [QLabel('&'+self.col_metadata['name']+': ' +
_('tags to add'), parent), w]
self.adding_widget = w self.adding_widget = w
w = TagsLineEdit(parent, values) w = TagsLineEdit(parent, values)
w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred) w.setSizePolicy(QSizePolicy.Minimum, QSizePolicy.Preferred)
self.widgets.append(QLabel('&'+self.col_metadata['name']+': (tags to remove)', parent)) self.widgets.append(QLabel('&'+self.col_metadata['name']+': ' +
_('tags to remove'), parent))
self.widgets.append(w) self.widgets.append(w)
self.removing_widget = w self.removing_widget = w
else: else:
@ -413,12 +414,10 @@ def populate_bulk_metadata_page(layout, db, book_ids, parent=None):
if len(w.widgets) == 1: if len(w.widgets) == 1:
layout.addWidget(w.widgets[0], row, 0, 1, -1) layout.addWidget(w.widgets[0], row, 0, 1, -1)
else: else:
c = 0 for c in range(0, len(w.widgets), 2):
while c < len(w.widgets):
w.widgets[c].setBuddy(w.widgets[c+1]) w.widgets[c].setBuddy(w.widgets[c+1])
layout.addWidget(w.widgets[c], row, c%2) layout.addWidget(w.widgets[c], row, 0)
layout.addWidget(w.widgets[c+1], row, (c+1)%2) layout.addWidget(w.widgets[c+1], row, 1)
c += 2
row += 1 row += 1
items = [] items = []
if len(ans) > 0: if len(ans) > 0:

4
src/calibre/gui2/dialogs/metadata_bulk.py
View File

@ -57,7 +57,9 @@ class MetadataBulkDialog(QDialog, Ui_MetadataBulkDialog):
self.__custom_col_layouts = [layout] self.__custom_col_layouts = [layout]
ans = self.custom_column_widgets ans = self.custom_column_widgets
for i in range(len(ans)-1): for i in range(len(ans)-1):
w.setTabOrder(ans[i].widgets[1], ans[i+1].widgets[1]) w.setTabOrder(ans[i].widgets[-1], ans[i+1].widgets[1])
for c in range(2, len(ans[i].widgets), 2):
w.setTabOrder(ans[i].widgets[c-1], ans[i].widgets[c+1])
def initialize_combos(self): def initialize_combos(self):
self.initalize_authors() self.initalize_authors()