diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a7e7eafd78..02fe076a8c 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -16,6 +16,15 @@
The license applies to all entries newer than 2009-04-28.
*/
+2012-01-25 14:23 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com)
+ * contrib/hbide/ideharbourhelp.prg
+ + Changed: the way .hbd page was being displayed.
+ Now it contains the complete syntax of the function/method etc.
+ Thanks to Massimo for the tip.
+
+ * contrib/hbide/idemain.prg
+ * Fixed: SplashScreen() issue reported by Itamar.
+
2012-01-25 20:23 UTC+0100 Viktor Szakats (harbour syenar.net)
* utils/hbmk2/hbmk2.prg
+ warning will be shown and lib ignored if user explicitly
diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg
index 2b66b546fd..b808dec338 100644
--- a/harbour/contrib/hbide/ideharbourhelp.prg
+++ b/harbour/contrib/hbide/ideharbourhelp.prg
@@ -229,12 +229,19 @@ METHOD IdeHarbourHelp:new( oIde )
/*----------------------------------------------------------------------*/
METHOD IdeHarbourHelp:create( oIde )
-
+ LOCAL cPath
+
DEFAULT oIde TO ::oIde
::oIde := oIde
::cPathInstall := ::oINI:getHarbourPath()
-
+ IF empty( ::cPathInstall )
+ hb_fNameSplit( hb_dirBase(), @cPath )
+ IF hb_fileExists( cPath + hb_ps() + "hbmk2.exe" )
+ ::cPathInstall := cPath + ".." + hb_ps()
+ ENDIF
+ ENDIF
+
RETURN Self
/*----------------------------------------------------------------------*/
@@ -1144,7 +1151,7 @@ METHOD IdeHarbourHelp:populateTextFile( cTextFile )
IF len( aFn ) > 0
FOR EACH oFunc IN aFn
IF hb_isObject( oFunc )
- aadd( aHtm, '
' + oFunc:cName + '' )
+ aadd( aHtm, '
' + hbide_arrayToMemoHtml( oFunc:aSyntax ) + '' )
ENDIF
NEXT
ELSE
diff --git a/harbour/contrib/hbide/idemain.prg b/harbour/contrib/hbide/idemain.prg
index 5296ee1f1a..3d872a575e 100644
--- a/harbour/contrib/hbide/idemain.prg
+++ b/harbour/contrib/hbide/idemain.prg
@@ -541,7 +541,7 @@ METHOD HbIde:create( aParams )
qPixmap := QPixmap( ":/resources" + hb_ps() + "hbidesplash.png" )
qSplash := QSplashScreen()
- qSplash:setWindowFlags( hb_bitOr( Qt_WindowStaysOnTopHint, qSplash:windowFlags() ) )
+ // qSplash:setWindowFlags( hb_bitOr( Qt_WindowStaysOnTopHint, qSplash:windowFlags() ) )
qSplash:setPixmap( qPixmap )
qSplash:show()
::showApplicationCursor( Qt_BusyCursor )
@@ -626,7 +626,7 @@ METHOD HbIde:create( aParams )
::oDK:buildToolBarPanels()
/* Main Menu */
::oAC:buildMainMenu()
-//::oDlg:show()
+
/* Initialize ChangeLog Manager */
::oCL := IdeChangeLog():new():create( Self )
@@ -666,6 +666,7 @@ METHOD HbIde:create( aParams )
::oCUI := IdeConsole():new():create( Self )
::oDlg:show() /* Shifted here - it gives the effect that time opening hbIDE is much less */
+ qSplash:raise()
/* Fill various elements of the IDE */
::oPM:populate()
@@ -716,7 +717,6 @@ METHOD HbIde:create( aParams )
ENDIF
::oDockB2:hide() /* This widget never contains anything so must be forced to hide */
- ::oDlg:Show()
IF ::nRunMode == HBIDE_RUN_MODE_PRG
::oDockPT:hide()