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 2014-07-05 12:14:31 +05:30
parent c5927abb00
commit 92c81aa6d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/gui2/dialogs/search.py
View File

@ -27,7 +27,7 @@ def init_dateop(cb):
cb.addItem(desc, op) cb.addItem(desc, op)
def current_dateop(cb): def current_dateop(cb):
return unicode(cb.itemData(cb.currentIndex()).toString()) return unicode(cb.itemData(cb.currentIndex()) or '')
class SearchDialog(QDialog, Ui_Dialog): class SearchDialog(QDialog, Ui_Dialog):
@ -127,12 +127,12 @@ class SearchDialog(QDialog, Ui_Dialog):
return (self.adv_search_string, self.box_search_string, self.date_search_string)[i]() return (self.adv_search_string, self.box_search_string, self.date_search_string)[i]()
def date_search_string(self): def date_search_string(self):
field = unicode(self.date_field.itemData(self.date_field.currentIndex()).toString()) field = unicode(self.date_field.itemData(self.date_field.currentIndex()) or '')
op = current_dateop(self.dateop_date) op = current_dateop(self.dateop_date)
prefix = '%s:%s' % (field, op) prefix = '%s:%s' % (field, op)
if self.sel_date.isChecked(): if self.sel_date.isChecked():
ans = '%s%s' % (prefix, self.date_year.value()) ans = '%s%s' % (prefix, self.date_year.value())
m = self.date_month.itemData(self.date_month.currentIndex()).toPyObject() m = self.date_month.itemData(self.date_month.currentIndex())
if m > 0: if m > 0:
ans += '-%s' % m ans += '-%s' % m
d = self.date_day.value() d = self.date_day.value()
@ -141,7 +141,7 @@ class SearchDialog(QDialog, Ui_Dialog):
return ans return ans
if self.sel_daysago.isChecked(): if self.sel_daysago.isChecked():
return '%s%sdaysago' % (prefix, self.date_daysago.value()) return '%s%sdaysago' % (prefix, self.date_daysago.value())
return '%s%s' % (prefix, unicode(self.date_human.itemData(self.date_human.currentIndex()).toString())) return '%s%s' % (prefix, unicode(self.date_human.itemData(self.date_human.currentIndex()) or ''))
def adv_search_string(self): def adv_search_string(self):
mk = self.matchkind.currentIndex() mk = self.matchkind.currentIndex()