User: kz Date: 06/01/03 08:16:00 Modified: /dba/dbaccess/source/ui/app/ AppDetailView.cxx
Log: INTEGRATION: CWS dba202c (1.12.50); FILE MERGED 2005/12/05 10:51:49 oj 1.12.50.3: set background at fixedline 2005/12/05 10:20:07 oj 1.12.50.2: #i52615# system color 2005/12/01 13:23:20 oj 1.12.50.1: #i52615# datachanged overload File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppDetailView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppDetailView.cxx?r1=1.12&r2=1.13 Delta lines: +73 -7 -------------------- --- AppDetailView.cxx 23 Sep 2005 12:16:10 -0000 1.12 +++ AppDetailView.cxx 3 Jan 2006 16:15:57 -0000 1.13 @@ -364,9 +364,7 @@ m_aHelpText.SetHelpId(HID_APP_HELP_TEXT); m_aDescription.SetHelpId(HID_APP_DESCRIPTION_TEXT); m_aDescription.SetText(ModuleRes(STR_DESCRIPTION)); - Font aFont = m_aDescription.GetControlFont(); - aFont.SetWeight(WEIGHT_BOLD); - m_aDescription.SetControlFont(aFont); + ImplInitSettings(sal_True,sal_True,sal_True); } // ----------------------------------------------------------------------------- OTasksWindow::~OTasksWindow() @@ -374,6 +372,56 @@ DBG_DTOR(OTasksWindow,NULL); Clear(); } +// ----------------------------------------------------------------------- +void OTasksWindow::DataChanged( const DataChangedEvent& rDCEvt ) +{ + DBG_CHKTHIS(OTasksWindow,NULL); + Window::DataChanged( rDCEvt ); + + if ( (rDCEvt.GetType() == DATACHANGED_SETTINGS) && + (rDCEvt.GetFlags() & SETTINGS_STYLE) ) + { + ImplInitSettings( sal_True, sal_True, sal_True ); + Invalidate(); + } +} +// ----------------------------------------------------------------------------- +void OTasksWindow::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) +{ + DBG_CHKTHIS(OTasksWindow,NULL); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( bFont ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( bForeground || bFont ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + m_aHelpText.SetTextColor( rStyleSettings.GetFieldTextColor() ); + m_aHelpText.SetTextFillColor(); + m_aDescription.SetTextColor( rStyleSettings.GetFieldTextColor() ); + m_aDescription.SetTextFillColor(); + //m_aFL.SetTextColor( rStyleSettings.GetFieldTextColor() ); + //m_aFL.SetTextFillColor(); + } + + if( bBackground ) + { + SetBackground( rStyleSettings.GetFieldColor() ); + m_aHelpText.SetBackground( rStyleSettings.GetFieldColor() ); + m_aDescription.SetBackground( rStyleSettings.GetFieldColor() ); + m_aFL.SetBackground( rStyleSettings.GetFieldColor() ); + } + + Font aFont = m_aDescription.GetControlFont(); + aFont.SetWeight(WEIGHT_BOLD); + m_aDescription.SetControlFont(aFont); +} // ----------------------------------------------------------------------------- void OTasksWindow::setHelpText(USHORT _nId) { @@ -526,10 +574,28 @@ void OApplicationDetailView::ImplInitSettings( sal_Bool bFont, sal_Bool bForeground, sal_Bool bBackground ) { DBG_CHKTHIS(OApplicationDetailView,NULL); - SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) ); - m_aHorzSplitter.SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) ); - m_aHorzSplitter.SetFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); - m_aHorzSplitter.SetTextFillColor( GetSettings().GetStyleSettings().GetDialogColor() ); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( bFont ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( bForeground || bFont ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + } + + if( bBackground ) + SetBackground( rStyleSettings.GetFieldColor() ); + + //SetBackground( Wallpaper( GetSettings().GetStyleSettings().GetDialogColor() ) ); + m_aHorzSplitter.SetBackground( rStyleSettings.GetDialogColor() ); + m_aHorzSplitter.SetFillColor( rStyleSettings.GetDialogColor() ); + m_aHorzSplitter.SetTextFillColor(rStyleSettings.GetDialogColor() ); } // ----------------------------------------------------------------------- void OApplicationDetailView::DataChanged( const DataChangedEvent& rDCEvt ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
