Add pharo-vcs#933

Simplify Edit project dialog:
 - add root directory
 - handle deselection (and select root)

Iceberg-TipUI.package/IceTipDirectoryDataSource.class/instance/directory..st

@@ -1,7 +1,7 @@
 accessing
 directory: aDirectory
 
-	rootItem := (self class rootItemFor: (self childrenToShowFrom: aDirectory))
+	rootItem := (self class rootItemFor: { aDirectory })
 		dataSource: self;
 		yourself.
 	self rootItem: rootItem

Iceberg-TipUI.package/IceTipEditProjectDialog.class/class/defaultSpec.st

@@ -17,10 +17,6 @@ defaultSpec
 								newRow: [ :emptyRow | "Fill space"  ] ] width: self iceLabelWidth;
 						newColumn: #sourceDirectoryTree ]
 					height: 200;
-				newRow: [ :row |
-					row newColumn: [ :emptyColumn | "Fill space" ] width: self iceLabelWidth. 
-					row newColumn: #useSourceFolder ]
-					height: self inputTextHeight;					
 				newRow: [ :row | 
 					row
 						newColumn: #formatLabel width: self iceLabelWidth;

Iceberg-TipUI.package/IceTipEditProjectDialog.class/instance/initializeDirectoryTree.st

@@ -7,5 +7,4 @@ initializeDirectoryTree
 		addColumn: (IceTipTableColumn newAction: #name icon: [ :each | self iconNamed: #package ]);
 		dataSource: dataSource;
 		onAnnouncement: FTSelectionChanged do: [ :announcement | 
-			self sourceDirectorySelectionChanged: announcement newSelectedRowIndexes.
-			useSourceFolder state: true ]
+			self sourceDirectorySelectionChanged: announcement newSelectedRowIndexes ]

Iceberg-TipUI.package/IceTipEditProjectDialog.class/instance/initializePresenter.st

@@ -4,20 +4,18 @@ initializePresenter
 	| path currentNode |
 	super initializePresenter.
 	path := (RelativePath with: model sourceDirectory) segments asOrderedCollection.
-
-	path isEmpty ifFalse: [
-		currentNode := self sourceDirectoryTree widget dataSource rootItem.
-
-		[ path isEmpty ] whileFalse: [ | currentSegment |
-			currentSegment := path removeFirst.
-			currentNode := currentNode children detect: [ :e | e data basename = currentSegment ] ifFound: [ :node | node expand. node ] ifNone: [ nil ]].
 
-		currentNode ifNotNil: [self sourceDirectoryTree widget selectRowIndex: (self sourceDirectoryTree widget dataSource indexOfElementMatching: [ :elem | elem = currentNode data ])].
-	].
-
+	currentNode := self sourceDirectoryTree widget dataSource rootItem children first.
+	currentNode expand.
+	[ path isEmpty ] whileFalse: [ | currentSegment |
+		currentSegment := path removeFirst.
+		currentNode := currentNode children detect: [ :e | (e data basename ifEmpty: [ '/' ]) = currentSegment ] ifFound: [ :node | node expand. node ] ifNone: [ nil ]].
+
+	currentNode ifNotNil: [
+		self sourceDirectoryTree widget
+			selectRowIndex: (self sourceDirectoryTree widget dataSource indexOfElementMatching: [ :elem | elem = currentNode data ]) ].
+
 	self formatList
 		items: self formats;
 		displayBlock: [ :each | each description ];
-		setSelectedItem: model repositoryProperties fileFormat.
-
-	useSourceFolder state: model sourceDirectory isNotEmpty.
+		setSelectedItem: model repositoryProperties fileFormat.

Iceberg-TipUI.package/IceTipEditProjectDialog.class/instance/initializeWidgets.st

@@ -8,14 +8,9 @@ initializeWidgets
 
 	formatLabel := self newLabel label: 'Format'.
 	formatList := self newDropList.
-
-	useSourceFolder := self newCheckBox 
-		label: 'Use Source Directory';
-		whenChangedDo: [ useSourceFolder state ifFalse: [ sourceDirectoryTree widget selectRowIndexes: #() ] ] .
-
+
 	self initializeDirectoryTree.
 	self focusOrder
 		add: nameInput;
 		add: sourceDirectoryTree;
-		add: useSourceFolder;
 		add: formatList

Iceberg-TipUI.package/IceTipEditProjectDialog.class/instance/newDirectoryDataSource.st

@@ -1,6 +1,6 @@
 initialization
 newDirectoryDataSource
-		
+
 	^ IceTipDirectoryDataSource new
 		directory: self model fileSystem;
 		yourself

Iceberg-TipUI.package/IceTipEditProjectDialog.class/instance/sourceDirectorySelectionChanged..st

@@ -1,14 +1,18 @@
 initialization
 sourceDirectorySelectionChanged: selectedIndexes
 
-	| selectedDirectory |
+	| selectedDirectory selection |
 	selectedIndexes
 		ifEmpty: [ 
 			"If the user does not select any directory, we choose the root and we use the default format"
 			selectedDirectoryPath := RelativePath new.
-			formatList setSelectedItem: defaultFormat  ]
-		ifNotEmpty: [ | selection |
+			self sourceDirectoryTree widget selectRowIndex: 1.
+			selection := self sourceDirectoryTree widget dataSource rootItem children first.
+			selectedDirectory := self sourceDirectoryTree widget dataSource rootItem children first data.
+		] ifNotEmpty: [
 			selection := self sourceDirectoryTree widget dataSource elementAt: selectedIndexes first.
-			selectedDirectory := selection data.
-			selectedDirectoryPath := selectedDirectory relativeTo: self model fileSystem.
-			formatList setSelectedItem: (self guessFormatFromDirectory: selectedDirectory) ].
+		].
+
+	selectedDirectory := selection data.
+	selectedDirectoryPath := selectedDirectory relativeTo: self model fileSystem. 
+	formatList setSelectedItem: (self guessFormatFromDirectory: selectedDirectory).

Iceberg-TipUI.package/IceTipEditProjectDialog.class/properties.json

@@ -12,13 +12,11 @@
 		"acceptCallback",
 		"sourceDirectoryLabel",
 		"sourceDirectoryTree",
-		"sourceDirectorySelectionLabel",
 		"selectedDirectoryPath",
 		"formatList",
 		"formatLabel",
 		"formats",
-		"defaultFormat",
-		"useSourceFolder"
+		"defaultFormat"
 	],
 	"name" : "IceTipEditProjectDialog",
 	"type" : "normal"