diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 7c1dcb7a25..114384e99c 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,16 @@ past entries belonging to author(s): Viktor Szakats. */ +2009-12-28 14:56 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/hbide.hbp + * contrib/hbide/hbide.prg + + contrib/hbide/idedocks.prg + + Added new file separating the code building docking widgets. + Another round of reforms, more follows. + + * contrib/hbide/idefindreplace.prg + ! Minor. + 2009-12-28 13:43 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbqt/hbqt_misc.prg % Fixed small omission, thanks Vailton. diff --git a/harbour/contrib/hbide/hbide.hbp b/harbour/contrib/hbide/hbide.hbp index d4ce6fec97..a5bc5b832d 100644 --- a/harbour/contrib/hbide/hbide.hbp +++ b/harbour/contrib/hbide/hbide.hbp @@ -21,4 +21,5 @@ idemisc.prg ideactions.prg ideeditor.prg idefindreplace.prg +idedocks.prg ideparseexpr.c diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index ae90974b90..919ef4e155 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -182,17 +182,11 @@ CLASS HbIde METHOD buildDialog() METHOD buildStatusBar() METHOD executeAction() - METHOD buildProjectTree() - METHOD buildEditorTree() + //METHOD buildProjectTree() + //METHOD buildEditorTree() METHOD manageFuncContext() METHOD manageProjectContext() - METHOD buildFuncList() - METHOD buildBottomArea() - METHOD buildCompileResults() - METHOD buildLinkResults() - METHOD buildOutputResults() - METHOD loadSources() METHOD editSource() METHOD selectSource() @@ -291,10 +285,10 @@ METHOD HbIde:create( cProjIni ) ::oTabWidget := ::oDa:oTabWidget ::qTabWidget := ::oDa:oTabWidget:oWidget - ::buildProjectTree() - ::buildEditorTree() - ::buildFuncList() - ::buildBottomArea() + //::buildProjectTree() + //::buildEditorTree() + + IdeDocks():new():create( Self ) ::qLayout := QGridLayout():new() ::qLayout:setContentsMargins( 0,0,0,0 ) @@ -883,7 +877,7 @@ METHOD HbIde:getCurrentTab() /*----------------------------------------------------------------------*/ // Project Tree /*----------------------------------------------------------------------*/ - +#if 0 METHOD HbIde:buildEditorTree() ::oDockED := XbpWindow():new( ::oDa ) @@ -972,7 +966,7 @@ METHOD HbIde:buildProjectTree() ENDIF RETURN Self - +#endif /*----------------------------------------------------------------------*/ METHOD HbIde:appendProjectInTree( aPrj ) @@ -1230,45 +1224,6 @@ METHOD HbIde:buildDialog() RETURN Self -/*----------------------------------------------------------------------*/ -// Function List -/*----------------------------------------------------------------------*/ - -METHOD HbIde:buildFuncList() - - ::oDockR := XbpWindow():new( ::oDa ) - ::oDockR:oWidget := QDockWidget():new( ::oDlg:oWidget ) - ::oDockR:oWidget:setObjectName( "dockFuncList" ) - ::oDlg:addChild( ::oDockR ) - ::oDockR:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable ) - ::oDockR:oWidget:setAllowedAreas( Qt_RightDockWidgetArea ) - ::oDockR:oWidget:setWindowTitle( "Functions List" ) - ::oDockR:oWidget:setFocusPolicy( Qt_NoFocus ) - - ::oFuncList := XbpListBox():new( ::oDockR ):create( , , { 0,0 }, { 100,400 }, , .t. ) - ::oFuncList:setStyleSheet( GetStyleSheet( "QListView" ) ) - - //::oFuncList:ItemMarked := {|mp1, mp2, oXbp| ::gotoFunction( mp1, mp2, oXbp ) } - ::oFuncList:ItemSelected := {|mp1, mp2, oXbp| ::gotoFunction( mp1, mp2, oXbp ) } - /* Harbour Extension : prefixed with "hb" */ - ::oFuncList:hbContextMenu := {|mp1, mp2, oXbp| ::manageFuncContext( mp1, mp2, oXbp ) } - - ::oFuncList:oWidget:setEditTriggers( QAbstractItemView_NoEditTriggers ) - - ::oDockR:oWidget:setWidget( ::oFuncList:oWidget ) - - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDockR:oWidget, Qt_Vertical ) - - IF ::aIni[ INI_HBIDE, FunctionListVisible ] == "YES" - ::lDockRVisible := .t. - //::setSizeAndPosByIni( ::oDockR:oWidget, FunctionListGeometry ) - ELSE - ::lDockRVisible := .f. - ::oDockR:hide() - ENDIF - - RETURN Self - /*----------------------------------------------------------------------*/ METHOD HbIde:updateFuncList() @@ -1351,87 +1306,6 @@ METHOD HbIde:CreateTags() RETURN ( NIL ) //----------------------------------------------------------------------// -// Dock Widgets -/*----------------------------------------------------------------------*/ - -METHOD HbIde:buildBottomArea() - - ::buildCompileResults() - ::buildLinkResults() - ::buildOutputResults() - - ::oDlg:oWidget:tabifyDockWidget( ::oDockB:oWidget , ::oDockB1:oWidget ) - ::oDlg:oWidget:tabifyDockWidget( ::oDockB1:oWidget, ::oDockB2:oWidget ) - - RETURN Self - -/*----------------------------------------------------------------------*/ - -METHOD HbIde:buildCompileResults() - - ::oDockB := XbpWindow():new( ::oDa ) - ::oDockB:oWidget := QDockWidget():new( ::oDlg:oWidget ) - ::oDockB:oWidget:setObjectName( "dockCompileResults" ) - ::oDlg:addChild( ::oDockB ) - ::oDockB:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) - ::oDockB:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) - ::oDockB:oWidget:setWindowTitle( "Compile Results" ) - ::oDockB:oWidget:setFocusPolicy( Qt_NoFocus ) - - ::oCompileResult := XbpMLE():new( ::oDockB ):create( , , { 0,0 }, { 100,400 }, , .t. ) - ::oDockB:oWidget:setWidget( ::oCompileResult:oWidget ) - - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB:oWidget, Qt_Horizontal ) - ::oDockB:hide() - - RETURN Self - -/*----------------------------------------------------------------------*/ - -METHOD HbIde:buildLinkResults() - - ::oDockB1 := XbpWindow():new( ::oDa ) - ::oDockB1:oWidget := QDockWidget():new( ::oDlg:oWidget ) - ::oDockB1:oWidget:setObjectName( "dockLinkResults" ) - ::oDlg:addChild( ::oDockB1 ) - ::oDockB1:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) - ::oDockB1:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) - ::oDockB1:oWidget:setWindowTitle( "Link Results" ) - ::oDockB1:oWidget:setFocusPolicy( Qt_NoFocus ) - - ::oLinkResult := XbpMLE():new( ::oDockB1 ):create( , , { 0,0 }, { 100, 400 }, , .t. ) - ::oDockB1:oWidget:setWidget( ::oLinkResult:oWidget ) - - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB1:oWidget, Qt_Horizontal ) - ::oDockB1:hide() - - RETURN Self - -/*----------------------------------------------------------------------*/ - -METHOD HbIde:buildOutputResults() - - ::oDockB2 := XbpWindow():new( ::oDa ) - ::oDockB2:oWidget := QDockWidget():new( ::oDlg:oWidget ) - ::oDockB2:oWidget:setObjectName( "dockOutputResults" ) - ::oDlg:addChild( ::oDockB2 ) - ::oDockB2:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) - ::oDockB2:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) - ::oDockB2:oWidget:setWindowTitle( "Output Console" ) - ::oDockB2:oWidget:setFocusPolicy( Qt_NoFocus ) - - ::oOutputResult := XbpMLE():new( ::oDockB2 ):create( , , { 0,0 }, { 100, 400 }, , .t. ) - ::oOutputResult:wordWrap := .f. - //::oOutputResult:dataLink := {|x| IIf( x==NIL, cText, cText := x ) } - - ::oDockB2:oWidget:setWidget( ::oOutputResult:oWidget ) - - ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB2:oWidget, Qt_Horizontal ) - ::oDockB2:hide() - - RETURN Self - -/*----------------------------------------------------------------------*/ // Printing /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg new file mode 100644 index 0000000000..7862f0d347 --- /dev/null +++ b/harbour/contrib/hbide/idedocks.prg @@ -0,0 +1,345 @@ +/* + * $Id$ + */ + +/* + * Harbour Project source code: + * + * Copyright 2009 Pritpal Bedi + * www - http://www.harbour-project.org + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this software; see the file COPYING. If not, write to + * the Free Software Foundation, Inc., 59 Temple Place, Suite 330, + * Boston, MA 02111-1307 USA (or visit the web site http://www.gnu.org/). + * + * As a special exception, the Harbour Project gives permission for + * additional uses of the text contained in its release of Harbour. + * + * The exception is that, if you link the Harbour libraries with other + * files to produce an executable, this does not by itself cause the + * resulting executable to be covered by the GNU General Public License. + * Your use of that executable is in no way restricted on account of + * linking the Harbour library code into it. + * + * This exception does not however invalidate any other reasons why + * the executable file might be covered by the GNU General Public License. + * + * This exception applies only to the code released by the Harbour + * Project under the name Harbour. If you copy code from other + * Harbour Project or Free Software Foundation releases into a copy of + * Harbour, as the General Public License permits, the exception does + * not apply to the code that you add in this way. To avoid misleading + * anyone as to the status of such modified files, you must delete + * this exception notice from them. + * + * If you write modifications of your own for Harbour, it is your choice + * whether to permit this exception to apply to your modifications. + * If you do not wish that, delete this exception notice. + * + */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/* + * EkOnkar + * ( The LORD is ONE ) + * + * Harbour-Qt IDE + * + * Pritpal Bedi + * 28Dec2009 + */ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ +/*----------------------------------------------------------------------*/ + +#include "hbide.ch" +#include "common.ch" +#include "hbclass.ch" +#include "hbqt.ch" + +/*----------------------------------------------------------------------*/ + +CLASS IdeDocks + + DATA oIde + + ACCESS oDlg INLINE ::oIde:oDlg + ACCESS oDA INLINE ::oIde:oDA + + ACCESS oDockPT INLINE ::oIde:oDockPT + ACCESS oProjTree INLINE ::oIde:oProjTree + ACCESS oProjRoot INLINE ::oIde:oProjRoot + ACCESS aProjData INLINE ::oIde:aProjData + ACCESS aProjects INLINE ::oIde:aProjects + + ACCESS oDockED INLINE ::oIde:oDockED + ACCESS oEditTree INLINE ::oIde:oEditTree + ACCESS oOpenedSources INLINE ::oIde:oOpenedSources + + ACCESS oDockR INLINE ::oIde:oDockR + ACCESS oFuncList INLINE ::oIde:oFuncList + + ACCESS oDockB INLINE ::oIde:oDockB + ACCESS oCompileResult INLINE ::oIde:oCompileResult + + ACCESS oDockB1 INLINE ::oIde:oDockB1 + ACCESS oLinkResult INLINE ::oIde:oLinkResult + + ACCESS oDockB2 INLINE ::oIde:oDockB2 + ACCESS oOutputResult INLINE ::oIde:oOutputResult + + METHOD new() + METHOD create() + METHOD destroy() + + METHOD buildProjectTree() + METHOD buildEditorTree() + METHOD buildFuncList() + METHOD buildCompileResults() + METHOD buildLinkResults() + METHOD buildOutputResults() + + ENDCLASS + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:new( oIde ) + + ::oIde := oIde + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:create( oIde ) + + DEFAULT oIde TO ::oIde + + ::oIde := oIde + + ::buildProjectTree() + ::buildEditorTree() + ::buildFuncList() + ::buildCompileResults() + ::buildLinkResults() + ::buildOutputResults() + + ::oDlg:oWidget:tabifyDockWidget( ::oDockB:oWidget , ::oDockB1:oWidget ) + ::oDlg:oWidget:tabifyDockWidget( ::oDockB1:oWidget, ::oDockB2:oWidget ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:destroy() + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildProjectTree() + LOCAL i + + ::oIde:oDockPT := XbpWindow():new( ::oDa ) + ::oDockPT:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockPT:oWidget:setObjectName( "dockProjectTree" ) + ::oDlg:addChild( ::oDockPT ) + ::oDockPT:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable ) + ::oDockPT:oWidget:setAllowedAreas( Qt_LeftDockWidgetArea ) + ::oDockPT:oWidget:setWindowTitle( "Projects" ) + ::oDockPT:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oProjTree := XbpTreeView():new() + ::oProjTree:hasLines := .T. + ::oProjTree:hasButtons := .T. + ::oProjTree:create( ::oDa, , { 0,0 }, { 10,10 }, , .t. ) + ::oProjTree:setStyleSheet( GetStyleSheet( "QTreeWidget" ) ) + + //::oProjTree:itemMarked := {|oItem| ::manageItemSelected( 0, oItem ), ::oCurProjItem := oItem } + ::oProjTree:itemMarked := {|oItem| ::oIde:oCurProjItem := oItem, ::oIde:manageFocusInEditor() } + ::oProjTree:itemSelected := {|oItem| ::oIde:manageItemSelected( oItem ) } + ::oProjTree:hbContextMenu := {|mp1, mp2, oXbp| ::oIde:manageProjectContext( mp1, mp2, oXbp ) } + + ::oIde:oProjRoot := ::oProjTree:rootItem:addItem( "Projects" ) + + aadd( ::aProjData, { ::oProjRoot:addItem( "Executables" ), "Executables", ::oProjRoot, NIL, NIL } ) + aadd( ::aProjData, { ::oProjRoot:addItem( "Libs" ), "Libs" , ::oProjRoot, NIL, NIL } ) + aadd( ::aProjData, { ::oProjRoot:addItem( "Dlls" ), "Dlls" , ::oProjRoot, NIL, NIL } ) + + ::oProjRoot:expand( .t. ) + // + FOR i := 1 TO len( ::aProjects ) + ::oIde:appendProjectInTree( ::aProjects[ i, 3 ] ) + NEXT + + /* Insert Project Tree Into Dock Widget */ + ::oDockPT:oWidget:setWidget( ::oProjTree:oWidget ) + + /* Add dock widget to Main Window */ + ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oDockPT:oWidget, Qt_Vertical ) + + IF ::oIde:aIni[ INI_HBIDE, ProjectTreeVisible ] == "NO" + ::oIde:lProjTreeVisible := .f. + ::oDockPT:hide() + ENDIF + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildEditorTree() + + ::oIde:oDockED := XbpWindow():new( ::oDa ) + ::oDockED:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockED:oWidget:setObjectName( "dockEditorTabs" ) + ::oDlg:addChild( ::oDockED ) + ::oDockED:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable ) + ::oDockED:oWidget:setAllowedAreas( Qt_LeftDockWidgetArea ) + ::oDockED:oWidget:setWindowTitle( "Editor Tabs" ) + ::oDockED:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oEditTree := XbpTreeView():new() + ::oEditTree:hasLines := .T. + ::oEditTree:hasButtons := .T. + ::oEditTree:create( ::oDa, , { 0,0 }, { 10,10 }, , .t. ) + ::oEditTree:setStyleSheet( GetStyleSheet( "QTreeWidget" ) ) + + //::oEditTree:itemMarked := {|oItem| ::manageItemSelected( 0, oItem ), ::oCurProjItem := oItem } + ::oEditTree:itemMarked := {|oItem| ::oIde:oCurProjItem := oItem, ::oIde:manageFocusInEditor() } + ::oEditTree:itemSelected := {|oItem| ::oIde:manageItemSelected( oItem ) } + ::oEditTree:hbContextMenu := {|mp1, mp2, oXbp| ::oIde:manageProjectContext( mp1, mp2, oXbp ) } + + ::oIde:oOpenedSources := ::oEditTree:rootItem:addItem( "Editor" ) + + ::oOpenedSources:expand( .t. ) + + /* Insert Project Tree Into Dock Widget */ + ::oDockED:oWidget:setWidget( ::oEditTree:oWidget ) + + /* Add dock widget to Main Window */ + ::oDlg:oWidget:addDockWidget_1( Qt_LeftDockWidgetArea, ::oDockED:oWidget, Qt_Vertical ) + + IF ::oIde:aIni[ INI_HBIDE, ProjectTreeVisible ] == "NO" + ::oIde:lProjTreeVisible := .f. + ::oDockED:hide() + ENDIF + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildFuncList() + + ::oIde:oDockR := XbpWindow():new( ::oDa ) + ::oDockR:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockR:oWidget:setObjectName( "dockFuncList" ) + ::oDlg:addChild( ::oDockR ) + ::oDockR:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable ) + ::oDockR:oWidget:setAllowedAreas( Qt_RightDockWidgetArea ) + ::oDockR:oWidget:setWindowTitle( "Functions List" ) + ::oDockR:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oFuncList := XbpListBox():new( ::oDockR ):create( , , { 0,0 }, { 100,400 }, , .t. ) + ::oFuncList:setStyleSheet( GetStyleSheet( "QListView" ) ) + + //::oFuncList:ItemMarked := {|mp1, mp2, oXbp| ::gotoFunction( mp1, mp2, oXbp ) } + ::oFuncList:ItemSelected := {|mp1, mp2, oXbp| ::oIde:gotoFunction( mp1, mp2, oXbp ) } + /* Harbour Extension : prefixed with "hb" */ + ::oFuncList:hbContextMenu := {|mp1, mp2, oXbp| ::oIde:manageFuncContext( mp1, mp2, oXbp ) } + + ::oFuncList:oWidget:setEditTriggers( QAbstractItemView_NoEditTriggers ) + + ::oDockR:oWidget:setWidget( ::oFuncList:oWidget ) + + ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDockR:oWidget, Qt_Vertical ) + + IF ::oIde:aIni[ INI_HBIDE, FunctionListVisible ] == "YES" + ::oIde:lDockRVisible := .t. + //::setSizeAndPosByIni( ::oDockR:oWidget, FunctionListGeometry ) + ELSE + ::oIde:lDockRVisible := .f. + ::oDockR:hide() + ENDIF + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildCompileResults() + + ::oIde:oDockB := XbpWindow():new( ::oDa ) + ::oDockB:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockB:oWidget:setObjectName( "dockCompileResults" ) + ::oDlg:addChild( ::oDockB ) + ::oDockB:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) + ::oDockB:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) + ::oDockB:oWidget:setWindowTitle( "Compile Results" ) + ::oDockB:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oCompileResult := XbpMLE():new( ::oDockB ):create( , , { 0,0 }, { 100,400 }, , .t. ) + ::oDockB:oWidget:setWidget( ::oCompileResult:oWidget ) + + ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB:oWidget, Qt_Horizontal ) + ::oDockB:hide() + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildLinkResults() + + ::oIde:oDockB1 := XbpWindow():new( ::oDa ) + ::oDockB1:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockB1:oWidget:setObjectName( "dockLinkResults" ) + ::oDlg:addChild( ::oDockB1 ) + ::oDockB1:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) + ::oDockB1:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) + ::oDockB1:oWidget:setWindowTitle( "Link Results" ) + ::oDockB1:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oLinkResult := XbpMLE():new( ::oDockB1 ):create( , , { 0,0 }, { 100, 400 }, , .t. ) + ::oDockB1:oWidget:setWidget( ::oLinkResult:oWidget ) + + ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB1:oWidget, Qt_Horizontal ) + ::oDockB1:hide() + + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeDocks:buildOutputResults() + + ::oIde:oDockB2 := XbpWindow():new( ::oDa ) + ::oDockB2:oWidget := QDockWidget():new( ::oDlg:oWidget ) + ::oDockB2:oWidget:setObjectName( "dockOutputResults" ) + ::oDlg:addChild( ::oDockB2 ) + ::oDockB2:oWidget:setFeatures( QDockWidget_DockWidgetClosable ) + ::oDockB2:oWidget:setAllowedAreas( Qt_BottomDockWidgetArea ) + ::oDockB2:oWidget:setWindowTitle( "Output Console" ) + ::oDockB2:oWidget:setFocusPolicy( Qt_NoFocus ) + + ::oIde:oOutputResult := XbpMLE():new( ::oDockB2 ):create( , , { 0,0 }, { 100, 400 }, , .t. ) + ::oOutputResult:wordWrap := .f. + //::oOutputResult:dataLink := {|x| IIf( x==NIL, cText, cText := x ) } + + ::oDockB2:oWidget:setWidget( ::oOutputResult:oWidget ) + + ::oDlg:oWidget:addDockWidget_1( Qt_BottomDockWidgetArea, ::oDockB2:oWidget, Qt_Horizontal ) + ::oDockB2:hide() + + RETURN Self + +/*----------------------------------------------------------------------*/ + diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index d42e86833f..82e4119d78 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -58,15 +58,11 @@ * Harbour-Qt IDE * * Pritpal Bedi - * 17Nov2009 + * 28Dec2009 */ /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ /*----------------------------------------------------------------------*/ -/* - * Many thanks to Vailton Renato for adding new functionalities. - */ -/*----------------------------------------------------------------------*/ #include "hbide.ch" #include "common.ch"