From a1493439a5cf6b266aed5f1e9e0f4d3e02a0fe00 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Wed, 29 Aug 2012 02:41:58 +0000 Subject: [PATCH] 2012-08-28 17:50 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + contrib/hbide/resources/dictionary.png + contrib/hbide/resources/launch_r.png * contrib/hbide/hbide.qrc * contrib/hbide/actions.prg * contrib/hbide/functions.prg * contrib/hbide/main.prg + Implemented: creation of .tag file usable as a dictionary. The activation is : Dictionary will be created in same folder where .hbp resides having same name with extention .tag. Thus created tags are not populated in the existing list of tags. --- harbour/contrib/gtwvg/tests/wvgmodal.prg | 2 +- harbour/contrib/hbide/actions.prg | 5 +++-- harbour/contrib/hbide/functions.prg | 18 ++++++++++++------ harbour/contrib/hbide/hbide.qrc | 2 ++ harbour/contrib/hbide/main.prg | 7 +++++-- .../contrib/hbide/resources/dictionary.png | Bin 0 -> 1353 bytes harbour/contrib/hbide/resources/launch_r.png | Bin 0 -> 1391 bytes 7 files changed, 23 insertions(+), 11 deletions(-) create mode 100644 harbour/contrib/hbide/resources/dictionary.png create mode 100644 harbour/contrib/hbide/resources/launch_r.png diff --git a/harbour/contrib/gtwvg/tests/wvgmodal.prg b/harbour/contrib/gtwvg/tests/wvgmodal.prg index fb7d40af41..052ede305f 100644 --- a/harbour/contrib/gtwvg/tests/wvgmodal.prg +++ b/harbour/contrib/gtwvg/tests/wvgmodal.prg @@ -162,7 +162,7 @@ FUNCTION DialogAlert( cCaption, aText_, aButtons_, sel, aMessage_, nTop, nTime ) next ENDIF - setcursor( 0 ) + SetCursor( 0 ) SetColor( 'N/W' ) CLS diff --git a/harbour/contrib/hbide/actions.prg b/harbour/contrib/hbide/actions.prg index f8436723cc..866aad5377 100644 --- a/harbour/contrib/hbide/actions.prg +++ b/harbour/contrib/hbide/actions.prg @@ -259,7 +259,7 @@ METHOD IdeActions:loadActions() aadd( aAct, { "InsertExternalFile" , "~External File at Cursor" , "insert-external-file", "", "No", "Yes" } ) aadd( aAct, { "InsertSeparator" , "~Separator" , "insert-separator", "F7" , "No", "Yes" } ) aadd( aAct, { "switchReadOnly" , "Switch Read~Only Mode" , "readonly" , "" , "No", "Yes" } ) - aadd( aAct, { "Properties" , "Properties" , "" , "" , "No", "Yes" } ) + aadd( aAct, { "Properties" , "Properties" , "properties" , "" , "No", "Yes" } ) aadd( aAct, { "ProjAddSource" , "Add Source to Project" , "projectadd" , "" , "No", "Yes" } ) aadd( aAct, { "ProjRemSource" , "Remove Source" , "projectdel" , "" , "No", "Yes" } ) aadd( aAct, { "ProjMainModule" , "Select Main Module" , "setmain" , "" , "No", "Yes" } ) @@ -271,7 +271,7 @@ METHOD IdeActions:loadActions() aadd( aAct, { "ReBuildLaunch" , "Rebuild and Launch Project" , "rebuildlaunch" , "" , "No", "Yes" } ) aadd( aAct, { "Compile" , "Compile Current Source" , "compile" , "" , "No", "Yes" } ) aadd( aAct, { "CompilePPO" , "Compile Current Source to PPO", "ppo" , "" , "No", "Yes" } ) - aadd( aAct, { "LaunchProject" , "Launch Project" , "" , "^F10" , "No", "Yes" } ) + aadd( aAct, { "LaunchProject" , "Launch Project" , "launch_r" , "^F10" , "No", "Yes" } ) aadd( aAct, { "ConfigureTools" , "Configure Tools...*" , "" , "" , "No", "Yes" } ) aadd( aAct, { "CuiEditor" , "CUI Screen Edirot" , "cuied" , "" , "No", "Yes" } ) aadd( aAct, { "UISrcManager" , "UI Source Manager" , "fileprg" , "" , "No", "Yes" } ) @@ -325,6 +325,7 @@ METHOD IdeActions:loadActions() aadd( aAct, { "SplitClose" , "Close Splitted Instance" , "split_close" , "" , "No", "Yes" } ) aadd( aAct, { "SplitH" , "Split Horizontally" , "split_h" , "" , "No", "Yes" } ) aadd( aAct, { "SplitV" , "Split Vertically" , "split_v" , "" , "No", "Yes" } ) + aadd( aAct, { "Dictionary" , "Create .tag Dictionary" , "dictionary" , "" , "No", "Yes" } ) RETURN aAct diff --git a/harbour/contrib/hbide/functions.prg b/harbour/contrib/hbide/functions.prg index bfd985e7ae..c5b90798b8 100644 --- a/harbour/contrib/hbide/functions.prg +++ b/harbour/contrib/hbide/functions.prg @@ -111,7 +111,7 @@ CLASS IdeFunctions INHERIT IdeObject METHOD destroy() METHOD clear( lHdrAlso ) METHOD show() - METHOD tagProject( cProjectTitle ) + METHOD tagProject( cProjectTitle, lGUI ) METHOD populateTable() METHOD consolidateList() METHOD buildHeader() @@ -517,14 +517,18 @@ METHOD IdeFunctions:buildTags() /*----------------------------------------------------------------------*/ -METHOD IdeFunctions:tagProject( cProjectTitle ) +METHOD IdeFunctions:tagProject( cProjectTitle, lGUI ) LOCAL aSumData := "" LOCAL cComments, aSummary, cPath, cSource, cExt, aTags, aText, aFuncList, aLines LOCAL cProjFile, cRoot, aCTags, aSources, cSrc, a_, n LOCAL qApp := QApplication() + hb_default( lGUI, .T. ) + IF !( ::inAction ) - ::enableControls( .f. ) + IF lGUI + ::enableControls( .f. ) + ENDIF cProjFile := ::oPM:getProjectFileNameFromTitle( cProjectTitle ) aSources := ::oPM:getSourcesByProjectTitle( cProjectTitle ) @@ -573,10 +577,12 @@ METHOD IdeFunctions:tagProject( cProjectTitle ) hb_memowrit( hb_FNameExtSet( cProjFile, ".tag" ), hb_serialize( aCTags ) ) - ::consolidateList() - ::populateTable() + IF lGUI + ::consolidateList() + ::populateTable() - ::enableControls( .t. ) + ::enableControls( .t. ) + ENDIF ENDIF RETURN cProjFile diff --git a/harbour/contrib/hbide/hbide.qrc b/harbour/contrib/hbide/hbide.qrc index 94c7789501..93dfbc753d 100644 --- a/harbour/contrib/hbide/hbide.qrc +++ b/harbour/contrib/hbide/hbide.qrc @@ -325,6 +325,8 @@ resources/dc_class.png resources/dc_procedure.png resources/stringify.png + resources/dictionary.png + resources/launch_r.png docs/faq.htm diff --git a/harbour/contrib/hbide/main.prg b/harbour/contrib/hbide/main.prg index eecee0e10e..d70ba076b9 100644 --- a/harbour/contrib/hbide/main.prg +++ b/harbour/contrib/hbide/main.prg @@ -1444,14 +1444,14 @@ METHOD HbIde:manageProjectContext( mp1, mp2, oXbpTreeItem ) IF !( Alltrim( Upper( ::cWrkProject ) ) == Alltrim( Upper( oXbpTreeItem:caption ) ) ) aadd( aPops, { "Set as Current" , {|| ::oPM:setCurrentProject( oXbpTreeItem:caption ) } } ) End - aadd( aPops, { "Properties" , {|| ::oPM:loadProperties( cHbp, .f., .t., .t. ) } } ) + aadd( aPops, { ::oAC:getAction( "Properties" ), {|| ::oPM:loadProperties( cHbp, .f., .t., .t. ) } } ) aadd( aPops, { "" } ) aadd( aPops, { ::oAC:getAction( "BuildQt" ), {|| ::oPM:buildProject( oXbpTreeItem:caption, .F., , , .T. ) } } ) aadd( aPops, { ::oAC:getAction( "BuildLaunchQt" ), {|| ::oPM:buildProject( oXbpTreeItem:caption, .T., , , .T. ) } } ) aadd( aPops, { ::oAC:getAction( "ReBuildQt" ), {|| ::oPM:buildProject( oXbpTreeItem:caption, .F., .T., , .T. ) } } ) aadd( aPops, { ::oAC:getAction( "ReBuildLaunchQt" ), {|| ::oPM:buildProject( oXbpTreeItem:caption, .T., .T., , .T. ) } } ) aadd( aPops, { "" } ) - aadd( aPops, { "Launch" , {|| ::oPM:launchProject( oXbpTreeItem:caption ) } } ) + aadd( aPops, { ::oAC:getAction( "LaunchProject" ), {|| ::oPM:launchProject( oXbpTreeItem:caption ) } } ) aadd( aPops, { "" } ) aadd( aPops, { "Remove Project" , {|| ::oPM:removeProject( oXbpTreeItem:caption ) } } ) IF !empty( ::oEV:getNames() ) @@ -1461,6 +1461,9 @@ METHOD HbIde:manageProjectContext( mp1, mp2, oXbpTreeItem ) NEXT aadd( aPops, { aSub, "Select an environment" } ) ENDIF + aadd( aPops, { "" } ) + aadd( aPops, { ::oAC:getAction( "Dictionary" ), {|v| v := ::oFN:tagProject( ::aProjData[ n, TRE_ORIGINAL ], .F. ), ; + MsgBox( iif( Empty( v ), "Not Succeeded", v ), "Dictionary Creation" ) } } ) hbide_ExecPopup( aPops, mp1, ::oProjTree:oWidget ) diff --git a/harbour/contrib/hbide/resources/dictionary.png b/harbour/contrib/hbide/resources/dictionary.png new file mode 100644 index 0000000000000000000000000000000000000000..4bf557784aeaedc0033651d1fc47a1fe4cdb3a44 GIT binary patch literal 1353 zcmV-P1-AN$P)~+LkX`oe}cyu~K(xWC<8tv>KFKHzCw? z%x$t`nG3RfStd~Zpc_WTw1!hZc>t|TD(WIZvQt)H{33c}JgUoA0SiY6eEcpdrpX)6 zWic7tFqlxu7x`S4(aKL()m23eC-->(EtTb4LJHgL0JtG~Sp^1KE`YjjBe{KGKl(3U z6eo)Y(m=1M0x~#2KugC|TN?x~G|7H&a55NtdFJU;yF7s37B1KkR_JTag6Z>vQdJG) z+dZI`KMUsFxj;YPA?^i)BjB4_0Q%WRo{a+0Pj*1prgwn!_6TKqnzngX)9Lp;fabEY zFUR;;t#x(;pzsM|_=9MiKL=!dCdt|Q0rtK1CQ*7~yw3`lGfP3eH;>B+?-@FA7 znKcu7-rGW0GKJaOw?WtLy(IPfB>{+Q+U~g*n`=FQrdg%O(phS*1u(~DL3sXLk~nYx z<&6Upm@xxGYu1vkwJ+kBmCJ!;<-kDwHe!N;xqEj*XZ?1Pym-mFGLY1?!}D93D?NbY z(@GknV3c5b2-H=p#ZjdDzX2E?lCM>*gv_Es=)H6W=;0q=eBCS1*F69ji$OI19vJM8 zL;n|F0Uf%{o1E5Ae)(*f7f?9;k1$O=G;)fpJ?o1%a;q(i(psXdeiH^nWX%Vmwx0+D zE-b#%RO|s9EhxH`Zt4?8mh5ky-E}9Z^m#zn3Xrf=fD<Gb{k> z7A_5xFRkpHHor8A_WxqhNV~-j#g#@JOWffQEWfj}Gtt)4I$=dk^?-OaXUtt0AHKcm zd_`^bR5xdkXZ{Y~RUm`P`JH|&7Be=!S~um`iQ_lL&g5}f!HHut*Ax^KJj(NR@5Xq);t$o~MyN=7pxMtgUsX-)nCu`*#sO23T+00000 LNkvXXu0mjff=zdY literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/launch_r.png b/harbour/contrib/hbide/resources/launch_r.png new file mode 100644 index 0000000000000000000000000000000000000000..cb777413ba2a8ea2e0e31aa1df298dafa0ec26c1 GIT binary patch literal 1391 zcmV-#1(5oQP)tEDq;ZVJ`vTS3MxtGQ<6P7>-Q{$*^M#4a#NZZ@jZF`@+zgD*J9{k(893{ z{YU^cH8sm3k;ut#IJ~H{vlD2ByWpo>mE*bp1n~KM33As*J32bHw6?YqU0q$^q`cT- z%c{O}y}M;bz@o#WWF#ZO(7Rqq{X5sv(t^s%%c}{3I4Vmd&~yNwI&~TyZ*GS4oQ1s3 z7@ydEsm(VdU`Z4IPK020g-GE*m}TF0G$sp^x!T&=j}IR{@-jjQf3nCCT>z*$;J1b!EL07c&cy&r4&Vx)z#HF zKR+K;R;~jV<-wp(jRSa5lIB#dSVm0&r0(f0$<0eUM-oUB1uT$~#D@Z0DjVkG~?#_*QZb5X#tawyS>MZFy2OaL)!y%I8}yV0`sV8V+@omNdl52vD4{9 zto)aU*!uWv2y{?>lCu zEUC-KQZiP^uWX@~ur2!W5(@blD6}DnH6`H#--yU1n6Xi(Lh{lf-Wtab_fg$E?JuJJ zeqNChwS@j;`JE|%7k2JNl4(w!Ec~o9#a8B=V=WPtYF$#u=ie}35AqH=HiiiO;iApW z7jGwgDq=zxrBOgqdJNDcO1szD;|bGY3)5cJKkbOty>U<(FqjIQ$+l8wvbB^lrxcPA zfibx6-7t*~{+2r2->wNW-RGO?@Vwo9)n0};2lD!jMm5&uXgBw4HGDp!i^c)8A>j#^ zCGBZXVsZhei8g7N;F#Xyycs_>+^zSzyS{(7J~UaM`KsfK083O6@@?1(RcE@k#BQGv zux8gjgyT$E-uR@&A-%zhIK`v)(Ee>c+BfxG|!002ovPDHLkV1j>Aj^_XX literal 0 HcmV?d00001