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

Adapt the SaveVersionDialog text field to use ctr+s for accept #268

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

Adapt the SaveVersionDialog text field to use ctr+s for accept #268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7fb0065
adapt the SaveVersionDialog text field to use ctr+s for accept
tom95 Jun 7, 2020
afed9a3
ensure we persist the commit message text even when cancelling
tom95 Jun 7, 2020
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
16 changes: 8 additions & 8 deletions .squot
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
OrderedDictionary {
'src\/VersionControl.package' : #SquotCypressCodeSerializer,
'src\/Pharo-compatibility.package' : #SquotCypressCodeSerializer,
'src\/Squot.package' : #SquotCypressCodeSerializer,
'src\/FileSystem-Git.package' : #SquotCypressCodeSerializer,
'src\/Squit.package' : #SquotCypressCodeSerializer,
'src\/BaselineOfSquot.package' : #SquotCypressCodeSerializer,
'src\/SquotTonel-Core.package' : #SquotCypressCodeSerializer,
'src\/SquotTonel-Tests.package' : #SquotCypressCodeSerializer
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like you have a different version of STON than I have?

'src/VersionControl.package' : #SquotCypressCodeSerializer,
'src/Pharo-compatibility.package' : #SquotCypressCodeSerializer,
'src/Squot.package' : #SquotCypressCodeSerializer,
'src/FileSystem-Git.package' : #SquotCypressCodeSerializer,
'src/Squit.package' : #SquotCypressCodeSerializer,
'src/BaselineOfSquot.package' : #SquotCypressCodeSerializer,
'src/SquotTonel-Core.package' : #SquotCypressCodeSerializer,
'src/SquotTonel-Tests.package' : #SquotCypressCodeSerializer
}
1 change: 0 additions & 1 deletion src/Squot.package/SquotSaveVersionDialog.class/instance/accept.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
actions
accept
self updateMessageFromViews.
((self messageWasChanged not or: [message isEmpty])
and: [(self confirm: 'Do you really want to commit without a proper commit message?') not])
ifTrue: [^ self].
Expand Down
6 changes: 6 additions & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/acceptMessage..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
accessing
acceptMessage: anObject

self message: anObject.

cancelling ifFalse: [self accept]
4 changes: 0 additions & 4 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/cancel.st
View file
Open in desktop

This file was deleted.

1 change: 1 addition & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/initialize.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@ initialize-release
initialize
super initialize.
message := self defaultMessage.
cancelling := false.
5 changes: 5 additions & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/whileCancellingDo..st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
accessing
whileCancellingDo: aBlock

cancelling := true.
aBlock ensure: [cancelling := false]
3 changes: 2 additions & 1 deletion 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 @@ -5,7 +5,8 @@ widgetSpecs: builder
name: 'message for the new version';
model: self;
getText: #message;
setText: #message:;
setText: #acceptMessage:;
askBeforeDiscardingEdits: false;
frame: (LayoutFrame fractions: ([email protected] corner: 1@1) offsets: (0@0 corner: 0@(-25)));
yourself.
self buildButtonBar: builder}
3 changes: 3 additions & 0 deletions src/Squot.package/SquotSaveVersionDialog.class/instance/windowIsClosing.st
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
ui
windowIsClosing
self whileCancellingDo: [self updateMessageFromViews].
12 changes: 7 additions & 5 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 @@ -2,24 +2,26 @@
"class" : {
"themeProperties" : "jr 10/14/2018 00:52" },
"instance" : {
"accept" : "jr 5/22/2020 15:51",
"accept" : "tobe 6/6/2020 16:29",
"acceptMessage:" : "tobe 6/7/2020 19:49",
"actionCommit" : "fn 4/11/2017 16:01",
"activateNodeCommandLabel" : "jr 4/7/2019 22:30",
"browseOtherEdition" : "jr 6/6/2020 01:04",
"browseOtherEditionLabel" : "jr 6/6/2020 00:48",
"buildButtonBar:" : "jr 11/18/2018 01:39",
"buildDiffPane:" : "jr 11/18/2018 01:33",
"cancel" : "jr 11/18/2018 00:44",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The text was updated even on cancel, so the text could be saved for later.
Without your change, one can start a commit, write a message, then notice a bug in the diff, cancel, fix the code, press commit again, and the previously typed message is filled in automatically.
That logic is not in the dialog class, but in the SquotWorkingCopy or SquotInteractiveSaveOperation.

"deactivateNodeCommandLabel" : "jr 4/7/2019 22:29",
"defaultMessage" : "jr 10/14/2018 01:24",
"excludeMethodsThatAreAssumedUnchanged" : "jr 5/22/2020 15:49",
"initialize" : "jr 11/18/2018 00:50",
"initialize" : "tobe 6/7/2020 20:22",
"inspectOriginalArtifactCommandLabel" : "jr 11/18/2018 01:05",
"message" : "jr 2/17/2017 17:03",
"message:" : "jr 2/17/2017 17:03",
"message:" : "tobe 6/6/2020 09:15",
"messageWasChanged" : "jr 11/17/2018 23:19",
"parentVersions:" : "jr 2/17/2017 19:34",
"rootNodes" : "jr 2/26/2020 22:57",
"updateMessageFromViews" : "jr 10/14/2018 01:30",
"widgetSpecs:" : "jr 11/18/2018 01:32",
"whileCancellingDo:" : "tobe 6/7/2020 19:49",
"widgetSpecs:" : "tobe 6/7/2020 20:23",
"windowIsClosing" : "tobe 6/7/2020 19:54",
"windowLabel" : "jr 11/18/2018 01:29" } }
3 changes: 2 additions & 1 deletion src/Squot.package/SquotSaveVersionDialog.class/properties.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
],
"commentStamp" : "jr 3/17/2018 19:48",
"instvars" : [
"message" ],
"message",
"cancelling" ],
"name" : "SquotSaveVersionDialog",
"pools" : [
],
Expand Down
14 changes: 0 additions & 14 deletions src/Squot.package/monticello.meta/postscript.st
View file
Open in desktop

This file was deleted.