diff --git a/harbour/ChangeLog b/harbour/ChangeLog index f63276b2a5..32c9c52913 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-05 09:57 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.prg + * contrib/hbide/projects/hbide.hbi + * contrib/hbide/resources/projectproperties.ui + ! Probably now dialog will exit cleanly on . + ! Destroyed more Qt objects on exit. + + * contrib/hbxbp/xbpstatusbar.prg + ! Destruction of panels. + 2009-12-05 18:38 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * contrib/hbide/hbide.prg - Deleted non __HARBOUR__ #if branch. Please tell me if I'm diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index 24b715876f..827a308b95 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -379,6 +379,8 @@ METHOD HbIde:create( cProjIni ) /* Very important - destroy resources */ ::oDlg:destroy() + HBXBP_DEBUG( "EXITING after destroy .................." ) + RETURN self /*----------------------------------------------------------------------*/ @@ -439,8 +441,6 @@ METHOD HbIde:loadConfig( cHbideIni ) cHbideIni := hb_dirBase() + "hbide.ini" ENDIF - HBXBP_DEBUG( hb_dirBase(), cHbideIni ) - ::cProjIni := cHbideIni ::aIni := { afill( array( INI_HBIDE_VRBLS ), "" ), {}, {} } @@ -745,6 +745,17 @@ METHOD HbIde:closeSource() ::oFuncList:clear() ::saveSource( nTab ) ::qTabWidget:removeTab( ::qTabWidget:currentIndex() ) + + /* Destroy all objects */ + // { oTab, qEdit, qHiliter, qLayout, cSourceFile, qDocument } + // + Qt_DisConnect_Signal( QT_PTROF( ::aTabs[ nTab, 2 ] ), "textChanged()" ) + Qt_DisConnect_Signal( QT_PTROF( ::aTabs[ nTab, 2 ] ), "cursorPositionChanged()" ) + + ::aTabs[ nTab, 6 ]:pPtr := 0 + ::aTabs[ nTab, 4 ]:pPtr := 0 + ::aTabs[ nTab, 3 ]:pPtr := 0 + ::aTabs[ nTab, 2 ]:pPtr := 0 ENDIF IF ::qTabWidget:count() == 0 ::oDockR:hide() @@ -1517,6 +1528,11 @@ METHOD HbIde:fetchProjectProperties() ENDIF qPrpDlg:exec() + + oPBOk:destroy() + oPBSv:destroy() + oPBCn:destroy() + Qt_DisConnect_Signal( QT_PTROF( oTabWidget ), "currentChanged(int)" ) ENDIF ::aPrpObjs := {} diff --git a/harbour/contrib/hbide/projects/hbide.hbi b/harbour/contrib/hbide/projects/hbide.hbi index 776aee5fda..9dc34aa546 100644 --- a/harbour/contrib/hbide/projects/hbide.hbi +++ b/harbour/contrib/hbide/projects/hbide.hbi @@ -22,14 +22,13 @@ LaunchProgram = hbide.prg ideactions.prg idemisc.prg -ideparseexpr.prg idestylesheets.prg idetags.prg +ideparseexpr.c freadlin.c hbide.ch - hbide.ini [ METADATA ] diff --git a/harbour/contrib/hbide/resources/projectproperties.ui b/harbour/contrib/hbide/resources/projectproperties.ui index 5333b9ca2b..ccf72889c5 100644 --- a/harbour/contrib/hbide/resources/projectproperties.ui +++ b/harbour/contrib/hbide/resources/projectproperties.ui @@ -19,6 +19,9 @@ Project Properties + + + @@ -312,7 +315,7 @@ p, li { white-space: pre-wrap; } <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Compiler/Linker flags may include all commands except the source files list. Additional libraries can be included here.</span></p></body></html> - background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(128, 170, 165, 255), stop:1 rgba(255, 255, 255, 255)); + background-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(158, 158, 158, 255), stop:1 rgba(255, 255, 255, 255)); QPlainTextEdit::NoWrap @@ -568,7 +571,7 @@ p, li { white-space: pre-wrap; } - Save_Exit + Save and Exit diff --git a/harbour/contrib/hbxbp/xbpstatusbar.prg b/harbour/contrib/hbxbp/xbpstatusbar.prg index d063e965c0..3673ccc846 100644 --- a/harbour/contrib/hbxbp/xbpstatusbar.prg +++ b/harbour/contrib/hbxbp/xbpstatusbar.prg @@ -158,7 +158,8 @@ METHOD XbpStatusBar:destroy() IF ( nItems := Len( ::aItems ) ) > 0 FOR i := 1 TO nItems - ::aItems[ i ] := NIL + ::aItems[ i ]:oParent := NIL + ::aItems[ i ]:oWidget:pPtr := 0 NEXT ENDIF