Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-07 10:14:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1352 (problem with configuration page)

Browse Source
This commit is contained in:
Kovid Goyal 2008-12-07 03:43:51 -08:00
parent 4d5f5b854b
commit 642ac41a57
3 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/ebooks/metadata/epub.py
View File

@ -113,7 +113,7 @@ class CoverRenderer(QObject):
pal = self.page.palette() pal = self.page.palette()
pal.setBrush(QPalette.Background, Qt.white) pal.setBrush(QPalette.Background, Qt.white)
self.page.setPalette(pal) self.page.setPalette(pal)
self.page.setViewportSize(QSize(self.WIDTH, self.HEIGHT)) self.page.setViewportSize(QSize(600, 800))
self.page.mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff) self.page.mainFrame().setScrollBarPolicy(Qt.Vertical, Qt.ScrollBarAlwaysOff)
self.page.mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff) self.page.mainFrame().setScrollBarPolicy(Qt.Horizontal, Qt.ScrollBarAlwaysOff)
QObject.connect(self.page, SIGNAL('loadFinished(bool)'), self.render_html) QObject.connect(self.page, SIGNAL('loadFinished(bool)'), self.render_html)

1
src/calibre/gui2/dialogs/config.py
View File

@ -44,6 +44,7 @@ class ConfigDialog(QDialog, Ui_Dialog):
self._category_model = CategoryModel() self._category_model = CategoryModel()
self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row())) self.connect(self.category_view, SIGNAL('activated(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
self.connect(self.category_view, SIGNAL('clicked(QModelIndex)'), lambda i: self.stackedWidget.setCurrentIndex(i.row()))
self.category_view.setModel(self._category_model) self.category_view.setModel(self._category_model)
self.db = db self.db = db
self.server = server self.server = server

18
src/calibre/trac/donations/server.py
View File

@ -105,7 +105,7 @@ class Stats:
mean = sum(amounts)/l mean = sum(amounts)/l
return sqrt( sum([i**2 for i in amounts])/l - mean**2 ) return sqrt( sum([i**2 for i in amounts])/l - mean**2 )
def __init__(self, records): def __init__(self, records, start, end):
self.total = sum([r.amount for r in records]) self.total = sum([r.amount for r in records])
self.days = {} self.days = {}
l, rg = date.max, date.min l, rg = date.max, date.min
@ -117,15 +117,15 @@ class Stats:
self.days[r.date] = [] self.days[r.date] = []
self.days[r.date].append(r) self.days[r.date].append(r)
self.min, self.max = l, rg self.min, self.max = start, end
self.period = self.max - self.min self.period = (self.max - self.min) + timedelta(days=1)
daily_totals = [] daily_totals = []
day = self.min day = self.min
while day <= self.max: while day <= self.max:
x = self.days.get(day, []) x = self.days.get(day, [])
daily_totals.append(sum([y.amount for y in x])) daily_totals.append(sum([y.amount for y in x]))
day += timedelta(days=1) day += timedelta(days=1)
self.daily_average = self.total/len(daily_totals) if len(daily_totals) else 0. self.daily_average = self.total/self.period.days
self.daily_deviation = self.get_deviation(daily_totals) self.daily_deviation = self.get_deviation(daily_totals)
self.average = self.total/len(records) if len(records) else 0. self.average = self.total/len(records) if len(records) else 0.
self.average_deviation = self.get_deviation(self.totals) self.average_deviation = self.get_deviation(self.totals)
@ -237,12 +237,8 @@ class Server(object):
self.calculate_trend() self.calculate_trend()
def get_slice(self, start_date, end_date): def get_slice(self, start_date, end_date):
stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date]) stats = Stats([r for r in self.records if r.date >= start_date and r.date <= end_date],
if start_date > date.min and end_date < date.max: start_date, end_date)
stats.period = end_date - start_date
stats.period += timedelta(days=1)
stats.min = start_date
stats.max = end_date
return stats return stats
def month(self, year, month): def month(self, year, month):
@ -496,4 +492,4 @@ def main(args=sys.argv):
return 0 return 0
if __name__ == '__main__': if __name__ == '__main__':
sys.exit(main()) sys.exit(main())