diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st index 78bf9a2f..ec063f8d 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buildHistoryListSpecWith..st @@ -5,4 +5,5 @@ buildHistoryListSpecWith: aBuilder model: self; list: #historyDescriptions; getIndex: #historyListSelectionIndex; - setIndex: #historyListSelectionIndex: \ No newline at end of file + setIndex: #historyListSelectionIndex:; + menu: #setUpHistoryListMenuMorph: \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st index 252a4576..2792237c 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/buttons.st @@ -2,5 +2,4 @@ building buttons ^ #(('Switch to detailed view' #switchToDetailedView 'Switch to a more detailed version of this window with more functionality') - ('Invert selection' #invertSelection 'Select all unselected changes and vice versa') ('Load selected changes' #loadSelectedChanges 'Load the selected changes into this image')) \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryList.st new file mode 100644 index 00000000..6b8c5ec8 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryList.st @@ -0,0 +1,4 @@ +actions +ignoreAllOfHistoryList + + self historyList do: [:each | each ignore] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListAndUpdateUI.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListAndUpdateUI.st new file mode 100644 index 00000000..ef72e8cb --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListAndUpdateUI.st @@ -0,0 +1,6 @@ +menu-actions +ignoreAllOfHistoryListAndUpdateUI + + self + ignoreAllOfHistoryList; + updateAfterMenuAction \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelected.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelected.st new file mode 100644 index 00000000..f8ace38f --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelected.st @@ -0,0 +1,6 @@ +actions +ignoreAllOfHistoryListExceptSelected + + (self historyList + reject: [:each | each = self selectedHistoryListItem]) + do: [:each | each ignore] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelectedAndUpdateUI.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelectedAndUpdateUI.st new file mode 100644 index 00000000..ce43da30 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/ignoreAllOfHistoryListExceptSelectedAndUpdateUI.st @@ -0,0 +1,6 @@ +menu-actions +ignoreAllOfHistoryListExceptSelectedAndUpdateUI + + self + ignoreAllOfHistoryListExceptSelected; + updateAfterMenuAction \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st index 3baee8ef..bb49c9f7 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/initializeHistoryList.st @@ -6,5 +6,4 @@ initializeHistoryList showWhile: [(self retrieveChangeRecordsFromChangesFile reject: [:each | self isInImage: each]) reversed]. self historyList: (self getHistoryListFrom: changeRecords). - self historyList do: [:each | - each history first isSelected: true] \ No newline at end of file + self selectAllLatestChangesOfHistoryList diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/invertSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/invertSelection.st deleted file mode 100644 index 36af713e..00000000 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/invertSelection.st +++ /dev/null @@ -1,7 +0,0 @@ -button-actions -invertSelection - - self displayedChangeListItems do: [:each | - each isSelected: (each isSelected not)]. - - self updateAfterChangeSelection diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryList.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryList.st new file mode 100644 index 00000000..f3646805 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryList.st @@ -0,0 +1,4 @@ +actions +selectAllLatestChangesOfHistoryList + + self historyList do: [:each | each selectLatest] \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryListAndUpdateUI.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryListAndUpdateUI.st new file mode 100644 index 00000000..425f785b --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/selectAllLatestChangesOfHistoryListAndUpdateUI.st @@ -0,0 +1,6 @@ +menu-actions +selectAllLatestChangesOfHistoryListAndUpdateUI + + self + selectAllLatestChangesOfHistoryList; + updateAfterMenuAction \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/setUpHistoryListMenuMorph..st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/setUpHistoryListMenuMorph..st new file mode 100644 index 00000000..d9f78567 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/setUpHistoryListMenuMorph..st @@ -0,0 +1,8 @@ +building +setUpHistoryListMenuMorph: aMenuMorph + + aMenuMorph addList: #( + ('Ignore all' ignoreAllOfHistoryListAndUpdateUI) + ('All latest changes' selectAllLatestChangesOfHistoryListAndUpdateUI) + ('Ingore all except this one' ignoreAllOfHistoryListExceptSelectedAndUpdateUI)). + ^ aMenuMorph \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st index 622340fe..993b2af8 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterChangeSelection.st @@ -1,7 +1,8 @@ updating updateAfterChangeSelection - self repaintChangeListSelection. - self refreshHistoryList. - self repaintHistoryListSelection. - self updateCodePane \ No newline at end of file + self + repaintChangeListSelection; + refreshHistoryList; + repaintHistoryListSelection; + updateCodePane \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st index f9b1de54..3d975a49 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterHistorySelection.st @@ -1,6 +1,7 @@ updating updateAfterHistorySelection - self refreshChangeList. - self repaintChangeListSelection. - self repaintHistoryListSelection \ No newline at end of file + self + refreshChangeList; + repaintChangeListSelection; + repaintHistoryListSelection \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterMenuAction.st b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterMenuAction.st new file mode 100644 index 00000000..d64877f9 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/instance/updateAfterMenuAction.st @@ -0,0 +1,6 @@ +updating +updateAfterMenuAction + + self + refreshHistoryList; + refreshChangeList \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json index da0f407d..db89260d 100644 --- a/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRBrowser.class/methodProperties.json @@ -5,11 +5,11 @@ "instance" : { "buildButtonPanelSpecWith:" : "mg 5/15/2020 09:24", "buildButtonSpecsWith:" : "mg 5/14/2020 21:14", - "buildHistoryListSpecWith:" : "SV 6/12/2020 19:57", + "buildHistoryListSpecWith:" : "mg 6/26/2020 10:59", "buildSingleSelectionChangeListSpecWith:" : "SV 6/21/2020 12:54", "buildWith:" : "SV 6/21/2020 13:07", "buttonHeight" : "mg 5/11/2020 19:05", - "buttons" : "mg 6/15/2020 18:46", + "buttons" : "mg 6/29/2020 17:53", "buttonsFrame" : "mg 5/11/2020 18:56", "changeListFrame" : "SV 6/21/2020 12:24", "changeListSelectionIndex" : "SV 6/21/2020 12:53", @@ -28,9 +28,12 @@ "historyListFrame" : "SV 6/21/2020 12:24", "historyListSelectionIndex" : "SV 6/12/2020 19:58", "historyListSelectionIndex:" : "SV 6/21/2020 13:35", - "initialize" : "SV 6/21/2020 13:10", - "initializeHistoryList" : "SV 6/22/2020 21:32", - "invertSelection" : "SV 6/12/2020 21:50", + "ignoreAllOfHistoryList" : "mg 6/29/2020 18:56", + "ignoreAllOfHistoryListAndUpdateUI" : "mg 6/29/2020 18:58", + "ignoreAllOfHistoryListExceptSelected" : "mg 6/29/2020 18:58", + "ignoreAllOfHistoryListExceptSelectedAndUpdateUI" : "mg 6/29/2020 18:59", + "initialize" : "mg 6/29/2020 18:50", + "initializeHistoryList" : "mg 6/26/2020 11:11", "isAnyDisplayedChangeListItemSelected" : "SV 6/27/2020 19:38", "isInImage:" : "SV 5/20/2020 13:03", "loadSelectedChanges" : "mg 6/20/2020 09:52", @@ -40,12 +43,16 @@ "repaintChangeListSelection" : "SV 6/27/2020 19:48", "repaintHistoryListSelection" : "SV 6/12/2020 21:41", "retrieveChangeRecordsFromChangesFile" : "SV 6/12/2020 22:03", + "selectAllLatestChangesOfHistoryList" : "mg 6/29/2020 18:58", + "selectAllLatestChangesOfHistoryListAndUpdateUI" : "mg 6/29/2020 18:59", "selectedChangeListItems" : "SV 6/27/2020 19:39", "selectedDisplayedChangeListItems" : "SV 6/27/2020 19:38", "selectedHistoryListItem" : "SV 6/12/2020 21:37", "setChangeListItemSelectionAt:to:" : "SV 6/12/2020 21:51", + "setUpHistoryListMenuMorph:" : "mg 6/29/2020 19:00", "switchToDetailedView" : "mg 5/14/2020 21:26", - "updateAfterChangeSelection" : "SV 6/27/2020 19:48", - "updateAfterHistorySelection" : "SV 6/27/2020 19:48", + "updateAfterChangeSelection" : "mg 6/29/2020 18:04", + "updateAfterHistorySelection" : "mg 6/29/2020 18:04", + "updateAfterMenuAction" : "mg 6/29/2020 18:04", "updateCodePane" : "SV 6/21/2020 13:16", "wantsOptionalButtons" : "SV 6/21/2020 12:26" } } diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/ignore.st b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/ignore.st new file mode 100644 index 00000000..51f3fa0a --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/ignore.st @@ -0,0 +1,4 @@ +selecting +ignore + + self history do: [:change | change isSelected: false] diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/selectLatest.st b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/selectLatest.st new file mode 100644 index 00000000..b0ec9975 --- /dev/null +++ b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/instance/selectLatest.st @@ -0,0 +1,5 @@ +selecting +selectLatest + + self ignore. + self history first isSelected: true \ No newline at end of file diff --git a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json index 15444689..0a09a1b5 100644 --- a/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json +++ b/packages/ChangesReloaded-Core.package/CRHistoryListItem.class/methodProperties.json @@ -13,7 +13,9 @@ "hasSelectedChangeListItem" : "SV 6/22/2020 21:08", "history" : "SV 6/12/2020 13:46", "history:" : "gf 6/15/2020 23:34", + "ignore" : "mg 6/26/2020 11:09", "initialize" : "mg 6/20/2020 09:55", + "selectLatest" : "mg 6/26/2020 11:09", "selectedChangeListItems" : "mg 6/20/2020 09:30", "selector" : "SV 6/12/2020 13:49", "selector:" : "SV 6/12/2020 13:49" } }