diff --git a/harbour/ChangeLog b/harbour/ChangeLog index 2bf5c0b6c4..09dd198af3 100644 --- a/harbour/ChangeLog +++ b/harbour/ChangeLog @@ -16,6 +16,12 @@ The license applies to all entries newer than 2009-04-28. */ +2011-04-16 11:59 UTC-0800 Pritpal Bedi (bedipritpal@hotmail.com) + * contrib/hbide/ideactions.prg + * contrib/hbide/idedocks.prg + ! Adopted: to comply with latest hbXBP change where + oXbp:setStyleSheet() was made PROTECed method. + 2011-04-16 20:32 UTC+0200 Viktor Szakats (harbour.01 syenar.hu) * contrib/3rd/sqlite3/sqlite3.c * contrib/3rd/sqlite3/sqlite3.dif diff --git a/harbour/contrib/hbide/ideactions.prg b/harbour/contrib/hbide/ideactions.prg index eaf47cbde1..be6832db63 100644 --- a/harbour/contrib/hbide/ideactions.prg +++ b/harbour/contrib/hbide/ideactions.prg @@ -324,7 +324,7 @@ METHOD IdeActions:buildToolBar() oTBar:imageWidth := 20 oTBar:imageHeight := 20 oTBar:create( , , { 0, ::oDlg:currentSize()[ 2 ]-60 }, { ::oDlg:currentSize()[ 1 ], 60 } ) - oTBar:setStyleSheet( GetStyleSheet( "QToolBar", ::nAnimantionMode ) ) + oTBar:oWidget:setStyleSheet( GetStyleSheet( "QToolBar", ::nAnimantionMode ) ) oTBar:oWidget:setAllowedAreas( Qt_LeftToolBarArea + Qt_RightToolBarArea + Qt_TopToolBarArea + Qt_BottomToolBarArea ) oTBar:oWidget:setFocusPolicy( Qt_NoFocus ) @@ -385,7 +385,7 @@ METHOD IdeActions:buildMainMenu() // LOCAL cTheme := "QMenuPop" oMenuBar := ::oDlg:MenuBar() - //oMenuBar:setStyleSheet( GetStyleSheet( "QMenuBar", ::nAnimantionMode ) ) + //oMenuBar:oWidget:setStyleSheet( GetStyleSheet( "QMenuBar", ::nAnimantionMode ) ) /*----------------------------------------------------------------------------*/ /* File */ diff --git a/harbour/contrib/hbide/idedocks.prg b/harbour/contrib/hbide/idedocks.prg index 5a0018de1a..f94436917d 100644 --- a/harbour/contrib/hbide/idedocks.prg +++ b/harbour/contrib/hbide/idedocks.prg @@ -327,7 +327,7 @@ METHOD IdeDocks:buildDialog() ::oDlg:qtObject := hbide_getUI( "mainwindow" ) ::oDlg:create( , , , , , .f. ) - ::oDlg:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) ) + ::oDlg:oWidget:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) ) ::oDlg:close := {|| hbide_setClose( hbide_getYesNo( "hbIDE is about to be closed!", "Are you sure?" ) ) } ::oDlg:setDockOptions( QMainWindow_AllowTabbedDocks + QMainWindow_ForceTabbedDocks ) @@ -1546,7 +1546,7 @@ METHOD IdeDocks:buildProjectTree() ::oProjTree:hasButtons := .T. ::oProjTree:create( ::oDockPT, , { 0,0 }, { 100,10 }, , .t. ) - ::oProjTree:setStyleSheet( GetStyleSheet( "QTreeWidgetHB", ::nAnimantionMode ) ) + ::oProjTree:oWidget:setStyleSheet( GetStyleSheet( "QTreeWidgetHB", ::nAnimantionMode ) ) ::oProjTree:oWidget:setMinimumWidth( 100 ) ::oProjTree:oWidget:setSizePolicy( QSizePolicy_MinimumExpanding, QSizePolicy_Preferred ) ::oProjTree:oWidget:setIconSize( QSize( 12,12 ) ) @@ -1867,7 +1867,7 @@ METHOD IdeDocks:getMarkWidget( nIndex ) /*----------------------------------------------------------------------*/ METHOD IdeDocks:animateComponents( nMode ) - LOCAL cStyle, oView + LOCAL cStyle, oView, oMenu IF nMode == NIL ::oIde:nAnimantionMode := iif( ::nAnimantionMode == HBIDE_ANIMATION_NONE, HBIDE_ANIMATION_GRADIENT, HBIDE_ANIMATION_NONE ) @@ -1879,10 +1879,13 @@ METHOD IdeDocks:animateComponents( nMode ) ::qAnimateAction:setChecked( ::nAnimantionMode != HBIDE_ANIMATION_NONE ) /* Main Window */ - ::oDlg:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) ) + ::oDlg:oWidget:setStyleSheet( GetStyleSheet( "QMainWindow", ::nAnimantionMode ) ) /* Main Menu Bar with all its submenus */ - ::oDlg:menubar():setStyleSheet( GetStyleSheet( "QMenuBar", nMode ), GetStyleSheet( "QMenuPop", nMode ) ) + ::oDlg:menubar():oWidget:setStyleSheet( GetStyleSheet( "QMenuBar", nMode ) ) + FOR EACH oMenu IN ::oDlg:menubar():childList() + oMenu:oWidget:setStyleSheet( GetStyleSheet( "QMenuPop", nMode ) ) + NEXT /* Toolbars */ ::oMainToolbar:oWidget:setStyleSheet( GetStyleSheet( "QToolBar", nMode ) ) @@ -1925,7 +1928,7 @@ METHOD IdeDocks:animateComponents( nMode ) ::oQScintillaDock:oWidget : setStyleSheet( cStyle ) ::oSourceThumbnailDock:oWidget : setStyleSheet( cStyle ) - ::oProjTree:setStyleSheet( GetStyleSheet( "QTreeWidgetHB", ::nAnimantionMode ) ) + ::oProjTree:oWidget:setStyleSheet( GetStyleSheet( "QTreeWidgetHB", ::nAnimantionMode ) ) /* Edior Tab Widget */ FOR EACH oView IN ::aViews