From a0b380fb848306f492a758131838cc7f6eee60f2 Mon Sep 17 00:00:00 2001 From: Pritpal Bedi Date: Sat, 8 Sep 2012 01:29:16 +0000 Subject: [PATCH] 2012-09-07 18:24 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/gtwvg/crt.prg ! A Nasty Fix. Was not releasing children snd hence the memory. * contrib/hbide/actions.prg * contrib/hbide/docks.prg + Added: separate toolbar for "Files" actions. --- harbour/ChangeLog | 8 +++++++ harbour/contrib/gtwvg/crt.prg | 3 +++ harbour/contrib/hbide/actions.prg | 39 ++++++++++++++++++++++++------- harbour/contrib/hbide/docks.prg | 1 + 4 files changed, 43 insertions(+), 8 deletions(-) diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 23e0982363..7738dce111 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,14 @@ The license applies to all entries newer than 2009-04-28. */ +2012-09-07 18:24 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/gtwvg/crt.prg + ! A Nasty Fix. Was not releasing children snd hence the memory. + + * contrib/hbide/actions.prg + * contrib/hbide/docks.prg + + Added: separate toolbar for "Files" actions. + 2012-09-07 09:24 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) * contrib/hbide/docks.prg * contrib/hbide/stylesheets.prg diff --git a/harbour/contrib/gtwvg/crt.prg b/harbour/contrib/gtwvg/crt.prg index 3175e499f3..7be77c7f71 100644 --- a/harbour/contrib/gtwvg/crt.prg +++ b/harbour/contrib/gtwvg/crt.prg @@ -391,6 +391,7 @@ METHOD WvgCrt:destroy() IF Len( ::aChildren ) > 0 aeval( ::aChildren, {|o| o:destroy() } ) + ::aChildren := {} ENDIF IF ! ::isGT @@ -403,6 +404,8 @@ METHOD WvgCrt:destroy() ::pGTp := NIL ENDIF + ::WvgWindow:destroy() + RETURN Self /*----------------------------------------------------------------------*/ diff --git a/harbour/contrib/hbide/actions.prg b/harbour/contrib/hbide/actions.prg index 3d4dfe42d1..de33031c66 100644 --- a/harbour/contrib/hbide/actions.prg +++ b/harbour/contrib/hbide/actions.prg @@ -94,6 +94,7 @@ CLASS IdeActions INHERIT IdeObject DATA oActToolsBtn DATA qMainToolbar + DATA qFilesToolbar DATA qPartsToolbar DATA qProjectToolbar DATA qTBarDocks @@ -113,6 +114,7 @@ CLASS IdeActions INHERIT IdeObject METHOD buildToolBars() METHOD buildToolbarMain() + METHOD buildToolbarFiles() METHOD buildToolbarParts() METHOD buildToolbarProject() METHOD buildToolbarDocks() @@ -526,6 +528,7 @@ METHOD IdeActions:buildMainMenu() oSubMenu:addItem( { oSubMenu2, "Toolbars" } ) oSubMenu2:oWidget:addAction( ::oIde:oMainToolbar:oWidget:toggleViewAction() ) + oSubMenu2:oWidget:addAction( ::qFilesToolbar:toggleViewAction() ) oSubMenu2:oWidget:addAction( ::qPartsToolbar:toggleViewAction() ) oSubMenu2:oWidget:addAction( ::qProjectToolbar:toggleViewAction() ) oSubMenu2:oWidget:addAction( ::qTBarDocks:toggleViewAction() ) @@ -966,6 +969,7 @@ STATIC FUNCTION hbide_buildCodecMenu( oIde, oMenu ) METHOD IdeActions:buildToolBars() ::buildToolbarMain() + ::buildToolbarFiles() ::buildToolbarParts() ::buildToolbarProject() ::buildToolBarDocks() @@ -1000,13 +1004,6 @@ METHOD IdeActions:buildToolbarMain() ::oActToolsBtn := oTBar:oWidget:addWidget( ::oIde:oTM:buildToolsButton() ) oTBar:addItem( , , , , , nSep ) ::oActToolsBtn := oTBar:oWidget:addWidget( ::oIde:oTM:buildViewsButton() ) - oTBar:addItem( , , , , , nSep ) - - oTBar:addItem( ::getAction( "TB_New" ), , , , , , "New" ) - oTBar:addItem( ::getAction( "TB_Open" ), , , , , , "Open" ) - oTBar:addItem( ::getAction( "TB_Save" ), , , , , , "Save" ) - oTBar:addItem( ::getAction( "TB_Close" ), , , , , , "Close" ) - oTBar:addItem( ::getAction( "TB_Print" ), , , , , , "Print" ) ::oIde:oMainToolbar := oTBar @@ -1014,9 +1011,35 @@ METHOD IdeActions:buildToolbarMain() /*----------------------------------------------------------------------*/ +METHOD IdeActions:buildToolbarFiles() + + ::qFilesToolbar := HBQToolBar():new( "ToolBar_Files" ) + + ::qFilesToolbar:cName := "ToolBar_Files" + ::qFilesToolbar:allowedAreas := Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea + ::qFilesToolbar:size := QSize( 12, 12 ) + + ::qFilesToolbar:create() + + ::qFilesToolbar:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) + ::qFilesToolbar:setWindowTitle( "Ide Files" ) + ::qFilesToolbar:setToolButtonStyle( Qt_ToolButtonIconOnly ) + + ::qFilesToolbar:addAction( "IdeNew" , ::getAction( "TB_New" ), {|| ::oIde:execAction( "new" ) } ) + ::qFilesToolbar:addAction( "IdeOpen", ::getAction( "TB_Open" ), {|| ::oIde:execAction( "Open" ) } ) + ::qFilesToolbar:addAction( "IdeOpen", ::getAction( "TB_Save" ), {|| ::oIde:execAction( "Save" ) } ) + ::qFilesToolbar:addAction( "IdeOpen", ::getAction( "TB_Close" ), {|| ::oIde:execAction( "Close" ) } ) + ::qFilesToolbar:addAction( "IdeOpen", ::getAction( "TB_Print" ), {|| ::oIde:execAction( "Print" ) } ) + + ::oDlg:oWidget:addToolBar( Qt_TopToolBarArea, ::qFilesToolbar:oWidget ) + + RETURN Self + +/*----------------------------------------------------------------------*/ + METHOD IdeActions:buildToolbarParts() - ::qPartsToolbar := HBQToolBar():new( "ToolBar_Docks" ) + ::qPartsToolbar := HBQToolBar():new( "ToolBar_Parts" ) ::qPartsToolbar:cName := "ToolBar_Parts" ::qPartsToolbar:allowedAreas := Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea diff --git a/harbour/contrib/hbide/docks.prg b/harbour/contrib/hbide/docks.prg index 7b5d8bef03..7496efe3ec 100644 --- a/harbour/contrib/hbide/docks.prg +++ b/harbour/contrib/hbide/docks.prg @@ -1655,6 +1655,7 @@ METHOD IdeDocks:animateComponents( nMode ) /* Toolbars */ ::oMainToolbar:oWidget:setStyleSheet( GetStyleSheet( iif( ::oMainToolbar : oWidget:orientation() == Qt_Horizontal, "QToolBar", "QToolBarLR5" ), nMode ) ) + ::oAC:qFilesToolbar :setStyleSheet( GetStyleSheet( iif( ::oAC:qFilesToolbar : oWidget:orientation() == Qt_Horizontal, "QToolBar", "QToolBarLR5" ), nMode ) ) ::oAC:qTBarDocks :setStyleSheet( GetStyleSheet( iif( ::oAC:qTBarDocks : oWidget:orientation() == Qt_Horizontal, "QToolBar", "QToolBarLR5" ), nMode ) ) ::oAC:qPartsToolbar :setStyleSheet( GetStyleSheet( iif( ::oAC:qPartsToolbar : oWidget:orientation() == Qt_Horizontal, "QToolBar", "QToolBarLR5" ), nMode ) ) ::oAC:qProjectToolbar :setStyleSheet( GetStyleSheet( iif( ::oAC:qProjectToolbar: oWidget:orientation() == Qt_Horizontal, "QToolBar", "QToolBarLR5" ), nMode ) )