diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 45e6d79759..a652733c64 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -17,6 +17,14 @@ past entries belonging to author(s): Viktor Szakats. */ +2010-04-27 10:00 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + + Left and right Toolbars made floatable, movable and dockable. + Now these can be placed anywhere user wants. + + % View menubar option is placed next to Edit. + 2010-04-27 08:16 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com) * contrib/hbide/hbide.hbp - Removed local addition. diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index 1762159a8a..af7b76f358 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -509,6 +509,38 @@ METHOD IdeActions:buildMainMenu() oSubMenu:addItem( { ::getAction( "switchReadOnly" ), {|| oIde:execAction( "switchReadOnly" ) } } ) oMenuBar:addItem( { oSubMenu, NIL } ) + /*----------------------------------------------------------------------------*/ + /* View */ + /*----------------------------------------------------------------------------*/ + oSubMenu := XbpMenu():new( oMenuBar ):create() + oSubMenu:title := "~View" + oMenuBar:addItem( { oSubMenu, NIL } ) + + oSubMenu:addItem( { "Toggle Animation", {|| oIde:execAction( "Animate" ) } } ) + oSubMenu:oWidget:addSeparator() + oSubMenu:oWidget:addAction_4( ::qTBarPanels:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::qTBarLines:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::qTBarDocks:toggleViewAction() ) + oSubMenu:oWidget:addSeparator() + oSubMenu:oWidget:addAction_4( ::oDockPT:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oDockED:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oSkltnsTreeDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addSeparator() + oSubMenu:oWidget:addAction_4( ::oHelpDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oDocViewDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oDocWriteDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oFuncDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oFunctionsDock:oWidget:toggleViewAction() ) + oSubMenu:oWidget:addAction_4( ::oPropertiesDock: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() ) + /*----------------------------------------------------------------------------*/ /* Project */ /*----------------------------------------------------------------------------*/ @@ -557,38 +589,6 @@ METHOD IdeActions:buildMainMenu() oSubMenu:addItem( { oSubMenu2, NIL } ) oMenuBar:addItem( { oSubMenu, NIL } ) - /*----------------------------------------------------------------------------*/ - /* View */ - /*----------------------------------------------------------------------------*/ - oSubMenu := XbpMenu():new( oMenuBar ):create() - oSubMenu:title := "~View" - oMenuBar:addItem( { oSubMenu, NIL } ) - - oSubMenu:addItem( { "Toggle Animation", {|| oIde:execAction( "Animate" ) } } ) - oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::qTBarPanels:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::qTBarLines:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::qTBarDocks:toggleViewAction() ) - oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oDockPT:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDockED:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oSkltnsTreeDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addSeparator() - oSubMenu:oWidget:addAction_4( ::oHelpDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDocViewDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oDocWriteDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFuncDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oFunctionsDock:oWidget:toggleViewAction() ) - oSubMenu:oWidget:addAction_4( ::oPropertiesDock: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() ) - /*----------------------------------------------------------------------------*/ /* Help */ /*----------------------------------------------------------------------------*/ @@ -677,15 +677,15 @@ STATIC FUNCTION hbide_buildCodecMenu( oIde, oMenu ) oSub1 := XbpMenu():new( oSubMenu ):create() oSub1:title := "Windows-1250 to 1258" - oSub1:addItem( { "-1250" , {|| oIde:setCodec( "Windows-1250" ) } } ) - oSub1:addItem( { "-1251" , {|| oIde:setCodec( "Windows-1251" ) } } ) - oSub1:addItem( { "-1252" , {|| oIde:setCodec( "Windows-1252" ) } } ) - oSub1:addItem( { "-1253" , {|| oIde:setCodec( "Windows-1253" ) } } ) - oSub1:addItem( { "-1254" , {|| oIde:setCodec( "Windows-1254" ) } } ) - oSub1:addItem( { "-1255" , {|| oIde:setCodec( "Windows-1255" ) } } ) - oSub1:addItem( { "-1256" , {|| oIde:setCodec( "Windows-1256" ) } } ) - oSub1:addItem( { "-1257" , {|| oIde:setCodec( "Windows-1257" ) } } ) - oSub1:addItem( { "-1258" , {|| oIde:setCodec( "Windows-1258" ) } } ) + oSub1:addItem( { "Windows-1250" , {|| oIde:setCodec( "Windows-1250" ) } } ) + oSub1:addItem( { "Windows-1251" , {|| oIde:setCodec( "Windows-1251" ) } } ) + oSub1:addItem( { "Windows-1252" , {|| oIde:setCodec( "Windows-1252" ) } } ) + oSub1:addItem( { "Windows-1253" , {|| oIde:setCodec( "Windows-1253" ) } } ) + oSub1:addItem( { "Windows-1254" , {|| oIde:setCodec( "Windows-1254" ) } } ) + oSub1:addItem( { "Windows-1255" , {|| oIde:setCodec( "Windows-1255" ) } } ) + oSub1:addItem( { "Windows-1256" , {|| oIde:setCodec( "Windows-1256" ) } } ) + oSub1:addItem( { "Windows-1257" , {|| oIde:setCodec( "Windows-1257" ) } } ) + oSub1:addItem( { "Windows-1258" , {|| oIde:setCodec( "Windows-1258" ) } } ) oSubMenu:addItem( { oSub1, NIL } ) oSubMenu:addItem( { "WINSAMI2 " , {|| oIde:setCodec( "WINSAMI2" ) } } ) diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 31e4e4b97d..1cca21b8e5 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -481,11 +481,11 @@ METHOD IdeDocks:buildToolBarPanels() ::qTBarPanels:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qTBarPanels:setObjectName( "ToolBar_Panels" ) ::qTBarPanels:setWindowTitle( "ToolBar: Editor Panels" ) - ::qTBarPanels:setAllowedAreas( Qt_LeftToolBarArea ) - ::qTBarPanels:setOrientation( Qt_Vertical ) + ::qTBarPanels:setAllowedAreas( Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ) + //::qTBarPanels:setOrientation( Qt_Vertical ) ::qTBarPanels:setIconSize( qSize ) - ::qTBarPanels:setMovable( .f. ) - ::qTBarPanels:setFloatable( .f. ) + //::qTBarPanels:setMovable( .f. ) + //::qTBarPanels:setFloatable( .f. ) ::oDlg:oWidget:addToolBar( Qt_LeftToolBarArea, ::qTBarPanels ) @@ -500,11 +500,12 @@ METHOD IdeDocks:buildToolBarPanels() ::qTBarLines:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qTBarLines:setObjectName( "ToolBar_Lines" ) ::qTBarLines:setWindowTitle( "ToolBar: Lines and Blocks" ) - ::qTBarLines:setAllowedAreas( Qt_LeftToolBarArea ) - ::qTBarLines:setOrientation( Qt_Vertical ) ::qTBarLines:setIconSize( qSize ) - ::qTBarLines:setMovable( .f. ) - ::qTBarLines:setFloatable( .f. ) + ::qTBarPanels:setAllowedAreas( Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ) + * ::qTBarLines:setAllowedAreas( Qt_LeftToolBarArea ) + * ::qTBarLines:setOrientation( Qt_Vertical ) + * ::qTBarLines:setMovable( .f. ) + * ::qTBarLines:setFloatable( .f. ) ::oDlg:oWidget:addToolBar( Qt_LeftToolBarArea, ::qTBarLines ) @@ -569,13 +570,15 @@ METHOD IdeDocks:buildToolBarPanels() ::qTBarDocks:setStyleSheet( GetStyleSheet( "QToolBarLR5", ::nAnimantionMode ) ) ::qTBarDocks:setObjectName( "ToolBar_Docks" ) ::qTBarDocks:setWindowTitle( "ToolBar: Dockable Widgets" ) + ::qTBarDocks:setIconSize( QSize():new( 16,16 ) ) + ::qTBarDocks:setToolButtonStyle( Qt_ToolButtonIconOnly ) + ::qTBarPanels:setAllowedAreas( Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ) + #if 0 ::qTBarDocks:setAllowedAreas( Qt_RightToolBarArea ) ::qTBarDocks:setOrientation( Qt_Vertical ) - ::qTBarDocks:setIconSize( QSize():new( 16,16 ) ) ::qTBarDocks:setMovable( .f. ) ::qTBarDocks:setFloatable( .f. ) - ::qTBarDocks:setToolButtonStyle( Qt_ToolButtonIconOnly ) - + #endif aBtns := {} aadd( aBtns, { ::oDockPT , "projtree" } ) aadd( aBtns, { ::oDockED , "editstree" } )