From bc8bf71afda446ae4adc027dfba01ac6528b650f Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Mon, 27 Aug 2012 06:31:13 +0000 Subject: [PATCH] 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 . + 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 . The following four types are considered: 1. Class 2. Method 3. Procedure 4. Function STATIC FUNCTION/PROCEDURE is considered normal FUNCTION/PROCEDURE. --- harbour/ChangeLog | 19 +++++++++++++++++ harbour/contrib/hbide/docks.prg | 20 +++++++++--------- harbour/contrib/hbide/editor.prg | 6 +++--- harbour/contrib/hbide/hbide.qrc | 3 +++ harbour/contrib/hbide/main.prg | 14 +++++++----- harbour/contrib/hbide/misc.prg | 10 +++++++++ harbour/contrib/hbide/resources/dc_class.png | Bin 0 -> 586 bytes harbour/contrib/hbide/resources/dc_method.png | Bin 0 -> 654 bytes .../contrib/hbide/resources/dc_procedure.png | Bin 0 -> 540 bytes harbour/contrib/hbide/tags.prg | 4 ++-- harbour/contrib/hbxbp/listbox.prg | 7 ++++-- 11 files changed, 61 insertions(+), 22 deletions(-) create mode 100644 harbour/contrib/hbide/resources/dc_class.png create mode 100644 harbour/contrib/hbide/resources/dc_method.png create mode 100644 harbour/contrib/hbide/resources/dc_procedure.png diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 6cff9adf53..6e3fba5e86 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -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 . + + + 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 . + 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. diff --git a/harbour/contrib/hbide/docks.prg b/harbour/contrib/hbide/docks.prg index d0a9bccd76..f00c41dd4f 100644 --- a/harbour/contrib/hbide/docks.prg +++ b/harbour/contrib/hbide/docks.prg @@ -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 diff --git a/harbour/contrib/hbide/editor.prg b/harbour/contrib/hbide/editor.prg index 7871c9d514..70ea240e2d 100644 --- a/harbour/contrib/hbide/editor.prg +++ b/harbour/contrib/hbide/editor.prg @@ -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. ) diff --git a/harbour/contrib/hbide/hbide.qrc b/harbour/contrib/hbide/hbide.qrc index c8dfceb059..29a7002689 100644 --- a/harbour/contrib/hbide/hbide.qrc +++ b/harbour/contrib/hbide/hbide.qrc @@ -321,6 +321,9 @@ resources/split_h.png resources/split_v.png resources/align_at.png + resources/dc_method.png + resources/dc_class.png + resources/dc_procedure.png docs/faq.htm diff --git a/harbour/contrib/hbide/main.prg b/harbour/contrib/hbide/main.prg index 9c35a795e4..279b70df58 100644 --- a/harbour/contrib/hbide/main.prg +++ b/harbour/contrib/hbide/main.prg @@ -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 diff --git a/harbour/contrib/hbide/misc.prg b/harbour/contrib/hbide/misc.prg index 617f1e7cca..df4e0b17ce 100644 --- a/harbour/contrib/hbide/misc.prg +++ b/harbour/contrib/hbide/misc.prg @@ -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 ) + +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbide/resources/dc_class.png b/harbour/contrib/hbide/resources/dc_class.png new file mode 100644 index 0000000000000000000000000000000000000000..fe97786a41dacdae2b59b3055a7e32c72229c43c GIT binary patch literal 586 zcmV-Q0=4~#P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0pCePK~z{r?N-5U z!!Qh#8oB5r3uFN=kY_*r_190o-M|}o1+S19@+|r+kS#Jq2M7WeE)W=t`A?hPyj4zGhpVUB_eAhWZ}HsFF%qFAGpS?DyfqcWtVOFZ8r4>U@B zB2rFhWUtC_LJetGQ7_7t$EW4Z;P~(g^=j|4fEm0_sE7Be*k^;Y0cq@Ez(*0~8YKjV zYBr4j-_g$u3=2-Vf}-($#DM&Qq6MD~7^?wV1}S-Kt?X0@#O}Ekb)_DlKAc@Ji!bxeW&1vV3g3tqbpiMNLu-EQvpGN}JML2o20b9c0v0ek z`)a;zZ9eY`KBe4RM=h6YM8?{Rm~c&4(KkHSvPaKvLC#T=if^!H4Jd~Jp+O-a%7Kb5 zEZ6eB-=k-4-*8r~!&ya*D&Dh31cI^%>b4Qov(YCkkx?)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0wYO8K~z{r?N-Z; z!Y~jeBFTvcXn+Q|B|)SDDxd>8poMK=YoLjAK^p;y8#~Vv$CJTe)?rt>5|%6yGM_hZ zKK5ktUVoi|syZ)k_hs=6ZlCUYeVsj{+snX6QJg=^@_ep%nGV&&pg=?WHXfPQp9TYC)er6Qa|P6I{# zjAX!3s3PkDfFW!+(j5Rm(Ez%NK3D@BCC>vCCOd3vITw`7*!-Jn?kQBp8}v3p= z8sC16Y&TuqT=6H7igqhI#nw(#3gB3eTsaG58eEFp$bMP-N%XS7;6M+f7q=e{6K+4d z)G!*f*Gt>48!A*>!)a#$_-4C4F@2LVSPNX$n0$Qjz^FEaZ}Md8j_bkfzo+{Y0N*7- zD(bxZFD&j76Lk8|1@cXjr2V7}2b0pw$Zk&2u-=UX4DtFU08?tmbe|*{4xAY|r5T@Z z7(mwGe+L8+W^@6O(VF)i%S13higcy2bmt2hwS9KKS%3ZmT*p#(C5uV{9Gb}c^%wxy z>C;2c*^&dmiUPnivvO*t9|J&ITn%)fC_MmczR~@kYlZcvHGg9p5zFMxUPSTRZJSg1 o9nZPCh?v@tHX<;*RepehFCy;hqG4Lz3;+NC07*qoM6N<$f{Z&9zW@LL literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/dc_procedure.png b/harbour/contrib/hbide/resources/dc_procedure.png new file mode 100644 index 0000000000000000000000000000000000000000..f490ec06c147a919f2c5326c43a5ef1cc60e9343 GIT binary patch literal 540 zcmV+%0^|LOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0kKI$K~z{r?Uv1L z!!Qhm1NiC%x*Z&W(?rXV4zkU49?padeS3e?PkXqczZlPqyU(+HpT#8!T^}Dtwi5y zWO_++Ag^Y_oF9bVT?WA5h|sy(;goTUZYlH+QZzbx3ej)=V_cjMvV(LCJ9`{mC_ogO z^GFL2)iR8BH>Byug(Sjs=#hkhz_8M<=@;fKXJ}6P6$MbdzE7do^AEk