iicd/Inkycal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor improvements

Browse Source 
Increased height for weekday names.
When there is more free space below the calendar, assign the empty space to the event section.
This commit is contained in:
Ace 2020-12-05 00:25:48 +01:00
parent 7b09d05a76
commit 10920bd610
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
inkycal/modules/inkycal_calendar.py
View File

@ -13,6 +13,7 @@ import arrow
filename = os.path.basename(__file__).split('.py')[0] filename = os.path.basename(__file__).split('.py')[0]
logger = logging.getLogger(filename) logger = logging.getLogger(filename)
class Calendar(inkycal_module): class Calendar(inkycal_module):
"""Calendar class """Calendar class
Create monthly calendar and show events from given icalendars Create monthly calendar and show events from given icalendars
@ -102,16 +103,15 @@ class Calendar(inkycal_module):
im_colour = Image.new('RGB', size = im_size, color = 'white') im_colour = Image.new('RGB', size = im_size, color = 'white')
# Allocate space for month-names, weekdays etc. # Allocate space for month-names, weekdays etc.
month_name_height = int(im_height * 0.1) month_name_height = int(im_height * 0.10)
weekdays_height = int(im_height * 0.05) weekdays_height = int(self.font.getsize('hg')[1] * 1.25)
logger.debug(f"month_name_height: {month_name_height}") logger.debug(f"month_name_height: {month_name_height}")
logger.debug(f"weekdays_height: {weekdays_height}") logger.debug(f"weekdays_height: {weekdays_height}")
if self.show_events == True: if self.show_events == True:
logger.debug("Allocating space for events") logger.debug("Allocating space for events")
calendar_height = int(im_height * 0.6) calendar_height = int(im_height * 0.6)
events_height = int(im_height * 0.25) events_height = im_height - month_name_height - weekdays_height - calendar_height
logger.debug(f'calendar-section size: {im_width} x {calendar_height} px') logger.debug(f'calendar-section size: {im_width} x {calendar_height} px')
logger.debug(f'events-section size: {im_width} x {events_height} px') logger.debug(f'events-section size: {im_width} x {events_height} px')
else: else:
@ -169,7 +169,8 @@ class Calendar(inkycal_module):
(icon_width, weekdays_height), (icon_width, weekdays_height),
weekday_names[_], weekday_names[_],
font = self.font, font = self.font,
autofit = True autofit = True,
fill_height=1.0
) )
# Create a calendar template and flatten (remove nestings) # Create a calendar template and flatten (remove nestings)
@ -191,7 +192,7 @@ class Calendar(inkycal_module):
for number in calendar_flat: for number in calendar_flat:
if number != int(now.day): if number != int(now.day):
write(im_black, grid[number], (icon_width, icon_height), write(im_black, grid[number], (icon_width, icon_height),
str(number), font = self.num_font, fill_height = 0.5) str(number), font = self.num_font, fill_height = 0.5, fill_width=0.5)
# Draw a red/black circle with the current day of month in white # Draw a red/black circle with the current day of month in white
icon = Image.new('RGBA', (icon_width, icon_height)) icon = Image.new('RGBA', (icon_width, icon_height))
@ -209,6 +210,10 @@ class Calendar(inkycal_module):
# If events should be loaded and shown... # If events should be loaded and shown...
if self.show_events == True: if self.show_events == True:
# If this month requires 5 instead of 6 rows, increase event section height
if len(cal.monthcalendar(now.year, now.month)) == 5:
events_height += icon_height
# import the ical-parser # import the ical-parser
from inkycal.modules.ical_parser import iCalendar from inkycal.modules.ical_parser import iCalendar