FileDialog.st
branchjv
changeset 13178 c9bf900fe729
parent 13173 e9da2324940d
parent 13025 8244753fe0a7
child 13180 64a4186ddfce
--- a/FileDialog.st	Mon Jul 01 12:31:33 2013 +0100
+++ b/FileDialog.st	Mon Jul 01 22:15:23 2013 +0100
@@ -613,7 +613,7 @@
 
     initialDefaultFileName := initialDefaultFileNameArg.
     initialDefaultFileName notNil ifTrue:[ 
-        initialDefaultFileName := initialDefaultFileName asFilename 
+        initialDefaultFileName := initialDefaultFileName asFilename.
     ].
 
     okText := okTextArg.
@@ -740,7 +740,7 @@
     ^ FileBrowserV2 flyByHelpSpec addPairsFrom:#(
 
 #openFileBrowser
-'Open a FileBrowser on the selected Directory'
+'Open a FileBrowser on the selected directory'
 
 )
 ! !
@@ -1277,8 +1277,6 @@
 !
 
 startFilename
-    "return the value of the instance variable 'startFilename' (automatically generated)"
-
     startFilename isNil ifTrue:[
         startFilename := Filename currentDirectory asAbsoluteFilename.
     ].
@@ -1286,8 +1284,6 @@
 !
 
 startFilename:something
-    "set the value of the instance variable 'startFilename' (automatically generated)"
-
     startFilename := something.
 ! !
 
@@ -1474,7 +1470,7 @@
     holder := builder bindingAt:#filenameHolder.
 
     holder isNil ifTrue:[
-        holder := ValueHolder new.
+        holder := startFilename asValue.
         holder addDependent:self.
         builder aspectAt:#filenameHolder put:holder.
     ].
@@ -1859,7 +1855,9 @@
     "Created: / 03-06-2013 / 17:41:14 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
-postBuildWith:aBuilder    
+postBuildWith:aBuilder 
+    |win hMin|
+
     treeBrowser multipleSelect:multipleSelect.
     appendWasPressed := false.
 
@@ -1867,6 +1865,15 @@
     (aBuilder componentAt:'appendButton') cursor:(Cursor thumbsUp).
     (aBuilder componentAt:'okButton') cursor:(Cursor thumbsUp).
 
+    win := aBuilder window .
+    hMin := (aBuilder window margin * 2)
+            + aBuilder menuBar preferredHeight
+            + (aBuilder componentAt:#FilenameEntryField) height
+            + (aBuilder componentAt:#ToolBar1) preferredHeight
+            + (aBuilder componentAt:#ButtonPanel) preferredHeight.
+
+    win minExtent:( win minExtent x @ hMin ).
+
     super postBuildWith:aBuilder
 !
 
@@ -1884,7 +1891,7 @@
 preOpenWith:aBuilder
     "called right before being opened"
 
-    | sumH oldVPanelHeight newVPanelHeight delta|
+    |delta|
 
     "Increase height of the window so height of the file part
      remain the same. This cares for any components added by a hook"
@@ -2071,11 +2078,11 @@
 !FileDialog class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 !
 
 version_HG
@@ -2084,6 +2091,6 @@
 !
 
 version_SVN
-    ^ '$Id: FileDialog.st,v 1.122 2013-06-14 09:17:39 cg Exp $'
+    ^ '$Id: FileDialog.st,v 1.127 2013-06-26 08:38:19 stefan Exp $'
 ! !