From 798bdbb49045fa56ab3e1e8bd0b32ed840d3ad20 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Tue, 6 Jul 2010 07:58:14 +0000 Subject: [PATCH] 2010-07-06 00:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/idebrowse.prg * contrib/hbide/idedocks.prg * contrib/hbide/ideplugins.prg * contrib/hbide/idesaveload.prg + Implemented: drg/drop support in "Projects" tree. Now you can drop .hbp project files onto it. % Fixed: RTE when a table was being opened twice. Now an alert message is flashed to this effect. ! Fixed: right-side dock widgets visibility behavior. Before next clicked dock was hidden under the tabs and user had to click again on the tab. --- harbour/ChangeLog | 15 +++ harbour/contrib/hbide/idebrowse.prg | 33 +++-- harbour/contrib/hbide/idedocks.prg | 166 +++++++++++++++----------- harbour/contrib/hbide/ideplugins.prg | 6 +- harbour/contrib/hbide/idesaveload.prg | 2 - 5 files changed, 137 insertions(+), 85 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 86b8c196fe..20f24d1ddb 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,21 @@ The license applies to all entries newer than 2009-04-28. */ +2010-07-06 00:51 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/idebrowse.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/ideplugins.prg + * contrib/hbide/idesaveload.prg + + Implemented: drg/drop support in "Projects" tree. + Now you can drop .hbp project files onto it. + + % Fixed: RTE when a table was being opened twice. + Now an alert message is flashed to this effect. + + ! Fixed: right-side dock widgets visibility behavior. + Before next clicked dock was hidden under the tabs and + user had to click again on the tab. + 2010-07-05 15:05 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/hbide.prg * contrib/hbide/idebrowse.prg diff --git a/harbour/contrib/hbide/idebrowse.prg b/harbour/contrib/hbide/idebrowse.prg index 729806d548..e0f9a74733 100644 --- a/harbour/contrib/hbide/idebrowse.prg +++ b/harbour/contrib/hbide/idebrowse.prg @@ -533,6 +533,10 @@ METHOD IdeBrowseManager:addTable( cFileDBF, cAlias, aInfo ) oBrw:create() + IF empty( oBrw:oBrw ) + RETURN Self + ENDIF + qSubWindow := ::oCurPanel:addBrowser( oBrw, aInfo ) ::connect( qSubWindow, "aboutToActivate()", {|| ::execEvent( "mdiSubWindow_aboutToActivate", qSubWindow ) } ) @@ -818,8 +822,9 @@ METHOD IdeBrowse:fetchAlias( cTable ) /*------------------------------------------------------------------------*/ METHOD IdeBrowse:create( oIde ) - LOCAL xVrb, cT, cAlias + LOCAL xVrb, cT, cAlias, bError, oErr LOCAL lMissing := .t. + LOCAL lErr := .f. DEFAULT oIde TO ::oIde ::oIde := oIde @@ -842,14 +847,24 @@ METHOD IdeBrowse:create( oIde ) ENDIF IF lMissing .AND. !empty( ::cTable ) - IF empty( ::cAlias ) - USE ( ::cTable ) SHARED NEW VIA ( ::cDriver ) - ELSE - cAlias := ::cAlias - USE ( ::cTable ) ALIAS ( cAlias ) SHARED NEW VIA ( ::cDriver ) - ENDIF - IF NetErr() - MsgBox( ::cTable, "Could not been opened!" ) + bError := ErrorBlock( {|o| break( o ) } ) + BEGIN SEQUENCE + IF empty( ::cAlias ) + USE ( ::cTable ) SHARED NEW VIA ( ::cDriver ) + ELSE + cAlias := ::cAlias + USE ( ::cTable ) ALIAS ( cAlias ) SHARED NEW VIA ( ::cDriver ) + ENDIF + IF NetErr() + MsgBox( ::cTable, "Could not been opened!" ) + lErr := .t. + ENDIF + RECOVER USING oErr + MsgBox( oErr:description, "Error Opening Table" ) + RETURN Self + ENDSEQUENCE + ErrorBlock( bError ) + IF lErr RETURN Self ENDIF IF empty( ::cAlias ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index cefa71f4d6..eadc3acafe 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -95,7 +95,7 @@ CLASS IdeDocks INHERIT IdeObject METHOD new( oIde ) METHOD create( oIde ) METHOD destroy() - METHOD execEvent( cEvent, p ) + METHOD execEvent( cEvent, p, p1 ) METHOD setView( cView ) METHOD buildToolBarPanels() METHOD buildHelpWidget() @@ -126,7 +126,7 @@ CLASS IdeDocks INHERIT IdeObject METHOD dispEnvironment( cEnviron ) METHOD addPanelButton( cPanel ) METHOD disblePanelButton( qTBtn ) - METHOD getADockWidget( nAreas, cObjectName, cWindowTitle, nFlags ) + METHOD getADockWidget( nAreas, cObjectName, cWindowTitle, nFlags, cEventVisibility ) METHOD getPanelIcon( cView ) METHOD animateComponents( nMode ) METHOD buildSourceThumbnail() @@ -260,7 +260,7 @@ METHOD IdeDocks:buildDialog() ::setView( "Stats" ) /* Always call with name */ ::oDlg:connectEvent( ::oDlg:oWidget, QEvent_WindowStateChange, {|e| ::execEvent( "QEvent_WindowStateChange", e ) } ) - ::oDlg:connectEvent( ::oDlg:oWidget, QEvent_Hide , {|e| ::execEvent( "QEvent_Hide", e ) } ) + ::oDlg:connectEvent( ::oDlg:oWidget, QEvent_Hide , {|e| ::execEvent( "QEvent_Hide" , e ) } ) #if 1 ::buildSystemTray() @@ -295,79 +295,90 @@ METHOD IdeDocks:buildSystemTray() /*----------------------------------------------------------------------*/ -METHOD IdeDocks:execEvent( cEvent, p ) +METHOD IdeDocks:execEvent( cEvent, p, p1 ) LOCAL qEvent, qMime, qList, qUrl, i SWITCH cEvent - - CASE "qHelpBrw_contextMenuRequested" - hbide_popupBrwContextMenu( ::qHelpBrw, p ) - EXIT - CASE "dockQScintilla_topLevelChanged" - CASE "dockQScintilla_dockLocationChanged" - CASE "dockQScintilla_allowedAreasChanged" - CASE "dockQScintilla_featuresChanged" - EXIT CASE "dockQScintilla_visibilityChanged" IF p; ::oBM:show() ; ENDIF - //::oQScintillaDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT CASE "dockSourceThumbnail_visibilityChanged" IF p; ::oEM:showThumbnail(); ENDIF - //::oSourceThumbnailDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT CASE "dockSkltnsTree_visibilityChanged" IF p; ::oSK:showTree(); ENDIF - //::oSkltnsTreeDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT CASE "dockHelpDock_visibilityChanged" - //::oHelpDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "dockDocViewer_visibilityChanged" IF p; ::oHL:show(); ENDIF - //::oDocViewDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "dockDocWriter_visibilityChanged" IF p; ::oDW:show(); ENDIF - //::oDocWriteDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "oFuncDock_visibilityChanged" - //::oFuncDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "docFunctions_visibilityChanged" IF p; ::oFN:show(); ENDIF - //::oFunctionsDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "dockProperties_visibilityChanged" IF p; ::oPM:fetchProperties(); ENDIF - //::oPropertiesDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "docEnvironments_visibilityChanged" IF p; ::oEV:show(); ENDIF - //::oEnvironDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "docSkeletons_visibilityChanged" IF p; ::oSK:show(); ENDIF - //::oSkeltnDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "dockThemes_visibilityChanged" IF p; ::oTH:show(); ENDIF - //::oThemesDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF EXIT - CASE "dockFindInFiles_visibilityChanged" IF p; ::oFF:show(); ENDIF - //::oFindDock:oWidget:raise() + IF ! p .AND. ! p1:isVisible() + p1:raise() + ENDIF + EXIT + /* Miscellaneous */ + CASE "qHelpBrw_contextMenuRequested" + hbide_popupBrwContextMenu( ::qHelpBrw, p ) EXIT - CASE "QEvent_WindowStateChange" qEvent := QWindowStateChangeEvent():from( p ) ::nPrevWindowState := qEvent:oldState() @@ -435,6 +446,26 @@ METHOD IdeDocks:execEvent( cEvent, p ) ENDIF EXIT + CASE "projectTree_dragEnterEvent" +HB_TRACE( HB_TR_ALWAYS, "projectTree_dragEnterEvent" ) + QDragEnterEvent():from( p ):acceptProposedAction() + EXIT + + CASE "projectTree_dropEvent" +HB_TRACE( HB_TR_ALWAYS, "projectTree_dropEvent" ) + qEvent := QDropEvent():from( p ) + qMime := QMimeData():from( qEvent:mimeData() ) + IF qMime:hasUrls() + qList := QStringList():from( qMime:hbUrlList() ) + FOR i := 0 TO qList:size() - 1 + qUrl := QUrl():new( qList:at( i ) ) + IF hbide_sourceType( qUrl:toLocalFile() ) == ".hbp" + ::oPM:loadProperties( qUrl:toLocalFile(), .f., .f., .t. ) + ENDIF + NEXT + ENDIF + EXIT + ENDSWITCH RETURN Self @@ -508,7 +539,7 @@ METHOD IdeDocks:buildDockWidgets() /*----------------------------------------------------------------------*/ -METHOD IdeDocks:getADockWidget( nAreas, cObjectName, cWindowTitle, nFlags ) +METHOD IdeDocks:getADockWidget( nAreas, cObjectName, cWindowTitle, nFlags, cEventVisibility ) LOCAL oDock, nBasic DEFAULT nFlags TO 0 @@ -526,6 +557,10 @@ METHOD IdeDocks:getADockWidget( nAreas, cObjectName, cWindowTitle, nFlags ) oDock:oWidget:setStyleSheet( getStyleSheet( "QDockWidget", ::nAnimantionMode ) ) oDock:hide() + IF !empty( cEventVisibility ) + ::connect( oDock:oWidget, cEventVisibility, {|p| ::execEvent( cEventVisibility, p, oDock:oWidget ) } ) + ENDIF + RETURN oDock /*----------------------------------------------------------------------*/ @@ -843,7 +878,7 @@ METHOD IdeDocks:addPanelButton( cPanel ) /*----------------------------------------------------------------------*/ METHOD IdeDocks:buildProjectTree() - LOCAL i, oItem + LOCAL i, oItem, qDrop LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea ::oIde:oDockPT := ::getADockWidget( nAreas, "dockProjectTree", "Projects", QDockWidget_DockWidgetFloatable ) @@ -888,6 +923,13 @@ METHOD IdeDocks:buildProjectTree() ::oDockPT:hide() + qDrop := ::oDockPT:oWidget // ::oProjTree:oWidget + + qDrop:setAcceptDrops( .t. ) + qDrop:installEventFilter( ::pEvents ) + ::connect( qDrop, QEvent_DragEnter, {|p| ::execEvent( "projectTree_dragEnterEvent", p ) } ) + ::connect( qDrop, QEvent_Drop , {|p| ::execEvent( "projectTree_dropEvent" , p ) } ) + RETURN Self /*----------------------------------------------------------------------*/ @@ -931,8 +973,7 @@ METHOD IdeDocks:buildSkeletonsTree() ::oIde:oSkltnsTreeDock := ::getADockWidget( nAreas, "dockSkltnsTree", "Skeletons", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oSkltnsTreeDock:oWidget, Qt_Vertical ) - - ::connect( ::oSkltnsTreeDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockSkltnsTree_visibilityChanged", p ) } ) + ::connect( ::oSkltnsTreeDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockSkltnsTree_visibilityChanged", p, ::oSkltnsTreeDock:oWidget ) } ) RETURN Self @@ -943,8 +984,7 @@ METHOD IdeDocks:buildFuncList() ::oIde:oFuncDock := ::getADockWidget( nAreas, "dockFuncList", "Functions List", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFuncDock:oWidget, Qt_Vertical ) - - ::connect( ::oFuncDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "oFuncDock_visibilityChanged", p ) } ) + ::connect( ::oFuncDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "oFuncDock_visibilityChanged", p, ::oFuncDock:oWidget ) } ) ::oIde:oFuncList := XbpListBox():new( ::oFuncDock ):create( , , { 0,0 }, { 100,400 }, , .t. ) ::oFuncList:oWidget:setEditTriggers( QAbstractItemView_NoEditTriggers ) @@ -982,7 +1022,7 @@ METHOD IdeDocks:buildHelpWidget() ::oHelpDock:connect( ::qHelpBrw, "customContextMenuRequested(QPoint)", {|p| ::execEvent( "qHelpBrw_contextMenuRequested", p ) } ) - ::connect( ::oHelpDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockHelpDock_visibilityChanged", p ) } ) + ::connect( ::oHelpDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockHelpDock_visibilityChanged", p, ::oHelpDock:oWidget ) } ) RETURN Self @@ -1094,8 +1134,7 @@ METHOD IdeDocks:buildThemesDock() ::oIde:oThemesDock := ::getADockWidget( nAreas, "dockThemes", "Theme Manager", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oThemesDock:oWidget, Qt_Horizontal ) - - ::connect( ::oThemesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockThemes_visibilityChanged", p ) } ) + ::connect( ::oThemesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockThemes_visibilityChanged", p, ::oThemesDock:oWidget ) } ) RETURN Self @@ -1106,8 +1145,7 @@ METHOD IdeDocks:buildPropertiesDock() ::oIde:oPropertiesDock := ::getADockWidget( nAreas, "dockProperties", "Project Properties", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oPropertiesDock:oWidget, Qt_Horizontal ) - - ::connect( ::oPropertiesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockProperties_visibilityChanged", p ) } ) + ::connect( ::oPropertiesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockProperties_visibilityChanged", p, ::oPropertiesDock:oWidget ) } ) RETURN Self @@ -1118,8 +1156,7 @@ METHOD IdeDocks:buildFindInFiles() ::oIde:oFindDock := ::getADockWidget( nAreas, "dockFindInFiles", "Find in Files", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFindDock:oWidget, Qt_Horizontal ) - - ::connect( ::oFindDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockFindInFiles_visibilityChanged", p ) } ) + ::connect( ::oFindDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockFindInFiles_visibilityChanged", p, ::oFindDock:oWidget ) } ) RETURN Self @@ -1130,8 +1167,7 @@ METHOD IdeDocks:buildDocViewer() ::oIde:oDocViewDock := ::getADockWidget( nAreas, "dockDocViewer", "Harbour Documentation", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocViewDock:oWidget, Qt_Horizontal ) - - ::connect( ::oDocViewDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockDocViewer_visibilityChanged", p ) } ) + ::connect( ::oDocViewDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockDocViewer_visibilityChanged", p, ::oDocViewDock:oWidget ) } ) RETURN Self @@ -1142,8 +1178,7 @@ METHOD IdeDocks:buildDocWriter() ::oIde:oDocWriteDock := ::getADockWidget( nAreas, "dockDocWriter", "Documentation Writer", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocWriteDock:oWidget, Qt_Horizontal ) - - ::connect( ::oDocWriteDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockDocWriter_visibilityChanged", p ) } ) + ::connect( ::oDocWriteDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockDocWriter_visibilityChanged", p, ::oDocWriteDock:oWidget ) } ) RETURN Self @@ -1154,8 +1189,7 @@ METHOD IdeDocks:buildFunctionsDock() ::oIde:oFunctionsDock := ::getADockWidget( nAreas, "dockFunctions", "Projects Functions Lookup", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oFunctionsDock:oWidget, Qt_Horizontal ) - - ::connect( ::oFunctionsDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docFunctions_visibilityChanged", p ) } ) + ::connect( ::oFunctionsDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docFunctions_visibilityChanged", p, ::oFunctionsDock:oWidget ) } ) RETURN Self @@ -1166,8 +1200,7 @@ METHOD IdeDocks:buildEnvironDock() ::oIde:oEnvironDock := ::getADockWidget( nAreas, "dockEnvironments", "Compiler Environments", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oEnvironDock:oWidget, Qt_Horizontal ) - - ::connect( ::oEnvironDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docEnvironments_visibilityChanged", p ) } ) + ::connect( ::oEnvironDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docEnvironments_visibilityChanged", p, ::oEnvironDock:oWidget ) } ) RETURN Self @@ -1178,20 +1211,20 @@ METHOD IdeDocks:buildSkeletonWidget() ::oIde:oSkeltnDock := ::getADockWidget( nAreas, "dockSkeleton", "Code Skeletons", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oSkeltnDock:oWidget, Qt_Horizontal ) - - ::connect( ::oSkeltnDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docSkeletons_visibilityChanged", p ) } ) + ::connect( ::oSkeltnDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "docSkeletons_visibilityChanged", p, ::oSkeltnDock:oWidget ) } ) RETURN Self /*----------------------------------------------------------------------*/ METHOD IdeDocks:buildSourceThumbnail() + LOCAL oDock LOCAL nAreas := Qt_LeftDockWidgetArea + Qt_RightDockWidgetArea + Qt_TopDockWidgetArea + Qt_BottomDockWidgetArea - ::oIde:oSourceThumbnailDock := ::getADockWidget( nAreas, "dockSourceThumbnail", "Source Thumbnail", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oSourceThumbnailDock:oWidget, Qt_Horizontal ) - - ::connect( ::oSourceThumbnailDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockSourceThumbnail_visibilityChanged", p ) } ) + oDock := ::getADockWidget( nAreas, "dockSourceThumbnail", "Source Thumbnail", QDockWidget_DockWidgetFloatable ) + ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, oDock:oWidget, Qt_Horizontal ) + ::connect( oDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( "dockSourceThumbnail_visibilityChanged", p, oDock:oWidget ) } ) + ::oIde:oSourceThumbnailDock := oDock RETURN Self @@ -1202,12 +1235,7 @@ METHOD IdeDocks:buildQScintilla() ::oIde:oQScintillaDock := ::getADockWidget( nAreas, "dockQScintilla", "ideDBU", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oQScintillaDock:oWidget, Qt_Horizontal ) - - ::connect( ::oQScintillaDock:oWidget, "visibilityChanged(bool)" , {|p| ::execEvent( "dockQScintilla_visibilityChanged" , p ) } ) - ::connect( ::oQScintillaDock:oWidget, "topLevelChanged(bool)" , {|p| ::execEvent( "dockQScintilla_topLevelChanged" , p ) } ) - ::connect( ::oQScintillaDock:oWidget, "dockLocationChanged(int)" , {|p| ::execEvent( "dockQScintilla_dockLocationChanged", p ) } ) - ::connect( ::oQScintillaDock:oWidget, "allowedAreasChanged(int)" , {|p| ::execEvent( "dockQScintilla_allowedAreasChanged", p ) } ) - ::connect( ::oQScintillaDock:oWidget, "featuresChanged(int)" , {|p| ::execEvent( "dockQScintilla_featuresChanged" , p ) } ) + ::connect( ::oQScintillaDock:oWidget, "visibilityChanged(bool)" , {|p| ::execEvent( "dockQScintilla_visibilityChanged", p, ::oQScintillaDock:oWidget ) } ) RETURN Self diff --git a/harbour/contrib/hbide/ideplugins.prg b/harbour/contrib/hbide/ideplugins.prg index 31d8b81372..56ea938930 100644 --- a/harbour/contrib/hbide/ideplugins.prg +++ b/harbour/contrib/hbide/ideplugins.prg @@ -160,11 +160,8 @@ STATIC FUNCTION hbide_loadAPlugin( cPlugin, oIde, cVer ) FUNCTION hbide_runAScript( cBuffer, cCompFlags, xParam ) LOCAL cFile, pHrb, oErr - LOCAL bError := ErrorBlock( {|o| break( o ) } ) LOCAL lError := .f. - - HB_SYMBOL_UNUSED( cCompFlags ) - HB_SYMBOL_UNUSED( xParam ) + LOCAL bError := ErrorBlock( {|o| break( o ) } ) BEGIN SEQUENCE cFile := hb_compileFromBuf( cBuffer, cCompFlags ) //, "-n2", "-w3", "-es2", "-q0" ) @@ -185,7 +182,6 @@ FUNCTION hbide_runAScript( cBuffer, cCompFlags, xParam ) ENDIF ErrorBlock( bError ) - RETURN NIL /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 1648547ebc..54166474cc 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -189,8 +189,6 @@ METHOD IdeINI:save( cHbideIni ) DEFAULT cHbideIni TO ::oIde:cProjIni - HB_TRACE( HB_TR_ALWAYS, "IdeINI:saveINI( cHbideIni )" ) - IF ::oIde:nRunMode != HBIDE_RUN_MODE_INI RETURN Nil ENDIF