From 59ee62a4e97543efe27c3d82d34457d64910607f Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Wed, 23 Mar 2011 01:46:21 +0000 Subject: [PATCH] 2011-03-22 18:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idedocks.prg ! Fixed: RTE at exit. --- harbour/ChangeLog | 4 +++ harbour/contrib/hbide/idedocks.prg | 55 +++++++++++++++++++++++++++--- 2 files changed, 55 insertions(+), 4 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 07462da3c3..eeb81e1b34 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,10 @@ The license applies to all entries newer than 2009-04-28. */ +2011-03-22 18:44 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idedocks.prg + ! Fixed: RTE at exit. + 2011-03-22 18:27 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/gtwvg/gtwvg.c ! Reverted. Seems it had been hectic today. diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index b94242fdf2..9711b5a444 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -179,6 +179,8 @@ METHOD IdeDocks:destroy() ::oIde:oProjRoot := NIL ::oIde:oOpenedSources := NIL +#if 1 + ::oOutputResult:oWidget : disconnect( "copyAvailable(bool)" ) ::oEnvironDock:oWidget : disconnect( "visibilityChanged(bool)" ) ::oPropertiesDock:oWidget : disconnect( "visibilityChanged(bool)" ) @@ -203,7 +205,7 @@ METHOD IdeDocks:destroy() #endif IF !empty( ::oSys ) - ::oSys : disconnect( "activated(QSystemTrayIcon::ActivationReason)" ) + ::oIde:oSys : disconnect( "activated(QSystemTrayIcon::ActivationReason)" ) ::qAct1 : disconnect( "triggered(bool)" ) ::qAct2 : disconnect( "triggered(bool)" ) ENDIF @@ -221,6 +223,50 @@ METHOD IdeDocks:destroy() qTBtn:disconnect( "clicked()" ) NEXT +#else + + ::oOutputResult:oWidget := NIL + ::oEnvironDock:oWidget := NIL + ::oPropertiesDock:oWidget := NIL + ::oThemesDock:oWidget := NIL + ::oDocViewDock:oWidget := NIL + ::oDocWriteDock:oWidget := NIL + ::oFindDock:oWidget := NIL + ::oFunctionsDock:oWidget := NIL + ::oSkeltnDock:oWidget := NIL + ::oHelpDock:oWidget := NIL + ::oFuncDock:oWidget := NIL + + ::oSourceThumbnailDock:oWidget := NIL + ::oQScintillaDock:oWidget := NIL + ::oReportsManagerDock:oWidget := NIL + ::oFormatDock:oWidget := NIL + + #if 0 /* Not Implemented */ + ::oDockPT:oWidget := NIL + ::oDockED:oWidget := NIL + ::oDockB2:oWidget := NIL + #endif + + IF !empty( ::oIde:oSys ) + ::oIde:oSys := NIL + ::qAct1 := NIL + ::qAct2 := NIL + ENDIF + + FOR EACH qTBtn IN ::aPanels + qTBtn := NIL + NEXT + FOR EACH qTBtn IN ::aMdiBtns + qTBtn := NIL + NEXT + + FOR EACH qTBtn IN ::oIde:aMarkTBtns + qTBtn := NIL + NEXT + +#endif + RETURN Self /*------------------------------------------------------------------------*/ @@ -455,8 +501,10 @@ METHOD IdeDocks:execEvent( cEvent, p, p1 ) ENDIF EXIT CASE "dockReportsManager_visibilityChanged" - IF ! p .AND. ! p1:isVisible() - p1:raise() + IF !empty( p1 ) + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF ENDIF EXIT CASE "dockQScintilla_visibilityChanged" @@ -562,7 +610,6 @@ METHOD IdeDocks:execEvent( cEvent, p, p1 ) ::qTimer := QTimer() ::qTimer:setSingleShot( .t. ) ::qTimer:setInterval( 250 ) - //::connect( ::qTimer, "timeout()", {|| ::execEvent( "qTimer_timeOut" ) } ) ::qTimer:connect( "timeout()", {|| ::execEvent( "qTimer_timeOut" ) } ) ENDIF ::qTimer:start()