diff --git a/src/FileSystem-Git.package/.squot-contents b/src/FileSystem-Git.package/.squot-contents index 8999e8416..1158738d0 100644 --- a/src/FileSystem-Git.package/.squot-contents +++ b/src/FileSystem-Git.package/.squot-contents @@ -1,7 +1,7 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, #id : UUID [ '9d2378120e641f4fad4dd02310c91f53' ], - #objectsReplacedByNames : true, #slotOverrides : { }, + #objectsReplacedByNames : true, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squit.package/.squot-contents b/src/Squit.package/.squot-contents index 0fd3153e7..a52a8f4a8 100644 --- a/src/Squit.package/.squot-contents +++ b/src/Squit.package/.squot-contents @@ -1,7 +1,7 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, #id : UUID [ '207bca0df934e041b1e79b9ff315b588' ], - #objectsReplacedByNames : true, #slotOverrides : { }, + #objectsReplacedByNames : true, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squit.package/SquitFeedback.class/instance/actionSubmit.st b/src/Squit.package/SquitFeedback.class/instance/actionSubmit.st index c84d7d980..c4cec5ab4 100644 --- a/src/Squit.package/SquitFeedback.class/instance/actionSubmit.st +++ b/src/Squit.package/SquitFeedback.class/instance/actionSubmit.st @@ -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 diff --git a/src/Squit.package/SquitFeedback.class/instance/buildInputFields..st b/src/Squit.package/SquitFeedback.class/instance/buildInputFields..st index be6d88f38..7267a24a7 100644 --- a/src/Squit.package/SquitFeedback.class/instance/buildInputFields..st +++ b/src/Squit.package/SquitFeedback.class/instance/buildInputFields..st @@ -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; @@ -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. } \ No newline at end of file diff --git a/src/Squit.package/SquitFeedback.class/methodProperties.json b/src/Squit.package/SquitFeedback.class/methodProperties.json index 15ecd145d..f91201dde 100644 --- a/src/Squit.package/SquitFeedback.class/methodProperties.json +++ b/src/Squit.package/SquitFeedback.class/methodProperties.json @@ -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", diff --git a/src/Squot.package/.squot-contents b/src/Squot.package/.squot-contents index 09d3ef66c..4538c973f 100644 --- a/src/Squot.package/.squot-contents +++ b/src/Squot.package/.squot-contents @@ -1,7 +1,7 @@ SquotTrackedObjectMetadata { #objectClassName : #PackageInfo, #id : UUID [ '7e0624d4d6eca84f879c365f65ae74be' ], - #objectsReplacedByNames : true, #slotOverrides : { }, + #objectsReplacedByNames : true, #serializer : #SquotCypressCodeSerializer } \ No newline at end of file diff --git a/src/Squot.package/SquotSaveVersionDialog.class/instance/message..st b/src/Squot.package/SquotSaveVersionDialog.class/instance/message..st index b85ef2159..78e9bdf08 100644 --- a/src/Squot.package/SquotSaveVersionDialog.class/instance/message..st +++ b/src/Squot.package/SquotSaveVersionDialog.class/instance/message..st @@ -1,4 +1,5 @@ accessing message: anObject - message := anObject \ No newline at end of file + message := anObject. + ^ true \ No newline at end of file diff --git a/src/Squot.package/SquotSaveVersionDialog.class/instance/okToRevertChanges..st b/src/Squot.package/SquotSaveVersionDialog.class/instance/okToRevertChanges..st new file mode 100644 index 000000000..3bebd9c5a --- /dev/null +++ b/src/Squot.package/SquotSaveVersionDialog.class/instance/okToRevertChanges..st @@ -0,0 +1,5 @@ +ui toolbuilder +okToRevertChanges: aspect + + aspect = #message: ifTrue: [self message: self defaultMessage]. + ^ true \ No newline at end of file diff --git a/src/Squot.package/SquotSaveVersionDialog.class/instance/widgetSpecs..st b/src/Squot.package/SquotSaveVersionDialog.class/instance/widgetSpecs..st index 0e6e0a7eb..c4849ff7a 100644 --- a/src/Squot.package/SquotSaveVersionDialog.class/instance/widgetSpecs..st +++ b/src/Squot.package/SquotSaveVersionDialog.class/instance/widgetSpecs..st @@ -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} \ No newline at end of file diff --git a/src/Squot.package/SquotSaveVersionDialog.class/methodProperties.json b/src/Squot.package/SquotSaveVersionDialog.class/methodProperties.json index 08af2de8a..46f6a874e 100644 --- a/src/Squot.package/SquotSaveVersionDialog.class/methodProperties.json +++ b/src/Squot.package/SquotSaveVersionDialog.class/methodProperties.json @@ -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" } }