Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

2007-10-06 Douglas Blank <dblank@cs.brynmawr.edu>

Browse Source 
* src/plugins/Calendar.py: various improvements



svn: r9090
This commit is contained in:
Benny Malengier 2007-10-06 13:26:42 +00:00
parent f7a7d711c6
commit 70d363111e
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@ -1,3 +1,6 @@
2007-10-06 Douglas Blank <dblank@cs.brynmawr.edu>
* src/plugins/Calendar.py: various improvements
2007-10-06 Benny Malengier <benny.malengier@gramps-project.org> 2007-10-06 Benny Malengier <benny.malengier@gramps-project.org>
* src/DataViews/_RelationView.py: don't crash on missing media ref * src/DataViews/_RelationView.py: don't crash on missing media ref
* src/DisplayTabs/_GalleryTab.py: on missing media ref, notify to run check tool * src/DisplayTabs/_GalleryTab.py: on missing media ref, notify to run check tool

37
src/plugins/Calendar.py
View File

@ -83,6 +83,12 @@ def easter(year):
day = l + 28 - 31 * ( month / 4 ) day = l + 28 - 31 * ( month / 4 )
return "%d/%d/%d" % (year, month, day) return "%d/%d/%d" % (year, month, day)
def g2iso(dow):
""" Converst GRAMPS day of week to ISO day of week """
# GRAMPS: SUN = 1
# ISO: MON = 1
return (dow + 5) % 7 + 1
#------------------------------------------------------------------------ #------------------------------------------------------------------------
# #
# Calendar # Calendar
@ -209,14 +215,19 @@ class Calendar(Report):
cell_height = (height - header)/ 6 cell_height = (height - header)/ 6
current_date = datetime.date(year, month, 1) current_date = datetime.date(year, month, 1)
spacing = pt2cm(1.25 * self["CAL-Text"].get_size()) # 158 spacing = pt2cm(1.25 * self["CAL-Text"].get_size()) # 158
if current_date.isoweekday() != 7: # start dow here is 7, sunday if current_date.isoweekday() != g2iso(self["start_dow"] + 1):
current_ord = current_date.toordinal() - current_date.isoweekday() # Go back to previous first day of week, and start from there
current_ord = (current_date.toordinal() -
((current_date.isoweekday() + 7) -
g2iso(self["start_dow"] + 1) ) % 7)
else: else:
current_ord = current_date.toordinal() current_ord = current_date.toordinal()
for day_col in range(7): for day_col in range(7):
font_height = pt2cm(self["CAL-Daynames"].get_size()) font_height = pt2cm(self["CAL-Daynames"].get_size())
self.doc.center_text("CAL-Daynames", self.doc.center_text("CAL-Daynames",
GrampsLocale.long_days[day_col+1], GrampsLocale.long_days[(day_col+
g2iso(self["start_dow"] + 1))
% 7 + 1],
day_col * cell_width + cell_width/2, day_col * cell_width + cell_width/2,
header - font_height * 1.5) header - font_height * 1.5)
for week_row in range(6): for week_row in range(6):
@ -702,6 +713,9 @@ class NewReportOptions(ReportOptions):
class CalendarOptions(NewReportOptions): class CalendarOptions(NewReportOptions):
def enable_options(self): def enable_options(self):
weekdays = []
for count in range(7):
weekdays.append(GrampsLocale.long_days[count + 1])
self.enable_dict = {} self.enable_dict = {}
self.widgets = [ self.widgets = [
FilterWidget(self, label = _("Filter"), FilterWidget(self, label = _("Filter"),
@ -734,6 +748,13 @@ class CalendarOptions(NewReportOptions):
help = "Year of calendar", help = "Year of calendar",
valid_text = "Any year", valid_text = "Any year",
), ),
SelectionWidget(self, label = _("First day of week"),
name = "start_dow",
value = 0, # First day of week
options = map(lambda w: ("", w, w), weekdays),
help = "Select the first day of the week for the calendar",
valid_text="Select the first day of the week for the calendar",
),
SelectionWidget(self, label = _("Country for holidays"), SelectionWidget(self, label = _("Country for holidays"),
name = "country", name = "country",
value = 0, # Don't include holidays value = 0, # Don't include holidays
@ -824,6 +845,9 @@ class CalendarOptions(NewReportOptions):
class CalendarReportOptions(NewReportOptions): class CalendarReportOptions(NewReportOptions):
def enable_options(self): def enable_options(self):
weekdays = []
for count in range(7):
weekdays.append(GrampsLocale.long_days[count + 1])
self.enable_dict = {} self.enable_dict = {}
self.widgets = [ self.widgets = [
FilterWidget(self, label = _("Filter"), FilterWidget(self, label = _("Filter"),
@ -863,6 +887,13 @@ class CalendarReportOptions(NewReportOptions):
help = "Year of report", help = "Year of report",
valid_text = "Any year", valid_text = "Any year",
), ),
SelectionWidget(self, label = _("First day of week"),
name = "start_dow",
value = 0,
options = map(lambda w: ("", w, w), weekdays),
help = "Select the first day of the week for the calendar",
valid_text="Select the first day of the week for the calendar",
),
SelectionWidget(self, label = _("Country for holidays"), SelectionWidget(self, label = _("Country for holidays"),
name = "country", name = "country",
value = 0, # Don't include holidays value = 0, # Don't include holidays