diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index f6c201317b..263356878b 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -17,6 +17,38 @@
past entries belonging to author(s): Viktor Szakats.
*/
+2010-02-26 18:15 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+ * contrib/hbqt/THbQtUI.prg
+ ! Miss of prev commit.
+
+ * contrib/hbide/idefindreplace.prg
+ ! A nasty fix.
+
+ * contrib/hbide/ideharbourhelp.prg
+ + Implemented: text file viewer "as is" if it does not contain
+ any function's documentation. In Harbour's /doc* tree
+ there are many files without NANFORUM tags.
+
+2010-02-26 16:54 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
+ * contrib/hbide/resources/docviewgenerator.ui
+ * contrib/hbide/resources/docviewgenerator.uic
+ ! Enabled: left-right tab-widgets to share space as per user wish.
+ You can resize the indivisual tab-widgets, move cursor in-between
+ horizontal divider.
+
+ * doc/hdr_tpl.txt
+ ! Little correction in exact number of spaces and little
+ more awareness tip for writer.
+
+ * contrib/hbide/ideharbourhelp.prg
+ * contrib/hbide/idemisc.prg
+ ! More refinements the way Harbour document is displayed.
+ Please forward your suggessions.
+ ! Presentation: documents tree is now exact syncronization with
+ Harbour's folder structure but depicting only those folders
+ with /doc and /doc/en endingings.
+ + Enabled: to reload the tree on the fly. Marco, check it.
+
2010-02-26 23:18 UTC+0100 Viktor Szakats (harbour.01 syenar.hu)
* src/rtl/tget.prg
* tests/rto_get.prg
diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg
index dbfcc9b8eb..34f6f8f500 100644
--- a/harbour/contrib/hbide/idefindreplace.prg
+++ b/harbour/contrib/hbide/idefindreplace.prg
@@ -322,11 +322,7 @@ METHOD IdeFindReplace:create( oIde )
::oIde := oIde
- #ifdef HBIDE_USE_UIC
::oUI := HbQtUI():new( ::oIde:resPath + "finddialog.uic", ::oIde:oDlg:oWidget ):build()
- #else
- ::oUI := HbQtUI():new( ::oIde:resPath + "finddialog.ui", ::oIde:oDlg:oWidget ):create()
- #endif
::oUI:setWindowFlags( Qt_Sheet )
aeval( ::oIde:aIni[ INI_FIND ], {|e| ::oUI:q_comboFindWhat:addItem( e ) } )
@@ -339,7 +335,7 @@ METHOD IdeFindReplace:create( oIde )
::oUI:signal( "buttonReplace", "clicked()", {|| ::onClickReplace() } )
::oUI:signal( "buttonClose" , "clicked()", ;
{|| ::oIde:aIni[ INI_HBIDE, FindDialogGeometry ] := hbide_posAndSize( ::oUI:oWidget ), ;
- ::oUI:hide(), ::oSearchReplace:oUI:hide() } )
+ ::oUI:hide() } )
::oUI:signal( "comboFindWhat", "editTextChanged(text)", {|| ::oUI:q_radioEntire:setChecked( .t. ) } )
diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg
index 8807cc8a1c..d181439609 100644
--- a/harbour/contrib/hbide/ideharbourhelp.prg
+++ b/harbour/contrib/hbide/ideharbourhelp.prg
@@ -966,14 +966,18 @@ METHOD IdeHarbourHelp:populateTextFile( cTextFile )
aadd( aHtm, "" )
aadd( aHtm, " " )
aadd( aHtm, ' ' + cTextFile + '
' )
- aadd( aHtm, '
' + ' ' + '' )
+ aadd( aHtm, '
' + '
' )
IF nParsed > 0
aFn := ::aFuncByFile[ nParsed, 2 ]
- FOR EACH oFunc IN aFn
- IF hb_isObject( oFunc )
- aadd( aHtm, '
' + oFunc:cName + '' )
- ENDIF
- NEXT
+ IF len( aFn ) > 0
+ FOR EACH oFunc IN aFn
+ IF hb_isObject( oFunc )
+ aadd( aHtm, '
' + oFunc:cName + '' )
+ ENDIF
+ NEXT
+ ELSE
+ aadd( aHtm, '
' + hb_memoread( cTextFile ) + '
' )
+ ENDIF
ENDIF
aadd( aHtm, " " )
aadd( aHtm, "" )
diff --git a/harbour/contrib/hbqt/THbQtUI.prg b/harbour/contrib/hbqt/THbQtUI.prg
index 31b9022b3d..7350232a14 100644
--- a/harbour/contrib/hbqt/THbQtUI.prg
+++ b/harbour/contrib/hbqt/THbQtUI.prg
@@ -867,7 +867,10 @@ STATIC FUNCTION hbq_getConstants()
;
"Qt_ScrollBarAsNeeded" => Qt_ScrollBarAsNeeded , ;
"Qt_ScrollBarAlwaysOff" => Qt_ScrollBarAlwaysOff , ;
- "Qt_ScrollBarAlwaysOn" => Qt_ScrollBarAlwaysOn ;
+ "Qt_ScrollBarAlwaysOn" => Qt_ScrollBarAlwaysOn , ;
+ ;
+ "Qt_Horizontal" => Qt_Horizontal , ;
+ "Qt_Vertical" => Qt_Vertical ;
}
ENDIF