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

2012-08-26 23:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)

Browse Source 
* contrib/hbxbp/listbox.prg
    + Extended: method :addItem( cText, qImage ) in XbpListBox() class.
       This is Harbour extension, Xbase++ does not accepts <qImage>.

  + contrib/hbide/resources/dc_class.png
  + contrib/hbide/resources/dc_method.png
  + contrib/hbide/resources/dc_procedure.png
  * contrib/hbide/docks.prg
  * contrib/hbide/editor.prg
  * contrib/hbide/hbide.qrc
  * contrib/hbide/main.prg
  * contrib/hbide/misc.prg
  * contrib/hbide/tags.prg
    + Added: icons to represent the type of identifier in <Functions List>.
       The following four types are considered:
          1. Class  2. Method  3. Procedure  4. Function 
       STATIC FUNCTION/PROCEDURE is considered normal FUNCTION/PROCEDURE.
This commit is contained in:
Pritpal Bedi
2012-08-27 06:31:13 +00:00
parent bb57f9070a
commit bc8bf71afd
11 changed files with 61 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
harbour/ChangeLog
View File

@@ -16,6 +16,25 @@
The license applies to all entries newer than 2009-04-28.
*/
2012-08-26 23:22 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbxbp/listbox.prg
+ Extended: method :addItem( cText, qImage ) in XbpListBox() class.
This is Harbour extension, Xbase++ does not accepts <qImage>.
+ contrib/hbide/resources/dc_class.png
+ contrib/hbide/resources/dc_method.png
+ contrib/hbide/resources/dc_procedure.png
* contrib/hbide/docks.prg
* contrib/hbide/editor.prg
* contrib/hbide/hbide.qrc
* contrib/hbide/main.prg
* contrib/hbide/misc.prg
* contrib/hbide/tags.prg
+ Added: icons to represent the type of identifier in <Functions List>.
The following four types are considered:
1. Class 2. Method 3. Procedure 4. Function
STATIC FUNCTION/PROCEDURE is considered normal FUNCTION/PROCEDURE.
2012-08-26 17:46 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
* contrib/hbide/edit.prg
* Fixed: a small glich in building the aligned line.

20
harbour/contrib/hbide/docks.prg
View File

@@ -379,16 +379,16 @@ METHOD IdeDocks:destroy()
::qMdiToolBarL:destroy()
::qMdiToolBarL := NIL
ENDIF
::nPass := NIL
::aPanels := NIL
::aMdiBtns := NIL
::aBtnLines := NIL
::aBtnDocks := NIL
::oBtnTabClose := NIL
::aViewsInfo := NIL
::qTBtnClose := NIL
::qTimer := NIL
::nPrevWindowState := NIL
::nPass := NIL
::aPanels := NIL
::aMdiBtns := NIL
::aBtnLines := NIL
::aBtnDocks := NIL
::oBtnTabClose := NIL
::aViewsInfo := NIL
::qTBtnClose := NIL
::qTimer := NIL
::nPrevWindowState := NIL
RETURN Self

6
harbour/contrib/hbide/editor.prg
View File

@@ -262,7 +262,7 @@ METHOD IdeEditsManager:create( oIde )
aadd( ::aActions, { "TB_Compile" , ::qContextMenu:addAction( ::oAC:getAction( "TB_Compile" ) ) } )
aadd( ::aActions, { "TB_CompilePPO", ::qContextMenu:addAction( ::oAC:getAction( "TB_CompilePPO" ) ) } )
aadd( ::aActions, { "" , ::qContextMenu:addSeparator() } )
aadd( ::aActions, { "Apply Theme" , ::qContextMenu:addAction( "Apply Theme" ) } )
aadd( ::aActions, { "Apply Theme" , ::qContextMenu:addAction( QIcon( hbide_image( "syntaxhiliter" ) ), "Apply Theme" ) } )
aadd( ::aActions, { "Save as Skltn", ::qContextMenu:addAction( "Save as Skeleton..." ) } )
::qContextSub := ::qContextMenu:addMenu( QIcon( hbide_image( "split" ) ), "Split" )
//
@@ -1442,8 +1442,8 @@ METHOD IdeEditor:create( oIde, cSourceFile, nPos, nHPos, nVPos, cTheme, cView, a
::qEdit:setTextInteractionFlags( Qt_TextSelectableByMouse + Qt_TextSelectableByKeyboard )
ENDIF
::qDocument:connect( "modificationChanged(bool)" , {|p| ::execEvent( __qDocModificationChanged__, p ) } )
::qDocument:connect( "contentsChange(int,int,int)", {|p,p1,p2| ::execEvent( __qDocContentsChange__, p, p1, p2 ) } )
::qDocument:connect( "modificationChanged(bool)" , {|p | ::execEvent( __qDocModificationChanged__, p ) } )
::qDocument:connect( "contentsChange(int,int,int)", {|p,p1,p2| ::execEvent( __qDocContentsChange__ , p, p1, p2 ) } )
::qDocument:setModified( .f. )

3
harbour/contrib/hbide/hbide.qrc
View File

@@ -321,6 +321,9 @@
<file>resources/split_h.png</file>
<file>resources/split_v.png</file>
<file>resources/align_at.png</file>
<file>resources/dc_method.png</file>
<file>resources/dc_class.png</file>
<file>resources/dc_procedure.png</file>
<file>docs/faq.htm</file>
</qresource>
</RCC>

14
harbour/contrib/hbide/main.prg
View File

@@ -1488,7 +1488,7 @@ METHOD HbIde:manageProjectContext( mp1, mp2, oXbpTreeItem )
/*----------------------------------------------------------------------*/
METHOD HbIde:updateFuncList( lSorted )
LOCAL a_:={}
LOCAL aFunc :={}, a_
DEFAULT lSorted TO ::lSortedFuncList
@@ -1497,11 +1497,15 @@ METHOD HbIde:updateFuncList( lSorted )
::oFuncList:clear()
IF !empty( ::aTags )
IF lSorted
aeval( ::aTags, {|e_| aadd( a_, e_[ 7 ] ) } )
asort( a_, , , {|e,f| lower( e ) < lower( f ) } )
aeval( a_, {|e| ::oFuncList:addItem( e ) } )
aeval( ::aTags, {|e_| aadd( aFunc, { e_[ 6 ], e_[ 7 ] } ) } )
asort( aFunc, , , {|e,f| lower( e[ 2 ] ) < lower( f[ 2 ] ) } )
FOR EACH a_ IN aFunc
::oFuncList:addItem( a_[ 2 ], QIcon( hbide_identifierImage( a_[ 1 ] ) ) )
NEXT
ELSE
aeval( ::aTags, {|e_| ::oFuncList:addItem( e_[ 7 ] ) } )
FOR EACH a_ IN ::aTags
::oFuncList:addItem( a_[ 7 ], QIcon( hbide_identifierImage( a_[ 6 ] ) ) )
NEXT
ENDIF
ENDIF

10
harbour/contrib/hbide/misc.prg
View File

@@ -2043,3 +2043,13 @@ FUNCTION hbide_getHbxFunctions( cBuffer )
/*----------------------------------------------------------------------*/
FUNCTION hbide_identifierImage( cIdentifier )
LOCAL cImage
cIdentifier := Upper( cIdentifier )
cImage := iif( "CLAS" $ cIdentifier, "dc_class", iif( "METH" $ cIdentifier, "dc_method", iif( "PROC" $ cIdentifier, "dc_procedure", "dc_function" ) ) )
RETURN hbide_image( cImage )
/*----------------------------------------------------------------------*/

BIN
harbour/contrib/hbide/resources/dc_class.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 586 B

BIN
harbour/contrib/hbide/resources/dc_method.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 654 B

BIN
harbour/contrib/hbide/resources/dc_procedure.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 540 B

4
harbour/contrib/hbide/tags.prg
View File

@@ -176,13 +176,13 @@ FUNCTION UpdateTags( cModule, aSummary, aSumData, aFuncList, aLines, aText )
cModule ,;
cSyntax ,;
cType ,;
iif( LEFTEQUAL( cType, "METH" ), ":", "" ) + cSyntax, ;
iif( LEFTEQUAL( cType, "METH" ), "", "" ) + cSyntax, ;
aText[ aSumData[ i,2 ] ] ;
};
)
ENDIF
AAdd( aFuncList, { iif( LEFTEQUAL( cType, "METH" ), ":", "" ) + cSyntax, aSumData[ i, 2 ], aSumData[ i, 1 ] } )
AAdd( aFuncList, { iif( LEFTEQUAL( cType, "METH" ), "", "" ) + cSyntax, aSumData[ i, 2 ], aSumData[ i, 1 ] } )
AAdd( aLines, i )
NEXT

7
harbour/contrib/hbxbp/listbox.prg
View File

@@ -104,7 +104,7 @@ CLASS XbpListBox INHERIT XbpWindow, DataRef
METHOD setTopItem( nIndex ) VIRTUAL
METHOD numItems() INLINE len( ::aItems )
METHOD addItem( cItem )
METHOD addItem( cItem, qIcon )
METHOD clear( lConnect )
METHOD delItem( nIndex )
METHOD getItem( nIndex )
@@ -364,10 +364,13 @@ METHOD XbpListBox:clear( lConnect )
/*----------------------------------------------------------------------*/
METHOD XbpListBox:addItem( cItem )
METHOD XbpListBox:addItem( cItem, qIcon )
LOCAL qItm := QListWidgetItem()
qItm:setText( cItem )
IF HB_ISOBJECT( qIcon )
qItm:setIcon( qIcon )
ENDIF
::oWidget:addItem( qItm )
aadd( ::aItems, qItm )