From 2fe41e8222b441643cce490911815def87eddc4d Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Thu, 25 Feb 2010 01:12:15 +0000 Subject: [PATCH] 2010-02-24 16:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/resources/docviewgenerator.ui * contrib/hbide/resources/docviewgenerator.uic * contrib/hbide/resources/environments.ui * contrib/hbide/resources/environments.uic * contrib/hbide/resources/finddialog.uic * contrib/hbide/resources/findinfiles.uic * contrib/hbide/resources/findinfilesex.ui * contrib/hbide/resources/findinfilesex.uic * contrib/hbide/resources/findsource.uic * contrib/hbide/resources/mainwindow.uic * contrib/hbide/resources/projectproperties.uic * contrib/hbide/resources/projectpropertiesex.ui * contrib/hbide/resources/projectpropertiesex.uic * contrib/hbide/resources/searchreplace.ui * contrib/hbide/resources/searchreplace.uic * contrib/hbide/resources/searchreplacepanel.ui * contrib/hbide/resources/searchreplacepanel.uic * contrib/hbide/resources/selectionlist.uic * contrib/hbide/resources/selectproject.uic * contrib/hbide/resources/skeletons.ui * contrib/hbide/resources/skeletons.uic * contrib/hbide/resources/themes.uic * contrib/hbide/resources/themesex.ui * contrib/hbide/resources/themesex.uic ! A thourough uniform naming protocol adapted. + contrib/hbide/resources/harbourhelp.png + contrib/hbide/resources/projectstree.png + contrib/hbide/resources/richtext.png + contrib/hbide/resources/syntaxhiliter.png + contrib/hbide/resources/tabs.png * contrib/hbide/resources/blockcomment.png + contrib/hbide/resources/codeskeletons.png * contrib/hbide/resources/dc_function.png + Added more images. * contrib/hbqt/hbqt_hbslots.cpp * contrib/hbqt/hbqt_hbslots.h + Added slots for QDockWidget(). * contrib/hbqt/THbQtUI.prg ! Refined destructor. * contrib/hbide/hbide.prg * contrib/hbide/ideactions.prg * contrib/hbide/idedocks.prg * contrib/hbide/idefindreplace.prg * contrib/hbide/ideharbourhelp.prg * contrib/hbide/idemisc.prg * contrib/hbide/ideobject.prg * contrib/hbide/ideprojmanager.prg * contrib/hbide/idesaveload.prg * contrib/hbide/idethemes.prg + This commit is mainly uplifts and rationlizes the menus, toolbars, and docking widgets plus a big consideration of parent child relationship is achieved. * Implemented: right-side toolbar which contains the toggle icons for docking widgets. The same functionality is available also in main-menu option. * Menu options are reworked and all actions pertaining to docking widgets are removed from there. The same is applied to top-toolbar also. All actions pertaining to block operations are cornered at the left-side toolbar. Thus menus, toolbars are in perfect synchronization. * Harbour-help is now loaded on demand. Only when help icon is toggled on the right-toolbar. * hbIDE icon is changed as I committed before. No one forwarded his opinions, so I assume it is appropriate image. ; NOTE: This commit now presents hbIDE to the external world with almost-profession look and feel, so we can spread the word. ; This commit is with heavy changes so regression is possible. Please speak-out if you find something weired. --- harbour/ChangeLog | 83 +++++++ harbour/contrib/hbide/hbide.prg | 23 +- harbour/contrib/hbide/ideactions.prg | 84 +++---- harbour/contrib/hbide/idedocks.prg | 235 ++++++++++++------ harbour/contrib/hbide/idefindreplace.prg | 25 +- harbour/contrib/hbide/ideharbourhelp.prg | 66 +++-- harbour/contrib/hbide/idemisc.prg | 9 + harbour/contrib/hbide/ideobject.prg | 1 + harbour/contrib/hbide/ideprojmanager.prg | 155 ++++++------ harbour/contrib/hbide/idesaveload.prg | 8 +- harbour/contrib/hbide/idethemes.prg | 19 +- .../contrib/hbide/resources/blockcomment.png | Bin 954 -> 159 bytes .../contrib/hbide/resources/codeskeletons.png | Bin 0 -> 152 bytes .../contrib/hbide/resources/dc_function.png | Bin 156 -> 162 bytes .../hbide/resources/docviewgenerator.ui | 51 ++-- .../hbide/resources/docviewgenerator.uic | 143 +++++------ .../contrib/hbide/resources/environments.ui | 16 +- .../contrib/hbide/resources/environments.uic | 122 ++++----- .../contrib/hbide/resources/finddialog.uic | 4 +- .../contrib/hbide/resources/findinfiles.uic | 4 +- .../contrib/hbide/resources/findinfilesex.ui | 4 +- .../contrib/hbide/resources/findinfilesex.uic | 142 +++++------ .../contrib/hbide/resources/findsource.uic | 4 +- .../contrib/hbide/resources/harbourhelp.png | Bin 0 -> 303 bytes .../contrib/hbide/resources/mainwindow.uic | 4 +- .../hbide/resources/projectproperties.uic | 4 +- .../hbide/resources/projectpropertiesex.ui | 4 +- .../hbide/resources/projectpropertiesex.uic | 118 ++++----- .../contrib/hbide/resources/projectstree.png | Bin 0 -> 244 bytes harbour/contrib/hbide/resources/richtext.png | Bin 0 -> 504 bytes .../contrib/hbide/resources/searchreplace.ui | 4 +- .../contrib/hbide/resources/searchreplace.uic | 62 ++--- .../hbide/resources/searchreplacepanel.ui | 6 +- .../hbide/resources/searchreplacepanel.uic | 80 +++--- .../contrib/hbide/resources/selectionlist.uic | 4 +- .../contrib/hbide/resources/selectproject.uic | 4 +- harbour/contrib/hbide/resources/skeletons.ui | 4 +- harbour/contrib/hbide/resources/skeletons.uic | 66 ++--- .../contrib/hbide/resources/syntaxhiliter.png | Bin 0 -> 262 bytes harbour/contrib/hbide/resources/tabs.png | Bin 0 -> 210 bytes harbour/contrib/hbide/resources/themes.uic | 4 +- harbour/contrib/hbide/resources/themesex.ui | 8 +- harbour/contrib/hbide/resources/themesex.uic | 96 +++---- harbour/contrib/hbqt/THbQtUI.prg | 15 +- harbour/contrib/hbqt/hbqt_hbslots.cpp | 23 +- harbour/contrib/hbqt/hbqt_hbslots.h | 8 +- 46 files changed, 949 insertions(+), 763 deletions(-) create mode 100644 harbour/contrib/hbide/resources/codeskeletons.png create mode 100644 harbour/contrib/hbide/resources/harbourhelp.png create mode 100644 harbour/contrib/hbide/resources/projectstree.png create mode 100644 harbour/contrib/hbide/resources/richtext.png create mode 100644 harbour/contrib/hbide/resources/syntaxhiliter.png create mode 100644 harbour/contrib/hbide/resources/tabs.png diff --git a/harbour/ChangeLog b/harbour/ChangeLog index a8abcf81cd..ceca045926 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,88 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-02-24 16:46 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + + * contrib/hbide/resources/docviewgenerator.ui + * contrib/hbide/resources/docviewgenerator.uic + * contrib/hbide/resources/environments.ui + * contrib/hbide/resources/environments.uic + * contrib/hbide/resources/finddialog.uic + * contrib/hbide/resources/findinfiles.uic + * contrib/hbide/resources/findinfilesex.ui + * contrib/hbide/resources/findinfilesex.uic + * contrib/hbide/resources/findsource.uic + * contrib/hbide/resources/mainwindow.uic + * contrib/hbide/resources/projectproperties.uic + * contrib/hbide/resources/projectpropertiesex.ui + * contrib/hbide/resources/projectpropertiesex.uic + * contrib/hbide/resources/searchreplace.ui + * contrib/hbide/resources/searchreplace.uic + * contrib/hbide/resources/searchreplacepanel.ui + * contrib/hbide/resources/searchreplacepanel.uic + * contrib/hbide/resources/selectionlist.uic + * contrib/hbide/resources/selectproject.uic + * contrib/hbide/resources/skeletons.ui + * contrib/hbide/resources/skeletons.uic + * contrib/hbide/resources/themes.uic + * contrib/hbide/resources/themesex.ui + * contrib/hbide/resources/themesex.uic + ! A thourough uniform naming protocol adapted. + + + contrib/hbide/resources/harbourhelp.png + + contrib/hbide/resources/projectstree.png + + contrib/hbide/resources/richtext.png + + contrib/hbide/resources/syntaxhiliter.png + + contrib/hbide/resources/tabs.png + * contrib/hbide/resources/blockcomment.png + + contrib/hbide/resources/codeskeletons.png + * contrib/hbide/resources/dc_function.png + + Added more images. + + * contrib/hbqt/hbqt_hbslots.cpp + * contrib/hbqt/hbqt_hbslots.h + + Added slots for QDockWidget(). + + * contrib/hbqt/THbQtUI.prg + ! Refined destructor. + + * contrib/hbide/hbide.prg + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + * contrib/hbide/idefindreplace.prg + * contrib/hbide/ideharbourhelp.prg + * contrib/hbide/idemisc.prg + * contrib/hbide/ideobject.prg + * contrib/hbide/ideprojmanager.prg + * contrib/hbide/idesaveload.prg + * contrib/hbide/idethemes.prg + + + This commit is mainly uplifts and rationlizes the menus, + toolbars, and docking widgets plus a big consideration of + parent child relationship is achieved. + + * Implemented: right-side toolbar which contains the toggle + icons for docking widgets. The same functionality is available + also in main-menu option. + + * Menu options are reworked and all actions pertaining to docking + widgets are removed from there. The same is applied to + top-toolbar also. All actions pertaining to block operations + are cornered at the left-side toolbar. Thus menus, toolbars are + in perfect synchronization. + + * Harbour-help is now loaded on demand. Only when help icon is + toggled on the right-toolbar. + + * hbIDE icon is changed as I committed before. No one forwarded + his opinions, so I assume it is appropriate image. + + ; NOTE: This commit now presents hbIDE to the external world + with almost-profession look and feel, so we can spread the word. + + ; This commit is with heavy changes so regression is possible. + Please speak-out if you find something weired. + 2010-02-25 01:50 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * config/wce/global.mk * config/win/global.mk @@ -37,6 +119,7 @@ * ENDTEXT -> #pragma __endtext (Thanks for the hint, Xavi) +>>>>>>> .r13984 2010-02-24 20:04 UTC+0100 Viktor Szakats (harbour.01 syenar.hu) * src/pp/ppcore.c * src/compiler/cmdcheck.c diff --git a/harbour/contrib/hbide/hbide.prg b/harbour/contrib/hbide/hbide.prg index e216ea3ee6..9edb1db287 100644 --- a/harbour/contrib/hbide/hbide.prg +++ b/harbour/contrib/hbide/hbide.prg @@ -167,6 +167,7 @@ CLASS HbIde DATA qTBarSlctns DATA qTBarLines DATA qTBarPanels + DATA qTBarDocks ACCESS oCurEditor INLINE ::oEM:getEditorCurrent() ACCESS qCurEdit INLINE ::oEM:getEditCurrent() @@ -384,8 +385,8 @@ METHOD HbIde:create( cProjIni ) ::oPM:setCurrentProject( ::cWrkProject, .f. ) /* Set components Sizes */ - ::setSizeByIni( ::oProjTree:oWidget, ProjectTreeGeometry ) - ::setSizeByIni( ::oEditTree:oWidget, ProjectTreeGeometry ) + * ::setSizeByIni( ::oProjTree:oWidget, ProjectTreeGeometry ) + * ::setSizeByIni( ::oEditTree:oWidget, ProjectTreeGeometry ) /* Restore Settings */ hbide_restSettings( Self ) @@ -473,12 +474,11 @@ METHOD HbIde:create( cProjIni ) hbide_dbg( " " ) ::oFindInFiles:destroy() - ::oSearchReplace:destroy() ::oFR:destroy() - ::oPM:destroy() ::oEM:destroy() ::oDK:destroy() + * ::oSearchReplace:destroy() ::oDlg:destroy() ::oAC:destroy() @@ -512,8 +512,6 @@ METHOD HbIde:execAction( cKey ) CASE "Properties" CASE "SelectProject" CASE "CloseProject" - CASE "Environments" - ::execProjectAction( cKey ) EXIT CASE "New" CASE "Open" @@ -546,7 +544,6 @@ METHOD HbIde:execAction( cKey ) CASE "BlockSgl2Dbl" CASE "BlockDbl2Sgl" CASE "switchReadOnly" - CASE "Search" CASE "Find" CASE "FindEx" CASE "SetMark" @@ -573,7 +570,7 @@ METHOD HbIde:execAction( cKey ) ::execWindowsAction( cKey ) EXIT CASE "Help" - ::oHelp:show() + ::oHelpDock:show() EXIT ENDSWITCH @@ -651,12 +648,9 @@ METHOD HbIde:execEditorAction( cKey ) EXIT CASE "FindEx" IF !Empty( ::qCurEdit ) - ::oSearchReplace:beginFind() + * ::oSearchReplace:beginFind() ENDIF EXIT - CASE "Search" - ::oFindInFiles:show() - EXIT CASE "SetMark" ::oEM:setMark() EXIT @@ -750,9 +744,6 @@ METHOD HbIde:execSourceAction( cKey ) METHOD HbIde:execProjectAction( cKey ) SWITCH cKey - CASE "Environments" - ::oPM:manageEnvironments() - EXIT CASE "NewProject" ::oPM:loadProperties( , .t., .t., .t. ) EXIT @@ -954,6 +945,7 @@ METHOD HbIde:updateProjectTree( aPrj ) /* Reassign all children nodes */ FOR EACH cPath IN oProject:hPaths oItem := oParent:addItem( cPath:__enumKey() ) + oItem:oWidget:setTooltip( cPath:__enumKey() ) aadd( ::aProjData, { oItem, "Path", oParent, cPath:__enumKey(), oProject:title, oProject } ) NEXT /* Souces */ @@ -964,6 +956,7 @@ METHOD HbIde:updateProjectTree( aPrj ) IF n > 0 oP := ::aProjData[ n, TRE_OITEM ] oItem := oP:addItem( oSource:file + oSource:ext ) + oItem:oWidget:setTooltip( oSource:file + oSource:ext ) aadd( ::aProjData, { oItem, "Source File", oP, oSource:original, oProject:title } ) ENDIF NEXT diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 46a3544037..8aea7becb6 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -295,8 +295,8 @@ METHOD IdeActions:loadActions() aadd( aAct, { "BlockComment" , "Block Comment" , "blockcomment" , "Sh+^/", "No", "Yes" } ) aadd( aAct, { "BlockIndentR" , "Indent Right" , "blockindentr" , "^Tab" , "No", "Yes" } ) aadd( aAct, { "BlockIndentL" , "Indent Left" , "blockindentl" , "Sh+^Tab", "No", "Yes" } ) - aadd( aAct, { "BlockDbl2Sgl" , "Double Quotes to Single" , "blockdbl2sgl" , "" , "No", "Yes" } ) - aadd( aAct, { "BlockSgl2Dbl" , "Single Quotes to Double" , "blocksgl2dbl" , "" , "No", "Yes" } ) + aadd( aAct, { "BlockDbl2Sgl" , "Double Quotes to Single" , "dbl2sglquote" , "" , "No", "Yes" } ) + aadd( aAct, { "BlockSgl2Dbl" , "Single Quotes to Double" , "sgl2dblquote" , "" , "No", "Yes" } ) aadd( aAct, { "DuplicateLine" , "Duplicate Current Line" , "duplicateline" , "^D" , "No", "Yes" } ) aadd( aAct, { "DeleteLine" , "Delete Line" , "deleteline" , "^Delete", "No", "Yes" } ) @@ -324,7 +324,7 @@ METHOD IdeActions:buildToolBar() oTBar:buttonClick := {|oButton| ::oIde:execAction( oButton:key ) } oTBar:addItem( ::getAction( "TB_Exit" ), , , , , , "Exit" ) - oTBar:addItem( ::getAction( "Help" ), , , , , , "Help" ) + * oTBar:addItem( ::getAction( "Help" ), , , , , , "Help" ) oTBar:addItem( , , , , , nSep ) oTBar:addItem( ::getAction( "TB_New" ), , , , , , "New" ) oTBar:addItem( ::getAction( "TB_Open" ), , , , , , "Open" ) @@ -339,10 +339,10 @@ METHOD IdeActions:buildToolBar() oTBar:addItem( ::getAction( "TB_Rebuild" ), , , , , , "Rebuild" ) oTBar:addItem( ::getAction( "TB_RebuildLaunch" ), , , , , , "RebuildLaunch" ) oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "TB_ToggleProjectTree" ), , , , , , "ToggleProjectTree" ) - oTBar:addItem( ::getAction( "TB_ToggleBuildInfo" ), , , , , , "ToggleBuildInfo" ) - oTBar:addItem( ::getAction( "TB_ToggleFuncList" ), , , , , , "ToggleFuncList" ) - oTBar:addItem( , , , , , nSep ) + * oTBar:addItem( ::getAction( "TB_ToggleProjectTree" ), , , , , , "ToggleProjectTree" ) + * oTBar:addItem( ::getAction( "TB_ToggleBuildInfo" ), , , , , , "ToggleBuildInfo" ) + * oTBar:addItem( ::getAction( "TB_ToggleFuncList" ), , , , , , "ToggleFuncList" ) + * oTBar:addItem( , , , , , nSep ) oTBar:addItem( ::getAction( "TB_Undo" ), , , , , , "Undo" ) oTBar:addItem( ::getAction( "TB_Redo" ), , , , , , "Redo" ) oTBar:addItem( , , , , , nSep ) @@ -353,15 +353,15 @@ METHOD IdeActions:buildToolBar() oTBar:addItem( ::getAction( "TB_SelectionMode" ), , , , , , "SelectionMode" ) oTBar:addItem( , , , , , nSep ) oTBar:addItem( ::getAction( "TB_Find" ), , , , , , "Find" ) - oTBar:addItem( ::getAction( "TB_Search" ), , , , , , "Search" ) - oTBar:addItem( , , , , , nSep ) + * oTBar:addItem( ::getAction( "TB_Search" ), , , , , , "Search" ) + * oTBar:addItem( , , , , , nSep ) oTBar:addItem( ::getAction( "TB_SetMark" ), , , , , , "SetMark" ) * oTBar:addItem( ::getAction( "TB_GotoMark" ), , , , , , "GotoMark" ) oTBar:addItem( ::getAction( "TB_Goto" ), , , , , , "Goto" ) - oTBar:addItem( , , , , , nSep ) - oTBar:addItem( ::getAction( "TB_ToUpper" ), , , , , , "ToUpper" ) - oTBar:addItem( ::getAction( "TB_ToLower" ), , , , , , "ToLower" ) - oTBar:addItem( ::getAction( "TB_Invert" ), , , , , , "Invert" ) + * oTBar:addItem( , , , , , nSep ) + * oTBar:addItem( ::getAction( "TB_ToUpper" ), , , , , , "ToUpper" ) + * oTBar:addItem( ::getAction( "TB_ToLower" ), , , , , , "ToLower" ) + * oTBar:addItem( ::getAction( "TB_Invert" ), , , , , , "Invert" ) oTBar:addItem( ::getAction( "TB_MatchPairs" ), , , , , , "MatchPairs" ) oTBar:addItem( , , , , , nSep ) oTBar:addItem( ::getAction( "ZoomIn" ), , , , , , "ZoomIn" ) @@ -479,26 +479,26 @@ METHOD IdeActions:buildMainMenu() oSubMenu:addItem( { ::getAction( "SelectAll" ), {|| oIde:execAction( "SelectAll" ) } } ) hbide_menuAddSep( oSubMenu ) oSubMenu:addItem( { ::getAction( "Find" ), {|| oIde:execAction( "Find" ) } } ) - oSubMenu:addItem( { ::getAction( "FindEx" ), {|| oIde:execAction( "FindEx" ) } } ) - oSubMenu:addItem( { ::getAction( "FindInFiles" ), {|| oIde:execAction( "FindInFiles" ) } } ) + * oSubMenu:addItem( { ::getAction( "FindEx" ), {|| oIde:execAction( "FindEx" ) } } ) oSubMenu:addItem( { ::getAction( "Goto" ), {|| oIde:execAction( "Goto" ) } } ) hbide_menuAddSep( oSubMenu ) // oSubMenu2 := XbpMenu():new( oSubMenu ):create() - oSubMenu2:addItem( { ::getAction( "DuplicateLine" ), {|| oIde:execAction( "DuplicateLine" ) } } ) - oSubMenu2:addItem( { ::getAction( "DeleteLine" ), {|| oIde:execAction( "DeleteLine" ) } } ) - oSubMenu2:addItem( { ::getAction( "MoveLineUp" ), {|| oIde:execAction( "MoveLineUp" ) } } ) - oSubMenu2:addItem( { ::getAction( "MoveLineDown" ), {|| oIde:execAction( "MoveLineDown" ) } } ) + oSubMenu2:addItem( { ::getAction( "DuplicateLine" ), {|| oIde:execAction( "DuplicateLine" ) } } ) + oSubMenu2:addItem( { ::getAction( "DeleteLine" ), {|| oIde:execAction( "DeleteLine" ) } } ) + oSubMenu2:addItem( { ::getAction( "MoveLineUp" ), {|| oIde:execAction( "MoveLineUp" ) } } ) + oSubMenu2:addItem( { ::getAction( "MoveLineDown" ), {|| oIde:execAction( "MoveLineDown" ) } } ) oMenuBar:addItem( { oSubMenu2, _T( "~Line..." ) } ) // oSubMenu2 := XbpMenu():new( oSubMenu ):create() - oSubMenu2:addItem( { ::getAction( "StreamComment" ), {|| oIde:execAction( "StreamComment" ) } } ) - oSubMenu2:addItem( { ::getAction( "BlockComment" ), {|| oIde:execAction( "BlockComment" ) } } ) - oSubMenu2:addItem( { ::getAction( "BlockIndentR" ), {|| oIde:execAction( "BlockIndentR" ) } } ) - oSubMenu2:addItem( { ::getAction( "BlockIndentL" ), {|| oIde:execAction( "BlockIndentL" ) } } ) + oSubMenu2:addItem( { ::getAction( "StreamComment" ), {|| oIde:execAction( "StreamComment" ) } } ) + oSubMenu2:addItem( { ::getAction( "BlockComment" ), {|| oIde:execAction( "BlockComment" ) } } ) hbide_menuAddSep( oSubMenu2 ) - oSubMenu2:addItem( { ::getAction( "BlockSgl2Dbl" ), {|| oIde:execAction( "BlockSgl2Dbl" ) } } ) - oSubMenu2:addItem( { ::getAction( "BlockDbl2Sgl" ), {|| oIde:execAction( "BlockDbl2Sgl" ) } } ) + oSubMenu2:addItem( { ::getAction( "BlockIndentR" ), {|| oIde:execAction( "BlockIndentR" ) } } ) + oSubMenu2:addItem( { ::getAction( "BlockIndentL" ), {|| oIde:execAction( "BlockIndentL" ) } } ) + hbide_menuAddSep( oSubMenu2 ) + oSubMenu2:addItem( { ::getAction( "BlockSgl2Dbl" ), {|| oIde:execAction( "BlockSgl2Dbl" ) } } ) + oSubMenu2:addItem( { ::getAction( "BlockDbl2Sgl" ), {|| oIde:execAction( "BlockDbl2Sgl" ) } } ) oMenuBar:addItem( { oSubMenu2, _T( "~Block..." ) } ) hbide_menuAddSep( oSubMenu ) @@ -535,8 +535,6 @@ METHOD IdeActions:buildMainMenu() hbide_menuAddSep( oSubMenu ) oSubMenu:addItem( { ::getAction( "SelectProject" ), {|| oIde:execAction( "SelectProject" ) } } ) oSubMenu:addItem( { ::getAction( "CloseProject" ), {|| oIde:execAction( "CloseProject" ) } } ) - hbide_menuAddSep( oSubMenu ) - oSubMenu:addItem( { ::getAction( "Environments" ), {|| oIde:execAction( "Environments" ) } } ) oMenuBar:addItem( { oSubMenu, NIL } ) /*----------------------------------------------------------------------------*/ @@ -574,15 +572,12 @@ METHOD IdeActions:buildMainMenu() /*----------------------------------------------------------------------------*/ oSubMenu := XbpMenu():new( oMenuBar ):create() oSubMenu:title := "~Setup" - oSubMenu:addItem( { ::getAction( "ManageThemes" ), {|| oIde:oThemes:fetch() } } ) oSubMenu:addItem( { ::getAction( "DefaultTheme" ), {|| oIde:oThemes:setWrkTheme() } } ) hbide_menuAddSep( oSubMenu ) oSubMenu2 := hbide_buildCodecMenu( oIde, oSubMenu ) oSubMenu2:title := "~Codecs" oSubMenu:addItem( { oSubMenu2, NIL } ) - hbide_menuAddSep( oSubMenu ) oMenuBar:addItem( { oSubMenu, NIL } ) - oSubMenu:oWidget:addAction_4( ::oSkeltnDock:oWidget:toggleViewAction() ) /*----------------------------------------------------------------------------*/ /* Docks */ @@ -590,23 +585,22 @@ METHOD IdeActions:buildMainMenu() oSubMenu := XbpMenu():new( oMenuBar ):create() oSubMenu:title := "~Docks" oMenuBar:addItem( { oSubMenu, NIL } ) - - oSubMenu:oWidget:addAction_4( ::oDockED:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDockPT:oWidget:toggleViewAction() ) - - oSubMenu:oWidget:addAction_4( ::oFuncDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oHelpDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oSkeltnDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oThemesDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oEnvironDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oHelpDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oDocViewDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addSeparator() + oSubMenu:oWidget:addAction_4( ::oDockPT:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oDockED:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addSeparator() + oSubMenu:oWidget:addAction_4( ::oFuncDock:oWidget:toggleViewAction() ) oSubMenu:oWidget:addAction_4( ::oPropertiesDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFindDock:oWidget:toggleViewAction() ) - + oSubMenu:oWidget:addAction_4( ::oEnvironDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oSkeltnDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oThemesDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oFindDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addSeparator() oSubMenu:oWidget:addAction_4( ::oDockB2:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDockB1:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDockB:oWidget:toggleViewAction() ) - - oSubMenu:oWidget:addAction_4( ::oDocViewDock:oWidget:toggleViewAction() ) + * oSubMenu:oWidget:addAction_4( ::oDockB1:oWidget:toggleViewAction() ) + * oSubMenu:oWidget:addAction_4( ::oDockB:oWidget:toggleViewAction() ) /*----------------------------------------------------------------------------*/ /* Help */ diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 7744823767..d283230eac 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -72,11 +72,20 @@ /*----------------------------------------------------------------------*/ +#define docEnvironments_visibilityChanged 301 +#define dockFindInFiles_visibilityChanged 302 +#define dockThemes_visibilityChanged 303 +#define dockProperties_visibilityChanged 304 +#define dockDocViewer_visibilityChanged 305 + +/*----------------------------------------------------------------------*/ + CLASS IdeDocks INHERIT IdeObject DATA nPass INIT 0 DATA aPanels INIT {} DATA aBtnLines INIT {} + DATA aBtnDocks INIT {} DATA oBtnTabClose METHOD new( oIde ) @@ -152,12 +161,14 @@ METHOD IdeDocks:destroy() oUI:destroy() - /* Initiate more destructors */ - FOR EACH qTBtn IN ::aPanels ::disconnect( qTBtn, "clicked()" ) qTBtn := NIL NEXT + FOR EACH qTBtn IN ::aBtnLines + ::disconnect( qTBtn, "clicked()" ) + qTBtn := NIL + NEXT RETURN Self @@ -190,8 +201,6 @@ METHOD IdeDocks:getADockWidget( nArea, cObjectName, cWindowTitle, nFlags ) METHOD IdeDocks:buildDockWidgets() - ::buildToolBarPanels() - ::buildProjectTree() ::buildEditorTree() @@ -209,8 +218,8 @@ METHOD IdeDocks:getADockWidget( nArea, cObjectName, cWindowTitle, nFlags ) ::buildOutputResults() ::buildDocViewer() - ::oDlg:oWidget:tabifyDockWidget( ::oDockB:oWidget , ::oDockB1:oWidget ) - ::oDlg:oWidget:tabifyDockWidget( ::oDockB1:oWidget, ::oDockB2:oWidget ) + ::oDlg:oWidget:tabifyDockWidget( ::oDockB:oWidget , ::oDockB1:oWidget ) + ::oDlg:oWidget:tabifyDockWidget( ::oDockB1:oWidget , ::oDockB2:oWidget ) ::oDlg:oWidget:tabifyDockWidget( ::oHelpDock:oWidget , ::oSkeltnDock:oWidget ) ::oDlg:oWidget:tabifyDockWidget( ::oSkeltnDock:oWidget , ::oFindDock:oWidget ) @@ -219,6 +228,8 @@ METHOD IdeDocks:getADockWidget( nArea, cObjectName, cWindowTitle, nFlags ) ::oDlg:oWidget:tabifyDockWidget( ::oPropertiesDock:oWidget, ::oEnvironDock:oWidget ) ::oDlg:oWidget:tabifyDockWidget( ::oEnvironDock:oWidget , ::oFuncDock:oWidget ) + ::buildToolBarPanels() + RETURN Self /*----------------------------------------------------------------------*/ @@ -257,6 +268,32 @@ METHOD IdeDocks:execEvent( nMode, p ) aadd( aMenu, { "Copy" , {|| ::qHelpBrw:copy() } } ) hbide_execPopup( aMenu, p, ::qHelpBrw ) + + CASE nMode == dockDocViewer_visibilityChanged + IF p + ::oDocViewDock:qtObject:show() + ENDIF + + CASE nMode == dockProperties_visibilityChanged + IF p + ::oPM:fetchProperties() + ENDIF + + CASE nMode == docEnvironments_visibilityChanged + IF p + ::oPM:manageEnvironments() + ENDIF + + CASE nMode == dockFindInFiles_visibilityChanged + IF p + ::oFindInFiles:show() + ENDIF + + CASE nMode == dockThemes_visibilityChanged + IF p + ::oThemes:show() + ENDIF + ENDCASE RETURN Self @@ -264,10 +301,10 @@ METHOD IdeDocks:execEvent( nMode, p ) /*----------------------------------------------------------------------*/ METHOD IdeDocks:buildDialog() - LOCAL s + LOCAL s, aSize ::oIde:oDlg := XbpDialog():new() - ::oDlg:icon := ::resPath + "vr.png" + ::oDlg:icon := ::resPath + "hbide.png" // "vr.png" ::oDlg:title := "Harbour IDE" ::oDlg:qtObject := HbQtUI():new( ::resPath + "mainwindow.uic" ):build() ::oDlg:create( , , , , , .f. ) @@ -279,11 +316,17 @@ METHOD IdeDocks:buildDialog() ::oDlg:oWidget:setTabPosition( Qt_BottomDockWidgetArea, QTabWidget_South ) ::oDlg:oWidget:setCorner( Qt_BottomLeftCorner, Qt_LeftDockWidgetArea ) ::oDlg:oWidget:setCorner( Qt_BottomRightCorner, Qt_RightDockWidgetArea ) + ::oDlg:oWidget:resize( 850,430 ) ::oIde:oDa := ::oDlg:drawingArea SetAppWindow( ::oDlg ) + // Center on Desktop and decorate + aSize := AppDesktop():currentSize() + ::oDlg:setPos( { ( aSize[ 1 ] - ::oDlg:currentSize()[ 1 ] ) / 2, ; + ( aSize[ 2 ] - ::oDlg:currentSize()[ 2 ] ) / 2 } ) + ::oIde:setPosAndSizeByIni( ::oDlg:oWidget, MainWindowGeometry ) ::oDlg:Show() @@ -300,8 +343,8 @@ METHOD IdeDocks:buildDialog() ::buildStackedWidget() ::qLayout:addWidget_1( ::oStackedWidget:oWidget, 0, 0, 1, 1 ) - ::buildSearchReplaceWidget() - ::qLayout:addWidget_1( ::oSearchReplace:oUI, 1, 0, 1, 1 ) +// ::buildSearchReplaceWidget() //////////////////////////////////// +// ::qLayout:addWidget_1( ::oSearchReplace:oUI, 1, 0, 1, 1 ) /* View Panels */ ::buildViewWidget() /* Main */ @@ -418,55 +461,31 @@ METHOD IdeDocks:disblePanelButton( qTBtn ) /*----------------------------------------------------------------------*/ METHOD IdeDocks:addPanelButton( cPanel ) - LOCAL qTBtn, aColors, nIndex - - #if 0 /* Royal Blue */ - aColors := { ; - "#000073" , ; - "#000080" , ; - "#19198D" , ; - "#333399" , ; - "#4D4DA6" , ; - "#6666B3" , ; - "#8080C0" , ; - "#9999CC" , ; - "#B2B2D9" , ; - "#CCCCE6" , ; - "#E6E6F2" ; - } - #endif - #if 0 /* Turquish */ - aColors := { ; - "#009999" , ; - "#19A3A3" , ; - "#33ADAD" , ; - "#4DB8B8" , ; - "#66C2C2" , ; - "#80CCCC" , ; - "#99D6D6" , ; - "#B2E0E0" , ; - "#CCEBEB" , ; - "#E6F5F5" ; - } - #endif - - aColors := { "#996633", "#A37547", "#AD855C", "#B89470", "#C2A385", "#CCB299", "#D6C2AD", "#E0D1C2", "#EBE0D6", "#F5F0EB" } + LOCAL qTBtn, aColors, nIndex, cColor + * aColors := { "#996633", "#A37547", "#AD855C", "#B89470", "#C2A385", "#CCB299", "#D6C2AD", "#E0D1C2", "#EBE0D6", "#F5F0EB" } + aColors := { "#98FB98","#20B2AA","#6B8E23","#9ACD32","#FFFF00","#FF00FF","#FFA500","#4169E1","#00FF7F","#FFFF00" } IF cPanel == "Main" - nIndex := 0 + nIndex := 1 + cColor := "#008000" ELSE - nIndex := len( ::aPanels ) - 1 + nIndex := len( ::aPanels ) + IF nIndex > len( aColors ) + nIndex := nIndex - len( aColors ) + ENDIF + cColor := aColors[ nIndex ] ENDIF qTBtn := QToolButton():new() qTBtn:setMaximumHeight( 12 ) qTBtn:setMaximumWidth( 18 ) qTBtn:setTooltip( "Panel: " + cPanel ) - qTBtn:setStyleSheet( "background-color: " + aColors[ nIndex + 1 ] + " ;" ) + qTBtn:setStyleSheet( "background-color: " + cColor + " ;" ) ::connect( qTBtn, "clicked()", {|| ::disblePanelButton( qTBtn ), ::setView( cPanel ) } ) ::qTBarPanels:addWidget( qTBtn ) + ::qTBarPanels:addSeparator() aadd( ::aPanels, qTBtn ) @@ -475,10 +494,14 @@ METHOD IdeDocks:addPanelButton( cPanel ) /*----------------------------------------------------------------------*/ METHOD IdeDocks:buildToolBarPanels() - LOCAL s, qSize, qTBtn, a_, aBtns + LOCAL s, qTBtn, a_, aBtns, qAct + + STATIC qSize qSize := QSize():new( 20,20 ) + /* Toolbar Panels */ + ::oIde:qTBarPanels := QToolBar():new() ::qTBarPanels:setObjectName( "ToolBar_Panels" ) ::qTBarPanels:setAllowedAreas( Qt_LeftToolBarArea ) @@ -496,7 +519,6 @@ METHOD IdeDocks:buildToolBarPanels() NEXT /* Toolbar Line Actions */ - //::oDlg:oWidget:addToolBarBreak( Qt_LeftToolBarArea ) ::oIde:qTBarLines := QToolBar():new() ::qTBarLines:setObjectName( "ToolBar_Lines" ) @@ -523,27 +545,79 @@ METHOD IdeDocks:buildToolBarPanels() ::qTBarLines:addWidget( qTBtn ) aadd( ::aBtnLines, qTBtn ) NEXT - ::qTBarLines:addSeparator() aBtns := {} + aadd( aBtns, { "toupper" , "To Upper" , {|| ::oEM:convertSelection( "ToUpper" ) } } ) + aadd( aBtns, { "tolower" , "To Lower" , {|| ::oEM:convertSelection( "ToLower" ) } } ) + aadd( aBtns, { "invertcase" , "Invert Case" , {|| ::oEM:convertSelection( "Invert" ) } } ) + aadd( aBtns, {} ) aadd( aBtns, { "blockcomment" , "Block Comment" , {|| ::oEM:blockComment() } } ) aadd( aBtns, { "streamcomment" , "Stream Comment" , {|| ::oEM:streamComment() } } ) + aadd( aBtns, {} ) aadd( aBtns, { "blockindentr" , "Indent Right" , {|| ::oEM:indent( 1 ) } } ) aadd( aBtns, { "blockindentl" , "Indent Left" , {|| ::oEM:indent( -1 ) } } ) + aadd( aBtns, {} ) aadd( aBtns, { "sgl2dblquote" , "Single to Double Quotes", {|| ::oEM:convertDQuotes() } } ) aadd( aBtns, { "dbl2sglquote" , "Double to Single Quotes", {|| ::oEM:convertQuotes() } } ) + aadd( aBtns, {} ) FOR EACH a_ IN aBtns - qTBtn := QToolButton():new() - qTBtn:setTooltip( a_[ 2 ] ) - qTBtn:setIcon( ::resPath + a_[ 1 ] + ".png" ) - qTBtn:setMaximumWidth( 20 ) - qTBtn:setMaximumHeight( 20 ) - ::connect( qTBtn, "clicked()", a_[ 3 ] ) - ::qTBarLines:addWidget( qTBtn ) - aadd( ::aBtnLines, qTBtn ) + IF empty( a_ ) + ::qTBarLines:addSeparator() + ELSE + qTBtn := QToolButton():new() + qTBtn:setTooltip( a_[ 2 ] ) + qTBtn:setIcon( ::resPath + a_[ 1 ] + ".png" ) + qTBtn:setMaximumWidth( 20 ) + qTBtn:setMaximumHeight( 20 ) + ::connect( qTBtn, "clicked()", a_[ 3 ] ) + ::qTBarLines:addWidget( qTBtn ) + aadd( ::aBtnLines, qTBtn ) + ENDIF NEXT + /* Right-hand docks toolbar */ + ::oIde:qTBarDocks := QToolBar():new() + ::qTBarDocks:setObjectName( "ToolBar_Docks" ) + ::qTBarDocks:setAllowedAreas( Qt_RightToolBarArea ) + ::qTBarDocks:setOrientation( Qt_Vertical ) + ::qTBarDocks:setIconSize( QSize():new( 16,16 ) ) + ::qTBarDocks:setMovable( .f. ) + ::qTBarDocks:setFloatable( .f. ) + ::qTBarDocks:setStyleSheet( "QToolBar { spacing: 1px; color: white; margin-top: 2px; }" ) + ::qTBarDocks:setToolButtonStyle( Qt_ToolButtonIconOnly ) + + aBtns := {} + aadd( aBtns, { ::oHelpDock , "help" } ) + aadd( aBtns, { ::oDocViewDock , "harbourhelp" } ) + aadd( aBtns, {} ) + aadd( aBtns, { ::oDockPT , "projectstree" } ) + aadd( aBtns, { ::oDockED , "tabs" } ) + aadd( aBtns, {} ) + aadd( aBtns, { ::oFuncDock , "dc_function" } ) + aadd( aBtns, { ::oPropertiesDock, "properties" } ) + aadd( aBtns, { ::oEnvironDock , "envconfig" } ) + aadd( aBtns, { ::oSkeltnDock , "codeskeletons" } ) + aadd( aBtns, { ::oThemesDock , "syntaxhiliter" } ) + aadd( aBtns, { ::oFindDock , "search" } ) + aadd( aBtns, {} ) + aadd( aBtns, { ::oDockB2 , "builderror" } ) + * aadd( aBtns, { ::oDockB1 , "builderror" } ) + * aadd( aBtns, { ::oDockB , "builderror" } ) + + FOR EACH a_ IN aBtns + IF empty( a_ ) + ::qTBarDocks:addSeparator() + ELSE + qAct := QAction():from( a_[ 1 ]:oWidget:toggleViewAction() ) + qAct:setIcon( hbide_image( a_[ 2 ] ) ) + ::qTBarDocks:addAction( qAct ) + aadd( ::aBtnDocks, qAct ) + ENDIF + NEXT + + ::oDlg:oWidget:addToolBar( Qt_RightToolBarArea, ::qTBarDocks ) + RETURN Self /*----------------------------------------------------------------------*/ @@ -557,15 +631,17 @@ METHOD IdeDocks:buildProjectTree() ::oDlg:addChild( ::oDockPT ) ::oDockPT:oWidget:setFeatures( QDockWidget_DockWidgetClosable + QDockWidget_DockWidgetMovable ) ::oDockPT:oWidget:setAllowedAreas( Qt_LeftDockWidgetArea ) - ::oDockPT:oWidget:setWindowTitle( "Projects" ) + ::oDockPT:oWidget:setWindowTitle( "Projects Tree" ) ::oDockPT:oWidget:setFocusPolicy( Qt_NoFocus ) ::oIde:oProjTree := XbpTreeView():new() ::oProjTree:hasLines := .T. ::oProjTree:hasButtons := .T. - ::oProjTree:create( ::oDockPT, , { 0,0 }, { 10,10 }, , .t. ) + ::oProjTree:create( ::oDockPT, , { 0,0 }, { 100,10 }, , .t. ) ::oProjTree:setStyleSheet( GetStyleSheet( "QTreeWidgetHB" ) ) + ::oProjTree:oWidget:setMinimumWidth( 100 ) + ::oProjTree:oWidget:setSizePolicy_1( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) * ::oProjTree:itemMarked := {|oItem| ::manageItemSelected( 0, oItem ), ::oCurProjItem := oItem } ::oProjTree:itemMarked := {|oItem| ::oIde:oCurProjItem := oItem, ::oIde:manageFocusInEditor() } @@ -613,7 +689,10 @@ METHOD IdeDocks:buildEditorTree() ::oIde:oEditTree := XbpTreeView():new() ::oEditTree:hasLines := .T. ::oEditTree:hasButtons := .T. - ::oEditTree:create( ::oDockED, , { 0,0 }, { 10,10 }, , .t. ) + ::oEditTree:create( ::oDockED, , { 0,0 }, { 100,10 }, , .t. ) + + ::oEditTree:oWidget:setSizePolicy_1( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) + ::oEditTree:oWidget:setMinimumWidth( 100 ) //::oEditTree:itemMarked := {|oItem| ::manageItemSelected( 0, oItem ), ::oCurProjItem := oItem } ::oEditTree:itemMarked := {|oItem| ::oIde:oCurProjItem := oItem, ::oIde:manageFocusInEditor() } @@ -811,6 +890,8 @@ METHOD IdeDocks:buildThemesDock() ::oIde:oThemesDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockThemes", "Editor Themes", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oThemesDock:oWidget, Qt_Horizontal ) + ::connect( ::oThemesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( dockThemes_visibilityChanged, p ) } ) + RETURN Self /*----------------------------------------------------------------------*/ @@ -820,14 +901,7 @@ METHOD IdeDocks:buildPropertiesDock() ::oIde:oPropertiesDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockProperties", "Project Properties", QDockWidget_DockWidgetFloatable ) ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oPropertiesDock:oWidget, Qt_Horizontal ) - RETURN Self - -/*----------------------------------------------------------------------*/ - -METHOD IdeDocks:buildEnvironDock() - - ::oIde:oEnvironDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockEnvironments", "Compiler Environments", QDockWidget_DockWidgetFloatable ) - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oEnvironDock:oWidget, Qt_Horizontal ) + ::connect( ::oPropertiesDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( dockProperties_visibilityChanged, p ) } ) RETURN Self @@ -838,19 +912,20 @@ METHOD IdeDocks:buildFindInFiles() ::oIde:oFindDock := ::getADockWidget( Qt_RightDockWidgetArea, "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 ) } ) + RETURN Self /*----------------------------------------------------------------------*/ METHOD IdeDocks:buildDocViewer() - ::oIde:oDocViewDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockDocViewer", "Document Viewer", QDockWidget_DockWidgetFloatable ) + ::oIde:oDocViewDock := ::getADockWidget( Qt_RightDockWidgetArea, "dockDocViewer", "Harbour Documentation", QDockWidget_DockWidgetFloatable ) + ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocViewDock:oWidget, Qt_Horizontal ) ::oDocViewDock:qtObject := ideHarbourHelp():new():create( ::oIde ) - ::oDocViewDock:oWidget:setWidget( ::oDocViewDock:qtObject:oUI ) - - ::oDlg:oWidget:addDockWidget_1( Qt_RightDockWidgetArea, ::oDocViewDock:oWidget, Qt_Horizontal ) + ::connect( ::oDocViewDock:oWidget, "visibilityChanged(bool)", {|p| ::execEvent( dockDocViewer_visibilityChanged, p ) } ) RETURN Self @@ -977,16 +1052,16 @@ METHOD IdeDocks:setStatusText( nPart, xValue ) oPanel:caption := "Find: " + xValue EXIT CASE SB_PNL_CODEC - oPanel:caption := "Codec: " + xValue + "" + oPanel:caption := "Codec: " + xValue + "" EXIT CASE SB_PNL_ENVIRON oPanel:caption := "Env: " + xValue + "" EXIT CASE SB_PNL_VIEW - oPanel:caption := "View: " + xValue + "" + oPanel:caption := "View: " + xValue + "" EXIT CASE SB_PNL_PROJECT - oPanel:caption := "Proj: " + xValue + "" + oPanel:caption := "Proj: " + xValue + "" EXIT ENDSWITCH @@ -1062,3 +1137,13 @@ METHOD IdeDocks:toggleBottomDocks() /*----------------------------------------------------------------------*/ +METHOD IdeDocks:buildEnvironDock() + + ::oIde:oEnvironDock := ::getADockWidget( Qt_RightDockWidgetArea, "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 ) } ) + + RETURN Self + +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/idefindreplace.prg b/harbour/contrib/hbide/idefindreplace.prg index fa3591972f..dbfcc9b8eb 100644 --- a/harbour/contrib/hbide/idefindreplace.prg +++ b/harbour/contrib/hbide/idefindreplace.prg @@ -73,6 +73,7 @@ CLASS IdeSearchReplace INHERIT IdeObject + DATA oXbp DATA qFindLineEdit DATA qReplLineEdit DATA nCurDirection INIT 0 @@ -104,8 +105,17 @@ METHOD IdeSearchReplace:create( oIde ) ::oIde := oIde - //::oUI := HbQtUI():new( ::oIde:resPath + "searchreplacepanel.uic", ::oIde:oDlg:oWidget ):build() + + #if 0 ::oUI := HbQtUI():new( ::oIde:resPath + "searchreplace.uic", ::oIde:oDlg:oWidget ):build() + ::oXbp := XbpWindow():new() + ::oXbp:oWidget := ::oUI:oWidget + ::oDlg:addChild( ::oXbp ) + ::oXbp:qtObject := ::oUI + #else + ::oUI := HbQtUI():new( ::oIde:resPath + "searchreplace.uic", ::oIde:oDlg:oWidget ):build() + #endif + ::oUI:setFocusPolicy( Qt_StrongFocus ) ::oUI:q_frameFind:setStyleSheet( "" ) @@ -141,7 +151,7 @@ METHOD IdeSearchReplace:create( oIde ) ::oUI:q_checkReplace:setEnabled( .f. ) ::oUI:q_frameReplace:hide() - +hbide_dbg("========================================================================IdeSearchReplace:create()" ) RETURN Self /*----------------------------------------------------------------------*/ @@ -149,8 +159,11 @@ METHOD IdeSearchReplace:create( oIde ) METHOD IdeSearchReplace:destroy() ::disconnect( ::qFindLineEdit, "textChanged(QString)" ) + ::disconnect( ::qFindLineEdit, "returnPressed()" ) - ::oUI:destroy() + IF hb_isObject( ::oUI ) + ::oUI:destroy() + ENDIF RETURN Self @@ -609,7 +622,7 @@ METHOD IdeFindInFiles:buildUI() ::oUI := HbQtUI():new( ::oIde:resPath + "findinfilesex.uic", ::oFindDock:oWidget ):build() ::oUI:hide() -hbide_dbg( "-------------------------", 0 ) + ::oFindDock:qtObject := ::oUI ::oFindDock:oWidget:setWidget( ::oUI ) @@ -639,7 +652,7 @@ hbide_dbg( "-------------------------", 0 ) ::oUI:q_checkListOnly:setChecked( .t. ) ::oUI:q_checkPrg:setChecked( .t. ) - ::oIde:setPosAndSizeByIni( ::oUI:oWidget, FindInFilesDialogGeometry ) + * ::oIde:setPosAndSizeByIni( ::oUI:oWidget, FindInFilesDialogGeometry ) qLineEdit := QLineEdit():configure( ::oUI:q_comboExpr:lineEdit() ) IF !empty( ::oEM ) @@ -884,7 +897,6 @@ METHOD IdeFindInFiles:show() IF empty( ::oUI ) ::buildUI() ENDIF - ::oFindDock:show() RETURN Self @@ -1328,4 +1340,3 @@ STATIC FUNCTION hbide_isSourceOfType( cSource, aFilter ) RETURN ascan( aFilter, {|e| cExt $ e } ) > 0 /*----------------------------------------------------------------------*/ - diff --git a/harbour/contrib/hbide/ideharbourhelp.prg b/harbour/contrib/hbide/ideharbourhelp.prg index 2ff8efe973..82d6cb89d6 100644 --- a/harbour/contrib/hbide/ideharbourhelp.prg +++ b/harbour/contrib/hbide/ideharbourhelp.prg @@ -164,6 +164,7 @@ CLASS IdeHarbourHelp INHERIT IdeObject METHOD new( oIde ) METHOD create( oIde ) + METHOD show() METHOD destroy() METHOD execEvent( nMode, p, p1 ) @@ -204,17 +205,26 @@ METHOD IdeHarbourHelp:create( oIde ) DEFAULT oIde TO ::oIde ::oIde := oIde - ::oUI := HbQtUI():new( ::resPath + "docviewgenerator.uic", ::oDlg:oWidget ):build() + RETURN Self - ::setImages() - ::setTooltips() - ::installSignals() - ::setParameters() +/*----------------------------------------------------------------------*/ - ::populateRootInfo() +METHOD IdeHarbourHelp:show() - /* Should it be here */ - ::refreshDocTree() + IF empty( ::oUI ) + ::oUI := HbQtUI():new( ::resPath + "docviewgenerator.uic", ::oDlg:oWidget ):build() + + ::oDocViewDock:oWidget:setWidget( ::oUI ) + + ::setImages() + ::setTooltips() + ::installSignals() + ::setParameters() + + ::populateRootInfo() + + ::refreshDocTree() + ENDIF RETURN Self @@ -223,6 +233,10 @@ METHOD IdeHarbourHelp:create( oIde ) METHOD IdeHarbourHelp:destroy() LOCAL a_ + IF empty( ::oUI ) + RETURN Self + ENDIF + ::disconnect( ::oUI:q_treeDoc, "itemSelectionChanged()" ) ::disconnect( ::oUI:q_treeCategory, "itemSelectionChanged()" ) @@ -255,8 +269,10 @@ METHOD IdeHarbourHelp:destroy() a_[ 1 ] := NIL ; a_[ 3 ] := NIL ENDIF NEXT - ::aNodes[ 1, 1 ] := NIL - ::aNodes := NIL + IF !empty( ::aNodes ) + ::aNodes[ 1, 1 ] := NIL + ENDIF + ::aNodes := NIL /* Index Tab */ FOR EACH a_ IN ::aFunctions @@ -287,23 +303,23 @@ METHOD IdeHarbourHelp:destroy() METHOD IdeHarbourHelp:setImages() LOCAL oUI := ::oUI - oUI:q_buttonHome:setIcon( ::resPath + "dc_home.png" ) - oUI:q_buttonBackward:setIcon( ::resPath + "dc_left.png" ) - oUI:q_buttonForward:setIcon( ::resPath + "dc_right.png" ) - oUI:q_buttonUp:setIcon( ::resPath + "dc_up.png" ) - oUI:q_buttonRefresh:setIcon( ::resPath + "dc_refresh.png" ) - oUI:q_buttonPrint:setIcon( ::resPath + "dc_print.png" ) - oUI:q_buttonPdf:setIcon( ::resPath + "dc_pdffile.png" ) + oUI:q_buttonHome:setIcon( hbide_image( "dc_home" ) ) + oUI:q_buttonBackward:setIcon( hbide_image( "dc_left" ) ) + oUI:q_buttonForward:setIcon( hbide_image( "dc_right" ) ) + oUI:q_buttonUp:setIcon( hbide_image( "dc_up" ) ) + oUI:q_buttonRefresh:setIcon( hbide_image( "dc_refresh" ) ) + oUI:q_buttonPrint:setIcon( hbide_image( "dc_print" ) ) + oUI:q_buttonPdf:setIcon( hbide_image( "dc_pdffile" ) ) - oUI:q_buttonSave:setIcon( ::resPath + "save.png" ) - oUI:q_buttonExit:setIcon( ::resPath + "dc_quit.png" ) + oUI:q_buttonSave:setIcon( hbide_image( "save" ) ) + oUI:q_buttonExit:setIcon( hbide_image( "dc_quit" ) ) - oUI:q_buttonInstall:setIcon( ::resPath + "dc_folder.png" ) + oUI:q_buttonInstall:setIcon( hbide_image( "dc_folder" ) ) - oUI:q_buttonArgPlus:setIcon( ::resPath + "dc_plus.png" ) - oUI:q_buttonArgMinus:setIcon( ::resPath + "dc_delete.png" ) - oUI:q_buttonArgUp:setIcon( ::resPath + "dc_up.png" ) - oUI:q_buttonArgDown:setIcon( ::resPath + "dc_down.png" ) + oUI:q_buttonArgPlus:setIcon( hbide_image( "dc_plus" ) ) + oUI:q_buttonArgMinus:setIcon( hbide_image( "dc_delete" ) ) + oUI:q_buttonArgUp:setIcon( hbide_image( "dc_up" ) ) + oUI:q_buttonArgDown:setIcon( hbide_image( "dc_down" ) ) RETURN Self @@ -673,7 +689,7 @@ METHOD IdeHarbourHelp:populateIndex() METHOD IdeHarbourHelp:parseTextFile( cTextFile, oParent ) LOCAL a_, s, nPart, oFunc, oTWItem LOCAL lIsFunc := .f. - LOCAL cIcon := ::resPath + "dc_function.png" + LOCAL cIcon := hbide_image( "dc_function" ) LOCAL aFn := {} LOCAL nParsed := ascan( ::aFuncByFile, {|e_| e_[ 1 ] == cTextFile } ) diff --git a/harbour/contrib/hbide/idemisc.prg b/harbour/contrib/hbide/idemisc.prg index eee8ba8333..592838a850 100644 --- a/harbour/contrib/hbide/idemisc.prg +++ b/harbour/contrib/hbide/idemisc.prg @@ -1612,3 +1612,12 @@ FUNCTION hbide_stripRoot( cRoot, cPath ) /*----------------------------------------------------------------------*/ +FUNCTION hbide_image( cName ) + RETURN hbide_pathToOsPath( hb_DirBase() + "resources" + "/" + cName + ".png" ) + +/*----------------------------------------------------------------------*/ + +FUNCTION hbide_uic( cName ) + RETURN hbide_pathToOsPath( hb_DirBase() + "resources" + "/" + cName + ".uic" ) + +/*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/ideobject.prg b/harbour/contrib/hbide/ideobject.prg index 796556e83a..b5420d7f8c 100644 --- a/harbour/contrib/hbide/ideobject.prg +++ b/harbour/contrib/hbide/ideobject.prg @@ -116,6 +116,7 @@ CLASS IdeObject ACCESS qTBarSlctns INLINE ::oIde:qTBarSlctns ACCESS qTBarLines INLINE ::oIde:qTBarLines ACCESS qTBarPanels INLINE ::oIde:qTBarPanels + ACCESS qTBarDocks INLINE ::oIde:qTBarDocks ACCESS cWrkProject INLINE ::oIde:cWrkProject ACCESS cWrkTheme INLINE ::oIde:cWrkTheme diff --git a/harbour/contrib/hbide/ideprojmanager.prg b/harbour/contrib/hbide/ideprojmanager.prg index 0613b9b171..4a2077b93f 100644 --- a/harbour/contrib/hbide/ideprojmanager.prg +++ b/harbour/contrib/hbide/ideprojmanager.prg @@ -363,8 +363,6 @@ METHOD IdeProject:expandMeta( s ) CLASS IdeProjManager INHERIT IdeObject - DATA oUIEnv - DATA cSaveTo DATA aPrjProps INIT {} @@ -414,6 +412,7 @@ CLASS IdeProjManager INHERIT IdeObject METHOD loadHbpProject() METHOD isValidProjectLocation( lTell ) METHOD setProjectLocation( cPath ) + METHOD buildInterface() ENDCLASS @@ -439,7 +438,9 @@ METHOD IdeProjManager:create( oIDE ) METHOD IdeProjManager:destroy() - //::oUIEnv:destroy() + IF !empty( ::oUI ) + // ::oUI:destroy() + ENDIF RETURN Self @@ -518,7 +519,10 @@ METHOD IdeProjManager:loadProperties( cProjFileName, lNew, lFetch, lUpdateTree ) /* Access/Assign via this object */ ::oProject := IdeProject():new( ::oIDE, ::aPrjProps ) // - ::fetchProperties() + //::fetchProperties() + // + ::oPropertiesDock:show() + // IF !empty( ::cSaveTo ) .and. hb_FileExists( ::cSaveTo ) cProjFileName := ::cSaveTo ::aPrjProps := hbide_fetchHbiStructFromFile( hbide_pathToOSPath( cProjFileName ) ) /* Reload from file */ @@ -550,55 +554,14 @@ METHOD IdeProjManager:loadProperties( cProjFileName, lNew, lFetch, lUpdateTree ) /*----------------------------------------------------------------------*/ METHOD IdeProjManager:fetchProperties() - LOCAL cLukupPng LOCAL cPrjLoc := hb_dirBase() + "projects" + IF empty( ::oProject ) + ::oProject := IdeProject():new( ::oIDE, ::aPrjProps ) + ENDIF + IF empty( ::oUI ) - ::oUI := HbQtUI():new( ::resPath + "projectpropertiesex.uic", ::oDlg:oWidget ):build() - - ::oPropertiesDock:oWidget:setWidget( ::oUI ) - ::oPropertiesDock:qtObject := ::oUI - - ::oUI:q_comboPrjType:addItem( "Executable" ) - ::oUI:q_comboPrjType:addItem( "Library" ) - ::oUI:q_comboPrjType:addItem( "Dll" ) - - cLukupPng := ::resPath + "folder.png" - // - ::oUI:q_buttonChoosePrjLoc:setIcon( cLukupPng ) - ::oUI:q_buttonChooseWd :setIcon( cLukupPng ) - ::oUI:q_buttonChooseDest :setIcon( cLukupPng ) - ::oUI:q_buttonBackup :setIcon( cLukupPng ) - ::oUI:q_buttonXmate :setIcon( ::resPath + "xmate.png" ) - ::oUI:q_buttonHbp :setIcon( ::resPath + "open.png" ) - - ::oUI:q_buttonSelect :setIcon( ::resPath + "open.png" ) - //::oUI:q_buttonSort :setIcon( ::resPath + "toupper.png" ) // TODO: toupper.png => atoz.png - ::oUI:q_buttonSort :setIcon( ::resPath + "sort.png" ) // TODO: toupper.png => atoz.png - //::oUI:q_buttonSortZA :setIcon( ::resPath + "tolower.png" ) // tolower.png => ztoa.png - ::oUI:q_buttonSortZA :setIcon( ::resPath + "sortdescend.png" ) // tolower.png => ztoa.png - ::oUI:q_buttonSortOrg:setIcon( ::resPath + "invertcase.png" ) // tolower.png => ztoa.png - - ::oUI:signal( "buttonCn" , "clicked()", {|| ::lSaveOK := .f., ::oPropertiesDock:hide() } ) //oWidget:close() } ) - ::oUI:signal( "buttonSave" , "clicked()", {|| ::lSaveOK := .t., ::save( .F. ) } ) - ::oUI:signal( "buttonSaveExit" , "clicked()", {|| ::lSaveOK := .t., ::save( .T. ) } ) - // - ::oUI:signal( "buttonSelect" , "clicked()", {|| ::addSources() } ) - ::oUI:signal( "buttonSort" , "clicked()", {|| ::sortSources( "az" ) } ) - ::oUI:signal( "buttonSortZA" , "clicked()", {|| ::sortSources( "za" ) } ) - ::oUI:signal( "buttonSortOrg" , "clicked()", {|| ::sortSources( "org" ) } ) - // - ::oUI:signal( "tabWidget" , "currentChanged(int)", {|p| ::updateHbp( p ) } ) - ::oUI:signal( "editMetaData" , "textChanged()" , {|| ::updateMetaData() } ) - - ::oUI:signal( "buttonChoosePrjLoc", "clicked()", {|| ::PromptForPath( 'editPrjLoctn' , 'Choose Project Location...' ) } ) - ::oUI:signal( "buttonChooseWd" , "clicked()", {|| ::PromptForPath( 'editWrkFolder', 'Choose Working Folder...' ) } ) - ::oUI:signal( "buttonChooseDest" , "clicked()", {|| ::PromptForPath( 'editDstFolder', 'Choose Destination Folder...' ) } ) - ::oUI:signal( "buttonBackup" , "clicked()", {|| ::PromptForPath( 'editBackup' , 'Choose Backup Folder...' ) } ) - ::oUI:signal( "buttonXmate" , "clicked()", {|| ::loadXhpProject() } ) - ::oUI:signal( "buttonHbp" , "clicked()", {|| ::loadHbpProject() } ) - - ::oUI:signal( "editPrjLoctn" , "textChanged(QString)", {|cPath| ::setProjectLocation( cPath ) } ) + ::buildInterface() ENDIF IF empty( ::aPrjProps ) @@ -652,7 +615,56 @@ METHOD IdeProjManager:fetchProperties() ::oUI:oWidget:setWindowTitle( 'Properties for "' + ::oUI:q_editPrjTitle:Text() + '"' ) ENDIF - ::oPropertiesDock:show() + RETURN Self + +/*----------------------------------------------------------------------*/ + +METHOD IdeProjManager:buildInterface() + LOCAL cLukupPng + + ::oUI := HbQtUI():new( ::resPath + "projectpropertiesex.uic", ::oDlg:oWidget ):build() + + ::oPropertiesDock:oWidget:setWidget( ::oUI ) + ::oPropertiesDock:qtObject := ::oUI + + ::oUI:q_comboPrjType:addItem( "Executable" ) + ::oUI:q_comboPrjType:addItem( "Library" ) + ::oUI:q_comboPrjType:addItem( "Dll" ) + + cLukupPng := hbide_image( "folder" ) + // + ::oUI:q_buttonChoosePrjLoc:setIcon( cLukupPng ) + ::oUI:q_buttonChooseWd :setIcon( cLukupPng ) + ::oUI:q_buttonChooseDest :setIcon( cLukupPng ) + ::oUI:q_buttonBackup :setIcon( cLukupPng ) + ::oUI:q_buttonXmate :setIcon( hbide_image( "xmate" ) ) + ::oUI:q_buttonHbp :setIcon( hbide_image( "open" ) ) + + ::oUI:q_buttonSelect :setIcon( hbide_image( "open" ) ) + ::oUI:q_buttonSort :setIcon( hbide_image( "sort" ) ) + ::oUI:q_buttonSortZA :setIcon( hbide_image( "sortdescend" ) ) + ::oUI:q_buttonSortOrg:setIcon( hbide_image( "invertcase" ) ) + + ::oUI:signal( "buttonCn" , "clicked()", {|| ::lSaveOK := .f., ::oPropertiesDock:hide() } ) + ::oUI:signal( "buttonSave" , "clicked()", {|| ::lSaveOK := .t., ::save( .F. ) } ) + ::oUI:signal( "buttonSaveExit" , "clicked()", {|| ::lSaveOK := .t., ::save( .T. ) } ) + // + ::oUI:signal( "buttonSelect" , "clicked()", {|| ::addSources() } ) + ::oUI:signal( "buttonSort" , "clicked()", {|| ::sortSources( "az" ) } ) + ::oUI:signal( "buttonSortZA" , "clicked()", {|| ::sortSources( "za" ) } ) + ::oUI:signal( "buttonSortOrg" , "clicked()", {|| ::sortSources( "org" ) } ) + // + ::oUI:signal( "tabWidget" , "currentChanged(int)", {|p| ::updateHbp( p ) } ) + ::oUI:signal( "editMetaData" , "textChanged()" , {|| ::updateMetaData() } ) + + ::oUI:signal( "buttonChoosePrjLoc", "clicked()", {|| ::PromptForPath( 'editPrjLoctn' , 'Choose Project Location...' ) } ) + ::oUI:signal( "buttonChooseWd" , "clicked()", {|| ::PromptForPath( 'editWrkFolder', 'Choose Working Folder...' ) } ) + ::oUI:signal( "buttonChooseDest" , "clicked()", {|| ::PromptForPath( 'editDstFolder', 'Choose Destination Folder...' ) } ) + ::oUI:signal( "buttonBackup" , "clicked()", {|| ::PromptForPath( 'editBackup' , 'Choose Backup Folder...' ) } ) + ::oUI:signal( "buttonXmate" , "clicked()", {|| ::loadXhpProject() } ) + ::oUI:signal( "buttonHbp" , "clicked()", {|| ::loadHbpProject() } ) + + ::oUI:signal( "editPrjLoctn" , "textChanged(QString)", {|cPath| ::setProjectLocation( cPath ) } ) RETURN Self @@ -965,28 +977,28 @@ METHOD IdeProjManager:loadXhpProject() /*----------------------------------------------------------------------*/ METHOD IdeProjManager:manageEnvironments() + LOCAL oUIEnv - IF empty( ::oUIEnv ) - ::oUIEnv := HbQtUI():new( ::resPath + "environments.uic", ::oEnvironDock:oWidget ):build() - ::oEnvironDock:qtObject := ::oUIEnv - ::oEnvironDock:oWidget:setWidget( ::oUIEnv ) + IF empty( ::oEnvironDock:qtObject ) + oUIEnv := HbQtUI():new( ::resPath + "environments.uic", ::oEnvironDock:oWidget ):build() + ::oEnvironDock:qtObject := oUIEnv + ::oEnvironDock:oWidget:setWidget( oUIEnv ) - ::oUIEnv:q_buttonPathMk2:setIcon( ::resPath + "folder.png" ) - ::oUIEnv:q_buttonPathEnv:setIcon( ::resPath + "folder.png" ) + oUIEnv:q_buttonPathMk2:setIcon( hbide_image( "folder" ) ) + oUIEnv:q_buttonPathEnv:setIcon( hbide_image( "folder" ) ) - ::oUIEnv:signal( "buttonCn" , "clicked()", {|| ::oEnvironDock:hide() } ) - ::oUIEnv:signal( "buttonSave" , "clicked()", {|| ::saveEnvironments() } ) - ::oUIEnv:signal( "buttonSaveExit", "clicked()", {|| ::saveEnvironments(), ::oEnvironDock:hide() } ) - ::oUIEnv:signal( "buttonPathMk2" , "clicked()", {|| ::PromptForPath( 'editPathMk2', 'Choose hbmk2 Executable Folder...' ) } ) - ::oUIEnv:signal( "buttonPathEnv" , "clicked()", {|| ::PromptForPath( 'editPathEnv', 'Choose hbIDE.env Folder...' ), ; - ::oUIEnv:q_editCompilers:setPlainText( hb_memoread( hbide_pathFile( ::oUIEnv:q_editPathEnv:text(), "hbide.env" ) ) ) } ) + oUIEnv:signal( "buttonCn" , "clicked()", {|| ::oEnvironDock:hide() } ) + oUIEnv:signal( "buttonSave" , "clicked()", {|| ::saveEnvironments() } ) + oUIEnv:signal( "buttonSaveExit", "clicked()", {|| ::saveEnvironments(), ::oEnvironDock:hide() } ) + oUIEnv:signal( "buttonPathMk2" , "clicked()", {|| ::PromptForPath( 'editPathMk2', 'Choose hbmk2 Executable Folder...' ) } ) + oUIEnv:signal( "buttonPathEnv" , "clicked()", {|| ::PromptForPath( 'editPathEnv', 'Choose hbIDE.env Folder...' ), ; + ::oEnvironDock:qtObject:q_editCompilers:setPlainText( ; + hb_memoread( hbide_pathFile( ::oEnvironDock:qtObject:q_editPathEnv:text(), "hbide.env" ) ) ) } ) ENDIF - ::oUIEnv:q_editPathMk2 :setText( ::aINI[ INI_HBIDE, PathMk2 ] ) - ::oUIEnv:q_editPathEnv :setText( ::aINI[ INI_HBIDE, PathEnv ] ) - ::oUIEnv:q_editCompilers:setPlainText( hb_memoread( hbide_pathFile( ::aINI[ INI_HBIDE, PathEnv ], "hbide.env" ) ) ) - - ::oEnvironDock:show() + ::oEnvironDock:qtObject:q_editPathMk2 :setText( ::aINI[ INI_HBIDE, PathMk2 ] ) + ::oEnvironDock:qtObject:q_editPathEnv :setText( ::aINI[ INI_HBIDE, PathEnv ] ) + ::oEnvironDock:qtObject:q_editCompilers:setPlainText( hb_memoread( hbide_pathFile( ::aINI[ INI_HBIDE, PathEnv ], "hbide.env" ) ) ) RETURN Self @@ -994,9 +1006,10 @@ METHOD IdeProjManager:manageEnvironments() METHOD IdeProjManager:saveEnvironments() LOCAL cText, cPathMk2, cPathEnv + LOCAL oUIEnv := ::oEnvironDock:qtObject - cPathMk2 := ::oUIEnv:q_editPathMk2:text() - cPathEnv := ::oUIEnv:q_editPathEnv:text() + cPathMk2 := oUIEnv:q_editPathMk2:text() + cPathEnv := oUIEnv:q_editPathEnv:text() ::oIDE:aINI[ INI_HBIDE, PathMk2 ] := cPathMk2 ::oIDE:aINI[ INI_HBIDE, PathEnv ] := cPathEnv @@ -1004,7 +1017,7 @@ METHOD IdeProjManager:saveEnvironments() ::oIDE:cWrkPathMk2 := cPathMk2 ::oIDE:cWrkPathEnv := cPathEnv - IF !empty( cText := ::oUIEnv:q_editCompilers:toPlainText() ) + IF !empty( cText := oUIEnv:q_editCompilers:toPlainText() ) hb_MemoWrit( hbide_pathFile( cPathEnv, "hbide.env" ), cText ) ENDIF diff --git a/harbour/contrib/hbide/idesaveload.prg b/harbour/contrib/hbide/idesaveload.prg index 3d80d16c51..744d238765 100644 --- a/harbour/contrib/hbide/idesaveload.prg +++ b/harbour/contrib/hbide/idesaveload.prg @@ -79,21 +79,21 @@ FUNCTION hbide_saveINI( oIde ) aadd( txt_, " " ) aadd( txt_, "MainWindowGeometry = " + hbide_posAndSize( oIde:oDlg:oWidget ) ) aadd( txt_, "ProjectTreeVisible = " + IIF( oIde:lProjTreeVisible, "YES", "NO" ) ) - aadd( txt_, "ProjectTreeGeometry = " + hbide_posAndSize( oIde:oProjTree:oWidget ) ) + * aadd( txt_, "ProjectTreeGeometry = " + hbide_posAndSize( oIde:oProjTree:oWidget ) ) aadd( txt_, "FunctionListVisible = " + IIF( oIde:lDockRVisible, "YES", "NO" ) ) aadd( txt_, "FunctionListGeometry = " + hbide_posAndSize( oIde:oFuncList:oWidget ) ) aadd( txt_, "RecentTabIndex = " + hb_ntos( oIde:qTabWidget:currentIndex() ) ) aadd( txt_, "CurrentProject = " + oIde:cWrkProject ) aadd( txt_, "GotoDialogGeometry = " + oIde:aIni[ INI_HBIDE, GotoDialogGeometry ] ) - aadd( txt_, "PropsDialogGeometry = " + oIde:aIni[ INI_HBIDE, PropsDialogGeometry ] ) + * aadd( txt_, "PropsDialogGeometry = " + oIde:aIni[ INI_HBIDE, PropsDialogGeometry ] ) aadd( txt_, "FindDialogGeometry = " + oIde:aIni[ INI_HBIDE, FindDialogGeometry ] ) - aadd( txt_, "ThemesDialogGeometry = " + oIde:aIni[ INI_HBIDE, ThemesDialogGeometry ] ) + * aadd( txt_, "ThemesDialogGeometry = " + oIde:aIni[ INI_HBIDE, ThemesDialogGeometry ] ) aadd( txt_, "CurrentTheme = " + oIde:cWrkTheme ) aadd( txt_, "CurrentCodec = " + oIde:cWrkCodec ) aadd( txt_, "PathMk2 = " + oIde:aIni[ INI_HBIDE, PathMk2 ] ) aadd( txt_, "PathEnv = " + oIde:aIni[ INI_HBIDE, PathEnv ] ) aadd( txt_, "CurrentEnvironment = " + oIde:cWrkEnvironment ) - aadd( txt_, "FindInFilesDialogGeometry = " + oIde:aIni[ INI_HBIDE, FindInFilesDialogGeometry ] ) + * aadd( txt_, "FindInFilesDialogGeometry = " + oIde:aIni[ INI_HBIDE, FindInFilesDialogGeometry ] ) aadd( txt_, "CurrentFind = " + oIde:cWrkFind ) aadd( txt_, "CurrentFolderFind = " + oIde:cWrkFolderFind ) aadd( txt_, "CurrentReplace = " + oIde:cWrkReplace ) diff --git a/harbour/contrib/hbide/idethemes.prg b/harbour/contrib/hbide/idethemes.prg index 7c2e05dfdd..ffbaf2efab 100644 --- a/harbour/contrib/hbide/idethemes.prg +++ b/harbour/contrib/hbide/idethemes.prg @@ -129,7 +129,7 @@ CLASS IdeThemes INHERIT IdeObject METHOD setSyntaxRule( qHiliter, cName, cPattern, aAttr ) METHOD setSyntaxFormat( qHiliter, cName, aAttr ) METHOD setSyntaxHilighting( qEdit, cTheme, lNew ) - METHOD fetch() + METHOD show() METHOD copy() METHOD setTheme() METHOD setAttributes() @@ -213,8 +213,9 @@ METHOD IdeThemes:create( oIde, cIniFile ) METHOD IdeThemes:destroy() IF !empty( ::oThemes ) - + ::oUI:destroy() ENDIF + RETURN Self /*----------------------------------------------------------------------*/ @@ -407,15 +408,15 @@ METHOD IdeThemes:setSyntaxHilighting( qEdit, cTheme, lNew ) /*----------------------------------------------------------------------*/ -METHOD IdeThemes:fetch() +METHOD IdeThemes:show() IF empty( ::oUI ) ::lCreating := .t. ::oUI := HbQtUI():new( ::oIde:resPath + "themesex.uic", ::oThemesDock:oWidget ):build() - ::oThemesDock:oWidget:setWidget( ::oUI ) ::oThemesDock:qtObject := ::oUI + ::oThemesDock:oWidget:setWidget( ::oUI ) ::oUI:signal( "comboThemes" , "currentIndexChanged(int)", {|i| ::nCurTheme := i+1, ::setTheme( i ) } ) ::oUI:signal( "comboItems" , "currentIndexChanged(int)", {|i| ::nCurItem := i+1, ::setAttributes( i ) } ) @@ -432,7 +433,7 @@ METHOD IdeThemes:fetch() ::oUI:signal( "buttonClose" , "clicked()", ; {|| ::oIde:aIni[ INI_HBIDE, ThemesDialogGeometry ] := hbide_posAndSize( ::oUI:oWidget ), ::oThemesDock:hide() } ) - ::oIde:setPosAndSizeByIni( ::oUI:oWidget, ThemesDialogGeometry ) + * ::oIde:setPosAndSizeByIni( ::oUI:oWidget, ThemesDialogGeometry ) /* Fill Themes Dialog Values */ ::oUI:setWindowTitle( GetKeyValue( ::aControls, "dialogTitle" ) ) @@ -453,7 +454,7 @@ METHOD IdeThemes:fetch() aeval( ::aThemes, {|e_| ::oUI:qObj[ "comboThemes" ]:addItem( e_[ 1 ] ) } ) aeval( ::aItems , {|e_| ::oUI:qObj[ "comboItems" ]:addItem( e_[ 2 ] ) } ) - ::qEdit := ::oUI:qObj[ "plainTextEdit" ] + ::qEdit := ::oUI:qObj[ "plainThemeText" ] ::qEdit:setPlainText( GetSource() ) ::qEdit:setLineWrapMode( QTextEdit_NoWrap ) ::qEdit:setFont( ::oIde:oFont:oWidget ) @@ -469,8 +470,6 @@ METHOD IdeThemes:fetch() ENDIF - ::oThemesDock:show() - RETURN Self /*----------------------------------------------------------------------*/ @@ -590,11 +589,7 @@ METHOD IdeThemes:selectTheme() LOCAL oSL, oStrList, oStrModel, a_, nDone LOCAL pSlots := Qt_Slots_New() - #ifdef HBIDE_USE_UIC oSL := HbQtUI():new( ::oIde:resPath + "selectionlist.uic", ::oIde:oDlg:oWidget ):build() - #else - oSL := HbQtUI():new( ::oIde:resPath + "selectionlist.ui", ::oIde:oDlg:oWidget ):create() - #endif oSL:setWindowTitle( "Available Themes" ) diff --git a/harbour/contrib/hbide/resources/blockcomment.png b/harbour/contrib/hbide/resources/blockcomment.png index 074eceb2ab7f9d6ac2b9b07b5f6df7ee51e6c5b3..ebee40df625e2e9eafc32a2629af07ceb3ed3e26 100644 GIT binary patch delta 142 zcmdnRKA&-dWIY=L1B3kM|A|0~v%n*=n1O-s6$mpf?n*8M3I=+*IEGmCCja>V-=0}@ zhSFIU-UJ43SYXq#!JXE*)A>c>VsXk~=xr&v_KSD1?YCie_2gW}kiD5HW@? z{+agn_Rh}EL?Y4C(=#+Ql+9*SsZ=tV)LW6}a*OiF|I+ov4{K|SFP~2s6)WOIJm7J) zSR>AeH=-a~F;=VcxN=Q;kEU~dE>p&P-)dTHC~Mdq5#1ZYN3D38(e@v zqEv$n4p`1wA0*L|#5wDo)u0dt&Rg%T2DPwpYP}*TR)*%7R4f$PD4+&LXpJ4A6(Ya` z18QMQf%DF3Fbgp>CimWH@D6SC=Gv>%U?tw;G}huJwqX*kU<10*ia69jnlfm@F7ywe zF)A?e40z5x2P_RE!7>!mm0Yne43p_G7KVW9*o?1u$?$Lshp>bi)H6#YqA9MAX~v_4 z4*h8eB9N5woJ%r_0r($??4C+@p->nd9W54%rBZ2retvp-dTD8?TrRJytW+wMYPDLc z)pT=Xa`H(OMf`D~rXdj7vC<2_&v4#&EtBnUT&~--N4jpBjb4uOnRMUajpe%!-nGsi zY^tBxySekn^~Cv>1E)@Oy-gf`JbZbo>*LhO`0IyPC*F^&?--lR&s27QT0PrQ`nvCL s@zRThYO>aL`+Mr>y}7MJ4P(Qrb>~k1T<-p|{}1Sr=^seHN?o|~51*96IsgCw diff --git a/harbour/contrib/hbide/resources/codeskeletons.png b/harbour/contrib/hbide/resources/codeskeletons.png new file mode 100644 index 0000000000000000000000000000000000000000..7699f1b2b8b1a6110ebb52f36b5209a663e649a6 GIT binary patch literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`@t!V@Ar-fdP7LH~FyL{XK6(2* zn{^KsG=+-0GXK?3)=zBRz1dcPDIsl^qy^)b<8ECI2JI>bJf=ydTsBF#a&8t|%HeIy zrx(uL(ye{x0$+e?=*zF7`!YWKm)~=LK|c$}+L9kJjcfU4Z~(1h@O1TaS?83{1OQpA BH>v;t literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/dc_function.png b/harbour/contrib/hbide/resources/dc_function.png index f928748c3cdbb08cfd5b81769e7e671a8f6df1f9..52fa8a745656a2f89bad4d4540433921ee6e0d13 100644 GIT binary patch delta 145 zcmbQkxQKCrWIY=L1B3kM|A|0~v%n*=n1O-s6$mpf?n*8M3Wj*PIEGmCCja>V-=0}@ zM#WKur6*=&Fkdj8n8F|?t!duy!a%{vIFI=PGf%%`NdaTz%Z6KQ3U%y3X{d8z5)TXPr~xEL5bUHx3vIVCg!03S~@CIA2c delta 139 zcmZ3)IEQh9WIYoD1H*)g8D>C=v%n*=n1O-s2naJy)#j513i^4vIEH8hC;#wQN>ETa z-{2s?c*yHvPK{K6uWBswCZ1&ia##Ov%y9UoYL*+ag^_*1DmJ!|24Cj3j~t~}E;Q(B o6lObw^*&^`kiN?Hh=HM%J#qK6qfa*iO=j?P^>bla=akR{07SDbO8@`> diff --git a/harbour/contrib/hbide/resources/docviewgenerator.ui b/harbour/contrib/hbide/resources/docviewgenerator.ui index 462db938c9..25b565c622 100644 --- a/harbour/contrib/hbide/resources/docviewgenerator.ui +++ b/harbour/contrib/hbide/resources/docviewgenerator.ui @@ -1,22 +1,31 @@ - Form - + FormDocViewer + 0 0 - 768 - 515 + 640 + 563 Form + + 2 + 4 + + 2 + + + 2 + @@ -60,15 +69,9 @@ - - - 200 - 0 - - - 300 + 200 16777215 @@ -80,7 +83,7 @@ - Contents + Topics @@ -269,7 +272,7 @@ - Arguments + Args @@ -338,7 +341,7 @@ - Description + Desc @@ -366,26 +369,6 @@ - - - Template - - - - - - - - - - Source - - - - - - - diff --git a/harbour/contrib/hbide/resources/docviewgenerator.uic b/harbour/contrib/hbide/resources/docviewgenerator.uic index 0cdf5e2b72..3504a94544 100644 --- a/harbour/contrib/hbide/resources/docviewgenerator.uic +++ b/harbour/contrib/hbide/resources/docviewgenerator.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'docviewgenerator.ui' ** -** Created: Mon Feb 22 18:56:47 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -31,7 +31,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormDocViewer { public: QGridLayout *gridLayout; @@ -102,12 +102,6 @@ public: QWidget *tabTests; QGridLayout *gridLayout_6; QPlainTextEdit *plainTests; - QWidget *tabTemplate; - QGridLayout *gridLayout_7; - QPlainTextEdit *plainTemplate; - QWidget *tabSource; - QGridLayout *gridLayout_9; - QPlainTextEdit *plainSource; QHBoxLayout *horizontalLayout_3; QToolButton *buttonHome; QToolButton *buttonBackward; @@ -120,38 +114,38 @@ public: QToolButton *buttonSave; QToolButton *buttonExit; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormDocViewer) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(768, 515); - gridLayout = new QGridLayout(Form); + if (FormDocViewer->objectName().isEmpty()) + FormDocViewer->setObjectName(QString::fromUtf8("FormDocViewer")); + FormDocViewer->resize(640, 563); + gridLayout = new QGridLayout(FormDocViewer); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - gridLayout->setContentsMargins(-1, 4, -1, -1); + gridLayout->setContentsMargins(2, 4, 2, 2); horizontalLayout = new QHBoxLayout(); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - labelInstall = new QLabel(Form); + labelInstall = new QLabel(FormDocViewer); labelInstall->setObjectName(QString::fromUtf8("labelInstall")); horizontalLayout->addWidget(labelInstall); - editInstall = new QLineEdit(Form); + editInstall = new QLineEdit(FormDocViewer); editInstall->setObjectName(QString::fromUtf8("editInstall")); horizontalLayout->addWidget(editInstall); - buttonInstall = new QToolButton(Form); + buttonInstall = new QToolButton(FormDocViewer); buttonInstall->setObjectName(QString::fromUtf8("buttonInstall")); buttonInstall->setAutoRaise(false); horizontalLayout->addWidget(buttonInstall); - labelDocPrefix = new QLabel(Form); + labelDocPrefix = new QLabel(FormDocViewer); labelDocPrefix->setObjectName(QString::fromUtf8("labelDocPrefix")); horizontalLayout->addWidget(labelDocPrefix); - editDocPrefix = new QLineEdit(Form); + editDocPrefix = new QLineEdit(FormDocViewer); editDocPrefix->setObjectName(QString::fromUtf8("editDocPrefix")); editDocPrefix->setMaximumSize(QSize(70, 16777215)); @@ -160,10 +154,9 @@ public: gridLayout->addLayout(horizontalLayout, 2, 0, 1, 2); - tabWidgetContents = new QTabWidget(Form); + tabWidgetContents = new QTabWidget(FormDocViewer); tabWidgetContents->setObjectName(QString::fromUtf8("tabWidgetContents")); - tabWidgetContents->setMinimumSize(QSize(200, 0)); - tabWidgetContents->setMaximumSize(QSize(300, 16777215)); + tabWidgetContents->setMaximumSize(QSize(200, 16777215)); tabWidgetContents->setDocumentMode(false); tabContents = new QWidget(); tabContents->setObjectName(QString::fromUtf8("tabContents")); @@ -209,7 +202,7 @@ public: gridLayout->addWidget(tabWidgetContents, 5, 0, 1, 1); - tabWidgetElements = new QTabWidget(Form); + tabWidgetElements = new QTabWidget(FormDocViewer); tabWidgetElements->setObjectName(QString::fromUtf8("tabWidgetElements")); tabView = new QWidget(); tabView->setObjectName(QString::fromUtf8("tabView")); @@ -428,68 +421,48 @@ public: gridLayout_6->addWidget(plainTests, 0, 0, 1, 1); tabWidgetElements->addTab(tabTests, QString()); - tabTemplate = new QWidget(); - tabTemplate->setObjectName(QString::fromUtf8("tabTemplate")); - gridLayout_7 = new QGridLayout(tabTemplate); - gridLayout_7->setObjectName(QString::fromUtf8("gridLayout_7")); - plainTemplate = new QPlainTextEdit(tabTemplate); - plainTemplate->setObjectName(QString::fromUtf8("plainTemplate")); - - gridLayout_7->addWidget(plainTemplate, 0, 0, 1, 1); - - tabWidgetElements->addTab(tabTemplate, QString()); - tabSource = new QWidget(); - tabSource->setObjectName(QString::fromUtf8("tabSource")); - gridLayout_9 = new QGridLayout(tabSource); - gridLayout_9->setObjectName(QString::fromUtf8("gridLayout_9")); - plainSource = new QPlainTextEdit(tabSource); - plainSource->setObjectName(QString::fromUtf8("plainSource")); - - gridLayout_9->addWidget(plainSource, 0, 0, 1, 1); - - tabWidgetElements->addTab(tabSource, QString()); gridLayout->addWidget(tabWidgetElements, 5, 1, 1, 1); horizontalLayout_3 = new QHBoxLayout(); horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); - buttonHome = new QToolButton(Form); + buttonHome = new QToolButton(FormDocViewer); buttonHome->setObjectName(QString::fromUtf8("buttonHome")); buttonHome->setAutoRaise(false); horizontalLayout_3->addWidget(buttonHome); - buttonBackward = new QToolButton(Form); + buttonBackward = new QToolButton(FormDocViewer); buttonBackward->setObjectName(QString::fromUtf8("buttonBackward")); buttonBackward->setAutoRaise(false); horizontalLayout_3->addWidget(buttonBackward); - buttonForward = new QToolButton(Form); + buttonForward = new QToolButton(FormDocViewer); buttonForward->setObjectName(QString::fromUtf8("buttonForward")); buttonForward->setAutoRaise(false); horizontalLayout_3->addWidget(buttonForward); - buttonUp = new QToolButton(Form); + buttonUp = new QToolButton(FormDocViewer); buttonUp->setObjectName(QString::fromUtf8("buttonUp")); buttonUp->setAutoRaise(false); horizontalLayout_3->addWidget(buttonUp); - buttonRefresh = new QToolButton(Form); + buttonRefresh = new QToolButton(FormDocViewer); buttonRefresh->setObjectName(QString::fromUtf8("buttonRefresh")); buttonRefresh->setAutoRaise(false); horizontalLayout_3->addWidget(buttonRefresh); - buttonPrint = new QToolButton(Form); + buttonPrint = new QToolButton(FormDocViewer); buttonPrint->setObjectName(QString::fromUtf8("buttonPrint")); buttonPrint->setAutoRaise(false); horizontalLayout_3->addWidget(buttonPrint); - buttonPdf = new QToolButton(Form); + buttonPdf = new QToolButton(FormDocViewer); buttonPdf->setObjectName(QString::fromUtf8("buttonPdf")); horizontalLayout_3->addWidget(buttonPdf); @@ -498,13 +471,13 @@ public: horizontalLayout_3->addItem(horizontalSpacer_2); - buttonSave = new QToolButton(Form); + buttonSave = new QToolButton(FormDocViewer); buttonSave->setObjectName(QString::fromUtf8("buttonSave")); buttonSave->setAutoRaise(false); horizontalLayout_3->addWidget(buttonSave); - buttonExit = new QToolButton(Form); + buttonExit = new QToolButton(FormDocViewer); buttonExit->setObjectName(QString::fromUtf8("buttonExit")); buttonExit->setAutoRaise(false); @@ -514,50 +487,48 @@ public: gridLayout->addLayout(horizontalLayout_3, 0, 0, 1, 2); - retranslateUi(Form); + retranslateUi(FormDocViewer); tabWidgetContents->setCurrentIndex(0); tabWidgetElements->setCurrentIndex(0); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormDocViewer); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormDocViewer) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - labelInstall->setText(QApplication::translate("Form", "Harbour Installation Root:", 0, QApplication::UnicodeUTF8)); + FormDocViewer->setWindowTitle(QApplication::translate("FormDocViewer", "Form", 0, QApplication::UnicodeUTF8)); + labelInstall->setText(QApplication::translate("FormDocViewer", "Harbour Installation Root:", 0, QApplication::UnicodeUTF8)); buttonInstall->setText(QString()); - labelDocPrefix->setText(QApplication::translate("Form", "Doc folder prefix:", 0, QApplication::UnicodeUTF8)); - tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabContents), QApplication::translate("Form", "Contents", 0, QApplication::UnicodeUTF8)); - tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabByName), QApplication::translate("Form", "Index", 0, QApplication::UnicodeUTF8)); - tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabByCategory), QApplication::translate("Form", "Category", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabView), QApplication::translate("Form", "View", 0, QApplication::UnicodeUTF8)); - label->setText(QApplication::translate("Form", "Template:", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("Form", "Name", 0, QApplication::UnicodeUTF8)); - label_3->setText(QApplication::translate("Form", "Category:", 0, QApplication::UnicodeUTF8)); - label_4->setText(QApplication::translate("Form", "Sub-Category:", 0, QApplication::UnicodeUTF8)); - label_5->setText(QApplication::translate("Form", "One-Liner", 0, QApplication::UnicodeUTF8)); - label_6->setText(QApplication::translate("Form", "Syntax:", 0, QApplication::UnicodeUTF8)); - label_8->setText(QApplication::translate("Form", "Returns:", 0, QApplication::UnicodeUTF8)); - label_12->setText(QApplication::translate("Form", "Status:", 0, QApplication::UnicodeUTF8)); - label_13->setText(QApplication::translate("Form", "Platforms:", 0, QApplication::UnicodeUTF8)); - label_14->setText(QApplication::translate("Form", "Files:", 0, QApplication::UnicodeUTF8)); - label_15->setText(QApplication::translate("Form", "See Also:", 0, QApplication::UnicodeUTF8)); - label_9->setText(QApplication::translate("Form", ".txt path:", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabGeneral), QApplication::translate("Form", "General", 0, QApplication::UnicodeUTF8)); - labelArgName->setText(QApplication::translate("Form", "Name:", 0, QApplication::UnicodeUTF8)); - labelArgDesc->setText(QApplication::translate("Form", "Description:", 0, QApplication::UnicodeUTF8)); + labelDocPrefix->setText(QApplication::translate("FormDocViewer", "Doc folder prefix:", 0, QApplication::UnicodeUTF8)); + tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabContents), QApplication::translate("FormDocViewer", "Topics", 0, QApplication::UnicodeUTF8)); + tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabByName), QApplication::translate("FormDocViewer", "Index", 0, QApplication::UnicodeUTF8)); + tabWidgetContents->setTabText(tabWidgetContents->indexOf(tabByCategory), QApplication::translate("FormDocViewer", "Category", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabView), QApplication::translate("FormDocViewer", "View", 0, QApplication::UnicodeUTF8)); + label->setText(QApplication::translate("FormDocViewer", "Template:", 0, QApplication::UnicodeUTF8)); + label_2->setText(QApplication::translate("FormDocViewer", "Name", 0, QApplication::UnicodeUTF8)); + label_3->setText(QApplication::translate("FormDocViewer", "Category:", 0, QApplication::UnicodeUTF8)); + label_4->setText(QApplication::translate("FormDocViewer", "Sub-Category:", 0, QApplication::UnicodeUTF8)); + label_5->setText(QApplication::translate("FormDocViewer", "One-Liner", 0, QApplication::UnicodeUTF8)); + label_6->setText(QApplication::translate("FormDocViewer", "Syntax:", 0, QApplication::UnicodeUTF8)); + label_8->setText(QApplication::translate("FormDocViewer", "Returns:", 0, QApplication::UnicodeUTF8)); + label_12->setText(QApplication::translate("FormDocViewer", "Status:", 0, QApplication::UnicodeUTF8)); + label_13->setText(QApplication::translate("FormDocViewer", "Platforms:", 0, QApplication::UnicodeUTF8)); + label_14->setText(QApplication::translate("FormDocViewer", "Files:", 0, QApplication::UnicodeUTF8)); + label_15->setText(QApplication::translate("FormDocViewer", "See Also:", 0, QApplication::UnicodeUTF8)); + label_9->setText(QApplication::translate("FormDocViewer", ".txt path:", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabGeneral), QApplication::translate("FormDocViewer", "General", 0, QApplication::UnicodeUTF8)); + labelArgName->setText(QApplication::translate("FormDocViewer", "Name:", 0, QApplication::UnicodeUTF8)); + labelArgDesc->setText(QApplication::translate("FormDocViewer", "Description:", 0, QApplication::UnicodeUTF8)); buttonArgPlus->setText(QString()); buttonArgMinus->setText(QString()); buttonArgUp->setText(QString()); buttonArgDown->setText(QString()); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabArguments), QApplication::translate("Form", "Arguments", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabDesc), QApplication::translate("Form", "Description", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabExamples), QApplication::translate("Form", "Examples", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabTests), QApplication::translate("Form", "Tests", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabTemplate), QApplication::translate("Form", "Template", 0, QApplication::UnicodeUTF8)); - tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabSource), QApplication::translate("Form", "Source", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabArguments), QApplication::translate("FormDocViewer", "Args", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabDesc), QApplication::translate("FormDocViewer", "Desc", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabExamples), QApplication::translate("FormDocViewer", "Examples", 0, QApplication::UnicodeUTF8)); + tabWidgetElements->setTabText(tabWidgetElements->indexOf(tabTests), QApplication::translate("FormDocViewer", "Tests", 0, QApplication::UnicodeUTF8)); buttonHome->setText(QString()); buttonBackward->setText(QString()); buttonForward->setText(QString()); @@ -567,13 +538,13 @@ public: buttonPdf->setText(QString()); buttonSave->setText(QString()); buttonExit->setText(QString()); - Q_UNUSED(Form); + Q_UNUSED(FormDocViewer); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormDocViewer: public Ui_FormDocViewer {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/environments.ui b/harbour/contrib/hbide/resources/environments.ui index 2bc8809fbd..e1c9bc8b74 100644 --- a/harbour/contrib/hbide/resources/environments.ui +++ b/harbour/contrib/hbide/resources/environments.ui @@ -1,7 +1,7 @@ - Form - + FormEnvironments + 0 @@ -15,7 +15,7 @@ - + 0 @@ -46,9 +46,9 @@ p, li { white-space: pre-wrap; } - + - + 100 @@ -85,9 +85,9 @@ p, li { white-space: pre-wrap; } - + - + 100 @@ -122,7 +122,7 @@ p, li { white-space: pre-wrap; } - + diff --git a/harbour/contrib/hbide/resources/environments.uic b/harbour/contrib/hbide/resources/environments.uic index cb3e5143ed..425f53eca8 100644 --- a/harbour/contrib/hbide/resources/environments.uic +++ b/harbour/contrib/hbide/resources/environments.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'environments.ui' ** -** Created: Wed Feb 17 15:07:44 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -28,36 +28,36 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormEnvironments { public: QVBoxLayout *verticalLayout; - QTabWidget *tabWidget; + QTabWidget *tabWidgetEnv; QWidget *tabCompilers; QGridLayout *gridLayout_5; QPlainTextEdit *editCompilers; - QHBoxLayout *horizontalLayout_2; - QLabel *label_10; + QHBoxLayout *horizontalLayoutHbmk2; + QLabel *labelPathHbmk2; QLineEdit *editPathMk2; QToolButton *buttonPathMk2; - QHBoxLayout *horizontalLayout_3; - QLabel *label_12; + QHBoxLayout *horizontalLayoutEnv; + QLabel *labelPathEnv; QLineEdit *editPathEnv; QToolButton *buttonPathEnv; - QHBoxLayout *horizontalLayout_4; + QHBoxLayout *horizontalLayoutEnvButtons; QPushButton *buttonSaveExit; QPushButton *buttonSave; QPushButton *buttonCn; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormEnvironments) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(367, 519); - verticalLayout = new QVBoxLayout(Form); + if (FormEnvironments->objectName().isEmpty()) + FormEnvironments->setObjectName(QString::fromUtf8("FormEnvironments")); + FormEnvironments->resize(367, 519); + verticalLayout = new QVBoxLayout(FormEnvironments); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - tabWidget = new QTabWidget(Form); - tabWidget->setObjectName(QString::fromUtf8("tabWidget")); + tabWidgetEnv = new QTabWidget(FormEnvironments); + tabWidgetEnv->setObjectName(QString::fromUtf8("tabWidgetEnv")); tabCompilers = new QWidget(); tabCompilers->setObjectName(QString::fromUtf8("tabCompilers")); gridLayout_5 = new QGridLayout(tabCompilers); @@ -68,92 +68,92 @@ public: gridLayout_5->addWidget(editCompilers, 2, 1, 1, 1); - horizontalLayout_2 = new QHBoxLayout(); - horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); - label_10 = new QLabel(tabCompilers); - label_10->setObjectName(QString::fromUtf8("label_10")); - label_10->setMinimumSize(QSize(100, 0)); - label_10->setMaximumSize(QSize(100, 16777215)); + horizontalLayoutHbmk2 = new QHBoxLayout(); + horizontalLayoutHbmk2->setObjectName(QString::fromUtf8("horizontalLayoutHbmk2")); + labelPathHbmk2 = new QLabel(tabCompilers); + labelPathHbmk2->setObjectName(QString::fromUtf8("labelPathHbmk2")); + labelPathHbmk2->setMinimumSize(QSize(100, 0)); + labelPathHbmk2->setMaximumSize(QSize(100, 16777215)); - horizontalLayout_2->addWidget(label_10); + horizontalLayoutHbmk2->addWidget(labelPathHbmk2); editPathMk2 = new QLineEdit(tabCompilers); editPathMk2->setObjectName(QString::fromUtf8("editPathMk2")); - horizontalLayout_2->addWidget(editPathMk2); + horizontalLayoutHbmk2->addWidget(editPathMk2); buttonPathMk2 = new QToolButton(tabCompilers); buttonPathMk2->setObjectName(QString::fromUtf8("buttonPathMk2")); buttonPathMk2->setMinimumSize(QSize(0, 0)); - horizontalLayout_2->addWidget(buttonPathMk2); + horizontalLayoutHbmk2->addWidget(buttonPathMk2); - gridLayout_5->addLayout(horizontalLayout_2, 0, 1, 1, 1); + gridLayout_5->addLayout(horizontalLayoutHbmk2, 0, 1, 1, 1); - horizontalLayout_3 = new QHBoxLayout(); - horizontalLayout_3->setObjectName(QString::fromUtf8("horizontalLayout_3")); - label_12 = new QLabel(tabCompilers); - label_12->setObjectName(QString::fromUtf8("label_12")); - label_12->setMinimumSize(QSize(100, 0)); - label_12->setMaximumSize(QSize(100, 16777215)); + horizontalLayoutEnv = new QHBoxLayout(); + horizontalLayoutEnv->setObjectName(QString::fromUtf8("horizontalLayoutEnv")); + labelPathEnv = new QLabel(tabCompilers); + labelPathEnv->setObjectName(QString::fromUtf8("labelPathEnv")); + labelPathEnv->setMinimumSize(QSize(100, 0)); + labelPathEnv->setMaximumSize(QSize(100, 16777215)); - horizontalLayout_3->addWidget(label_12); + horizontalLayoutEnv->addWidget(labelPathEnv); editPathEnv = new QLineEdit(tabCompilers); editPathEnv->setObjectName(QString::fromUtf8("editPathEnv")); - horizontalLayout_3->addWidget(editPathEnv); + horizontalLayoutEnv->addWidget(editPathEnv); buttonPathEnv = new QToolButton(tabCompilers); buttonPathEnv->setObjectName(QString::fromUtf8("buttonPathEnv")); - horizontalLayout_3->addWidget(buttonPathEnv); + horizontalLayoutEnv->addWidget(buttonPathEnv); - gridLayout_5->addLayout(horizontalLayout_3, 1, 1, 1, 1); + gridLayout_5->addLayout(horizontalLayoutEnv, 1, 1, 1, 1); - tabWidget->addTab(tabCompilers, QString()); + tabWidgetEnv->addTab(tabCompilers, QString()); - verticalLayout->addWidget(tabWidget); + verticalLayout->addWidget(tabWidgetEnv); - horizontalLayout_4 = new QHBoxLayout(); - horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); - buttonSaveExit = new QPushButton(Form); + horizontalLayoutEnvButtons = new QHBoxLayout(); + horizontalLayoutEnvButtons->setObjectName(QString::fromUtf8("horizontalLayoutEnvButtons")); + buttonSaveExit = new QPushButton(FormEnvironments); buttonSaveExit->setObjectName(QString::fromUtf8("buttonSaveExit")); - horizontalLayout_4->addWidget(buttonSaveExit); + horizontalLayoutEnvButtons->addWidget(buttonSaveExit); - buttonSave = new QPushButton(Form); + buttonSave = new QPushButton(FormEnvironments); buttonSave->setObjectName(QString::fromUtf8("buttonSave")); buttonSave->setAutoDefault(false); buttonSave->setDefault(true); - horizontalLayout_4->addWidget(buttonSave); + horizontalLayoutEnvButtons->addWidget(buttonSave); - buttonCn = new QPushButton(Form); + buttonCn = new QPushButton(FormEnvironments); buttonCn->setObjectName(QString::fromUtf8("buttonCn")); buttonCn->setAutoDefault(false); - horizontalLayout_4->addWidget(buttonCn); + horizontalLayoutEnvButtons->addWidget(buttonCn); - verticalLayout->addLayout(horizontalLayout_4); + verticalLayout->addLayout(horizontalLayoutEnvButtons); - retranslateUi(Form); + retranslateUi(FormEnvironments); - tabWidget->setCurrentIndex(0); + tabWidgetEnv->setCurrentIndex(0); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormEnvironments); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormEnvironments) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); + FormEnvironments->setWindowTitle(QApplication::translate("FormEnvironments", "Form", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editCompilers->setToolTip(QApplication::translate("Form", "\n" + editCompilers->setToolTip(QApplication::translate("FormEnvironments", "\n" "\n" @@ -165,21 +165,21 @@ public: "

This opens up the possibility to experiment with different compilers without re-opening the IDE or setting up the envvars manually.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP editCompilers->setStyleSheet(QString()); - label_10->setText(QApplication::translate("Form", "Path to hbmk2", 0, QApplication::UnicodeUTF8)); + labelPathHbmk2->setText(QApplication::translate("FormEnvironments", "Path to hbmk2", 0, QApplication::UnicodeUTF8)); buttonPathMk2->setText(QString()); - label_12->setText(QApplication::translate("Form", "Path to hbIDE.env", 0, QApplication::UnicodeUTF8)); + labelPathEnv->setText(QApplication::translate("FormEnvironments", "Path to hbIDE.env", 0, QApplication::UnicodeUTF8)); buttonPathEnv->setText(QString()); - tabWidget->setTabText(tabWidget->indexOf(tabCompilers), QApplication::translate("Form", "Environments", 0, QApplication::UnicodeUTF8)); - buttonSaveExit->setText(QApplication::translate("Form", "Save and Exit", 0, QApplication::UnicodeUTF8)); - buttonSave->setText(QApplication::translate("Form", "Save", 0, QApplication::UnicodeUTF8)); - buttonCn->setText(QApplication::translate("Form", "Cancel", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + tabWidgetEnv->setTabText(tabWidgetEnv->indexOf(tabCompilers), QApplication::translate("FormEnvironments", "Environments", 0, QApplication::UnicodeUTF8)); + buttonSaveExit->setText(QApplication::translate("FormEnvironments", "Save and Exit", 0, QApplication::UnicodeUTF8)); + buttonSave->setText(QApplication::translate("FormEnvironments", "Save", 0, QApplication::UnicodeUTF8)); + buttonCn->setText(QApplication::translate("FormEnvironments", "Cancel", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormEnvironments); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormEnvironments: public Ui_FormEnvironments {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/finddialog.uic b/harbour/contrib/hbide/resources/finddialog.uic index 53b1e01028..274f96504f 100644 --- a/harbour/contrib/hbide/resources/finddialog.uic +++ b/harbour/contrib/hbide/resources/finddialog.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'finddialog.ui' ** -** Created: Tue Feb 2 14:13:37 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/findinfiles.uic b/harbour/contrib/hbide/resources/findinfiles.uic index b5f5307045..576dcfab5f 100644 --- a/harbour/contrib/hbide/resources/findinfiles.uic +++ b/harbour/contrib/hbide/resources/findinfiles.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'findinfiles.ui' ** -** Created: Sat Feb 6 14:38:09 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/findinfilesex.ui b/harbour/contrib/hbide/resources/findinfilesex.ui index af14da5625..5750c9418c 100644 --- a/harbour/contrib/hbide/resources/findinfilesex.ui +++ b/harbour/contrib/hbide/resources/findinfilesex.ui @@ -1,7 +1,7 @@ - Form - + FormFindInFilesEx + 0 diff --git a/harbour/contrib/hbide/resources/findinfilesex.uic b/harbour/contrib/hbide/resources/findinfilesex.uic index 592be0d6da..c21d04c193 100644 --- a/harbour/contrib/hbide/resources/findinfilesex.uic +++ b/harbour/contrib/hbide/resources/findinfilesex.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'findinfilesex.ui' ** -** Created: Wed Feb 17 17:38:32 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormFindInFilesEx { public: QGridLayout *gridLayout; @@ -75,22 +75,22 @@ public: QSpacerItem *horizontalSpacer_2; QCheckBox *checkSubFolders; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormFindInFilesEx) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(404, 443); - gridLayout = new QGridLayout(Form); + if (FormFindInFilesEx->objectName().isEmpty()) + FormFindInFilesEx->setObjectName(QString::fromUtf8("FormFindInFilesEx")); + FormFindInFilesEx->resize(404, 443); + gridLayout = new QGridLayout(FormFindInFilesEx); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); horizontalLayout_5 = new QHBoxLayout(); horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); - comboFolder = new QComboBox(Form); + comboFolder = new QComboBox(FormFindInFilesEx); comboFolder->setObjectName(QString::fromUtf8("comboFolder")); comboFolder->setEditable(true); horizontalLayout_5->addWidget(comboFolder); - buttonFolder = new QToolButton(Form); + buttonFolder = new QToolButton(FormFindInFilesEx); buttonFolder->setObjectName(QString::fromUtf8("buttonFolder")); horizontalLayout_5->addWidget(buttonFolder); @@ -100,44 +100,44 @@ public: horizontalLayout_6 = new QHBoxLayout(); horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); - labelFileTypes = new QLabel(Form); + labelFileTypes = new QLabel(FormFindInFilesEx); labelFileTypes->setObjectName(QString::fromUtf8("labelFileTypes")); labelFileTypes->setMinimumSize(QSize(52, 0)); labelFileTypes->setMaximumSize(QSize(52, 16777215)); horizontalLayout_6->addWidget(labelFileTypes); - checkAll = new QCheckBox(Form); + checkAll = new QCheckBox(FormFindInFilesEx); checkAll->setObjectName(QString::fromUtf8("checkAll")); horizontalLayout_6->addWidget(checkAll); - checkPrg = new QCheckBox(Form); + checkPrg = new QCheckBox(FormFindInFilesEx); checkPrg->setObjectName(QString::fromUtf8("checkPrg")); horizontalLayout_6->addWidget(checkPrg); - checkC = new QCheckBox(Form); + checkC = new QCheckBox(FormFindInFilesEx); checkC->setObjectName(QString::fromUtf8("checkC")); horizontalLayout_6->addWidget(checkC); - checkCpp = new QCheckBox(Form); + checkCpp = new QCheckBox(FormFindInFilesEx); checkCpp->setObjectName(QString::fromUtf8("checkCpp")); horizontalLayout_6->addWidget(checkCpp); - checkCh = new QCheckBox(Form); + checkCh = new QCheckBox(FormFindInFilesEx); checkCh->setObjectName(QString::fromUtf8("checkCh")); horizontalLayout_6->addWidget(checkCh); - checkH = new QCheckBox(Form); + checkH = new QCheckBox(FormFindInFilesEx); checkH->setObjectName(QString::fromUtf8("checkH")); horizontalLayout_6->addWidget(checkH); - checkRc = new QCheckBox(Form); + checkRc = new QCheckBox(FormFindInFilesEx); checkRc->setObjectName(QString::fromUtf8("checkRc")); checkRc->setMaximumSize(QSize(33, 16777215)); @@ -146,21 +146,21 @@ public: gridLayout->addLayout(horizontalLayout_6, 0, 0, 1, 4); - line_5 = new QFrame(Form); + line_5 = new QFrame(FormFindInFilesEx); line_5->setObjectName(QString::fromUtf8("line_5")); line_5->setFrameShape(QFrame::HLine); line_5->setFrameShadow(QFrame::Sunken); gridLayout->addWidget(line_5, 1, 0, 1, 4); - labelProjects = new QLabel(Form); + labelProjects = new QLabel(FormFindInFilesEx); labelProjects->setObjectName(QString::fromUtf8("labelProjects")); labelProjects->setMaximumSize(QSize(52, 16777215)); labelProjects->setAlignment(Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop); gridLayout->addWidget(labelProjects, 2, 0, 1, 1); - listProjects = new QListWidget(Form); + listProjects = new QListWidget(FormFindInFilesEx); listProjects->setObjectName(QString::fromUtf8("listProjects")); listProjects->setMinimumSize(QSize(0, 60)); listProjects->setMaximumSize(QSize(16777215, 60)); @@ -170,66 +170,66 @@ public: gridLayout->addWidget(listProjects, 2, 1, 1, 3); - line_3 = new QFrame(Form); + line_3 = new QFrame(FormFindInFilesEx); line_3->setObjectName(QString::fromUtf8("line_3")); line_3->setFrameShape(QFrame::HLine); line_3->setFrameShadow(QFrame::Sunken); gridLayout->addWidget(line_3, 9, 0, 1, 4); - labelExpr = new QLabel(Form); + labelExpr = new QLabel(FormFindInFilesEx); labelExpr->setObjectName(QString::fromUtf8("labelExpr")); labelExpr->setMaximumSize(QSize(52, 16777215)); gridLayout->addWidget(labelExpr, 11, 0, 1, 1); - comboExpr = new QComboBox(Form); + comboExpr = new QComboBox(FormFindInFilesEx); comboExpr->setObjectName(QString::fromUtf8("comboExpr")); comboExpr->setEditable(true); gridLayout->addWidget(comboExpr, 11, 1, 1, 3); - checkRegEx = new QCheckBox(Form); + checkRegEx = new QCheckBox(FormFindInFilesEx); checkRegEx->setObjectName(QString::fromUtf8("checkRegEx")); gridLayout->addWidget(checkRegEx, 12, 1, 1, 1); - checkMatchCase = new QCheckBox(Form); + checkMatchCase = new QCheckBox(FormFindInFilesEx); checkMatchCase->setObjectName(QString::fromUtf8("checkMatchCase")); gridLayout->addWidget(checkMatchCase, 12, 2, 1, 1); - checkListOnly = new QCheckBox(Form); + checkListOnly = new QCheckBox(FormFindInFilesEx); checkListOnly->setObjectName(QString::fromUtf8("checkListOnly")); gridLayout->addWidget(checkListOnly, 12, 3, 1, 1); - labelRepl = new QLabel(Form); + labelRepl = new QLabel(FormFindInFilesEx); labelRepl->setObjectName(QString::fromUtf8("labelRepl")); labelRepl->setMaximumSize(QSize(52, 16777215)); gridLayout->addWidget(labelRepl, 13, 0, 1, 1); - comboRepl = new QComboBox(Form); + comboRepl = new QComboBox(FormFindInFilesEx); comboRepl->setObjectName(QString::fromUtf8("comboRepl")); comboRepl->setEditable(true); gridLayout->addWidget(comboRepl, 13, 1, 1, 3); - line_4 = new QFrame(Form); + line_4 = new QFrame(FormFindInFilesEx); line_4->setObjectName(QString::fromUtf8("line_4")); line_4->setFrameShape(QFrame::HLine); line_4->setFrameShadow(QFrame::Sunken); gridLayout->addWidget(line_4, 14, 0, 1, 4); - editResults = new QTextEdit(Form); + editResults = new QTextEdit(FormFindInFilesEx); editResults->setObjectName(QString::fromUtf8("editResults")); editResults->setLineWrapMode(QTextEdit::NoWrap); gridLayout->addWidget(editResults, 16, 0, 1, 4); - labelStatus = new QLabel(Form); + labelStatus = new QLabel(FormFindInFilesEx); labelStatus->setObjectName(QString::fromUtf8("labelStatus")); labelStatus->setFrameShape(QFrame::Panel); labelStatus->setFrameShadow(QFrame::Sunken); @@ -239,22 +239,22 @@ public: horizontalLayout_7 = new QHBoxLayout(); horizontalLayout_7->setObjectName(QString::fromUtf8("horizontalLayout_7")); - buttonFind = new QPushButton(Form); + buttonFind = new QPushButton(FormFindInFilesEx); buttonFind->setObjectName(QString::fromUtf8("buttonFind")); horizontalLayout_7->addWidget(buttonFind); - buttonRepl = new QPushButton(Form); + buttonRepl = new QPushButton(FormFindInFilesEx); buttonRepl->setObjectName(QString::fromUtf8("buttonRepl")); horizontalLayout_7->addWidget(buttonRepl); - buttonStop = new QPushButton(Form); + buttonStop = new QPushButton(FormFindInFilesEx); buttonStop->setObjectName(QString::fromUtf8("buttonStop")); horizontalLayout_7->addWidget(buttonStop); - buttonClose = new QPushButton(Form); + buttonClose = new QPushButton(FormFindInFilesEx); buttonClose->setObjectName(QString::fromUtf8("buttonClose")); horizontalLayout_7->addWidget(buttonClose); @@ -262,7 +262,7 @@ public: gridLayout->addLayout(horizontalLayout_7, 15, 1, 1, 3); - labelFolder = new QLabel(Form); + labelFolder = new QLabel(FormFindInFilesEx); labelFolder->setObjectName(QString::fromUtf8("labelFolder")); labelFolder->setMaximumSize(QSize(52, 16777215)); @@ -270,7 +270,7 @@ public: horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); - checkOpenTabs = new QCheckBox(Form); + checkOpenTabs = new QCheckBox(FormFindInFilesEx); checkOpenTabs->setObjectName(QString::fromUtf8("checkOpenTabs")); horizontalLayout_4->addWidget(checkOpenTabs); @@ -279,7 +279,7 @@ public: horizontalLayout_4->addItem(horizontalSpacer); - checkSubProjects = new QCheckBox(Form); + checkSubProjects = new QCheckBox(FormFindInFilesEx); checkSubProjects->setObjectName(QString::fromUtf8("checkSubProjects")); horizontalLayout_4->addWidget(checkSubProjects); @@ -289,7 +289,7 @@ public: horizontalLayout_8 = new QHBoxLayout(); horizontalLayout_8->setObjectName(QString::fromUtf8("horizontalLayout_8")); - checkFolders = new QCheckBox(Form); + checkFolders = new QCheckBox(FormFindInFilesEx); checkFolders->setObjectName(QString::fromUtf8("checkFolders")); horizontalLayout_8->addWidget(checkFolders); @@ -298,7 +298,7 @@ public: horizontalLayout_8->addItem(horizontalSpacer_2); - checkSubFolders = new QCheckBox(Form); + checkSubFolders = new QCheckBox(FormFindInFilesEx); checkSubFolders->setObjectName(QString::fromUtf8("checkSubFolders")); horizontalLayout_8->addWidget(checkSubFolders); @@ -307,46 +307,46 @@ public: gridLayout->addLayout(horizontalLayout_8, 5, 1, 1, 3); - retranslateUi(Form); + retranslateUi(FormFindInFilesEx); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormFindInFilesEx); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormFindInFilesEx) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - buttonFolder->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - labelFileTypes->setText(QApplication::translate("Form", "File types:", 0, QApplication::UnicodeUTF8)); - checkAll->setText(QApplication::translate("Form", "all", 0, QApplication::UnicodeUTF8)); - checkPrg->setText(QApplication::translate("Form", ".prg", 0, QApplication::UnicodeUTF8)); - checkC->setText(QApplication::translate("Form", ".c", 0, QApplication::UnicodeUTF8)); - checkCpp->setText(QApplication::translate("Form", ".c++", 0, QApplication::UnicodeUTF8)); - checkCh->setText(QApplication::translate("Form", ".ch", 0, QApplication::UnicodeUTF8)); - checkH->setText(QApplication::translate("Form", ".h", 0, QApplication::UnicodeUTF8)); - checkRc->setText(QApplication::translate("Form", ".rc", 0, QApplication::UnicodeUTF8)); - labelProjects->setText(QApplication::translate("Form", "Projects:", 0, QApplication::UnicodeUTF8)); - labelExpr->setText(QApplication::translate("Form", "Expression", 0, QApplication::UnicodeUTF8)); - checkRegEx->setText(QApplication::translate("Form", "RegEx", 0, QApplication::UnicodeUTF8)); - checkMatchCase->setText(QApplication::translate("Form", "Match case", 0, QApplication::UnicodeUTF8)); - checkListOnly->setText(QApplication::translate("Form", "List only", 0, QApplication::UnicodeUTF8)); - labelRepl->setText(QApplication::translate("Form", "Replace:", 0, QApplication::UnicodeUTF8)); + FormFindInFilesEx->setWindowTitle(QApplication::translate("FormFindInFilesEx", "Form", 0, QApplication::UnicodeUTF8)); + buttonFolder->setText(QApplication::translate("FormFindInFilesEx", "...", 0, QApplication::UnicodeUTF8)); + labelFileTypes->setText(QApplication::translate("FormFindInFilesEx", "File types:", 0, QApplication::UnicodeUTF8)); + checkAll->setText(QApplication::translate("FormFindInFilesEx", "all", 0, QApplication::UnicodeUTF8)); + checkPrg->setText(QApplication::translate("FormFindInFilesEx", ".prg", 0, QApplication::UnicodeUTF8)); + checkC->setText(QApplication::translate("FormFindInFilesEx", ".c", 0, QApplication::UnicodeUTF8)); + checkCpp->setText(QApplication::translate("FormFindInFilesEx", ".c++", 0, QApplication::UnicodeUTF8)); + checkCh->setText(QApplication::translate("FormFindInFilesEx", ".ch", 0, QApplication::UnicodeUTF8)); + checkH->setText(QApplication::translate("FormFindInFilesEx", ".h", 0, QApplication::UnicodeUTF8)); + checkRc->setText(QApplication::translate("FormFindInFilesEx", ".rc", 0, QApplication::UnicodeUTF8)); + labelProjects->setText(QApplication::translate("FormFindInFilesEx", "Projects:", 0, QApplication::UnicodeUTF8)); + labelExpr->setText(QApplication::translate("FormFindInFilesEx", "Expression", 0, QApplication::UnicodeUTF8)); + checkRegEx->setText(QApplication::translate("FormFindInFilesEx", "RegEx", 0, QApplication::UnicodeUTF8)); + checkMatchCase->setText(QApplication::translate("FormFindInFilesEx", "Match case", 0, QApplication::UnicodeUTF8)); + checkListOnly->setText(QApplication::translate("FormFindInFilesEx", "List only", 0, QApplication::UnicodeUTF8)); + labelRepl->setText(QApplication::translate("FormFindInFilesEx", "Replace:", 0, QApplication::UnicodeUTF8)); labelStatus->setText(QString()); - buttonFind->setText(QApplication::translate("Form", "Find", 0, QApplication::UnicodeUTF8)); - buttonRepl->setText(QApplication::translate("Form", "Replace", 0, QApplication::UnicodeUTF8)); - buttonStop->setText(QApplication::translate("Form", "Stop", 0, QApplication::UnicodeUTF8)); - buttonClose->setText(QApplication::translate("Form", "Close", 0, QApplication::UnicodeUTF8)); - labelFolder->setText(QApplication::translate("Form", "Folder:", 0, QApplication::UnicodeUTF8)); - checkOpenTabs->setText(QApplication::translate("Form", "Include open tabs ", 0, QApplication::UnicodeUTF8)); - checkSubProjects->setText(QApplication::translate("Form", "Include sub-projects", 0, QApplication::UnicodeUTF8)); - checkFolders->setText(QApplication::translate("Form", "Include folders", 0, QApplication::UnicodeUTF8)); - checkSubFolders->setText(QApplication::translate("Form", "Include sub-folders", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + buttonFind->setText(QApplication::translate("FormFindInFilesEx", "Find", 0, QApplication::UnicodeUTF8)); + buttonRepl->setText(QApplication::translate("FormFindInFilesEx", "Replace", 0, QApplication::UnicodeUTF8)); + buttonStop->setText(QApplication::translate("FormFindInFilesEx", "Stop", 0, QApplication::UnicodeUTF8)); + buttonClose->setText(QApplication::translate("FormFindInFilesEx", "Close", 0, QApplication::UnicodeUTF8)); + labelFolder->setText(QApplication::translate("FormFindInFilesEx", "Folder:", 0, QApplication::UnicodeUTF8)); + checkOpenTabs->setText(QApplication::translate("FormFindInFilesEx", "Include open tabs ", 0, QApplication::UnicodeUTF8)); + checkSubProjects->setText(QApplication::translate("FormFindInFilesEx", "Include sub-projects", 0, QApplication::UnicodeUTF8)); + checkFolders->setText(QApplication::translate("FormFindInFilesEx", "Include folders", 0, QApplication::UnicodeUTF8)); + checkSubFolders->setText(QApplication::translate("FormFindInFilesEx", "Include sub-folders", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormFindInFilesEx); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormFindInFilesEx: public Ui_FormFindInFilesEx {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/findsource.uic b/harbour/contrib/hbide/resources/findsource.uic index 75964f538b..b503ac025a 100644 --- a/harbour/contrib/hbide/resources/findsource.uic +++ b/harbour/contrib/hbide/resources/findsource.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'findsource.ui' ** -** Created: Tue Feb 2 14:13:37 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:24 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/harbourhelp.png b/harbour/contrib/hbide/resources/harbourhelp.png new file mode 100644 index 0000000000000000000000000000000000000000..25e0997680bcae9a41a8cb6c3403f14a8b38018c GIT binary patch literal 303 zcmV+~0nq-5P)H@mj8eL|3Q(EcqG8E^$28%UMVPGW50LB^~hA%&a;9~V9 zH_=?M`ws)Z-B+vza50GfhiL|BZ0u3T;su}q4Cc?UhBnCQFawx4ZZiJ+q5dDM0U#If z@_fWF;P_Pr2K5;b|AYJvG5}-{(O!6*!SG-9p%eqd_Ge(tAa9Tqh{y)i<}myRX(lNe z!3L~1WBB**BRm{PHeePD13dIm44_I - Form - + FormProjectPropEx + 0 diff --git a/harbour/contrib/hbide/resources/projectpropertiesex.uic b/harbour/contrib/hbide/resources/projectpropertiesex.uic index 5f7f99c098..15d0d03056 100644 --- a/harbour/contrib/hbide/resources/projectpropertiesex.uic +++ b/harbour/contrib/hbide/resources/projectpropertiesex.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'projectpropertiesex.ui' ** -** Created: Wed Feb 17 15:22:01 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -30,7 +30,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormProjectPropEx { public: QVBoxLayout *verticalLayout; @@ -84,14 +84,14 @@ public: QPushButton *buttonSave; QPushButton *buttonCn; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormProjectPropEx) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(324, 434); - verticalLayout = new QVBoxLayout(Form); + if (FormProjectPropEx->objectName().isEmpty()) + FormProjectPropEx->setObjectName(QString::fromUtf8("FormProjectPropEx")); + FormProjectPropEx->resize(324, 434); + verticalLayout = new QVBoxLayout(FormProjectPropEx); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); - tabWidget = new QTabWidget(Form); + tabWidget = new QTabWidget(FormProjectPropEx); tabWidget->setObjectName(QString::fromUtf8("tabWidget")); tabGeneral = new QWidget(); tabGeneral->setObjectName(QString::fromUtf8("tabGeneral")); @@ -324,19 +324,19 @@ public: horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); - buttonSaveExit = new QPushButton(Form); + buttonSaveExit = new QPushButton(FormProjectPropEx); buttonSaveExit->setObjectName(QString::fromUtf8("buttonSaveExit")); horizontalLayout_4->addWidget(buttonSaveExit); - buttonSave = new QPushButton(Form); + buttonSave = new QPushButton(FormProjectPropEx); buttonSave->setObjectName(QString::fromUtf8("buttonSave")); buttonSave->setAutoDefault(false); buttonSave->setDefault(true); horizontalLayout_4->addWidget(buttonSave); - buttonCn = new QPushButton(Form); + buttonCn = new QPushButton(FormProjectPropEx); buttonCn->setObjectName(QString::fromUtf8("buttonCn")); buttonCn->setAutoDefault(false); @@ -346,84 +346,84 @@ public: verticalLayout->addLayout(horizontalLayout_4); - retranslateUi(Form); + retranslateUi(FormProjectPropEx); tabWidget->setCurrentIndex(0); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormProjectPropEx); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormProjectPropEx) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - label->setText(QApplication::translate("Form", "Project Type:", 0, QApplication::UnicodeUTF8)); + FormProjectPropEx->setWindowTitle(QApplication::translate("FormProjectPropEx", "Form", 0, QApplication::UnicodeUTF8)); + label->setText(QApplication::translate("FormProjectPropEx", "Project Type:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - comboPrjType->setToolTip(QApplication::translate("Form", "\n" + comboPrjType->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

A project may be of type Executable|Library|Dll.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_2->setText(QApplication::translate("Form", "Project Title:", 0, QApplication::UnicodeUTF8)); + label_2->setText(QApplication::translate("FormProjectPropEx", "Project Title:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editPrjTitle->setToolTip(QApplication::translate("Form", "\n" + editPrjTitle->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Title will be shown as a node in project tree.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_3->setText(QApplication::translate("Form", "Project Location:", 0, QApplication::UnicodeUTF8)); + label_3->setText(QApplication::translate("FormProjectPropEx", "Project Location:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editPrjLoctn->setToolTip(QApplication::translate("Form", "\n" + editPrjLoctn->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Project location is the folder where project definition file .hbi will be stored. <Project Location> plus <Output Name> will comprise the full file name with .hbp extension.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_4->setText(QApplication::translate("Form", "Working Folder:", 0, QApplication::UnicodeUTF8)); + label_4->setText(QApplication::translate("FormProjectPropEx", "Working Folder:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editWrkFolder->setToolTip(QApplication::translate("Form", "\n" + editWrkFolder->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Working folder will be used to host HBMK2 compliant <Output Name> plus <hbp> and will be designated as current folder when HBMK2 will be invoked.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_5->setText(QApplication::translate("Form", "Destination Folder:", 0, QApplication::UnicodeUTF8)); + label_5->setText(QApplication::translate("FormProjectPropEx", "Destination Folder:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editDstFolder->setToolTip(QApplication::translate("Form", "\n" + editDstFolder->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Destination folder is a compatibility slot and is reserved to place the <Output> .exe .a .lib.

\n" "

But currently this functionality will be achieved through the -o compiler flag.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_9->setText(QApplication::translate("Form", "Compile/Link Flags:", 0, QApplication::UnicodeUTF8)); + label_9->setText(QApplication::translate("FormProjectPropEx", "Compile/Link Flags:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editFlags->setToolTip(QApplication::translate("Form", "\n" + editFlags->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Compiler/Linker flags may include all commands except the source files list. Additional libraries can be included here.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP editFlags->setStyleSheet(QString()); - label_7->setText(QApplication::translate("Form", "Launch Parameters:", 0, QApplication::UnicodeUTF8)); - label_8->setText(QApplication::translate("Form", "Launch Program:", 0, QApplication::UnicodeUTF8)); - label_13->setText(QApplication::translate("Form", "Backup Location:", 0, QApplication::UnicodeUTF8)); + label_7->setText(QApplication::translate("FormProjectPropEx", "Launch Parameters:", 0, QApplication::UnicodeUTF8)); + label_8->setText(QApplication::translate("FormProjectPropEx", "Launch Program:", 0, QApplication::UnicodeUTF8)); + label_13->setText(QApplication::translate("FormProjectPropEx", "Backup Location:", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editOutName->setToolTip(QApplication::translate("Form", "\n" + editOutName->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" "

Output name is used as final name for .hbi .hbp .exe .lib .a and will be added to the paths retrieved via <Project Location>, <Working Folder>, <Destination Folder>, etc. So this is a very important component.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - label_6->setText(QApplication::translate("Form", "Output Name:", 0, QApplication::UnicodeUTF8)); - buttonChoosePrjLoc->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonBackup->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonChooseDest->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonChooseWd->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); + label_6->setText(QApplication::translate("FormProjectPropEx", "Output Name:", 0, QApplication::UnicodeUTF8)); + buttonChoosePrjLoc->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); + buttonBackup->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); + buttonChooseDest->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); + buttonChooseWd->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - buttonHbp->setToolTip(QApplication::translate("Form", "\n" + buttonHbp->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" @@ -439,9 +439,9 @@ public: "

This is done at the time of \"Build\" proces" "s.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - buttonHbp->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); + buttonHbp->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - buttonXmate->setToolTip(QApplication::translate("Form", "\n" + buttonXmate->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" @@ -452,10 +452,10 @@ public: "text-indent:0px;\">but it is possible that it may not load everything.

\n" "

So you may need manual editing.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - buttonXmate->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - tabWidget->setTabText(tabWidget->indexOf(tabGeneral), QApplication::translate("Form", "General", 0, QApplication::UnicodeUTF8)); + buttonXmate->setText(QApplication::translate("FormProjectPropEx", "...", 0, QApplication::UnicodeUTF8)); + tabWidget->setTabText(tabWidget->indexOf(tabGeneral), QApplication::translate("FormProjectPropEx", "General", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editSources->setToolTip(QApplication::translate("Form", "\n" + editSources->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" @@ -467,24 +467,24 @@ public: #endif // QT_NO_TOOLTIP editSources->setStyleSheet(QString()); #ifndef QT_NO_TOOLTIP - buttonSelect->setToolTip(QApplication::translate("Form", "Select Sources", 0, QApplication::UnicodeUTF8)); + buttonSelect->setToolTip(QApplication::translate("FormProjectPropEx", "Select Sources", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP buttonSelect->setText(QString()); #ifndef QT_NO_TOOLTIP - buttonSort->setToolTip(QApplication::translate("Form", "Sort by Ascending Order", 0, QApplication::UnicodeUTF8)); + buttonSort->setToolTip(QApplication::translate("FormProjectPropEx", "Sort by Ascending Order", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP buttonSort->setText(QString()); #ifndef QT_NO_TOOLTIP - buttonSortZA->setToolTip(QApplication::translate("Form", "Sort by Descending Order", 0, QApplication::UnicodeUTF8)); + buttonSortZA->setToolTip(QApplication::translate("FormProjectPropEx", "Sort by Descending Order", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP buttonSortZA->setText(QString()); #ifndef QT_NO_TOOLTIP - buttonSortOrg->setToolTip(QApplication::translate("Form", "Organize by Type and Sort Ascending", 0, QApplication::UnicodeUTF8)); + buttonSortOrg->setToolTip(QApplication::translate("FormProjectPropEx", "Organize by Type and Sort Ascending", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP buttonSortOrg->setText(QString()); - tabWidget->setTabText(tabWidget->indexOf(tabFiles), QApplication::translate("Form", "Sources", 0, QApplication::UnicodeUTF8)); - editMetaHelp->setStyleSheet(QApplication::translate("Form", "background-color: rgb(171, 171, 171);", 0, QApplication::UnicodeUTF8)); - editMetaHelp->setPlainText(QApplication::translate("Form", "HBIDE will employ the concept of meta-data which will be used to parse the paths or other info supplied to the interface.\n" + tabWidget->setTabText(tabWidget->indexOf(tabFiles), QApplication::translate("FormProjectPropEx", "Sources", 0, QApplication::UnicodeUTF8)); + editMetaHelp->setStyleSheet(QApplication::translate("FormProjectPropEx", "background-color: rgb(171, 171, 171);", 0, QApplication::UnicodeUTF8)); + editMetaHelp->setPlainText(QApplication::translate("FormProjectPropEx", "HBIDE will employ the concept of meta-data which will be used to parse the paths or other info supplied to the interface.\n" "\n" "Usually meta-key is enclosed in curly braces, but due to the fact that HBMK2 already exploits it, HBIDE will recognize meta-key in angled brackets.\n" "\n" @@ -499,7 +499,7 @@ public: "Enjoy\n" "Pritpal Bedi", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editMetaData->setToolTip(QApplication::translate("Form", "\n" + editMetaData->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" @@ -509,9 +509,9 @@ public: "

The expression is evaluated only once and keeps its value until the HBIDE interface is closed. In case of any error, the expression string itself is returned.

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP editMetaData->setStyleSheet(QString()); - tabWidget->setTabText(tabWidget->indexOf(tabMeta), QApplication::translate("Form", "Meta Data", 0, QApplication::UnicodeUTF8)); + tabWidget->setTabText(tabWidget->indexOf(tabMeta), QApplication::translate("FormProjectPropEx", "Meta Data", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editHbp->setToolTip(QApplication::translate("Form", "\n" + editHbp->setToolTip(QApplication::translate("FormProjectPropEx", "\n" "\n" @@ -521,17 +521,17 @@ public: ";\">Enjoy

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP editHbp->setStyleSheet(QString()); - tabWidget->setTabText(tabWidget->indexOf(tabHbp), QApplication::translate("Form", "hbp", 0, QApplication::UnicodeUTF8)); - buttonSaveExit->setText(QApplication::translate("Form", "Save and Exit", 0, QApplication::UnicodeUTF8)); - buttonSave->setText(QApplication::translate("Form", "Save", 0, QApplication::UnicodeUTF8)); - buttonCn->setText(QApplication::translate("Form", "Cancel", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + tabWidget->setTabText(tabWidget->indexOf(tabHbp), QApplication::translate("FormProjectPropEx", "hbp", 0, QApplication::UnicodeUTF8)); + buttonSaveExit->setText(QApplication::translate("FormProjectPropEx", "Save and Exit", 0, QApplication::UnicodeUTF8)); + buttonSave->setText(QApplication::translate("FormProjectPropEx", "Save", 0, QApplication::UnicodeUTF8)); + buttonCn->setText(QApplication::translate("FormProjectPropEx", "Cancel", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormProjectPropEx); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormProjectPropEx: public Ui_FormProjectPropEx {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/projectstree.png b/harbour/contrib/hbide/resources/projectstree.png new file mode 100644 index 0000000000000000000000000000000000000000..30b25ba81d4968ce6f2cab93d220b520ed949e6f GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`yFFbTLn>}1rz{XKI3&T#%ln^G zlWkSvkt_y};^y-*P1{U!JQF8Oo0jI`>znFg$Z%6sp_ylyed3QT(;6S%WAE5AiQ(}7 z>gp7UDKYa5j)1xceK-$4TbAD}8!gAvT re&(2&FK-&lTU1}u5q>kXQ;2~f&#q7KgePk*&>IY%u6{1-oD!MbveNg`||>;LPCs8*v-X>e{{FLkM{Cv_xB)gr{bH^rn&--0 zWu=+FKf`O|Urs58&fSlnp1gL?Xj@CxD~JIl6U+7#7yzf;2 literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/searchreplace.ui b/harbour/contrib/hbide/resources/searchreplace.ui index 3ff198e248..f767b982db 100644 --- a/harbour/contrib/hbide/resources/searchreplace.ui +++ b/harbour/contrib/hbide/resources/searchreplace.ui @@ -1,7 +1,7 @@ - Form - + FormSearchReplace1 + 0 diff --git a/harbour/contrib/hbide/resources/searchreplace.uic b/harbour/contrib/hbide/resources/searchreplace.uic index 198a4fe8af..99d94d6ca3 100644 --- a/harbour/contrib/hbide/resources/searchreplace.uic +++ b/harbour/contrib/hbide/resources/searchreplace.uic @@ -1,7 +1,7 @@ /******************************************************************************** ** Form generated from reading ui file 'searchreplace.ui' ** -** Created: Fri Feb 19 14:30:41 2010 +** Created: Wed Feb 24 16:25:25 2010 ** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! @@ -28,7 +28,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormSearchReplace1 { public: QVBoxLayout *verticalLayout; @@ -57,16 +57,16 @@ public: QSpacerItem *horizontalSpacer_2; QToolButton *buttonCloseRepl; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormSearchReplace1) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(817, 75); - verticalLayout = new QVBoxLayout(Form); + if (FormSearchReplace1->objectName().isEmpty()) + FormSearchReplace1->setObjectName(QString::fromUtf8("FormSearchReplace1")); + FormSearchReplace1->resize(817, 75); + verticalLayout = new QVBoxLayout(FormSearchReplace1); verticalLayout->setSpacing(5); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); verticalLayout->setContentsMargins(0, 3, 0, 3); - frameFind = new QFrame(Form); + frameFind = new QFrame(FormSearchReplace1); frameFind->setObjectName(QString::fromUtf8("frameFind")); frameFind->setFrameShape(QFrame::NoFrame); frameFind->setFrameShadow(QFrame::Plain); @@ -163,7 +163,7 @@ public: verticalLayout->addWidget(frameFind); - frameReplace = new QFrame(Form); + frameReplace = new QFrame(FormSearchReplace1); frameReplace->setObjectName(QString::fromUtf8("frameReplace")); frameReplace->setFrameShape(QFrame::NoFrame); frameReplace->setFrameShadow(QFrame::Plain); @@ -221,37 +221,37 @@ public: verticalLayout->addWidget(frameReplace); - retranslateUi(Form); + retranslateUi(FormSearchReplace1); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormSearchReplace1); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormSearchReplace1) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - labelFind->setText(QApplication::translate("Form", "Search:", 0, QApplication::UnicodeUTF8)); - buttonNext->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonPrev->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - label_2->setText(QApplication::translate("Form", "From:", 0, QApplication::UnicodeUTF8)); - radioTop->setText(QApplication::translate("Form", "Top", 0, QApplication::UnicodeUTF8)); - radioCursor->setText(QApplication::translate("Form", "Cursor", 0, QApplication::UnicodeUTF8)); - checkMatchCase->setText(QApplication::translate("Form", "Case", 0, QApplication::UnicodeUTF8)); - checkWhole->setText(QApplication::translate("Form", "Whole", 0, QApplication::UnicodeUTF8)); - checkRegEx->setText(QApplication::translate("Form", "RegEx", 0, QApplication::UnicodeUTF8)); - checkReplace->setText(QApplication::translate("Form", "Replace", 0, QApplication::UnicodeUTF8)); - buttonClose->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - labelReplace->setText(QApplication::translate("Form", "Replace:", 0, QApplication::UnicodeUTF8)); - buttonReplace->setText(QApplication::translate("Form", "Replace", 0, QApplication::UnicodeUTF8)); - checkGlobal->setText(QApplication::translate("Form", "Global", 0, QApplication::UnicodeUTF8)); - checkNoPrompt->setText(QApplication::translate("Form", "No Prompt", 0, QApplication::UnicodeUTF8)); - buttonCloseRepl->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + FormSearchReplace1->setWindowTitle(QApplication::translate("FormSearchReplace1", "Form", 0, QApplication::UnicodeUTF8)); + labelFind->setText(QApplication::translate("FormSearchReplace1", "Search:", 0, QApplication::UnicodeUTF8)); + buttonNext->setText(QApplication::translate("FormSearchReplace1", "...", 0, QApplication::UnicodeUTF8)); + buttonPrev->setText(QApplication::translate("FormSearchReplace1", "...", 0, QApplication::UnicodeUTF8)); + label_2->setText(QApplication::translate("FormSearchReplace1", "From:", 0, QApplication::UnicodeUTF8)); + radioTop->setText(QApplication::translate("FormSearchReplace1", "Top", 0, QApplication::UnicodeUTF8)); + radioCursor->setText(QApplication::translate("FormSearchReplace1", "Cursor", 0, QApplication::UnicodeUTF8)); + checkMatchCase->setText(QApplication::translate("FormSearchReplace1", "Case", 0, QApplication::UnicodeUTF8)); + checkWhole->setText(QApplication::translate("FormSearchReplace1", "Whole", 0, QApplication::UnicodeUTF8)); + checkRegEx->setText(QApplication::translate("FormSearchReplace1", "RegEx", 0, QApplication::UnicodeUTF8)); + checkReplace->setText(QApplication::translate("FormSearchReplace1", "Replace", 0, QApplication::UnicodeUTF8)); + buttonClose->setText(QApplication::translate("FormSearchReplace1", "...", 0, QApplication::UnicodeUTF8)); + labelReplace->setText(QApplication::translate("FormSearchReplace1", "Replace:", 0, QApplication::UnicodeUTF8)); + buttonReplace->setText(QApplication::translate("FormSearchReplace1", "Replace", 0, QApplication::UnicodeUTF8)); + checkGlobal->setText(QApplication::translate("FormSearchReplace1", "Global", 0, QApplication::UnicodeUTF8)); + checkNoPrompt->setText(QApplication::translate("FormSearchReplace1", "No Prompt", 0, QApplication::UnicodeUTF8)); + buttonCloseRepl->setText(QApplication::translate("FormSearchReplace1", "...", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormSearchReplace1); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormSearchReplace1: public Ui_FormSearchReplace1 {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/searchreplacepanel.ui b/harbour/contrib/hbide/resources/searchreplacepanel.ui index 7afc8b4e00..ebae0c5e70 100644 --- a/harbour/contrib/hbide/resources/searchreplacepanel.ui +++ b/harbour/contrib/hbide/resources/searchreplacepanel.ui @@ -1,12 +1,12 @@ - Form - + FormSearchReplace + 0 0 - 916 + 923 38 diff --git a/harbour/contrib/hbide/resources/searchreplacepanel.uic b/harbour/contrib/hbide/resources/searchreplacepanel.uic index 19f51d464e..24abda39ab 100644 --- a/harbour/contrib/hbide/resources/searchreplacepanel.uic +++ b/harbour/contrib/hbide/resources/searchreplacepanel.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'searchreplacepanel.ui' ** -** Created: Thu Feb 18 17:15:26 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -25,7 +25,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormSearchReplace { public: QHBoxLayout *horizontalLayout; @@ -44,24 +44,24 @@ public: QSpacerItem *horizontalSpacer; QToolButton *buttonClose; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormSearchReplace) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(916, 38); - Form->setMinimumSize(QSize(0, 30)); - Form->setMaximumSize(QSize(16777215, 38)); - Form->setStyleSheet(QString::fromUtf8("border-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(255, 255, 255, 255));")); - horizontalLayout = new QHBoxLayout(Form); + if (FormSearchReplace->objectName().isEmpty()) + FormSearchReplace->setObjectName(QString::fromUtf8("FormSearchReplace")); + FormSearchReplace->resize(923, 38); + FormSearchReplace->setMinimumSize(QSize(0, 30)); + FormSearchReplace->setMaximumSize(QSize(16777215, 38)); + FormSearchReplace->setStyleSheet(QString::fromUtf8("border-color: qlineargradient(spread:pad, x1:0, y1:0, x2:1, y2:0, stop:0 rgba(0, 0, 0, 255), stop:1 rgba(255, 255, 255, 255));")); + horizontalLayout = new QHBoxLayout(FormSearchReplace); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); horizontalLayout->setContentsMargins(-1, 2, -1, 2); - label = new QLabel(Form); + label = new QLabel(FormSearchReplace); label->setObjectName(QString::fromUtf8("label")); label->setMaximumSize(QSize(25, 20)); horizontalLayout->addWidget(label); - comboFind = new QComboBox(Form); + comboFind = new QComboBox(FormSearchReplace); comboFind->setObjectName(QString::fromUtf8("comboFind")); QSizePolicy sizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed); sizePolicy.setHorizontalStretch(0); @@ -74,49 +74,49 @@ public: horizontalLayout->addWidget(comboFind); - buttonNext = new QToolButton(Form); + buttonNext = new QToolButton(FormSearchReplace); buttonNext->setObjectName(QString::fromUtf8("buttonNext")); buttonNext->setAutoRaise(true); horizontalLayout->addWidget(buttonNext); - buttonPrev = new QToolButton(Form); + buttonPrev = new QToolButton(FormSearchReplace); buttonPrev->setObjectName(QString::fromUtf8("buttonPrev")); buttonPrev->setAutoRaise(true); horizontalLayout->addWidget(buttonPrev); - buttonTop = new QToolButton(Form); + buttonTop = new QToolButton(FormSearchReplace); buttonTop->setObjectName(QString::fromUtf8("buttonTop")); buttonTop->setAutoRaise(true); horizontalLayout->addWidget(buttonTop); - checkMatchCase = new QCheckBox(Form); + checkMatchCase = new QCheckBox(FormSearchReplace); checkMatchCase->setObjectName(QString::fromUtf8("checkMatchCase")); horizontalLayout->addWidget(checkMatchCase); - checkRegEx = new QCheckBox(Form); + checkRegEx = new QCheckBox(FormSearchReplace); checkRegEx->setObjectName(QString::fromUtf8("checkRegEx")); horizontalLayout->addWidget(checkRegEx); - label_2 = new QLabel(Form); + label_2 = new QLabel(FormSearchReplace); label_2->setObjectName(QString::fromUtf8("label_2")); label_2->setMinimumSize(QSize(30, 20)); label_2->setMaximumSize(QSize(30, 20)); horizontalLayout->addWidget(label_2); - checkReplace = new QCheckBox(Form); + checkReplace = new QCheckBox(FormSearchReplace); checkReplace->setObjectName(QString::fromUtf8("checkReplace")); checkReplace->setMinimumSize(QSize(62, 0)); checkReplace->setMaximumSize(QSize(62, 16777215)); horizontalLayout->addWidget(checkReplace); - comboReplace = new QComboBox(Form); + comboReplace = new QComboBox(FormSearchReplace); comboReplace->setObjectName(QString::fromUtf8("comboReplace")); sizePolicy.setHeightForWidth(comboReplace->sizePolicy().hasHeightForWidth()); comboReplace->setSizePolicy(sizePolicy); @@ -126,12 +126,12 @@ public: horizontalLayout->addWidget(comboReplace); - checkGlobal = new QCheckBox(Form); + checkGlobal = new QCheckBox(FormSearchReplace); checkGlobal->setObjectName(QString::fromUtf8("checkGlobal")); horizontalLayout->addWidget(checkGlobal); - checkNoPrompt = new QCheckBox(Form); + checkNoPrompt = new QCheckBox(FormSearchReplace); checkNoPrompt->setObjectName(QString::fromUtf8("checkNoPrompt")); horizontalLayout->addWidget(checkNoPrompt); @@ -140,39 +140,39 @@ public: horizontalLayout->addItem(horizontalSpacer); - buttonClose = new QToolButton(Form); + buttonClose = new QToolButton(FormSearchReplace); buttonClose->setObjectName(QString::fromUtf8("buttonClose")); buttonClose->setAutoRaise(true); horizontalLayout->addWidget(buttonClose); - retranslateUi(Form); + retranslateUi(FormSearchReplace); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormSearchReplace); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormSearchReplace) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - label->setText(QApplication::translate("Form", "Find:", 0, QApplication::UnicodeUTF8)); - buttonNext->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonPrev->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - buttonTop->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - checkMatchCase->setText(QApplication::translate("Form", "Case", 0, QApplication::UnicodeUTF8)); - checkRegEx->setText(QApplication::translate("Form", "RegEx", 0, QApplication::UnicodeUTF8)); + FormSearchReplace->setWindowTitle(QApplication::translate("FormSearchReplace", "Form", 0, QApplication::UnicodeUTF8)); + label->setText(QApplication::translate("FormSearchReplace", "Find:", 0, QApplication::UnicodeUTF8)); + buttonNext->setText(QApplication::translate("FormSearchReplace", "...", 0, QApplication::UnicodeUTF8)); + buttonPrev->setText(QApplication::translate("FormSearchReplace", "...", 0, QApplication::UnicodeUTF8)); + buttonTop->setText(QApplication::translate("FormSearchReplace", "...", 0, QApplication::UnicodeUTF8)); + checkMatchCase->setText(QApplication::translate("FormSearchReplace", "Case", 0, QApplication::UnicodeUTF8)); + checkRegEx->setText(QApplication::translate("FormSearchReplace", "RegEx", 0, QApplication::UnicodeUTF8)); label_2->setText(QString()); - checkReplace->setText(QApplication::translate("Form", "Replace:", 0, QApplication::UnicodeUTF8)); - checkGlobal->setText(QApplication::translate("Form", "Global", 0, QApplication::UnicodeUTF8)); - checkNoPrompt->setText(QApplication::translate("Form", "NoPrompt", 0, QApplication::UnicodeUTF8)); - buttonClose->setText(QApplication::translate("Form", "...", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + checkReplace->setText(QApplication::translate("FormSearchReplace", "Replace:", 0, QApplication::UnicodeUTF8)); + checkGlobal->setText(QApplication::translate("FormSearchReplace", "Global", 0, QApplication::UnicodeUTF8)); + checkNoPrompt->setText(QApplication::translate("FormSearchReplace", "NoPrompt", 0, QApplication::UnicodeUTF8)); + buttonClose->setText(QApplication::translate("FormSearchReplace", "...", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormSearchReplace); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormSearchReplace: public Ui_FormSearchReplace {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/selectionlist.uic b/harbour/contrib/hbide/resources/selectionlist.uic index 0855628a7d..c5c41f5916 100644 --- a/harbour/contrib/hbide/resources/selectionlist.uic +++ b/harbour/contrib/hbide/resources/selectionlist.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'selectionlist.ui' ** -** Created: Tue Feb 2 14:13:37 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/selectproject.uic b/harbour/contrib/hbide/resources/selectproject.uic index 77fcb03d54..66e59671b8 100644 --- a/harbour/contrib/hbide/resources/selectproject.uic +++ b/harbour/contrib/hbide/resources/selectproject.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'selectproject.ui' ** -** Created: Tue Feb 2 14:13:37 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/skeletons.ui b/harbour/contrib/hbide/resources/skeletons.ui index 1b1d4752ea..c4571a4958 100644 --- a/harbour/contrib/hbide/resources/skeletons.ui +++ b/harbour/contrib/hbide/resources/skeletons.ui @@ -1,7 +1,7 @@ - Form - + FormSkeletons + 0 diff --git a/harbour/contrib/hbide/resources/skeletons.uic b/harbour/contrib/hbide/resources/skeletons.uic index 218c59129a..2e0b3572bb 100644 --- a/harbour/contrib/hbide/resources/skeletons.uic +++ b/harbour/contrib/hbide/resources/skeletons.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'skeletons.ui' ** -** Created: Sat Feb 13 03:04:34 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -24,7 +24,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormSkeletons { public: QGridLayout *gridLayout; @@ -39,78 +39,78 @@ public: QPushButton *buttonNew; QPushButton *buttonUpdate; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormSkeletons) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(290, 508); - gridLayout = new QGridLayout(Form); + if (FormSkeletons->objectName().isEmpty()) + FormSkeletons->setObjectName(QString::fromUtf8("FormSkeletons")); + FormSkeletons->resize(290, 508); + gridLayout = new QGridLayout(FormSkeletons); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); - labelIdentity = new QLabel(Form); + labelIdentity = new QLabel(FormSkeletons); labelIdentity->setObjectName(QString::fromUtf8("labelIdentity")); gridLayout->addWidget(labelIdentity, 0, 0, 1, 2); - listNames = new QListWidget(Form); + listNames = new QListWidget(FormSkeletons); listNames->setObjectName(QString::fromUtf8("listNames")); gridLayout->addWidget(listNames, 1, 0, 3, 2); - buttonDelete = new QPushButton(Form); + buttonDelete = new QPushButton(FormSkeletons); buttonDelete->setObjectName(QString::fromUtf8("buttonDelete")); gridLayout->addWidget(buttonDelete, 3, 2, 1, 1); - buttonRename = new QPushButton(Form); + buttonRename = new QPushButton(FormSkeletons); buttonRename->setObjectName(QString::fromUtf8("buttonRename")); gridLayout->addWidget(buttonRename, 2, 2, 1, 1); - editCode = new QPlainTextEdit(Form); + editCode = new QPlainTextEdit(FormSkeletons); editCode->setObjectName(QString::fromUtf8("editCode")); editCode->setLineWrapMode(QPlainTextEdit::NoWrap); gridLayout->addWidget(editCode, 5, 0, 1, 3); - buttonClear = new QPushButton(Form); + buttonClear = new QPushButton(FormSkeletons); buttonClear->setObjectName(QString::fromUtf8("buttonClear")); gridLayout->addWidget(buttonClear, 6, 0, 1, 1); - labelSnippets = new QLabel(Form); + labelSnippets = new QLabel(FormSkeletons); labelSnippets->setObjectName(QString::fromUtf8("labelSnippets")); gridLayout->addWidget(labelSnippets, 4, 0, 1, 2); - buttonGetSel = new QPushButton(Form); + buttonGetSel = new QPushButton(FormSkeletons); buttonGetSel->setObjectName(QString::fromUtf8("buttonGetSel")); gridLayout->addWidget(buttonGetSel, 6, 1, 1, 1); - buttonNew = new QPushButton(Form); + buttonNew = new QPushButton(FormSkeletons); buttonNew->setObjectName(QString::fromUtf8("buttonNew")); gridLayout->addWidget(buttonNew, 1, 2, 1, 1); - buttonUpdate = new QPushButton(Form); + buttonUpdate = new QPushButton(FormSkeletons); buttonUpdate->setObjectName(QString::fromUtf8("buttonUpdate")); gridLayout->addWidget(buttonUpdate, 6, 2, 1, 1); - retranslateUi(Form); + retranslateUi(FormSkeletons); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormSkeletons); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormSkeletons) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - labelIdentity->setText(QApplication::translate("Form", "Identity", 0, QApplication::UnicodeUTF8)); - buttonDelete->setText(QApplication::translate("Form", "Delete", 0, QApplication::UnicodeUTF8)); - buttonRename->setText(QApplication::translate("Form", "Rename", 0, QApplication::UnicodeUTF8)); + FormSkeletons->setWindowTitle(QApplication::translate("FormSkeletons", "Form", 0, QApplication::UnicodeUTF8)); + labelIdentity->setText(QApplication::translate("FormSkeletons", "Identity", 0, QApplication::UnicodeUTF8)); + buttonDelete->setText(QApplication::translate("FormSkeletons", "Delete", 0, QApplication::UnicodeUTF8)); + buttonRename->setText(QApplication::translate("FormSkeletons", "Rename", 0, QApplication::UnicodeUTF8)); #ifndef QT_NO_TOOLTIP - editCode->setToolTip(QApplication::translate("Form", "\n" + editCode->setToolTip(QApplication::translate("FormSkeletons", "\n" "\n" @@ -135,18 +135,18 @@ public: "

be respected.

\n" "

", 0, QApplication::UnicodeUTF8)); #endif // QT_NO_TOOLTIP - buttonClear->setText(QApplication::translate("Form", "Clear", 0, QApplication::UnicodeUTF8)); - labelSnippets->setText(QApplication::translate("Form", "Code Snippet", 0, QApplication::UnicodeUTF8)); - buttonGetSel->setText(QApplication::translate("Form", "Get Selection", 0, QApplication::UnicodeUTF8)); - buttonNew->setText(QApplication::translate("Form", "Add New", 0, QApplication::UnicodeUTF8)); - buttonUpdate->setText(QApplication::translate("Form", "Update", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + buttonClear->setText(QApplication::translate("FormSkeletons", "Clear", 0, QApplication::UnicodeUTF8)); + labelSnippets->setText(QApplication::translate("FormSkeletons", "Code Snippet", 0, QApplication::UnicodeUTF8)); + buttonGetSel->setText(QApplication::translate("FormSkeletons", "Get Selection", 0, QApplication::UnicodeUTF8)); + buttonNew->setText(QApplication::translate("FormSkeletons", "Add New", 0, QApplication::UnicodeUTF8)); + buttonUpdate->setText(QApplication::translate("FormSkeletons", "Update", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormSkeletons); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormSkeletons: public Ui_FormSkeletons {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbide/resources/syntaxhiliter.png b/harbour/contrib/hbide/resources/syntaxhiliter.png new file mode 100644 index 0000000000000000000000000000000000000000..7c84660307189ecf6e30325a0e8fc73d8cdfab61 GIT binary patch literal 262 zcmV+h0r~!kP)|f9zp^3|JT$ z@B-?F0n9eZS=g<8p7x(XOBy0~?dgBqF0i`zO2JU@ z>)#xP+f0ra;;R4lV;aE9EQX=*_up3xEKzb;ZU3|E5f!~amTo8j0J|k_k@rOY&;S4c M07*qoM6N<$f)7D-{Qv*} literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/tabs.png b/harbour/contrib/hbide/resources/tabs.png new file mode 100644 index 0000000000000000000000000000000000000000..ea670821c057d0ec7c64e6b59cbd21128976eb2c GIT binary patch literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Gd*1#Ln>}1=VWC3IPakLBDdo3 z0S+UE4oQ9)3kI_j2M;z1E^C+|q3?XIegmTeUvu~2nhj01>_P`8DYX9MV?U52&2Nz) z`nfdXFoQXR;sn}mbP0 Hl+XkK1A9hI literal 0 HcmV?d00001 diff --git a/harbour/contrib/hbide/resources/themes.uic b/harbour/contrib/hbide/resources/themes.uic index 74ca5d5741..e44eb7382b 100644 --- a/harbour/contrib/hbide/resources/themes.uic +++ b/harbour/contrib/hbide/resources/themes.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'themes.ui' ** -** Created: Tue Feb 2 14:13:37 2010 -** by: Qt User Interface Compiler version 4.5.0 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ diff --git a/harbour/contrib/hbide/resources/themesex.ui b/harbour/contrib/hbide/resources/themesex.ui index 7420ffc27d..b048ee8cee 100644 --- a/harbour/contrib/hbide/resources/themesex.ui +++ b/harbour/contrib/hbide/resources/themesex.ui @@ -1,7 +1,7 @@ - Form - + FormThemesEx + 0 @@ -45,7 +45,7 @@ - + @@ -145,7 +145,7 @@ - + Qt::Horizontal diff --git a/harbour/contrib/hbide/resources/themesex.uic b/harbour/contrib/hbide/resources/themesex.uic index fed7c77296..60343e0e26 100644 --- a/harbour/contrib/hbide/resources/themesex.uic +++ b/harbour/contrib/hbide/resources/themesex.uic @@ -1,8 +1,8 @@ /******************************************************************************** ** Form generated from reading ui file 'themesex.ui' ** -** Created: Wed Feb 17 13:04:36 2010 -** by: Qt User Interface Compiler version 4.5.3 +** Created: Wed Feb 24 16:25:25 2010 +** by: Qt User Interface Compiler version 4.5.2 ** ** WARNING! All changes made in this file will be lost when recompiling ui file! ********************************************************************************/ @@ -29,7 +29,7 @@ QT_BEGIN_NAMESPACE -class Ui_Form +class Ui_FormThemesEx { public: QGridLayout *gridLayout; @@ -38,7 +38,7 @@ public: QLabel *labelTheme; QComboBox *comboThemes; QHBoxLayout *horizontalLayout_5; - QPlainTextEdit *plainTextEdit; + QPlainTextEdit *plainThemeText; QHBoxLayout *horizontalLayout_4; QLabel *labelItem; QComboBox *comboItems; @@ -50,7 +50,7 @@ public: QCheckBox *checkUnderline; QSpacerItem *horizontalSpacer_2; QHBoxLayout *horizontalLayout_2; - QFrame *line; + QFrame *lineSep; QHBoxLayout *horizontalLayout; QPushButton *buttonSave; QPushButton *buttonSaveAs; @@ -58,12 +58,12 @@ public: QPushButton *buttonApply; QPushButton *buttonClose; - void setupUi(QWidget *Form) + void setupUi(QWidget *FormThemesEx) { - if (Form->objectName().isEmpty()) - Form->setObjectName(QString::fromUtf8("Form")); - Form->resize(437, 403); - gridLayout = new QGridLayout(Form); + if (FormThemesEx->objectName().isEmpty()) + FormThemesEx->setObjectName(QString::fromUtf8("FormThemesEx")); + FormThemesEx->resize(437, 403); + gridLayout = new QGridLayout(FormThemesEx); gridLayout->setObjectName(QString::fromUtf8("gridLayout")); verticalLayout = new QVBoxLayout(); verticalLayout->setObjectName(QString::fromUtf8("verticalLayout")); @@ -71,13 +71,13 @@ public: horizontalLayout_6 = new QHBoxLayout(); horizontalLayout_6->setSpacing(10); horizontalLayout_6->setObjectName(QString::fromUtf8("horizontalLayout_6")); - labelTheme = new QLabel(Form); + labelTheme = new QLabel(FormThemesEx); labelTheme->setObjectName(QString::fromUtf8("labelTheme")); labelTheme->setMaximumSize(QSize(40, 16777215)); horizontalLayout_6->addWidget(labelTheme); - comboThemes = new QComboBox(Form); + comboThemes = new QComboBox(FormThemesEx); comboThemes->setObjectName(QString::fromUtf8("comboThemes")); horizontalLayout_6->addWidget(comboThemes); @@ -87,10 +87,10 @@ public: horizontalLayout_5 = new QHBoxLayout(); horizontalLayout_5->setObjectName(QString::fromUtf8("horizontalLayout_5")); - plainTextEdit = new QPlainTextEdit(Form); - plainTextEdit->setObjectName(QString::fromUtf8("plainTextEdit")); + plainThemeText = new QPlainTextEdit(FormThemesEx); + plainThemeText->setObjectName(QString::fromUtf8("plainThemeText")); - horizontalLayout_5->addWidget(plainTextEdit); + horizontalLayout_5->addWidget(plainThemeText); verticalLayout->addLayout(horizontalLayout_5); @@ -98,18 +98,18 @@ public: horizontalLayout_4 = new QHBoxLayout(); horizontalLayout_4->setSpacing(10); horizontalLayout_4->setObjectName(QString::fromUtf8("horizontalLayout_4")); - labelItem = new QLabel(Form); + labelItem = new QLabel(FormThemesEx); labelItem->setObjectName(QString::fromUtf8("labelItem")); labelItem->setMaximumSize(QSize(40, 16777215)); horizontalLayout_4->addWidget(labelItem); - comboItems = new QComboBox(Form); + comboItems = new QComboBox(FormThemesEx); comboItems->setObjectName(QString::fromUtf8("comboItems")); horizontalLayout_4->addWidget(comboItems); - buttonColor = new QPushButton(Form); + buttonColor = new QPushButton(FormThemesEx); buttonColor->setObjectName(QString::fromUtf8("buttonColor")); buttonColor->setMaximumSize(QSize(120, 16777215)); @@ -124,17 +124,17 @@ public: horizontalLayout_3->addItem(horizontalSpacer); - checkBold = new QCheckBox(Form); + checkBold = new QCheckBox(FormThemesEx); checkBold->setObjectName(QString::fromUtf8("checkBold")); horizontalLayout_3->addWidget(checkBold); - checkItalic = new QCheckBox(Form); + checkItalic = new QCheckBox(FormThemesEx); checkItalic->setObjectName(QString::fromUtf8("checkItalic")); horizontalLayout_3->addWidget(checkItalic); - checkUnderline = new QCheckBox(Form); + checkUnderline = new QCheckBox(FormThemesEx); checkUnderline->setObjectName(QString::fromUtf8("checkUnderline")); horizontalLayout_3->addWidget(checkUnderline); @@ -148,12 +148,12 @@ public: horizontalLayout_2 = new QHBoxLayout(); horizontalLayout_2->setObjectName(QString::fromUtf8("horizontalLayout_2")); - line = new QFrame(Form); - line->setObjectName(QString::fromUtf8("line")); - line->setFrameShape(QFrame::HLine); - line->setFrameShadow(QFrame::Sunken); + lineSep = new QFrame(FormThemesEx); + lineSep->setObjectName(QString::fromUtf8("lineSep")); + lineSep->setFrameShape(QFrame::HLine); + lineSep->setFrameShadow(QFrame::Sunken); - horizontalLayout_2->addWidget(line); + horizontalLayout_2->addWidget(lineSep); verticalLayout->addLayout(horizontalLayout_2); @@ -161,27 +161,27 @@ public: horizontalLayout = new QHBoxLayout(); horizontalLayout->setSpacing(10); horizontalLayout->setObjectName(QString::fromUtf8("horizontalLayout")); - buttonSave = new QPushButton(Form); + buttonSave = new QPushButton(FormThemesEx); buttonSave->setObjectName(QString::fromUtf8("buttonSave")); horizontalLayout->addWidget(buttonSave); - buttonSaveAs = new QPushButton(Form); + buttonSaveAs = new QPushButton(FormThemesEx); buttonSaveAs->setObjectName(QString::fromUtf8("buttonSaveAs")); horizontalLayout->addWidget(buttonSaveAs); - buttonCopy = new QPushButton(Form); + buttonCopy = new QPushButton(FormThemesEx); buttonCopy->setObjectName(QString::fromUtf8("buttonCopy")); horizontalLayout->addWidget(buttonCopy); - buttonApply = new QPushButton(Form); + buttonApply = new QPushButton(FormThemesEx); buttonApply->setObjectName(QString::fromUtf8("buttonApply")); horizontalLayout->addWidget(buttonApply); - buttonClose = new QPushButton(Form); + buttonClose = new QPushButton(FormThemesEx); buttonClose->setObjectName(QString::fromUtf8("buttonClose")); horizontalLayout->addWidget(buttonClose); @@ -194,32 +194,32 @@ public: gridLayout->addLayout(verticalLayout, 0, 0, 1, 1); - retranslateUi(Form); + retranslateUi(FormThemesEx); - QMetaObject::connectSlotsByName(Form); + QMetaObject::connectSlotsByName(FormThemesEx); } // setupUi - void retranslateUi(QWidget *Form) + void retranslateUi(QWidget *FormThemesEx) { - Form->setWindowTitle(QApplication::translate("Form", "Form", 0, QApplication::UnicodeUTF8)); - labelTheme->setText(QApplication::translate("Form", "Theme", 0, QApplication::UnicodeUTF8)); - labelItem->setText(QApplication::translate("Form", "Item", 0, QApplication::UnicodeUTF8)); - buttonColor->setText(QApplication::translate("Form", "Color", 0, QApplication::UnicodeUTF8)); - checkBold->setText(QApplication::translate("Form", "Bold", 0, QApplication::UnicodeUTF8)); - checkItalic->setText(QApplication::translate("Form", "Italic", 0, QApplication::UnicodeUTF8)); - checkUnderline->setText(QApplication::translate("Form", "Underline", 0, QApplication::UnicodeUTF8)); - buttonSave->setText(QApplication::translate("Form", "Save", 0, QApplication::UnicodeUTF8)); - buttonSaveAs->setText(QApplication::translate("Form", "Save As", 0, QApplication::UnicodeUTF8)); - buttonCopy->setText(QApplication::translate("Form", "Copy", 0, QApplication::UnicodeUTF8)); - buttonApply->setText(QApplication::translate("Form", "Apply", 0, QApplication::UnicodeUTF8)); - buttonClose->setText(QApplication::translate("Form", "Close", 0, QApplication::UnicodeUTF8)); - Q_UNUSED(Form); + FormThemesEx->setWindowTitle(QApplication::translate("FormThemesEx", "Form", 0, QApplication::UnicodeUTF8)); + labelTheme->setText(QApplication::translate("FormThemesEx", "Theme", 0, QApplication::UnicodeUTF8)); + labelItem->setText(QApplication::translate("FormThemesEx", "Item", 0, QApplication::UnicodeUTF8)); + buttonColor->setText(QApplication::translate("FormThemesEx", "Color", 0, QApplication::UnicodeUTF8)); + checkBold->setText(QApplication::translate("FormThemesEx", "Bold", 0, QApplication::UnicodeUTF8)); + checkItalic->setText(QApplication::translate("FormThemesEx", "Italic", 0, QApplication::UnicodeUTF8)); + checkUnderline->setText(QApplication::translate("FormThemesEx", "Underline", 0, QApplication::UnicodeUTF8)); + buttonSave->setText(QApplication::translate("FormThemesEx", "Save", 0, QApplication::UnicodeUTF8)); + buttonSaveAs->setText(QApplication::translate("FormThemesEx", "Save As", 0, QApplication::UnicodeUTF8)); + buttonCopy->setText(QApplication::translate("FormThemesEx", "Copy", 0, QApplication::UnicodeUTF8)); + buttonApply->setText(QApplication::translate("FormThemesEx", "Apply", 0, QApplication::UnicodeUTF8)); + buttonClose->setText(QApplication::translate("FormThemesEx", "Close", 0, QApplication::UnicodeUTF8)); + Q_UNUSED(FormThemesEx); } // retranslateUi }; namespace Ui { - class Form: public Ui_Form {}; + class FormThemesEx: public Ui_FormThemesEx {}; } // namespace Ui QT_END_NAMESPACE diff --git a/harbour/contrib/hbqt/THbQtUI.prg b/harbour/contrib/hbqt/THbQtUI.prg index 8813685f18..31b9022b3d 100644 --- a/harbour/contrib/hbqt/THbQtUI.prg +++ b/harbour/contrib/hbqt/THbQtUI.prg @@ -139,7 +139,7 @@ METHOD HbQtUI:create( cFile, qParent ) /*----------------------------------------------------------------------*/ METHOD HbQtUI:destroy() - LOCAL a_ + LOCAL a_, i ::oWidget:hide() @@ -150,10 +150,19 @@ METHOD HbQtUI:destroy() Qt_Events_disConnect( ::pEvents, a_[ 1 ], a_[ 2 ] ) NEXT + FOR EACH a_ IN ::widgets DESCEND + IF ( i := a_:__enumIndex() ) > 1 + IF type( a_[ 3 ] ) == "UI" .AND. !( a_[ 1 ] $ "QHBoxLayout,QVBoxLayout,QGridLayout" ) +hbide_dbg( "HbQtUI:destroy( 0 )", pad( a_[ 1 ], 20 ), pad( a_[ 2 ], 20 ), iif( i > 1, pad( ::widgets[ i - 1, 1 ],20 ), NIL ), i, len( ::widgets ) ) + ::qObj[ a_[ 2 ] ] := NIL + ENDIF + ENDIF + NEXT + FOR EACH a_ IN ::widgets DESCEND IF a_:__enumIndex() > 1 - IF type( a_[ 3 ] ) == "UI" -hbide_dbg( "HbQtUI:destroy()", 1, a_[ 1 ], a_[ 2 ] ) + IF type( a_[ 3 ] ) == "UI" .AND. ( a_[ 1 ] $ "QHBoxLayout,QVBoxLayout,QGridLayout" ) +hbide_dbg( "HbQtUI:destroy( 1 )", pad( a_[ 1 ], 20 ), pad( a_[ 2 ], 20 ), iif( i > 1, pad( ::widgets[ i - 1, 1 ],20 ), NIL ), i, len( ::widgets ) ) ::qObj[ a_[ 2 ] ] := NIL ENDIF ENDIF diff --git a/harbour/contrib/hbqt/hbqt_hbslots.cpp b/harbour/contrib/hbqt/hbqt_hbslots.cpp index 03d070ef4a..18ff93994b 100644 --- a/harbour/contrib/hbqt/hbqt_hbslots.cpp +++ b/harbour/contrib/hbqt/hbqt_hbslots.cpp @@ -211,9 +211,14 @@ static bool connect_signal( QString signal, QObject * object, HBSlots * t_slots if( signal == ( QString ) "backwardAvailable(bool)" ) return object->connect( object, SIGNAL( backwardAvailable( bool ) ), t_slots, SLOT( backwardAvailable( bool ) ), Qt::AutoConnection ); if( signal == ( QString ) "forwardAvailable(bool)" ) return object->connect( object, SIGNAL( forwardAvailable( bool ) ), t_slots, SLOT( forwardAvailable( bool ) ), Qt::AutoConnection ); if( signal == ( QString ) "highlighted(QUrl)" ) return object->connect( object, SIGNAL( highlighted( const QUrl & ) ), t_slots, SLOT( highlighted( const QUrl & ) ), Qt::AutoConnection ); - //if( signal == ( QString ) "highlighted(QString)" ) return object->connect( object, SIGNAL( highlighted( const QString & ) ), t_slots, SLOT( highlighted( const QString & ) ), Qt::AutoConnection ); if( signal == ( QString ) "historyChanged()" ) return object->connect( object, SIGNAL( historyChanged() ), t_slots, SLOT( historyChanged() ), Qt::AutoConnection ); if( signal == ( QString ) "sourceChanged(QUrl)" ) return object->connect( object, SIGNAL( sourceChanged( const QUrl & ) ), t_slots, SLOT( sourceChanged( const QUrl & ) ), Qt::AutoConnection ); + /* QDockWidget */ + if( signal == ( QString ) "allowedAreasChanged(int)" ) return object->connect( object, SIGNAL( allowedAreasChanged( Qt::DockWidgetAreas ) ), t_slots, SLOT( allowedAreasChanged( Qt::DockWidgetAreas ) ), Qt::AutoConnection ); + if( signal == ( QString ) "dockLocationChanged(int)" ) return object->connect( object, SIGNAL( dockLocationChanged( Qt::DockWidgetArea ) ), t_slots, SLOT( dockLocationChanged( Qt::DockWidgetArea ) ), Qt::AutoConnection ); + if( signal == ( QString ) "featuresChanged(int)" ) return object->connect( object, SIGNAL( featuresChanged( QDockWidget::DockWidgetFeatures ) ), t_slots, SLOT( featuresChanged( QDockWidget::DockWidgetFeatures ) ), Qt::AutoConnection ); + if( signal == ( QString ) "topLevelChanged(bool)" ) return object->connect( object, SIGNAL( topLevelChanged( bool ) ), t_slots, SLOT( topLevelChanged( bool ) ), Qt::AutoConnection ); + if( signal == ( QString ) "visibilityChanged(bool)" ) return object->connect( object, SIGNAL( visibilityChanged( bool ) ), t_slots, SLOT( visibilityChanged( bool ) ), Qt::AutoConnection ); /* New */ return false; @@ -361,9 +366,14 @@ static bool disconnect_signal( QObject * object, const char * signal ) if( signal == ( QString ) "backwardAvailable(bool)" ) return object->disconnect( SIGNAL( backwardAvailable( bool ) ) ); if( signal == ( QString ) "forwardAvailable(bool)" ) return object->disconnect( SIGNAL( forwardAvailable( bool ) ) ); if( signal == ( QString ) "highlighted(QUrl)" ) return object->disconnect( SIGNAL( highlighted( const QUrl & ) ) ); - //if( signal == ( QString ) "highlighted(QString)" ) return object->disconnect( SIGNAL( highlighted( const QString & ) ) ); if( signal == ( QString ) "historyChanged()" ) return object->disconnect( SIGNAL( historyChanged() ) ); if( signal == ( QString ) "sourceChanged(QUrl)" ) return object->disconnect( SIGNAL( sourceChanged( const QUrl & ) ) ); + /* QDockWidget */ + if( signal == ( QString ) "allowedAreasChanged(int)" ) return object->disconnect( SIGNAL( allowedAreasChanged( Qt::DockWidgetAreas ) ) ); + if( signal == ( QString ) "dockLocationChanged(int)" ) return object->disconnect( SIGNAL( dockLocationChanged( Qt::DockWidgetArea ) ) ); + if( signal == ( QString ) "featuresChanged(int)" ) return object->disconnect( SIGNAL( featuresChanged( QDockWidget::DockWidgetFeatures ) ) ); + if( signal == ( QString ) "topLevelChanged(bool)" ) return object->disconnect( SIGNAL( topLevelChanged( bool ) ) ); + if( signal == ( QString ) "visibilityChanged(bool)" ) return object->disconnect( SIGNAL( visibilityChanged( bool ) ) ); /* new */ return false; } @@ -964,9 +974,16 @@ void HBSlots::anchorClicked( const QUrl & link ) void HBSlots::backwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "backwardAvailable(bool)", available ); } void HBSlots::forwardAvailable( bool available ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "forwardAvailable(bool)", available ); } void HBSlots::highlighted( const QUrl & link ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "highlighted(QUrl)", link ); } -//void HBSlots::highlighted( const QString & link ) { hbqt_SlotsString( this, qobject_cast( sender() ), "highlighted(QString)", link ); } void HBSlots::historyChanged() { hbqt_SlotsExec( this, qobject_cast( sender() ), "historyChanged()" ); } void HBSlots::sourceChanged( const QUrl & src ) { hbqt_SlotsExecQUrl( this, qobject_cast( sender() ), "sourceChanged(QUrl)", src ); } +/* QDockWidget */ +void HBSlots::allowedAreasChanged( Qt::DockWidgetAreas allowedAreas ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "allowedAreasChanged(int)", allowedAreas ); } +void HBSlots::dockLocationChanged( Qt::DockWidgetArea area ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "dockLocationChanged(int)", area ); } +void HBSlots::featuresChanged( QDockWidget::DockWidgetFeatures features ) { hbqt_SlotsExecInt( this, qobject_cast( sender() ), "featuresChanged(int)", features ); } +void HBSlots::topLevelChanged( bool topLevel ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "topLevelChanged(bool)", topLevel ); } +void HBSlots::visibilityChanged( bool visible ) { hbqt_SlotsExecBool( this, qobject_cast( sender() ), "visibilityChanged(bool)", visible ); } +/* Latest */ + /*----------------------------------------------------------------------*/ /* diff --git a/harbour/contrib/hbqt/hbqt_hbslots.h b/harbour/contrib/hbqt/hbqt_hbslots.h index 5f63e981b1..3224e3aec0 100644 --- a/harbour/contrib/hbqt/hbqt_hbslots.h +++ b/harbour/contrib/hbqt/hbqt_hbslots.h @@ -63,6 +63,7 @@ #include #include #include +#include #include /*----------------------------------------------------------------------*/ @@ -259,9 +260,14 @@ public slots: void backwardAvailable( bool available ); void forwardAvailable( bool available ); void highlighted( const QUrl & link ); - // void highlighted( const QString & link ); void historyChanged(); void sourceChanged( const QUrl & src ); + /* QDockWidget */ + void allowedAreasChanged( Qt::DockWidgetAreas allowedAreas ); + void dockLocationChanged( Qt::DockWidgetArea area ); + void featuresChanged( QDockWidget::DockWidgetFeatures features ); + void topLevelChanged( bool topLevel ); + void visibilityChanged( bool visible ); /* */ };