Hide asset base version when showBase preference is disabled

src/Squot.package/SquotConflictingAssetChange.class/instance/buildBaseVersionWith..st

@@ -0,0 +1,8 @@
+toolbuilder
+buildBaseVersionWith: builder
+ ^ self
+ buildDynamicVersion: #buildBase:
+ label: 'Base:'
+ resolveAction: #resolveToBase
+ state: #isResolvedToBase
+ with: builder

src/Squot.package/SquotConflictingAssetChange.class/instance/buildBody..st

@@ -1,16 +1,5 @@
 toolbuilder
 buildBody: builder
- ^ SquotGUIUtilities buildEvenGrid: {
- {
- {#buildBase:. 'Base:'. #resolveToBase. #isResolvedToBase}.
- {#buildLeft:. 'Current:'. #resolveToLeft. #isResolvedToLeft}.
- {#buildRight:. 'Incoming:'. #resolveToRight. #isResolvedToRight}
- } collect: [:each |
- self
- buildDynamicVersion: each first
- label: each second
- resolveAction: each third
- state: each fourth
- with: builder].
- self buildResolutionPanel: builder.
- } ofSize: 2 @ 2 with: builder
+ ^ SquotPreferences showBase
+ ifTrue: [self buildBodyWithBase: builder]
+ ifFalse: [self buildBodyWithoutBase: builder]

src/Squot.package/SquotConflictingAssetChange.class/instance/buildBodyWithBase..st

@@ -0,0 +1,8 @@
+toolbuilder
+buildBodyWithBase: builder
+ ^ SquotGUIUtilities buildEvenGrid: {
+ self buildBaseVersionWith: builder.
+ self buildLeftVersionWith: builder.
+ self buildRightVersionWith: builder.
+ self buildResolutionPanel: builder.
+ } ofSize: 2 @ 2 with: builder

src/Squot.package/SquotConflictingAssetChange.class/instance/buildBodyWithoutBase..st

@@ -0,0 +1,9 @@
+toolbuilder
+buildBodyWithoutBase: builder
+ ^ SquotGUIUtilities buildVerticalSplit: 0.5
+ of: (SquotGUIUtilities buildHorizontalSplit: 0.5
+ of: (self buildLeftVersionWith: builder)
+ and: (self buildRightVersionWith: builder)
+ with: builder)
+ and: (self buildResolutionPanel: builder)
+ with: builder

src/Squot.package/SquotConflictingAssetChange.class/instance/buildLeftVersionWith..st

@@ -0,0 +1,8 @@
+toolbuilder
+buildLeftVersionWith: builder
+ ^ self
+ buildDynamicVersion: #buildLeft:
+ label: 'Current:'
+ resolveAction: #resolveToLeft
+ state: #isResolvedToLeft
+ with: builder

src/Squot.package/SquotConflictingAssetChange.class/instance/buildRightVersionWith..st

@@ -0,0 +1,8 @@
+toolbuilder
+buildRightVersionWith: builder
+ ^ self
+ buildDynamicVersion: #buildRight:
+ label: 'Incoming:'
+ resolveAction: #resolveToRight
+ state: #isResolvedToRight
+ with: builder

src/Squot.package/SquotConflictingAssetChange.class/methodProperties.json

@@ -4,14 +4,19 @@
  "instance" : {
  "base" : "mad 9/8/2023 12:09",
  "buildBase:" : "mad 9/20/2023 17:05",
- "buildBody:" : "mad 9/26/2023 14:04",
+ "buildBaseVersionWith:" : "mad 12/13/2023 18:44",
+ "buildBody:" : "mad 12/13/2023 18:46",
+ "buildBodyWithBase:" : "mad 12/13/2023 18:46",
+ "buildBodyWithoutBase:" : "mad 12/13/2023 18:49",
  "buildDynamicVersion:label:resolveAction:state:with:" : "mad 9/26/2023 14:03",
  "buildHead:" : "mad 9/8/2023 16:25",
  "buildLeft:" : "mad 9/20/2023 17:16",
+ "buildLeftVersionWith:" : "mad 12/13/2023 18:45",
  "buildResolution:" : "mad 9/20/2023 17:06",
  "buildResolutionPanel:" : "mad 9/26/2023 14:05",
  "buildResolveButton:state:with:" : "mad 9/26/2023 14:01",
  "buildRight:" : "mad 9/20/2023 17:06",
+ "buildRightVersionWith:" : "mad 12/13/2023 18:45",
  "buildWith:" : "mad 9/14/2023 13:58",
  "headText" : "mad 9/8/2023 16:23",
  "isResolved" : "mad 9/8/2023 16:24",