Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ui: fixes for dialog text fields (save version dialog + feedback dialog) #380

Open
wants to merge 6 commits into
base: develop
Choose a base branch
from
Open

ui: fixes for dialog text fields (save version dialog + feedback dialog) #380

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b1f6e31
ui: fixes for dialog text fields (save version dialog + feedback dialog)
LinqLover Jun 17, 2022
ca4d612
Merge branch 'develop' of fork into fix/dialog-text-fields
LinqLover Sep 8, 2022
09e2415
Once again, fix Squot merge errors
LinqLover Sep 8, 2022
1946069
Once again, fix Squot merge errors
LinqLover Sep 8, 2022
45eedac
Fix: drafted commit message not updated after pressing cmd + l and re…
LinqLover Sep 8, 2022
bc66078
Revert "Fix: drafted commit message not updated after pressing cmd + …
LinqLover Sep 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Squit.package/SquitFeedback.class/instance/actionSubmit.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
actions
actionSubmit
self changed: #acceptChanges.
self actionTitle ifEmpty: [self error: 'No title provided.'].
self actionMessage ifEmpty: [self error: 'No message provided.'].
WebClient
Expand Down
14 changes: 9 additions & 5 deletions src/Squit.package/SquitFeedback.class/instance/buildInputFields..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,24 +4,27 @@ buildInputFields: builder
builder pluggableInputFieldSpec new
model: self;
getText: #actionTitle;
editText: #actionTitle:;
setText: #actionTitle:;
help: 'A feedback title...';
frame: (LayoutFrame new
topFraction: 0;
bottomFraction: 0 offset: self inputFieldHeight;
leftFraction: 0; rightFraction: 1).
leftFraction: 0; rightFraction: 1);
yourself.
builder pluggableTextSpec new
model: self;
getText: #actionMessage;
editText: #actionMessage:;
setText: #actionMessage:;
help: 'A message explaining your issue/suggestion in detail...';
softLineWrap: true;
frame: (LayoutFrame new
topFraction: 0 offset: self inputFieldHeight;
bottomFraction: 1 offset: self inputFieldHeight negated;
leftFraction: 0; rightFraction: 1).
leftFraction: 0; rightFraction: 1);
in: [:textSpec |
(textSpec respondsTo: #plainTextOnly:) ifTrue: ">= Squeak 6.0"
[textSpec plainTextOnly: true]];
yourself.
builder pluggableInputFieldSpec new
model: self;
getText: #actionAuthor;
Expand All @@ -31,5 +34,6 @@ buildInputFields: builder
frame: (LayoutFrame new
topFraction: 1 offset: self inputFieldHeight negated;
bottomFraction: 1;
leftFraction: 0; rightFraction: 1).
leftFraction: 0; rightFraction: 1);
yourself.
}
4 changes: 2 additions & 2 deletions src/Squit.package/SquitFeedback.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
"actionCancel" : "fn 4/13/2017 13:27",
"actionMessage" : "fn 4/13/2017 13:38",
"actionMessage:" : "fn 4/13/2017 13:38",
"actionSubmit" : "jr 7/24/2020 10:16",
"actionSubmit" : "ct 6/17/2022 19:52",
"actionTitle" : "fn 4/13/2017 13:38",
"actionTitle:" : "fn 4/13/2017 13:38",
"buildButtons:" : "fn 4/13/2017 13:27",
"buildInputFields:" : "jr 2/17/2022 23:17",
"buildInputFields:" : "ct 6/17/2022 20:07",
"buildWith:" : "jr 1/13/2022 20:54",
"close" : "fn 4/13/2017 13:27",
"inputFieldHeight" : "jr 2/20/2022 11:26",
Expand Down
3 changes: 2 additions & 1 deletion src/Squot.package/SquotSaveVersionDialog.class/instance/message..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
accessing
message: anObject

message := anObject
message := anObject.
^ true
5 changes: 5 additions & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/okToRevertChanges..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
ui toolbuilder
okToRevertChanges: aspect

aspect = #message: ifTrue: [self message: self defaultMessage].
j4yk marked this conversation as resolved.
Show resolved Hide resolved
^ true
3 changes: 3 additions & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/widgetSpecs..st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ widgetSpecs: builder
setText: #message:;
editText: #message:;
frame: (LayoutFrame fractions: (0@0.7 corner: 0.8@1) offsets: (0@0 corner: 0@(self buttonHeight negated)));
in: [:textSpec |
(textSpec respondsTo: #plainTextOnly:) ifTrue: ">= Squeak 6.0"
[textSpec plainTextOnly: true]];
yourself.
self buildCoAuthorSelector: builder.
self buildButtonBar: builder}
5 changes: 3 additions & 2 deletions src/Squot.package/SquotSaveVersionDialog.class/methodProperties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,11 @@
"initialize" : "jr 11/18/2018 00:50",
"inspectOriginalArtifactCommandLabel" : "jr 11/18/2018 01:05",
"message" : "jr 2/17/2017 17:03",
"message:" : "jr 2/17/2017 17:03",
"message:" : "ct 6/17/2022 19:56",
"messageWasChanged" : "jr 11/17/2018 23:19",
"okToRevertChanges:" : "ct 6/17/2022 19:59",
"parentVersions:" : "jr 2/17/2017 19:34",
"toggleLoadSelectedNode" : "jr 10/4/2020 17:54",
"updateMessageFromViews" : "jr 10/14/2018 01:30",
"widgetSpecs:" : "jr 12/22/2021 13:09",
"widgetSpecs:" : "ct 6/17/2022 19:59",
"windowLabel" : "jr 11/18/2018 01:29" } }