diff --git a/src/calibre/gui2/store/search/search.py b/src/calibre/gui2/store/search/search.py index 9413c51a6e..c8eb53ade9 100644 --- a/src/calibre/gui2/store/search/search.py +++ b/src/calibre/gui2/store/search/search.py @@ -252,7 +252,7 @@ class SearchDialog(QDialog, Ui_Dialog): # Milliseconds self.hang_time = self.config.get('hang_time', 75) * 1000 - self.max_results = self.config.get('max_results', 10) + self.max_results = self.config.get('max_results', 15) self.should_open_external = self.config.get('open_external', True) # Number of threads to run for each type of operation diff --git a/src/calibre/gui2/store/search/search.ui b/src/calibre/gui2/store/search/search.ui index ba5cb2b975..83f42cd0d1 100644 --- a/src/calibre/gui2/store/search/search.ui +++ b/src/calibre/gui2/store/search/search.ui @@ -14,7 +14,7 @@ Get Books - + :/images/store.png:/images/store.png @@ -82,8 +82,8 @@ 0 0 - 173 - 106 + 193 + 127 @@ -254,6 +254,19 @@
widgets.h
+ + search_edit + search + results_view + store_list + select_all_stores + select_invert_stores + select_none_stores + configure + open_external + close + adv_search_button + diff --git a/src/calibre/gui2/store/stores/chitanka_plugin.py b/src/calibre/gui2/store/stores/chitanka_plugin.py index a1a22797c8..58ef109dba 100644 --- a/src/calibre/gui2/store/stores/chitanka_plugin.py +++ b/src/calibre/gui2/store/stores/chitanka_plugin.py @@ -40,9 +40,9 @@ class ChitankaStore(BasicStoreConfig, StorePlugin): d.exec_() def search(self, query, max_results=10, timeout=60): - # check for cyrilic symbols before performing search + # check for cyrillic symbols before performing search uquery = unicode(query.strip(), 'utf-8') - reObj = re.search(u'^[а-яА-Я\\d]{4,}[а-яА-Я\\d\\s]*$', uquery) + reObj = re.search(u'^[а-яА-Я\\d\\s]{3,}$', uquery) if not reObj: return diff --git a/src/calibre/gui2/store/stores/eknigi_plugin.py b/src/calibre/gui2/store/stores/eknigi_plugin.py index ee87b771be..7d88465f62 100644 --- a/src/calibre/gui2/store/stores/eknigi_plugin.py +++ b/src/calibre/gui2/store/stores/eknigi_plugin.py @@ -46,9 +46,9 @@ class eKnigiStore(BasicStoreConfig, StorePlugin): d.exec_() def search(self, query, max_results=10, timeout=60): - # check for cyrilic symbols before performing search + # check for cyrillic symbols before performing search uquery = unicode(query.strip(), 'utf-8') - reObj = re.search(u'^[а-яА-Я\\d]{2,}[а-яА-Я\\d\\s]*$', uquery) + reObj = re.search(u'^[а-яА-Я\\d\\s]{2,}$', uquery) if not reObj: return