diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 43c633a8b3..ee29c2cf06 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,17 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-06-01 14:16 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideharbourhelp.prg + ! Fixed a rare occured bug. + + * contrib/hbide/idehome.prg + ! Rearranged and "Welcome" tab contents columns. + + * contrib/hbide/ideprojmanager.prg + ! Made to invoke "Projects" tree window when a project is + created/saved through "Project Properties" dialog. + 2010-06-01 21:40 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * src/vm/fm.c * src/vm/set.c diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index 7e37c9bfa0..3224458ea9 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -1140,8 +1140,9 @@ METHOD IdeHarbourHelp:populateFuncDetails( n ) IF ( nIndex := ascan( ::aFunctions, {|e_| e_[ 4 ] == oTWItem } ) ) > 0 oFunc := ::aFunctions[ nIndex, 3 ] ENDIF - ::buildView( oFunc ) - + IF !empty( oFunc ) + ::buildView( oFunc ) + ENDIF RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index e42b1f6d2a..69ae9aec29 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -318,8 +318,8 @@ METHOD IdeHome:refresh() aadd( aHtm, ' Title ' ) aadd( aHtm, ' Type ' ) aadd( aHtm, ' Sources ' ) - aadd( aHtm, ' Last Modified ' ) - aadd( aHtm, ' Location ' ) + aadd( aHtm, ' Location ' ) + aadd( aHtm, ' Last Modified ' ) AADD( aHtm, ' ' ) // ::addProjectsInfo( @aHtm ) @@ -357,12 +357,15 @@ METHOD IdeHome:addProjectsInfo( aHtm ) aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'prj-' + prp_[ PRJ_PRP_TITLE ], 'resources/' + cIcon + '.png' ) + ' ' ) aadd( aHtm, ' ' + hbide_htmlAnchor( 'prj-' + prp_[ PRJ_PRP_TITLE ], prp_[ PRJ_PRP_TITLE ], a_[ 1 ] ) ) aadd( aHtm, ' ' ) - aadd( aHtm, ' ' ) + aadd( aHtm, ' ' ) aadd( aHtm, ' ' + left( prp_[ PRJ_PRP_TYPE ], 3 ) ) aadd( aHtm, ' ' ) - aadd( aHtm, ' ' ) + aadd( aHtm, ' ' ) aadd( aHtm, ' ' + hb_ntos( len( src_ ) ) ) aadd( aHtm, ' ' ) + aadd( aHtm, ' ' ) + aadd( aHtm, ' ' + hbide_pathNormalized( a_[ 1 ] ) ) + aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) IF ! empty( dir_ ) aadd( aHtm, ' ' + dtoc( dir_[ 1,3 ] ) + " " + dir_[ 1,4 ] ) @@ -370,9 +373,6 @@ METHOD IdeHome:addProjectsInfo( aHtm ) aadd( aHtm, ' ' ) ENDIF aadd( aHtm, ' ' ) - aadd( aHtm, ' ' ) - aadd( aHtm, ' ' + hbide_pathNormalized( a_[ 1 ] ) ) - aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) NEXT ENDIF @@ -426,8 +426,8 @@ METHOD IdeHome:buildSourcesInfo( cProjectTitle, aSrcInfo ) aadd( aHtm, ' Source' ) aadd( aHtm, ' Type' ) aadd( aHtm, ' Size' ) - aadd( aHtm, ' Last Modified' ) - aadd( aHtm, ' Location' ) + aadd( aHtm, ' Location' ) + aadd( aHtm, ' Last Modified' ) AADD( aHtm, ' ' ) // FOR EACH aSrc IN aSrcInfo @@ -456,15 +456,15 @@ METHOD IdeHome:formatSourceInfo( aHtm, aSrc ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' + aSrc[ 4 ] ) aadd( aHtm, ' ' ) - aadd( aHtm, ' ' ) + aadd( aHtm, ' ' ) aadd( aHtm, ' ' + hb_ntos( aSrc[ 6 ] ) ) aadd( aHtm, ' ' ) + aadd( aHtm, ' ' ) + aadd( aHtm, ' ' + aSrc[ 2 ] ) + aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' + dtoc( aSrc[ 7 ] ) + " " + aSrc[ 8 ] ) aadd( aHtm, ' ' ) - aadd( aHtm, ' ' ) - aadd( aHtm, ' ' + aSrc[ 2 ] ) - aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) RETURN Self diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 2c3550bd0b..72f049aafb 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -595,6 +595,9 @@ METHOD IdeProjManager:save( lCanClose ) ::oPropertiesDock:hide() ENDIF + IF lOk + ::oDockPT:show() + ENDIF RETURN lOk /*----------------------------------------------------------------------*/ @@ -817,7 +820,7 @@ METHOD IdeProjManager:synchronizeAlienProject( cProjFileName ) METHOD IdeProjManager:sortSources( cMode ) LOCAL a_, cTyp, s, d_, n - LOCAL aSrc := { ".ch", ".prg", ".c", ".cpp", ".h", ".obj", ".o", ".lib", ".a", ".rc", ".res" } + LOCAL aSrc := { ".prg", ".ch", ".c", ".cpp", ".h", ".obj", ".o", ".lib", ".a", ".rc", ".res" } LOCAL aTxt := { {} , {} , {} , {} , {} , {} , {} , {} , {} , {}, {} } LOCAL aRst := {}