diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ce6ba3e501..daca606c3d 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,18 @@ The license applies to all entries newer than 2009-04-28. */ +2011-02-12 13:03 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbxbp/hbpprocess.prg + ! Reworked: how command line parameters are passed to the appln. + * contrib/hbide/idebrowse.prg + ! Fixed: Goto() usage was broken in ideDBU ( result of strict + parameter checking introduced lately ). + * contrib/hbide/ideharbourhelp.prg + ! Tried: yet another time to cover case sensitivity in + "Document Viewer". + * contrib/hbide/idetools.prg + ! Tweaked: to pass application parameters for new protocol. + 2011-02-12 12:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * src/rtl/browse.prg ! Reversed some of the changes in previous commit. diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index adff2daa15..4abdb597f9 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -2323,10 +2323,17 @@ METHOD IdeBrowse:search( cSearch, lSoft, lLast, nMode ) /*----------------------------------------------------------------------*/ METHOD IdeBrowse:refreshAll() + LOCAL qRect ::oBrw:refreshAll() ::oBrw:forceStable() ::oBrw:setCurrentIndex( .t. ) + qRect := ::qMdi:geometry() + qRect:setHeight( qRect:height() + 3 ) + ::qMdi:setGeometry( qRect) + qRect:setHeight( qRect:height() - 3 ) + ::qMdi:setGeometry( qRect) + ::dispInfo() RETURN Self @@ -2373,7 +2380,7 @@ METHOD IdeBrowse:lock() METHOD IdeBrowse:goToAsk() LOCAL nRec - IF ! empty( nRec := ( QInputDialog() ):getInt( , "Goto", "Record_# ?", ::recno(), 1, ::lastrec() ) ) + IF ! empty( nRec := ( QInputDialog() ):getInt( ::qMdi, "Goto", "Record_# ?", ::recno(), 1, ::lastrec() ) ) ::goto( nRec ) ::refreshAll() ENDIF diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index a9cbbae47d..5d7c6d84be 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -669,7 +669,8 @@ STATIC FUNCTION hbide_buildFoldersTree( aNodes, aPaths ) FOR EACH s IN aPaths cPath := s cPath := hbide_stripRoot( cRoot, cPath ) - cPath := hbide_pathNormalized( cPath, .t. ) + //cPath := hbide_pathNormalized( cPath, .t. ) + cPath := hbide_pathNormalized( cPath, .f. ) aSubs := hb_aTokens( cPath, "/" ) @@ -683,19 +684,20 @@ STATIC FUNCTION hbide_buildFoldersTree( aNodes, aPaths ) cPPath := hbide_buildPathFromSubs( aSubs, i - 1 ) //nP := ascan( aNodes, {|e_| hb_FileMatch( hbide_pathNormalized( e_[ 4 ], .t. ), hbide_pathNormalized( cRoot + cPPath, .t. ) ) } ) nP := ascan( aNodes, {|e_| hb_FileMatch( hbide_pathNormalized( e_[ 4 ], .f. ), hbide_pathNormalized( cRoot + cPPath, .f. ) ) } ) + IF nP > 0 + oParent := aNodes[ nP, 1 ] - oParent := aNodes[ nP, 1 ] + cOSPath := hbide_pathToOSPath( cRoot + cCPath ) - cOSPath := hbide_pathToOSPath( cRoot + cCPath ) + oChild := QTreeWidgetItem() + oChild:setText( 0, aSubs[ i ] ) + oChild:setIcon( 0, cIcon ) + oChild:setToolTip( 0, cOSPath ) - oChild := QTreeWidgetItem() - oChild:setText( 0, aSubs[ i ] ) - oChild:setIcon( 0, cIcon ) - oChild:setToolTip( 0, cOSPath ) + oParent:addChild( oChild ) - oParent:addChild( oChild ) - - aadd( aNodes, { oChild, "Path", oParent, cOSPath, aSubs[ i ] } ) + aadd( aNodes, { oChild, "Path", oParent, cOSPath, aSubs[ i ] } ) + ENDIF ENDIF ENDIF NEXT diff --git a/harbour/contrib/hbide/idetools.prg b/harbour/contrib/hbide/idetools.prg index 5fbccf48e7..bb63222aeb 100644 --- a/harbour/contrib/hbide/idetools.prg +++ b/harbour/contrib/hbide/idetools.prg @@ -694,7 +694,7 @@ METHOD IdeToolsManager:addPanelsMenu( cPrompt ) /*----------------------------------------------------------------------*/ METHOD IdeToolsManager:execToolByParams( cCmd, cParams, cStartIn, lCapture, lOpen ) - LOCAL cArg + LOCAL cArg, lTokened ::oProcess := HbpProcess():new() @@ -704,9 +704,11 @@ METHOD IdeToolsManager:execToolByParams( cCmd, cParams, cStartIn, lCapture, lOpe ::oProcess:lDetached := !( lCapture ) IF empty( cCmd ) + lTokened := .f. cCmd := hbide_getShellCommand() cArg := iif( hbide_getOS() == "nix", "", "/C " ) ELSE + lTokened := .t. cArg := "" ENDIF @@ -721,7 +723,7 @@ METHOD IdeToolsManager:execToolByParams( cCmd, cParams, cStartIn, lCapture, lOpe ::oOutputResult:oWidget:append( cArg ) ::oOutputResult:oWidget:append( hbide_outputLine() ) ENDIF - ::oProcess:addArg( cArg ) + ::oProcess:addArg( cArg, lTokened ) ::oProcess:start( cCmd ) RETURN Self diff --git a/harbour/contrib/hbxbp/hbpprocess.prg b/harbour/contrib/hbxbp/hbpprocess.prg index ad6348587d..821041e0e1 100644 --- a/harbour/contrib/hbxbp/hbpprocess.prg +++ b/harbour/contrib/hbxbp/hbpprocess.prg @@ -95,7 +95,7 @@ CLASS HbpProcess METHOD new( cShellCmd ) METHOD create( cShellCmd ) METHOD destroy() VIRTUAL - METHOD addArg( cArg ) + METHOD addArg( cArg, lTokened ) METHOD start( cShellCmd ) METHOD waitForFinished() INLINE ::qProcess:waitForFinished() @@ -175,13 +175,23 @@ METHOD HbpProcess:output( bBlock ) /*----------------------------------------------------------------------*/ -METHOD HbpProcess:addArg( cArg ) +METHOD HbpProcess:addArg( cArg, lTokened ) + LOCAL s + + DEFAULT lTokened TO .f. IF empty( ::qStrList ) ::qStrList := QStringList() ENDIF - ::qStrList:append( cArg ) - + IF ! lTokened + ::qStrList:append( cArg ) + ELSE + FOR EACH s IN hb_aTokens( cArg, " " ) + IF ! empty( s := alltrim( s ) ) + ::qStrList:append( s ) + ENDIF + NEXT + ENDIF RETURN Self /*----------------------------------------------------------------------*/