Skip to content

Commit

Permalink
adjust position of Calendar Windows and abandon window when switching
Browse files Browse the repository at this point in the history
  • Loading branch information
@Margarete01
Margarete01 committed Jun 12, 2021
1 parent fadeeab commit 10055e5
Show file tree
Hide file tree
Showing 13 changed files with 36 additions and 22 deletions.
5 changes: 4 additions & 1 deletion packages/CalDAV-Core.package/CALApp.class/class/open.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,7 @@ open

app := CALApp new prepareCalendars.

^ (ToolBuilder default open: app) extent: 1500 @ 700
^ (ToolBuilder default open: app)
extent: 1500 @ 700;
position: 0 @ 0;
yourself
4 changes: 3 additions & 1 deletion packages/CalDAV-Core.package/CALApp.class/instance/openDeadlinesView.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
subwindows
openDeadlinesView

CALDeadlinesWindow openWith: self
CALDeadlinesWindow openWith: self.
self myDependents first abandon

3 changes: 2 additions & 1 deletion packages/CalDAV-Core.package/CALApp.class/instance/openQuickView.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ openQuickView
| date |

date := Time current asDate.
CALQuickView openDay: date for: self
CALQuickView openDay: date for: self.
self myDependents first abandon
6 changes: 3 additions & 3 deletions packages/CalDAV-Core.package/CALApp.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"class" : {
"fileDirectory" : "jz 7/8/2018 12:03",
"open" : "jz 7/12/2018 18:28",
"open" : "MD 6/12/2021 13:17",
"openQuickView" : "MD 6/9/2021 15:40" },
"instance" : {
"addCalendar:" : "dm 6/21/2018 15:24",
Expand Down Expand Up @@ -58,12 +58,12 @@
"openAddCalendarDialog" : "jz 7/8/2018 12:41",
"openAddEventDialog" : "jz 6/13/2018 20:26",
"openAddEventDialogFor:" : "jz 7/1/2018 12:48",
"openDeadlinesView" : "LM 6/9/2021 16:53",
"openDeadlinesView" : "MD 6/12/2021 13:09",
"openDeleteCalendarDialog" : "dm 7/22/2018 15:41",
"openEditEventDialogFor:" : "dm 7/24/2018 19:30",
"openEventDetailsFor:" : "dm 7/24/2018 19:07",
"openMonthView" : "yk 5/17/2021 15:52",
"openQuickView" : "LM 6/9/2021 16:31",
"openQuickView" : "MD 6/12/2021 13:12",
"openShowEventDialogFor:" : "dm 7/24/2018 19:29",
"openWeekView" : "yk 5/17/2021 15:52",
"prepareCalendars" : "jz 7/12/2018 18:29",
Expand Down
6 changes: 4 additions & 2 deletions packages/CalDAV-Core.package/CALDeadlinesWindow.class/class/openWith..st
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
initialize-release
openWith: aCALApp

| deadlineWindow |
| deadlineWindow deadlineWindowMorph |

deadlineWindow := CALDeadlinesWindow new.
deadlineWindow app: aCALApp.
^ ToolBuilder default open: deadlineWindow
deadlineWindowMorph := ToolBuilder default open: deadlineWindow.
deadlineWindowMorph position: (deadlineWindowMorph world right - deadlineWindowMorph width) @ 0.
^ deadlineWindowMorph
3 changes: 2 additions & 1 deletion packages/CalDAV-Core.package/CALDeadlinesWindow.class/instance/openApp.st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
toolbuilder
openApp

CALApp open
CALApp open.
self myDependents first abandon


3 changes: 2 additions & 1 deletion packages/CalDAV-Core.package/CALDeadlinesWindow.class/instance/openQuickView.st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ openQuickView
| date |

date := Time current asDate.
CALQuickView openDay: date for: self app
CALQuickView openDay: date for: self app.
self myDependents first abandon
6 changes: 3 additions & 3 deletions packages/CalDAV-Core.package/CALDeadlinesWindow.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
{
"class" : {
"openWith:" : "LM 6/8/2021 21:41" },
"openWith:" : "MD 6/12/2021 13:23" },
"instance" : {
"app" : "LM 6/8/2021 21:36",
"app:" : "MD 6/9/2021 15:23",
"buildAppButtonWith:" : "LM 6/9/2021 16:47",
"buildPanelWith:" : "LM 6/9/2021 16:46",
"buildQuickViewButtonWith:" : "LM 6/9/2021 16:38",
"buildWith:" : "LM 6/9/2021 16:47",
"openApp" : "LM 6/9/2021 16:49",
"openQuickView" : "LM 6/9/2021 16:39" } }
"openApp" : "MD 6/12/2021 13:13",
"openQuickView" : "MD 6/12/2021 13:13" } }
6 changes: 4 additions & 2 deletions packages/CalDAV-Core.package/CALQuickView.class/class/openDay.for..st
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
initialize-release
openDay: aDate for: anApp

| quickView |
| quickView quickViewMorph |

aDate start: (aDate start offset: DateAndTime localOffset).
quickView := CALQuickView new
app: anApp;
date: aDate;
yourself.
^ ToolBuilder default open: quickView
quickViewMorph := ToolBuilder default open: quickView.
quickViewMorph position: (quickViewMorph world right - quickViewMorph width) @ 0.
^ quickViewMorph
2 changes: 1 addition & 1 deletion packages/CalDAV-Core.package/CALQuickView.class/instance/buildWith..st
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildWith: aBuilder
windowSpec
model: self;
label: 'CALQuickView';
extent: 200 @ 200;
extent: 300 @ 200;
children: OrderedCollection new;
yourself.
windowSpec children
Expand Down
3 changes: 2 additions & 1 deletion packages/CalDAV-Core.package/CALQuickView.class/instance/openApp.st
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
toolbuilder
openApp

CALApp open
CALApp open.
self myDependents first abandon


3 changes: 2 additions & 1 deletion packages/CalDAV-Core.package/CALQuickView.class/instance/openDeadlinesView.st
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
toolbuilder
openDeadlinesView

CALDeadlinesWindow openWith: self app
CALDeadlinesWindow openWith: self app.
self myDependents first abandon
8 changes: 4 additions & 4 deletions packages/CalDAV-Core.package/CALQuickView.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"class" : {
"fileDirectory" : "yk 5/26/2021 13:11",
"openDay:for:" : "MD 6/9/2021 15:44" },
"openDay:for:" : "MD 6/12/2021 13:22" },
"instance" : {
"app" : "MD 6/9/2021 15:45",
"app:" : "MD 6/9/2021 15:45",
"buildAppButtonWith:" : "LM 6/9/2021 16:52",
"buildDeadlinesViewButtonWith:" : "LM 6/9/2021 16:54",
"buildEventListWith:" : "LM 6/9/2021 16:55",
"buildWith:" : "LM 6/9/2021 16:52",
"buildWith:" : "MD 6/12/2021 13:25",
"currentIndex" : "MD 6/9/2021 15:49",
"currentIndex:" : "MD 6/9/2021 15:49",
"date" : "MD 6/9/2021 15:46",
Expand All @@ -18,6 +18,6 @@
"events" : "MD 6/9/2021 15:52",
"filterOut15EventsIn:" : "MD 6/9/2021 15:54",
"initialize" : "yk 5/26/2021 13:25",
"openApp" : "LM 6/9/2021 16:52",
"openApp" : "MD 6/12/2021 13:13",
"openDay:for:" : "MD 6/9/2021 15:55",
"openDeadlinesView" : "LM 6/9/2021 16:55" } }
"openDeadlinesView" : "MD 6/12/2021 13:13" } }

0 comments on commit 10055e5

Please sign in to comment.