diff -r 3113972f5e4b -r 21182b668964 DirectoryContentsBrowser.st --- a/DirectoryContentsBrowser.st Wed Feb 05 19:55:57 2014 +0100 +++ b/DirectoryContentsBrowser.st Wed Feb 05 19:55:59 2014 +0100 @@ -183,11 +183,14 @@ ^#( (DataSetColumnSpec label: '' + labelIsImage: true labelButtonType: Group width: 22 minWidth: 22 height: 16 model: icon + menuFromApplication: false + printSelector: icon canSelect: false showRowSeparator: false showColSeparator: false @@ -472,6 +475,7 @@ "Do not manually edit this!! If it is corrupted, the MenuEditor may not be able to read the specification." + " MenuEditor new openOnClass:DirectoryContentsBrowser andSelector:#directoryContentsBrowserMenu (Menu new fromLiteralArrayEncoding:(DirectoryContentsBrowser directoryContentsBrowserMenu)) startUp @@ -498,6 +502,15 @@ label: '-' ) (MenuItem + label: 'SourceCodeManagement' + translateLabel: true + submenuChannel: scmMenuSlice + isMenuSlice: true + ) + (MenuItem + label: '-' + ) + (MenuItem label: 'New' translateLabel: true submenuChannel: newMenu @@ -677,8 +690,6 @@ nil nil ) - - "Modified: / 07-02-2007 / 18:44:44 / cg" ! viewBrowserMenu @@ -1251,6 +1262,14 @@ ^ browserItemList ! +currentDirectoryDisplayed + "Return a directory as Filename that is currently displayed in the browser" + + ^ directory + + "Modified: / 15-01-2013 / 11:42:19 / Jan Vrany " +! + selectionInFileList selectionInFileList isNil ifTrue:[ @@ -1641,6 +1660,14 @@ ^ destinationPath ! +dropObjects:aCollectionOfDropObjects + "drop manager wants to drop. + This is ony sent, if #canDrop: returned true. + Must be redefined in order for drop to work." + + ^ self shouldImplement +! + dropOver:aDropContext "called during drag & drop while moving over the widget." @@ -2647,39 +2674,39 @@ sensor := self windowGroup sensor. (sensor anyButtonPressed or:[sensor shiftDown]) ifTrue:[ - Processor yield. - - "/ no update while scrolling - timedOut := ( changeSema waitWithTimeoutMs:(self class updateTaskCyleTime asMilliseconds) ) isNil. - timedOut ifFalse:[changeSema signal]. - ^ self + Processor yield. + + "/ no update while scrolling + timedOut := ( changeSema waitWithTimeoutMs:(self class updateTaskCyleTime milliseconds) ) isNil. + timedOut ifFalse:[changeSema signal]. + ^ self ]. AbortOperationRequest handle:[ - "/ to get out of a debugger loop... - self debugMessage:'got an abort signal'. - self directoryContentsChangeFlag:false. - self filterChangeFlag:false. - self sortBlockChangeFlag:false. + "/ to get out of a debugger loop... + self debugMessage:'got an abort signal'. + self directoryContentsChangeFlag:false. + self filterChangeFlag:false. + self sortBlockChangeFlag:false. ] do:[ - (updatingColumns == true) ifTrue:[ - timedOut := false - ] ifFalse:[ - self debugMessage:'sema wait'. - timedOut := (changeSema waitWithTimeoutMs:(self class updateTaskCyleTime asMilliseconds)) isNil. - self debugMessage:'timedOut:', timedOut asString. - ]. - - (filterChangeFlag - or:[ sortBlockChangeFlag - or:[ directoryChangeFlag - or:[ directoryContentsChangeFlag - or:[ updatingColumns == true - or:[ timedOut ]]]]]) ifTrue:[ - accessLock critical:[ - self updateAfterTimeout:timedOut. - ]. - ]. + (updatingColumns == true) ifTrue:[ + timedOut := false + ] ifFalse:[ + self debugMessage:'sema wait'. + timedOut := (changeSema waitWithTimeoutMs:(self class updateTaskCyleTime asMilliseconds)) isNil. + self debugMessage:'timedOut:', timedOut asString. + ]. + + (filterChangeFlag + or:[ sortBlockChangeFlag + or:[ directoryChangeFlag + or:[ directoryContentsChangeFlag + or:[ updatingColumns == true + or:[ timedOut ]]]]]) ifTrue:[ + accessLock critical:[ + self updateAfterTimeout:timedOut. + ]. + ]. ]. "Modified: / 20-03-2012 / 13:07:22 / cg" @@ -3424,10 +3451,10 @@ !DirectoryContentsBrowser class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.257 2013-12-07 10:47:24 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.258 2014-02-05 18:55:59 cg Exp $' ! version_CVS - ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.257 2013-12-07 10:47:24 cg Exp $' + ^ '$Header: /cvs/stx/stx/libtool/DirectoryContentsBrowser.st,v 1.258 2014-02-05 18:55:59 cg Exp $' ! !