fivedev/harbour-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2012-07-19 23:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbide/ideedit.prg
  * contrib/hbide/idefindreplace.prg
    ! Fixed: Search and Replace in <FindInFiles> where multiple 
       S&R operations were producing irritating behavior.
       Please test properly ( only lightly tested ).

    ! Fixed and Optimized: CTRL+F - Find & Replace dialog behavior.
       It was not as par with standard dialogs of this kind.

  ; This commit finishes touches in Search & Replace functionality.
This commit is contained in:
Pritpal Bedi
2012-07-20 06:53:00 +00:00
parent 4fe096dc29
commit 642bff55ab
3 changed files with 106 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -16,6 +16,18 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-07-19 23:43 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/ideedit.prg
* contrib/hbide/idefindreplace.prg
! Fixed: Search and Replace in <FindInFiles> where multiple
S&R operations were producing irritating behavior.
Please test properly ( only lightly tested ).
! Fixed and Optimized: CTRL+F - Find & Replace dialog behavior.
It was not as par with standard dialogs of this kind.
; This commit finishes touches in Search & Replace functionality.
2012-07-20 07:50 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbnf/dispc.c
* contrib/hbnf/fttext.c
@@ -134,13 +146,11 @@
* contrib/hbide/hbqreportsmanager.prg
* contrib/hbide/ideactions.prg
* contrib/hbide/idebrowse.prg
* contrib/hbide/idefindreplace.prg
* contrib/hbide/idehome.prg
* contrib/hbide/idemain.prg
* contrib/hbide/idemisc.prg
* contrib/hbide/ideprojmanager.prg
* contrib/hbide/idesaveload.prg
* contrib/hbide/ideshortcuts.prg
* contrib/hbide/idethemes.prg
! Changed: hbIDE => HbIDE.
Formatting and code cleanup.
@@ -150,6 +160,11 @@
! Optimized: Column selection mode.
% Code cleanup.
* contrib/hbide/ideshortcuts.prg
* contrib/hbide/idefindreplace.prg
! Fixed: CTRL+N behavior. This now searches the last selected
string from cursors current location.
2012-07-19 22:09 UTC+0200 Viktor Szakats (harbour syenar.net)
* contrib/hbfbird/tests/testapi.c
* uncrustified

18
harbour/contrib/hbide/ideedit.prg
View File

@@ -274,7 +274,7 @@ METHOD IdeEdit:new( oIde, oEditor, nMode )
/*----------------------------------------------------------------------*/
METHOD IdeEdit:create( oIde, oEditor, nMode )
LOCAL nBlock
LOCAL nBlock, oPalette
DEFAULT oIde TO ::oIde
DEFAULT oEditor TO ::oEditor
@@ -293,6 +293,10 @@ METHOD IdeEdit:create( oIde, oEditor, nMode )
::qEdit:setFocusPolicy( Qt_StrongFocus )
::qEdit:setObjectName( hbide_getNextIDasString( "HBQPlainTextEdit" ) )
oPalette := ::qEdit:palette()
oPalette:setColor( QPalette_Inactive, QPalette_Highlight, QColor( Qt_yellow ) )
::qEdit:setPalette( oPalette )
::setFont()
::qEdit:hbSetSpaces( ::nTabSpaces )
@@ -522,18 +526,15 @@ METHOD IdeEdit:execEvent( nMode, p, p1 )
#if 0
CASE __textChanged__
// HB_TRACE( HB_TR_ALWAYS, "textChanged()" )
// ::oEditor:setTabImage( ::qEdit )
// ::handlePreviousWord( ::lUpdatePrevWord )
::oEditor:setTabImage( ::qEdit )
::handlePreviousWord( ::lUpdatePrevWord )
EXIT
CASE __modificationChanged__
::oEditor:setTabImage( ::qEdit )
EXIT
CASE __redoAvailable__
//HB_TRACE( HB_TR_DEBUG, "redoAvailable(bool)", p )
EXIT
CASE __undoAvailable__
//HB_TRACE( HB_TR_DEBUG, "undoAvailable(bool)", p )
EXIT
CASE __updateRequest__
EXIT
@@ -637,10 +638,7 @@ METHOD IdeEdit:execKeyEvent( nMode, nEvent, p, p1 )
::lCopyWhenDblClicked := .f. /* not intuitive */
::clickFuncHelp()
EXIT
CASE QEvent_Paint
// ::oIde:testPainter( p1 )
EXIT
CASE 21000 /* Sends Block Info { t,l,b,r,mode,state } hbGetBlockInfo() */
CASE 21000 /* Sends Block Info { t,l,b,r,mode,state } hbGetBlockInfo() */
::aSelectionInfo := p1
::oDK:setButtonState( "SelectionMode", ::aSelectionInfo[ 5 ] > 1 )
EXIT

167
harbour/contrib/hbide/idefindreplace.prg
View File

@@ -445,6 +445,7 @@ CLASS IdeFindReplace INHERIT IdeObject
METHOD create( oIde )
METHOD destroy()
METHOD show()
METHOD getFocus()
METHOD onClickReplace( nFrom )
METHOD replaceSelection( cReplWith )
METHOD replace()
@@ -465,13 +466,21 @@ METHOD IdeFindReplace:new( oIde )
/*----------------------------------------------------------------------*/
METHOD IdeFindReplace:destroy()
RETURN Self
IF !empty( ::oUI )
::qLineEdit:disConnect( "returnPressed()" )
::qLineEdit:disConnect( "textChanged(QString)" )
::qReplaceEdit:disConnect( "returnPressed()" )
::oUI:destroy()
/*----------------------------------------------------------------------*/
METHOD IdeFindReplace:getFocus()
::oUI:comboFindWhat:setFocus()
::qLineEdit:activateWindow()
::qLineEdit:setFocus()
IF ! empty( ::cText := ::oEM:getSelectedText() )
::qLineEdit:setText( ::cText )
::updateFindReplaceData( "find" )
ENDIF
::qLineEdit:selectAll()
RETURN Self
@@ -494,21 +503,24 @@ METHOD IdeFindReplace:create( oIde )
::oUI:radioDown:setChecked( .t. )
::oUI:connect( QEvent_Close, {|| ::oIde:oINI:cFindDialogGeometry := hbide_posAndSize( ::oUI:oWidget ) } )
::oUI:connect( QEvent_Hide , {|| ::oIde:oINI:cFindDialogGeometry := hbide_posAndSize( ::oUI:oWidget ) } )
::oUI:buttonFind :connect( "clicked()" , {| | ::onClickFind() } )
::oUI:buttonReplace:connect( "clicked()" , {| | ::onClickReplace() } )
::oUI:buttonFind :connect( "clicked()" , {| | ::onClickFind( 0 ) } )
::oUI:buttonReplace:connect( "clicked()" , {| | ::onClickReplace( 0 ) } )
::oUI:buttonClose :connect( "clicked()" , {| | ::oIde:oINI:cFindDialogGeometry := hbide_posAndSize( ::oUI:oWidget ), ::oUI:hide() } )
::oUI:comboFindWhat:connect( "editTextChanged(QString)" , {| | ::oUI:radioEntire:setChecked( .t. ) } )
::oUI:comboFindWhat:connect( "currentIndexChanged(QString)", {|p| ::oIde:oSBar:getItem( SB_PNL_SEARCH ):caption := "FIND: " + p } )
::oUI:checkListOnly:connect( "stateChanged(int)" , {|p| ::oUI:comboReplaceWith:setEnabled( p == 0 ), ;
iif( p == 1, ::oUI:buttonReplace:setEnabled( .f. ), NIL ) } )
::qLineEdit := ::oUI:comboFindWhat:lineEdit()
::qLineEdit:connect( "returnPressed()", {|| iif( empty( ::cText ), NIL, ;
::qLineEdit:setText( ::cText ) ), ::cText := "", ::onClickFind( 1 ) } )
::qLineEdit:connect( "returnPressed()" , {|| ::updateFindReplaceData( "find" ), ::onClickFind( 1 ) } )
::qLineEdit:connect( "textChanged(QString)", {|| ::oUI:radioEntire:setChecked( .t. ) } )
::qReplaceEdit := ::oUI:comboReplaceWith:lineEdit()
::qReplaceEdit:connect( "returnPressed()", {|| ::onClickReplace( 1 ) } )
::qReplaceEdit:connect( "returnPressed()", {|| ::updateFindReplaceData( "replace" ), ::onClickReplace( 1 ) } )
::oUI:comboFindWhat:setCurrentIndex( -1 )
::oUI:comboReplaceWith:setCurrentIndex( -1 )
RETURN Self
@@ -518,7 +530,6 @@ METHOD IdeFindReplace:show()
IF ! ::oUI:isHidden()
::oIde:oINI:cFindDialogGeometry := hbide_posAndSize( ::oUI:oWidget )
::oUI:hide()
ENDIF
::oIde:setPosByIniEx( ::oUI:oWidget, ::oINI:cFindDialogGeometry )
@@ -527,14 +538,12 @@ METHOD IdeFindReplace:show()
::oUI:checkGlobal:setEnabled( .f. )
::oUI:checkNoPrompting:setEnabled( .f. )
::oUI:checkListOnly:setChecked( .f. )
::oUI:comboFindWhat:setFocus()
IF ! empty( ::cText := ::oEM:getSelectedText() )
::qLineEdit:setText( ::cText )
::updateFindReplaceData( "find" )
::getFocus()
IF ::oUI:isHidden()
::oUI:show()
ENDIF
::qLineEdit:selectAll()
::oUI:show()
RETURN Self
@@ -543,17 +552,12 @@ METHOD IdeFindReplace:show()
METHOD IdeFindReplace:onClickFind( nFrom )
LOCAL lFound, nPos, qCursor
DEFAULT nFrom TO 0 // Click on Find Button
IF nFrom == 0
::updateFindReplaceData( "find" )
ENDIF
HB_SYMBOL_UNUSED( nFrom )
IF ::oUI:radioEntire:isChecked()
::oUI:radioFromCursor:setChecked( .t. )
qCursor := ::qCurEdit:textCursor()
nPos := qCursor:position()
qCursor:setPosition( 0 )
::qCurEdit:setTextCursor( qCursor )
IF ! ( lFound := ::find() )
@@ -569,13 +573,10 @@ METHOD IdeFindReplace:onClickFind( nFrom )
::oUI:checkGlobal:setEnabled( .t. )
::oUI:checkNoPrompting:setEnabled( .t. )
ELSE
::getFocus()
::oUI:buttonReplace:setEnabled( .f. )
::oUI:checkGlobal:setEnabled( .f. )
::oUI:checkNoPrompting:setEnabled( .f. )
::oUI:hide()
::oUI:show()
::oUI:comboFindWhat:setFocus()
::qLineEdit:selectAll()
ENDIF
RETURN Self
@@ -583,7 +584,7 @@ METHOD IdeFindReplace:onClickFind( nFrom )
/*----------------------------------------------------------------------*/
METHOD IdeFindReplace:find( lWarn )
LOCAL nFlags, qfocus
LOCAL nFlags
LOCAL cText := ::oUI:comboFindWhat:lineEdit():text()
LOCAL lFound := .f.
@@ -595,9 +596,8 @@ METHOD IdeFindReplace:find( lWarn )
nFlags += iif( ::oUI:radioUp:isChecked(), QTextDocument_FindBackward, 0 )
IF ! ( lFound := ::oEM:getEditObjectCurrent():findEx( cText, nFlags ) ) .AND. lWarn
qFocus := ::oUI:focusWidget()
::oEM:getEditObjectCurrent():clearSelection()
hbide_showWarning( "Cannot find : " + cText )
qFocus:setFocus( 0 )
ENDIF
ENDIF
@@ -607,10 +607,7 @@ METHOD IdeFindReplace:find( lWarn )
METHOD IdeFindReplace:onClickReplace( nFrom )
DEFAULT nFrom TO 0 // Click on Find Button
IF nFrom == 0
::updateFindReplaceData( "replace" )
ENDIF
HB_SYMBOL_UNUSED( nFrom )
IF ::oUI:comboReplaceWith:isEnabled()
::replace()
@@ -681,11 +678,8 @@ METHOD IdeFindReplace:updateFindReplaceData( cMode )
IF ( nIndex := ascan( ::oINI:aFind, {|e| e == cData } ) ) == 0
hb_ains( ::oINI:aFind, 1, cData, .t. )
::oUI:comboFindWhat:insertItem( 0, cData )
ELSE
::oUI:comboFindWhat:setCurrentIndex( nIndex - 1 )
ENDIF
ENDIF
//
::oDK:setStatusText( SB_PNL_SEARCH, cData )
ELSE
cData := ::oUI:comboReplaceWith:lineEdit():text()
@@ -697,7 +691,7 @@ METHOD IdeFindReplace:updateFindReplaceData( cMode )
ENDIF
ENDIF
RETURN Self
RETURN nIndex
/*----------------------------------------------------------------------*/
//
@@ -863,7 +857,6 @@ METHOD IdeFindInFiles:buildUI()
qItem:setFlags( Qt_ItemIsUserCheckable + Qt_ItemIsEnabled + Qt_ItemIsSelectable )
qItem:setText( cProj )
qItem:setCheckState( 0 )
//::oUI:listProjects:addItem_1( qItem )
::oUI:listProjects:addItem( qItem )
aadd( ::aItems, qItem )
ENDIF
@@ -871,8 +864,6 @@ METHOD IdeFindInFiles:buildUI()
ENDIF
::oUI:editResults:setReadOnly( .t. )
//::oUI:editResults:setFontFamily( "Courier New" )
//::oUI:editResults:setFontPointSize( 10 )
::oUI:editResults:setFont( ::oIde:oFont:oWidget )
::oUI:editResults:setContextMenuPolicy( Qt_CustomContextMenu )
@@ -994,49 +985,6 @@ METHOD IdeFindInFiles:execEvent( nEvent, p )
/*----------------------------------------------------------------------*/
METHOD IdeFindInFiles:replaceAll()
LOCAL nL, nB, qCursor, aFind
LOCAL cSource := ""
IF empty( ::cReplWith := ::oUI:comboRepl:currentText() )
RETURN Self
ENDIF
nL := Len( ::cReplWith )
IF ! hbide_getYesNo( "Starting REPLACE operation", "No way to interrupt", "Critical" )
RETURN Self
ENDIF
FOR EACH aFind IN ::aInfo
IF aFind[ 1 ] == -2
IF ! ( cSource == aFind[ 2 ] )
cSource := aFind[ 2 ]
::oSM:editSource( cSource, 0, 0, 0, NIL, "Main", .f., .t. )
ENDIF
qCursor := ::oIde:qCurEdit:textCursor()
qCursor:setPosition( 0 )
qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, aFind[ 3 ] - 1 )
qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, aFind[ 4 ] - 1 )
qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, Len( aFind[ 5 ] ) )
::qCurEdit:setTextCursor( qCursor )
nB := qCursor:position()
qCursor:beginEditBlock()
qCursor:removeSelectedText()
qCursor:insertText( ::cReplWith )
qCursor:setPosition( nB + nL )
::qCurEdit:setTextCursor( qCursor )
::oEM:getEditObjectCurrent():clearSelection()
qCursor:endEditBlock()
ENDIF
NEXT
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeFindInFiles:execContextMenu( p )
LOCAL nLine, qCursor, qMenu, qAct, cFind
@@ -1303,7 +1251,8 @@ METHOD IdeFindInFiles:findInABunch( aFiles )
s := hbide_pathToOSPath( s )
IF hb_fileExists( s )
::nSearched++
aBuffer := hb_ATokens( StrTran( hb_MemoRead( s ), Chr( 13 ) ), Chr( 10 ) )
::oSM:editSource( s, 0, 0, 0, NIL, "Main", .f., .t. )
aBuffer := hb_ATokens( StrTran( ::qCurEdit:toPlainText(), Chr( 13 ) ), Chr( 10 ) )
nLine := 0
IF ::lRegEx
@@ -1354,6 +1303,52 @@ METHOD IdeFindInFiles:findInABunch( aFiles )
/*----------------------------------------------------------------------*/
METHOD IdeFindInFiles:replaceAll()
LOCAL nL, nB, qCursor, aFind
LOCAL cSource := ""
IF empty( ::cReplWith := ::oUI:comboRepl:currentText() )
RETURN Self
ENDIF
nL := Len( ::cReplWith )
IF ! hbide_getYesNo( "Starting REPLACE operation", "No way to interrupt", "Critical" )
RETURN Self
ENDIF
FOR EACH aFind IN ::aInfo
IF aFind[ 1 ] == -2
IF ! ( cSource == aFind[ 2 ] )
cSource := aFind[ 2 ]
::oSM:editSource( cSource, 0, 0, 0, NIL, "Main", .f., .t. )
ENDIF
qCursor := ::oIde:qCurEdit:textCursor()
qCursor:setPosition( 0 )
qCursor:movePosition( QTextCursor_Down, QTextCursor_MoveAnchor, aFind[ 3 ] - 1 )
qCursor:movePosition( QTextCursor_Right, QTextCursor_MoveAnchor, aFind[ 4 ] - 1 )
qCursor:movePosition( QTextCursor_Right, QTextCursor_KeepAnchor, Len( aFind[ 5 ] ) )
::qCurEdit:setTextCursor( qCursor )
nB := qCursor:position()
qCursor:beginEditBlock()
qCursor:removeSelectedText()
qCursor:insertText( ::cReplWith )
qCursor:setPosition( nB + nL )
::qCurEdit:setTextCursor( qCursor )
::oEM:getEditObjectCurrent():clearSelection()
qCursor:endEditBlock()
ENDIF
NEXT
::oUI:editResults:clear() /* Mandatory - otherwise previous info will agin be inclusive */
::aInfo := {}
RETURN Self
/*----------------------------------------------------------------------*/
METHOD IdeFindInFiles:showLog( nType, cMsg, aLines )
LOCAL a_, n, cPre, cPost, nWidth, cText, nB, cL, nL, cT, cExp, aM
LOCAL qCursor, qResult