From fb442bc0f4c520fa56a54466f24fae1b3cdc9170 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 23 Nov 2009 06:31:57 +0000 Subject: [PATCH] 2009-11-22 22:27 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.prg * contrib/hbide/idetags.prg ! Changed the way was being populated. ! Fixed to not enter in Editing mode when double-clicked in . --- harbour/ChangeLog | 6 ++++++ harbour/contrib/hbide/hbide.prg | 7 +++++-- harbour/contrib/hbide/idetags.prg | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 10cb1338b9..2a88312c8e 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,12 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-11-22 22:27 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.prg + * contrib/hbide/idetags.prg + ! Changed the way was being populated. + ! Fixed to not enter in Editing mode when double-clicked in . + 2009-11-23 02:13 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/rtl/diskspac.c * src/rtl/disksphb.c diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 155266a20e..f412fe92ec 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -344,7 +344,8 @@ METHOD HbIde:updateFuncList() ::oFuncList:clear() IF !empty( ::aTags ) - aeval( ::aTags, {|e| ::oFuncList:addItem( e[ 2 ] + " " + e[ 5 ] ) } ) +// aeval( ::aTags, {|e| ::oFuncList:addItem( e[ 2 ] + " " + e[ 5 ] ) } ) + aeval( ::aTags, {|e_| ::oFuncList:addItem( e_[ 7 ] ) } ) ENDIF RETURN Self @@ -793,7 +794,8 @@ METHOD HbIde:gotoFunction( mp1, mp2, oListBox ) mp1 := oListBox:getData() mp2 := oListBox:getItem( mp1 ) - IF ( n := ascan( ::aTags, {|e| mp2 == e[ 2 ] + " " + e[ 5 ] } ) ) > 0 + //IF ( n := ascan( ::aTags, {|e| mp2 == e[ 2 ] + " " + e[ 5 ] } ) ) > 0 + IF ( n := ascan( ::aTags, {|e_| mp2 == e_[ 7 ] } ) ) > 0 cAnchor := trim( ::aText[ ::aTags[ n,3 ] ] ) IF !( ::aTabs[ ::nCurTab, 2 ]:find( cAnchor, QTextDocument_FindCaseSensitively ) ) ::aTabs[ ::nCurTab, 2 ]:find( cAnchor, QTextDocument_FindBackward + QTextDocument_FindCaseSensitively ) @@ -818,6 +820,7 @@ METHOD HbIde:buildFuncList() ::oFuncList:setStyleSheet( GetStyleSheet( "QListView" ) ) ::oFuncList:setColorBG( GraMakeRGBColor( { 210,120,220 } ) ) ::oFuncList:ItemMarked := {|mp1, mp2, oXbp| ::gotoFunction( mp1, mp2, oXbp ) } + ::oFuncList:oWidget:setEditTriggers( QAbstractItemView_NoEditTriggers ) ::oDockR:oWidget:setWidget( QT_PTROFXBP( ::oFuncList ) ) diff --git a/harbour/contrib/hbide/idetags.prg b/harbour/contrib/hbide/idetags.prg index 16329ec19c..6e2c5848e1 100644 --- a/harbour/contrib/hbide/idetags.prg +++ b/harbour/contrib/hbide/idetags.prg @@ -173,8 +173,8 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines ) aSumData[ i,2 ],; cModule ,; cSyntax ,; - 0 ,; - cSource ; + cType ,; + Iif( cType = "METH", ":", "" ) + cSyntax ; }; ) ENDIF