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

Changed tag_list_editor.py (the general category editor) to have three columns: value, count, and a new column 'was'. The "was" column is blank until the value is changed. All three are sortable.

Browse Source
This commit is contained in:
Charles Haley 2011-09-18 10:47:13 +02:00
parent cbc681ddca
commit 5f9dec1292
1 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/calibre/gui2/dialogs/tag_list_editor.py
View File

@ -18,10 +18,6 @@ class NameTableWidgetItem(QTableWidgetItem):
def data(self, role): def data(self, role):
if role == Qt.DisplayRole: if role == Qt.DisplayRole:
if self.initial_value != self.current_value:
return _('%(curr)s (was %(initial)s)')%dict(
curr=self.current_value, initial=self.initial_value)
else:
return self.current_value return self.current_value
elif role == Qt.EditRole: elif role == Qt.EditRole:
return self.current_value return self.current_value
@ -105,13 +101,16 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.up_arrow_icon = QIcon(I('arrow-up.png')) self.up_arrow_icon = QIcon(I('arrow-up.png'))
self.blank_icon = QIcon(I('blank.png')) self.blank_icon = QIcon(I('blank.png'))
self.table.setColumnCount(2) self.table.setColumnCount(3)
self.name_col = QTableWidgetItem(_('Tag')) self.name_col = QTableWidgetItem(_('Tag'))
self.table.setHorizontalHeaderItem(0, self.name_col) self.table.setHorizontalHeaderItem(0, self.name_col)
self.name_col.setIcon(self.up_arrow_icon) self.name_col.setIcon(self.up_arrow_icon)
self.count_col = QTableWidgetItem(_('Count')) self.count_col = QTableWidgetItem(_('Count'))
self.table.setHorizontalHeaderItem(1, self.count_col) self.table.setHorizontalHeaderItem(1, self.count_col)
self.count_col.setIcon(self.blank_icon) self.count_col.setIcon(self.blank_icon)
self.was_col = QTableWidgetItem(_('Was'))
self.table.setHorizontalHeaderItem(2, self.was_col)
self.count_col.setIcon(self.blank_icon)
# Capture clicks on the horizontal header to sort the table columns # Capture clicks on the horizontal header to sort the table columns
hh = self.table.horizontalHeader(); hh = self.table.horizontalHeader();
@ -120,6 +119,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
hh.sectionResized.connect(self.table_column_resized) hh.sectionResized.connect(self.table_column_resized)
self.name_order = 0 self.name_order = 0
self.count_order = 1 self.count_order = 1
self.was_order = 1
# Add the data # Add the data
select_item = None select_item = None
@ -135,6 +135,9 @@ class TagListEditor(QDialog, Ui_TagListEditor):
# only the name column can be selected # only the name column can be selected
item.setFlags (item.flags() & ~Qt.ItemIsSelectable) item.setFlags (item.flags() & ~Qt.ItemIsSelectable)
self.table.setItem(row, 1, item) self.table.setItem(row, 1, item)
item = QTableWidgetItem('')
item.setFlags (item.flags() & ~Qt.ItemIsSelectable)
self.table.setItem(row, 2, item)
# Scroll to the selected item if there is one # Scroll to the selected item if there is one
if select_item is not None: if select_item is not None:
@ -187,6 +190,10 @@ class TagListEditor(QDialog, Ui_TagListEditor):
if item.text() != item.initial_text(): if item.text() != item.initial_text():
id_ = item.data(Qt.UserRole).toInt()[0] id_ = item.data(Qt.UserRole).toInt()[0]
self.to_rename[id_] = unicode(item.text()) self.to_rename[id_] = unicode(item.text())
orig = self.table.item(item.row(), 2)
self.table.blockSignals(True)
orig.setData(Qt.DisplayRole, item.initial_text())
self.table.blockSignals(False)
def rename_tag(self): def rename_tag(self):
item = self.table.item(self.table.currentRow(), 0) item = self.table.item(self.table.currentRow(), 0)
@ -223,8 +230,10 @@ class TagListEditor(QDialog, Ui_TagListEditor):
def header_clicked(self, idx): def header_clicked(self, idx):
if idx == 0: if idx == 0:
self.do_sort_by_name() self.do_sort_by_name()
else: elif idx == 1:
self.do_sort_by_count() self.do_sort_by_count()
else:
self.do_sort_by_was()
def do_sort_by_name(self): def do_sort_by_name(self):
self.name_order = 1 if self.name_order == 0 else 0 self.name_order = 1 if self.name_order == 0 else 0
@ -232,6 +241,7 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.name_col.setIcon(self.down_arrow_icon if self.name_order self.name_col.setIcon(self.down_arrow_icon if self.name_order
else self.up_arrow_icon) else self.up_arrow_icon)
self.count_col.setIcon(self.blank_icon) self.count_col.setIcon(self.blank_icon)
self.was_col.setIcon(self.blank_icon)
def do_sort_by_count (self): def do_sort_by_count (self):
self.count_order = 1 if self.count_order == 0 else 0 self.count_order = 1 if self.count_order == 0 else 0
@ -239,6 +249,15 @@ class TagListEditor(QDialog, Ui_TagListEditor):
self.count_col.setIcon(self.down_arrow_icon if self.count_order self.count_col.setIcon(self.down_arrow_icon if self.count_order
else self.up_arrow_icon) else self.up_arrow_icon)
self.name_col.setIcon(self.blank_icon) self.name_col.setIcon(self.blank_icon)
self.was_col.setIcon(self.blank_icon)
def do_sort_by_was(self):
self.was_order = 1 if self.was_order == 0 else 0
self.table.sortByColumn(2, self.was_order)
self.was_col.setIcon(self.down_arrow_icon if self.was_order
else self.up_arrow_icon)
self.name_col.setIcon(self.blank_icon)
self.count_col.setIcon(self.blank_icon)
def accepted(self): def accepted(self):
self.save_geometry() self.save_geometry()