diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 27b9d8711b..401924fc56 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,15 @@ The license applies to all entries newer than 2009-04-28. */ +2010-06-29 14:00 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idehome.prg + + Changed to use embedded .png resources in html pages. + ; /resources dir isn't required now to run hbide. + + * contrib/hbide/ideskeletons.prg + ! Fixed to use embedded UI resource. + 2010-06-29 13:13 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/ideplugins.prg + Added support for .hbs extension (handled similarly as .prg). @@ -111,7 +120,7 @@ - Deleted some unnecessary trash from source. ; TOFIX: hbide.env should reside in same place as hbide.ini. [DONE] ; TOFIX: hbide internal html pages make reference to .png files - on disk. + on disk. [DONE] 2010-06-29 08:46 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * INSTALL diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index 199dd2358b..44cd85783d 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -1066,7 +1066,7 @@ METHOD IdeHarbourHelp:populateRootInfo() aadd( aHtm, '

' + ::cPathInstall + '

' ) aadd( aHtm, '
 
' ) aadd( aHtm, '
 
' ) - aadd( aHtm, '
' ) + aadd( aHtm, '
' ) aadd( aHtm, " " ) aadd( aHtm, "" ) diff --git a/harbour/contrib/hbide/idehome.prg b/harbour/contrib/hbide/idehome.prg index a42f7f0689..8edfa5e4f4 100644 --- a/harbour/contrib/hbide/idehome.prg +++ b/harbour/contrib/hbide/idehome.prg @@ -260,7 +260,7 @@ METHOD IdeHome:paintRequested( pPrinter ) METHOD IdeHome:setStyleSheetTextBrowser( qBrw ) - qBrw:setStyleSheet( 'QTextBrowser { background-image: url(resources/hbidesplashwatermark.png); ' + ; + qBrw:setStyleSheet( 'QTextBrowser { background-image: url(:/resources/hbidesplashwatermark.png); ' + ; 'background-attachment: scroll; background-repeat:no-repeat; background-position:center; ' + ; 'background-color: rgb(255,255,255); }' ) @@ -308,7 +308,7 @@ METHOD IdeHome:refresh() aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, '
' ) - aadd( aHtm, ' ' + ' ' + ' ' + ' ' ) + aadd( aHtm, ' ' + ' ' + ' ' + ' ' ) aadd( aHtm, ' Projects' ) aadd( aHtm, '  ' + ' ' + ' ' ) aadd( aHtm, ' ' + '( ' + ::oIde:cProjIni + ' )' + '' ) @@ -354,7 +354,7 @@ METHOD IdeHome:addProjectsInfo( aHtm ) aadd( aHtm, '
' ) - aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'prj-' + prp_[ PRJ_PRP_TITLE ], 'resources/' + cIcon + '.png' ) + ' ' ) + 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, ' ' ) @@ -419,7 +419,7 @@ METHOD IdeHome:buildSourcesInfo( cProjectTitle, aSrcInfo ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) @@ -450,7 +450,7 @@ METHOD IdeHome:formatSourceInfo( aHtm, aSrc ) aadd( aHtm, ' ' ) aadd( aHtm, ' ' ) aadd( aHtm, '
' ) - aadd( aHtm, ' ' + ' ' + ' ' + ' ' ) + aadd( aHtm, ' ' + ' ' + ' ' + ' ' ) aadd( aHtm, ' ' + cProjectTitle + '' ) aadd( aHtm, '
' ) - aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'fle-' + aSrc[ 1 ], 'resources/' + aSrc[ 5 ] + '.png' ) + ' ' ) + aadd( aHtm, ' ' + hbide_htmlImgAnchor( 'fle-' + aSrc[ 1 ], ':/resources/' + aSrc[ 5 ] + '.png' ) + ' ' ) aadd( aHtm, ' ' + hbide_htmlAnchor( 'fle-' + aSrc[ 1 ], aSrc[ 3 ], aSrc[ 1 ] ) ) aadd( aHtm, ' ' ) @@ -540,7 +540,7 @@ STATIC FUNCTION hbide_getFaqs() 'All you have to do is to enter different environment settings in _ONE_ hbide.env file which ' + ; 'resides alongside hbide.ini. hbIDE provides the interface to manipulate this .env settings ' + ; 'which can be invoked from right-toolbar icon "Compiler Environments". Follow the input fields. ' + ; - 'A template is provided in "resources/hbide.env", inspect it and you are through. Once hbide.env ' + ; + 'A template is provided in "hbide.env", inspect it and you are through. Once hbide.env ' + ; 'is ready, you will simply need to switch over the other environment which can be invoked ' + ; 'via right-click on a project node in "Projects" tree and point to "Select an environment" ' + ; 'and click on listed options. Next step is just to build the project.' ) diff --git a/harbour/contrib/hbide/ideskeletons.prg b/harbour/contrib/hbide/ideskeletons.prg index 0075dca895..62b5da4065 100644 --- a/harbour/contrib/hbide/ideskeletons.prg +++ b/harbour/contrib/hbide/ideskeletons.prg @@ -156,7 +156,8 @@ METHOD IdeSkeletons:destroy() METHOD IdeSkeletons:show() IF empty( ::oUI ) - ::oUI := HbQtUI():new( hbide_uic( "skeletons" ) ):build() +// ::oUI := HbQtUI():new( hbide_uic( "skeletons" ) ):build() + ::oUI := uiSkeletons() ::oSkeltnDock:oWidget:setWidget( ::oUI:oWidget ) @@ -549,4 +550,3 @@ METHOD IdeSkeletons:clearTree() RETURN Self /*----------------------------------------------------------------------*/ -