From 8700214dc6d7361edebd4a80d34f03e632aab624 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Mon, 8 Feb 2010 14:52:00 -0700 Subject: [PATCH] Fix #4829 (Weird date format) --- src/calibre/gui2/library.py | 5 ++++- src/calibre/gui2/viewer/documentview.py | 1 - 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/library.py b/src/calibre/gui2/library.py index 9b8210c75e..6e9b9b192f 100644 --- a/src/calibre/gui2/library.py +++ b/src/calibre/gui2/library.py @@ -97,7 +97,10 @@ class DateDelegate(QStyledItemDelegate): def createEditor(self, parent, option, index): qde = QStyledItemDelegate.createEditor(self, parent, option, index) - qde.setDisplayFormat(unicode(qde.displayFormat()).replace('yy', 'yyyy')) + stdformat = unicode(qde.displayFormat()) + if 'yyyy' not in stdformat: + stdformat = stdformat.replace('yy', 'yyyy') + qde.setDisplayFormat(stdformat) qde.setMinimumDate(QDate(101,1,1)) qde.setCalendarPopup(True) return qde diff --git a/src/calibre/gui2/viewer/documentview.py b/src/calibre/gui2/viewer/documentview.py index 6566042755..5ad22506b6 100644 --- a/src/calibre/gui2/viewer/documentview.py +++ b/src/calibre/gui2/viewer/documentview.py @@ -331,7 +331,6 @@ class Document(QWebPage): elem = self.find_bookmark_element() if elem is None or self.element_ypos(elem) < 100: - print elem, self.element_ypos(elem) bm = 'body|%f'%(float(self.ypos)/(self.height*0.7)) else: bm = unicode(elem.evaluateJavaScript(