From c0e5f4d7bb29fb76b61fb07d45438b1c33b6bcba Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:04:47 -0400 Subject: [PATCH 1/8] moved event line to the left --- inkycal/modules/inkycal_agenda.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index e1ccba5..bcaf36f 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -156,15 +156,15 @@ class Agenda(inkycal_module): logger.debug(f'time_width: {time_width}') # Calculate x-pos for time - x_time = date_width + x_time = int(date_width/3) logger.debug(f'x-time: {x_time}') # Find out how much space is left for event titles - event_width = im_width - time_width - date_width + event_width = im_width - time_width - int(date_width/3) logger.debug(f'width for events: {event_width}') # Calculate x-pos for event titles - x_event = date_width + time_width + x_event = int(date_width/3) + time_width logger.debug(f'x-event: {x_event}') # Merge list of dates and list of events From 1e37b77a5404665ec1cf1d50173dd4f28197aee1 Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:07:21 -0400 Subject: [PATCH 2/8] add all day and right align time --- inkycal/modules/inkycal_agenda.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index bcaf36f..54ca542 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -201,8 +201,13 @@ class Agenda(inkycal_module): # Check if event is all day, if not, add the time if not parser.all_day(_): write(im_black, (x_time, line_pos[cursor][1]), - (time_width, line_height), time, - font=self.font, alignment='left') + (time_width, line_height), time+" ", + font=self.font, alignment='right') + # Check if event is all day, if it is, add "all day" where time would be + if parser.all_day(_): + write(im_black, (x_time, line_pos[cursor][1]), + (time_width, line_height), "all day ", + font=self.font, alignment='right') write(im_black, (x_event, line_pos[cursor][1]), (event_width, line_height), From a3e604511d02d3d586b3c9192780aeab88830413 Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:14:26 -0400 Subject: [PATCH 3/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index 54ca542..2a61c8f 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -132,7 +132,7 @@ class Agenda(inkycal_module): # Sort events by beginning time parser.sort() - # parser.show_events() + print(parser.show_events()) # Set the width for date, time and event titles date_width = int(max([self.font.getlength( @@ -203,7 +203,6 @@ class Agenda(inkycal_module): write(im_black, (x_time, line_pos[cursor][1]), (time_width, line_height), time+" ", font=self.font, alignment='right') - # Check if event is all day, if it is, add "all day" where time would be if parser.all_day(_): write(im_black, (x_time, line_pos[cursor][1]), (time_width, line_height), "all day ", From 0469e75471443dd984b01e5357361eb73e514f4f Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:22:01 -0400 Subject: [PATCH 4/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index 2a61c8f..ca4b74f 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -132,7 +132,7 @@ class Agenda(inkycal_module): # Sort events by beginning time parser.sort() - print(parser.show_events()) + # parser.show_events() # Set the width for date, time and event titles date_width = int(max([self.font.getlength( From e8835c736c071aa356be7855e4881e7a0534e5c7 Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 13:53:26 -0400 Subject: [PATCH 5/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index ca4b74f..b1d1832 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -152,7 +152,7 @@ class Agenda(inkycal_module): time_width = int(max([self.font.getlength( events['begin'].format(self.time_format, locale=self.language)) - for events in upcoming_events]) * 1.2) + for events in upcoming_events])) logger.debug(f'time_width: {time_width}') # Calculate x-pos for time @@ -160,7 +160,7 @@ class Agenda(inkycal_module): logger.debug(f'x-time: {x_time}') # Find out how much space is left for event titles - event_width = im_width - time_width - int(date_width/3) + event_width = im_width - time_width logger.debug(f'width for events: {event_width}') # Calculate x-pos for event titles @@ -201,16 +201,16 @@ class Agenda(inkycal_module): # Check if event is all day, if not, add the time if not parser.all_day(_): write(im_black, (x_time, line_pos[cursor][1]), - (time_width, line_height), time+" ", + (time_width, line_height), time, font=self.font, alignment='right') if parser.all_day(_): write(im_black, (x_time, line_pos[cursor][1]), - (time_width, line_height), "all day ", + (time_width, line_height), "all day", font=self.font, alignment='right') write(im_black, (x_event, line_pos[cursor][1]), (event_width, line_height), - '• ' + title, font=self.font, alignment='left') + ' • ' + title, font=self.font, alignment='left') cursor += 1 # If no events were found, write only dates and lines From 099dde31cbb89f911c99c9b6588e2ef600bba949 Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 14:46:38 -0400 Subject: [PATCH 6/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index b1d1832..d1d8c4d 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -137,7 +137,7 @@ class Agenda(inkycal_module): # Set the width for date, time and event titles date_width = int(max([self.font.getlength( dates['begin'].format(self.date_format, locale=self.language)) - for dates in agenda_events]) * 1.2) + for dates in agenda_events])) logger.debug(f'date_width: {date_width}') # Calculate positions for each line @@ -152,7 +152,7 @@ class Agenda(inkycal_module): time_width = int(max([self.font.getlength( events['begin'].format(self.time_format, locale=self.language)) - for events in upcoming_events])) + for events in upcoming_events]+[self.font.getlength("all day")])) logger.debug(f'time_width: {time_width}') # Calculate x-pos for time From 6f2d9028d122db8cdb9a1c87cd407f3d06e5689c Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:46:56 -0400 Subject: [PATCH 7/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index d1d8c4d..ebcfa26 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -152,7 +152,7 @@ class Agenda(inkycal_module): time_width = int(max([self.font.getlength( events['begin'].format(self.time_format, locale=self.language)) - for events in upcoming_events]+[self.font.getlength("all day")])) + for events in upcoming_events])) logger.debug(f'time_width: {time_width}') # Calculate x-pos for time From c893fafaf159ed2f828b96f1c50bf37d855734dd Mon Sep 17 00:00:00 2001 From: emilyboda <9170143+emilyboda@users.noreply.github.com> Date: Fri, 15 Mar 2024 15:48:17 -0400 Subject: [PATCH 8/8] Update inkycal_agenda.py --- inkycal/modules/inkycal_agenda.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inkycal/modules/inkycal_agenda.py b/inkycal/modules/inkycal_agenda.py index ebcfa26..5b7f5d0 100755 --- a/inkycal/modules/inkycal_agenda.py +++ b/inkycal/modules/inkycal_agenda.py @@ -152,7 +152,7 @@ class Agenda(inkycal_module): time_width = int(max([self.font.getlength( events['begin'].format(self.time_format, locale=self.language)) - for events in upcoming_events])) + for events in upcoming_events]) + 10) logger.debug(f'time_width: {time_width}') # Calculate x-pos for time