Store search: Ability to control what stores are searched.

This commit is contained in:
John Schember 2011-02-27 20:20:58 -05:00
parent e741fb3aeb
commit 0eb9dbb4a4
2 changed files with 135 additions and 68 deletions

View File

@ -11,7 +11,8 @@ from threading import Event, Thread
from Queue import Queue from Queue import Queue
from PyQt4.Qt import Qt, QAbstractItemModel, QDialog, QTimer, QVariant, \ from PyQt4.Qt import Qt, QAbstractItemModel, QDialog, QTimer, QVariant, \
QModelIndex, QPixmap, QSize QModelIndex, QPixmap, QSize, QCheckBox, QVBoxLayout, QHBoxLayout, \
QPushButton
from calibre import browser from calibre import browser
from calibre.customize.ui import store_plugins from calibre.customize.ui import store_plugins
@ -41,12 +42,30 @@ class SearchDialog(QDialog, Ui_Dialog):
self.model = Matches() self.model = Matches()
self.results_view.setModel(self.model) self.results_view.setModel(self.model)
stores_group_layout = QVBoxLayout()
self.stores_group.setLayout(stores_group_layout)
for x in store_plugins(): for x in store_plugins():
self.store_plugins[x.name] = x self.store_plugins[x.name] = x
cbox = QCheckBox(x.name)
cbox.setChecked(True)
stores_group_layout.addWidget(cbox)
setattr(self, 'store_check_' + x.name, cbox)
store_button_layout = QHBoxLayout()
stores_group_layout.addLayout(store_button_layout)
self.select_all_stores = QPushButton(_('All'))
self.select_invert_stores = QPushButton(_('Invert'))
self.select_none_stores = QPushButton(_('None'))
store_button_layout.addWidget(self.select_all_stores)
store_button_layout.addWidget(self.select_invert_stores)
store_button_layout.addWidget(self.select_none_stores)
self.search.clicked.connect(self.do_search) self.search.clicked.connect(self.do_search)
self.checker.timeout.connect(self.get_results) self.checker.timeout.connect(self.get_results)
self.results_view.activated.connect(self.open_store) self.results_view.activated.connect(self.open_store)
self.select_all_stores.clicked.connect(self.stores_select_all)
self.select_invert_stores.clicked.connect(self.stores_select_invert)
self.select_none_stores.clicked.connect(self.stores_select_none)
self.resize_columns() self.resize_columns()
@ -80,9 +99,10 @@ class SearchDialog(QDialog, Ui_Dialog):
return return
for n in self.store_plugins: for n in self.store_plugins:
t = SearchThread(query, (n, self.store_plugins[n]), self.results, self.abort, self.TIMEOUT) if getattr(self, 'store_check_' + n).isChecked():
self.running_threads.append(t) t = SearchThread(query, (n, self.store_plugins[n]), self.results, self.abort, self.TIMEOUT)
t.start() self.running_threads.append(t)
t.start()
if self.running_threads: if self.running_threads:
self.hang_check = 0 self.hang_check = 0
self.checker.start(100) self.checker.start(100)
@ -115,6 +135,25 @@ class SearchDialog(QDialog, Ui_Dialog):
result = self.results_view.model().get_result(index) result = self.results_view.model().get_result(index)
self.store_plugins[result.store].open(self.gui, self, result.detail_item) self.store_plugins[result.store].open(self.gui, self, result.detail_item)
def get_store_checks(self):
checks = []
for x in self.store_plugins:
check = getattr(self, 'store_check_' + x, None)
if check:
checks.append(check)
return checks
def stores_select_all(self):
for check in self.get_store_checks():
check.setChecked(True)
def stores_select_invert(self):
for check in self.get_store_checks():
check.setChecked(not check.isChecked())
def stores_select_none(self):
for check in self.get_store_checks():
check.setChecked(False)
class SearchThread(Thread): class SearchThread(Thread):

View File

@ -6,8 +6,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>616</width> <width>937</width>
<height>545</height> <height>669</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@ -16,81 +16,109 @@
<property name="sizeGripEnabled"> <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QVBoxLayout" name="verticalLayout">
<item row="0" column="0"> <item>
<widget class="QLineEdit" name="search_edit"/> <layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Query:</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="search_edit"/>
</item>
<item>
<widget class="QPushButton" name="search">
<property name="text">
<string>Search</string>
</property>
</widget>
</item>
</layout>
</item> </item>
<item row="0" column="1"> <item>
<widget class="QPushButton" name="search"> <widget class="QSplitter" name="splitter">
<property name="text"> <property name="orientation">
<string>Search</string> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QGroupBox" name="stores_group">
<property name="title">
<string>Stores</string>
</property>
</widget>
<widget class="QTreeView" name="results_view">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>2</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="alternatingRowColors">
<bool>true</bool>
</property>
<property name="iconSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="rootIsDecorated">
<bool>false</bool>
</property>
<property name="uniformRowHeights">
<bool>false</bool>
</property>
<property name="itemsExpandable">
<bool>false</bool>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<property name="expandsOnDoubleClick">
<bool>false</bool>
</property>
</widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item>
<widget class="QTreeView" name="results_view"> <layout class="QHBoxLayout" name="horizontalLayout">
<property name="alternatingRowColors"> <item>
<bool>true</bool> <spacer name="horizontalSpacer">
</property> <property name="orientation">
<property name="iconSize"> <enum>Qt::Horizontal</enum>
<size> </property>
<width>32</width> <property name="sizeHint" stdset="0">
<height>32</height> <size>
</size> <width>40</width>
</property> <height>20</height>
<property name="rootIsDecorated"> </size>
<bool>false</bool> </property>
</property> </spacer>
<property name="uniformRowHeights"> </item>
<bool>false</bool> <item>
</property> <widget class="QPushButton" name="close">
<property name="itemsExpandable"> <property name="text">
<bool>false</bool> <string>Close</string>
</property> </property>
<property name="sortingEnabled"> </widget>
<bool>true</bool> </item>
</property> </layout>
<property name="expandsOnDoubleClick">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>
<connections> <connections>
<connection> <connection>
<sender>buttonBox</sender> <sender>close</sender>
<signal>accepted()</signal> <signal>clicked()</signal>
<receiver>Dialog</receiver> <receiver>Dialog</receiver>
<slot>accept()</slot> <slot>accept()</slot>
<hints> <hints>
<hint type="sourcelabel"> <hint type="sourcelabel">
<x>307</x> <x>526</x>
<y>524</y> <y>525</y>
</hint>
<hint type="destinationlabel">
<x>307</x>
<y>272</y>
</hint>
</hints>
</connection>
<connection>
<sender>buttonBox</sender>
<signal>rejected()</signal>
<receiver>Dialog</receiver>
<slot>accept()</slot>
<hints>
<hint type="sourcelabel">
<x>307</x>
<y>524</y>
</hint> </hint>
<hint type="destinationlabel"> <hint type="destinationlabel">
<x>307</x> <x>307</x>