User: kz Date: 06/01/03 08:16:58 Modified: /dba/dbaccess/source/ui/app/ AppView.cxx
Log: INTEGRATION: CWS dba202c (1.11.50); FILE MERGED 2005/12/05 10:20:08 oj 1.11.50.2: #i52615# system color 2005/12/01 13:23:21 oj 1.11.50.1: #i52615# datachanged overload File Changes: Directory: /dba/dbaccess/source/ui/app/ ======================================= File [changed]: AppView.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/app/AppView.cxx?r1=1.11&r2=1.12 Delta lines: +39 -4 -------------------- --- AppView.cxx 23 Sep 2005 12:17:46 -0000 1.11 +++ AppView.cxx 3 Jan 2006 16:16:56 -0000 1.12 @@ -225,9 +225,27 @@ // ----------------------------------------------------------------------------- void OAppBorderWindow::ImplInitSettings() { - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( true ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( true ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + } + + if( true ) + SetBackground( rStyleSettings.GetDialogColor() ); + + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); - SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } // ----------------------------------------------------------------------------- OApplicationView* OAppBorderWindow::getView() const { return m_pView; } @@ -610,8 +628,25 @@ // ----------------------------------------------------------------------------- void OApplicationView::ImplInitSettings() { - SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); + const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); + if( true ) + { + Font aFont; + aFont = rStyleSettings.GetFieldFont(); + aFont.SetColor( rStyleSettings.GetWindowTextColor() ); + SetPointFont( aFont ); + } + + if( true ) + { + SetTextColor( rStyleSettings.GetFieldTextColor() ); + SetTextFillColor(); + } + + if( true ) + SetBackground( rStyleSettings.GetFieldColor() ); + /*SetBackground( Wallpaper( Application::GetSettings().GetStyleSettings().GetDialogColor() ) ); SetFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); - SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() ); + SetTextFillColor( Application::GetSettings().GetStyleSettings().GetDialogColor() );*/ } //----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
