diff --git a/harbour/ChangeLog b/harbour/ChangeLog index ea9dac2555..5760a1f1ab 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,16 @@ The license applies to all entries newer than 2009-04-28. */ +2011-01-03 13:01 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/findinfilesex.ui + ! .rc => .txt + * contrib/hbide/idefindreplace.prg + + Included: all text files defined per + for "Find in Files" to be searched along other pre defined file types. + This is also valid for files included in projects per -3rd= option. + + First commit in year 2011 - Wish all Harbourians a Rewarding New Year. + 2011-03-01 22:20 UTC+0200 Petr Chornyj (myorg63 at mail.ru) * contrib/hbmisc/nconvert.prg + Added DecToRoman() function diff --git a/harbour/contrib/hbide/findinfilesex.ui b/harbour/contrib/hbide/findinfilesex.ui index 5750c9418c..98b6cc6dea 100644 --- a/harbour/contrib/hbide/findinfilesex.ui +++ b/harbour/contrib/hbide/findinfilesex.ui @@ -99,12 +99,12 @@ - 33 + 40 16777215 - .rc + .txt diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index 2150f8d2b5..c97aeebb17 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -1069,7 +1069,7 @@ METHOD IdeFindInFiles:find() lCpp := ::oUI:q_checkCpp:isChecked() lH := ::oUI:q_checkH:isChecked() lCh := ::oUI:q_checkCh:isChecked() - lRc := ::oUI:q_checkRc:isChecked() + lRc := ::oUI:q_checkRc:isChecked() /* Conceptually it is now lText */ aFilter := hbide_buildFilter( lPrg, lC, lCpp, lH, lCh, lRc ) @@ -1416,8 +1416,9 @@ METHOD IdeFindInFiles:paintRequested( pPrinter ) /*----------------------------------------------------------------------*/ -STATIC FUNCTION hbide_buildFilter( lPrg, lC, lCpp, lH, lCh, lRc ) +STATIC FUNCTION hbide_buildFilter( lPrg, lC, lCpp, lH, lCh, lTxt ) LOCAL aFilter := {} + LOCAL aExt IF lPrg aadd( aFilter, "*.prg" ) @@ -1433,9 +1434,11 @@ STATIC FUNCTION hbide_buildFilter( lPrg, lC, lCpp, lH, lCh, lRc ) ENDIF IF lCh aadd( aFilter, "*.ch" ) + aadd( aFilter, "*.h" ) ENDIF - IF lRc - aadd( aFilter, "*.rc" ) + IF lTxt + aExt := hb_atokens( hbide_setIde():oINI:cTextFileExtensions, "," ) + aeval( aExt, {|e| iif( empty( e ), NIL, aadd( aFilter, e ) ) } ) ENDIF RETURN aFilter