Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/hpi-swa-teaching/SWT18-Pr…
Browse files Browse the repository at this point in the history 
…oject-05.git
  • Loading branch information
Justus Zeinert committed Jul 25, 2018
2 parents a8a37a5 + 82a12e6 commit 21d9829
Show file tree
Hide file tree
Showing 12 changed files with 87 additions and 111 deletions.
35 changes: 9 additions & 26 deletions packages/CalDAV-Core.package/CALAddEventDialog.class/instance/buildButtons..st
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,13 @@
toolbuilding
buildButtons: aBuilder

| saveButton buttons beginPickerButton endPickerButton |

saveButton := aBuilder pluggableActionButtonSpec new.
saveButton
model: self;
action: #saveEvent;
label: 'Save Event';
frame: (0.01 @ 0.76 corner: self borderRight @ 0.86).
beginPickerButton := aBuilder pluggableActionButtonSpec new.
beginPickerButton
model: self;
label: 'Pick Begin Date';
action: #pickBeginDate;
frame: (self borderLeft @ 0.32 corner: 0.2 @ 0.42).
endPickerButton := aBuilder pluggableActionButtonSpec new.
endPickerButton
model: self;
label: 'Pick End Date';
action: #pickEndDate;
frame: (self borderLeft @ 0.43 corner: 0.2 @ 0.53).
| buttons |

^ buttons := OrderedCollection new
add: saveButton;
add: beginPickerButton;
add: endPickerButton;
add: (self buildFullDayButton: aBuilder);
yourself
buttons := OrderedCollection new.

buttons add: (self buildSaveButton: aBuilder).
buttons add: (self buildBeginPickerButton: aBuilder).
buttons add: (self buildEndPickerButton: aBuilder).
buttons add: (self buildFullDayButton: aBuilder).

^ buttons
2 changes: 1 addition & 1 deletion packages/CalDAV-Core.package/CALAddEventDialog.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
"openDate:forParent:" : "jz 7/25/2018 13:31" },
"instance" : {
"buildButtons:" : "PS 7/25/2018 17:08",
"buildButtons:" : "PS 7/25/2018 19:34",
"initialize" : "kk 6/19/2018 22:04",
"isReadOnly" : "lh 5/12/2018 19:37",
"saveEvent" : "jz 7/25/2018 13:31",
Expand Down
42 changes: 6 additions & 36 deletions packages/CalDAV-Core.package/CALEditEventDialog.class/instance/buildButtons..st
View file
Original file line number Diff line number Diff line change
@@ -1,44 +1,14 @@
toolbuilding
buildButtons: aBuilder

| editButton deleteButton buttons beginPickerButton endPickerButton |
| buttons |

buttons := OrderedCollection new.

editButton := aBuilder pluggableActionButtonSpec new.
editButton
model: self;
action: #saveEvent;
label: 'Save Event';
frame: ((self borderRight / 2 + 0.01) @ 0.76 corner: self borderRight @ 0.86);
enabled: self isReadOnly not.
buttons add: editButton.

deleteButton := aBuilder pluggableActionButtonSpec new.
deleteButton
model: self;
action: #deleteEvent;
label: 'Delete Event';
frame: (0.01 @ 0.76 corner: (self borderRight / 2) @ 0.86);
enabled: self isReadOnly not.
buttons add: deleteButton.

beginPickerButton := aBuilder pluggableActionButtonSpec new.
beginPickerButton
model: self;
label: 'Pick Begin Date';
action: #pickBeginDate;
frame: (self borderLeft@0.32 corner: 0.2@0.42);
enabled: self isReadOnly not.
buttons add: beginPickerButton.

endPickerButton := aBuilder pluggableActionButtonSpec new.
endPickerButton
model: self;
label: 'Pick End Date';
action: #pickEndDate;
frame: (self borderLeft @ 0.43 corner: 0.2 @ 0.53);
enabled: self isReadOnly not.
buttons add: endPickerButton.
buttons add: (self buildEditButton: aBuilder).
buttons add: (self buildDeleteButton: aBuilder).
buttons add: (self buildBeginPickerButton: aBuilder).
buttons add: (self buildEndPickerButton: aBuilder).
buttons add: (self buildFullDayButton: aBuilder).

^ buttons
2 changes: 1 addition & 1 deletion packages/CalDAV-Core.package/CALEditEventDialog.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"class" : {
"openEvent:forParent:" : "jz 7/25/2018 13:31" },
"instance" : {
"buildButtons:" : "dm 7/24/2018 19:12",
"buildButtons:" : "PS 7/25/2018 19:35",
"deleteEvent" : "jz 7/25/2018 13:31",
"initialize" : "dm 7/7/2018 09:55",
"oldEvent" : "dm 5/22/2018 19:12",
Expand Down
12 changes: 12 additions & 0 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildBeginPickerButton..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
toolbuilding
buildBeginPickerButton: aBuilder

| height |

height := (self spacing * 3) + (self lineHeight * 3).
^ aBuilder pluggableActionButtonSpec new
model: self;
label: 'Pick Begin Date';
action: #pickBeginDate;
frame: (self borderLeft @ height corner: 0.2 @ (height + self lineHeight));
enabled: self isReadOnly not.
46 changes: 5 additions & 41 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildButtons..st
View file
Original file line number Diff line number Diff line change
@@ -1,50 +1,14 @@
toolbuilding
buildButtons: aBuilder

| editButton deleteButton buttons beginPickerButton endPickerButton height |
| buttons |

buttons := OrderedCollection new.

height := (self spacing * 7) + (self lineHeight * 7).
editButton := aBuilder pluggableActionButtonSpec new.
editButton
model: self;
action: #saveEvent;
label: 'Save Event';
frame: ((self borderRight / 2 + 0.01) @ height corner: self borderRight @ (height + self lineHeight));
enabled: self isReadOnly not.
buttons add: editButton.

height := (self spacing * 7) + (self lineHeight * 7).
deleteButton := aBuilder pluggableActionButtonSpec new.
deleteButton
model: self;
action: #deleteEvent;
label: 'Delete Event';
frame: (self borderLeft @ height corner: (self borderRight / 2) @ (height + self lineHeight));
enabled: self isReadOnly not.
buttons add: deleteButton.

height := (self spacing * 3) + (self lineHeight * 3).
beginPickerButton := aBuilder pluggableActionButtonSpec new.
beginPickerButton
model: self;
label: 'Pick Begin Date';
action: #pickBeginDate;
frame: (self borderLeft @ height corner: 0.2 @ (height + self lineHeight));
enabled: self isReadOnly not.
buttons add: beginPickerButton.

height := (self spacing * 4) + (self lineHeight * 4).
endPickerButton := aBuilder pluggableActionButtonSpec new.
endPickerButton
model: self;
label: 'Pick End Date';
action: #pickEndDate;
frame: (self borderLeft @ height corner: 0.2 @ (height + self lineHeight));
enabled: self isReadOnly not.
buttons add: endPickerButton.

buttons add: (self buildEditButton: aBuilder).
buttons add: (self buildDeleteButton: aBuilder).
buttons add: (self buildBeginPickerButton: aBuilder).
buttons add: (self buildEndPickerButton: aBuilder).
buttons add: (self buildFullDayButton: aBuilder).

^ buttons
12 changes: 12 additions & 0 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildDeleteButton..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
toolbuilding
buildDeleteButton: aBuilder

| height |

height := (self spacing * 7) + (self lineHeight * 7).
^ aBuilder pluggableActionButtonSpec new
model: self;
action: #deleteEvent;
label: 'Delete Event';
frame: (self borderLeft @ height corner: (self borderRight / 2) @ (height + self lineHeight));
enabled: self isReadOnly not.
12 changes: 12 additions & 0 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildEditButton..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
toolbuilding
buildEditButton: aBuilder

| height |

height := (self lineHeight * 7) + (self spacing * 7).
^ aBuilder pluggableActionButtonSpec new
model: self;
action: #saveEvent;
label: 'Save Event';
frame: ((self borderRight / 2 + 0.01) @ height corner: self borderRight @ (height + self lineHeight));
enabled: self isReadOnly not.
12 changes: 12 additions & 0 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildEndPickerButton..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
toolbuilding
buildEndPickerButton: aBuilder

| height |

height := (self spacing * 4) + (self lineHeight * 4).
^ aBuilder pluggableActionButtonSpec new
model: self;
label: 'Pick End Date';
action: #pickEndDate;
frame: (self borderLeft @ height corner: 0.2 @ (height + self lineHeight));
enabled: self isReadOnly not.
11 changes: 11 additions & 0 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildSaveButton..st
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
toolbuilding
buildSaveButton: aBuilder

| height |

height := (self spacing * 7) + (self lineHeight * 7).
^ aBuilder pluggableActionButtonSpec new
model: self;
action: #saveEvent;
label: 'Save Event';
frame: (self borderLeft @ height corner: self borderRight @ (height + self lineHeight)).
4 changes: 0 additions & 4 deletions packages/CalDAV-Core.package/CALEventDialog.class/instance/buildStandardButtons..st
View file

This file was deleted.

8 changes: 6 additions & 2 deletions packages/CalDAV-Core.package/CALEventDialog.class/methodProperties.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,20 +11,24 @@
"buildBeginHourText:" : "jz 7/25/2018 17:22",
"buildBeginMinuteText:" : "jz 7/25/2018 17:22",
"buildBeginMonthText:" : "jz 7/25/2018 17:22",
"buildBeginPickerButton:" : "PS 7/25/2018 19:23",
"buildBeginYearText:" : "jz 7/25/2018 17:21",
"buildButtons:" : "jz 7/25/2018 19:17",
"buildButtons:" : "PS 7/25/2018 19:24",
"buildCalendarList:" : "jz 7/25/2018 13:31",
"buildDeleteButton:" : "PS 7/25/2018 19:21",
"buildDescriptionText:" : "jz 7/25/2018 17:10",
"buildEditButton:" : "PS 7/25/2018 19:37",
"buildEndDayText:" : "jz 7/25/2018 17:23",
"buildEndHourText:" : "jz 7/25/2018 17:23",
"buildEndMinuteText:" : "jz 7/25/2018 17:24",
"buildEndMonthText:" : "jz 7/25/2018 17:24",
"buildEndPickerButton:" : "PS 7/25/2018 19:23",
"buildEndYearText:" : "jz 7/25/2018 17:25",
"buildFields:" : "dm 7/24/2018 19:21",
"buildFullDayButton:" : "jz 7/25/2018 17:12",
"buildLocationText:" : "jz 7/25/2018 17:26",
"buildParticipantsText:" : "jz 7/25/2018 17:26",
"buildStandardButtons:" : "kk 7/5/2018 15:23",
"buildSaveButton:" : "PS 7/25/2018 19:32",
"buildStandardFields:" : "kk 7/5/2018 15:24",
"buildTitleText:" : "jz 7/25/2018 17:01",
"buildWith:" : "dm 7/24/2018 19:20",
Expand Down

0 comments on commit 21d9829

Please sign in to comment.