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

...

Browse Source
This commit is contained in:
Kovid Goyal 2010-05-04 21:44:29 -06:00
commit 07f3e87b13
2 changed files with 62 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/calibre/gui2/library.py
View File

@ -296,16 +296,17 @@ class BooksModel(QAbstractTableModel):
def read_config(self): def read_config(self):
self.use_roman_numbers = config['use_roman_numerals_for_series_number'] self.use_roman_numbers = config['use_roman_numerals_for_series_number']
self.column_map = config['column_map'][:] # force a copy cmap = config['column_map'][:] # force a copy
self.headers = {} self.headers = {}
for i in self.column_map: # take out any columns no longer in the db self.column_map = []
if not i in self.orig_headers and not i in self.custom_columns: for col in cmap: # take out any columns no longer in the db
self.column_map.remove(i) if col in self.orig_headers or col in self.custom_columns:
for i in self.column_map: self.column_map.append(col)
if i in self.orig_headers: for col in self.column_map:
self.headers[i] = self.orig_headers[i] if col in self.orig_headers:
elif i in self.custom_columns: self.headers[col] = self.orig_headers[col]
self.headers[i] = self.custom_columns[i]['name'] elif col in self.custom_columns:
self.headers[col] = self.custom_columns[col]['name']
self.build_data_convertors() self.build_data_convertors()
self.reset() self.reset()
self.emit(SIGNAL('columns_sorted()')) self.emit(SIGNAL('columns_sorted()'))

118
src/calibre/gui2/main.ui
View File

@ -157,6 +157,30 @@
<property name="margin"> <property name="margin">
<number>0</number> <number>0</number>
</property> </property>
<item>
<widget class="QLabel" name="restriction_label">
<property name="text">
<string>&amp;Restrict to:</string>
</property>
<property name="buddy">
<cstring>search_restriction</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="search_restriction">
<property name="toolTip">
<string>Books display will be restricted to those matching the selected saved search</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="search_count">
<property name="text">
<string>set in ui.py</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="advanced_search_button"> <widget class="QToolButton" name="advanced_search_button">
<property name="toolTip"> <property name="toolTip">
@ -206,13 +230,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="search_count">
<property name="text">
<string>set in ui.py</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QToolButton" name="clear_button"> <widget class="QToolButton" name="clear_button">
<property name="toolTip"> <property name="toolTip">
@ -336,69 +353,38 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QCheckBox" name="popularity"> <widget class="QCheckBox" name="popularity">
<property name="text"> <property name="text">
<string>Sort by &amp;popularity</string> <string>Sort by &amp;popularity</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="tag_match">
<property name="currentIndex">
<number>0</number>
</property> </property>
<item>
<property name="text">
<string>Match any</string>
</property>
</item>
<item>
<property name="text">
<string>Match all</string>
</property>
</item>
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3"> <widget class="QPushButton" name="edit_categories">
<item> <property name="toolTip">
<widget class="QComboBox" name="tag_match"> <string>Create, edit, and delete user categories</string>
<property name="currentIndex"> </property>
<number>0</number> <property name="text">
</property> <string>Manage &amp;user categories</string>
<item> </property>
<property name="text"> </widget>
<string>Match any</string>
</property>
</item>
<item>
<property name="text">
<string>Match all</string>
</property>
</item>
</widget>
</item>
<item>
<widget class="QPushButton" name="edit_categories">
<property name="toolTip">
<string>Create, edit, and delete user categories</string>
</property>
<property name="text">
<string>Manage &amp;user categories</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" stretch="10,50">
<item>
<widget class="QLabel" name="restriction_label">
<property name="text">
<string>&amp;Restrict to:</string>
</property>
<property name="buddy">
<cstring>search_restriction</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="search_restriction">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>50</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Books display will be restricted to those matching the selected saved search</string>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>