Skip to content

C
core
Kaydet (Commit) 6344b00e authored tarafından Stephan Bergmann's avatar Stephan Bergmann
Dosyalara gözat
Seçenekler

Adapt some GetUILocale leftovers 

Change-Id: I0400858249d4722a3b5583febd82200e62a64b20
üst d98e8a22
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
vcl/unx/gtk3/gdi/gtk3salnativewidgets-gtk.cxx
Dosyayı görüntüle @ 6344b00e
...@@ -1304,7 +1304,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings ) ...@@ -1304,7 +1304,7 @@ void GtkSalGraphics::updateSettings( AllSettings& rSettings )
fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() ); fprintf( stderr, "font name BEFORE system match: \"%s\"\n", aFamily.getStr() );
// match font to e.g. resolve "Sans" // match font to e.g. resolve "Sans"
psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILocale() ); psp::PrintFontManager::get().matchFont( aInfo, rSettings.GetUILanguageTag().getLocale() );
fprintf( stderr, "font match %s, name AFTER: \"%s\"\n", fprintf( stderr, "font match %s, name AFTER: \"%s\"\n",
aInfo.m_nID != 0 ? "succeeded" : "failed", aInfo.m_nID != 0 ? "succeeded" : "failed",
rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() ); rtl::OUStringToOString( aInfo.m_aStyleName, RTL_TEXTENCODING_ISO_8859_1 ).getStr() );
......
vcl/unx/kde/salnativewidgets-kde.cxx
Dosyayı görüntüle @ 6344b00e
...@@ -1873,7 +1873,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -1873,7 +1873,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
pKey = "titleFont"; pKey = "titleFont";
if ( pConfig->hasKey( pKey ) ) if ( pConfig->hasKey( pKey ) )
{ {
Font aFont = toFont( pConfig->readFontEntry( pKey ), rSettings.GetUILocale() ); Font aFont = toFont( pConfig->readFontEntry( pKey ), rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetTitleFont( aFont ); aStyleSettings.SetTitleFont( aFont );
bSetTitleFont = true; bSetTitleFont = true;
} }
...@@ -1934,7 +1934,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -1934,7 +1934,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) ); aStyleSettings.SetHighlightTextColor( toColor( qColorGroup.highlightedText() ) );
// Font // Font
Font aFont = toFont( kapp->font(), rSettings.GetUILocale() ); Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetAppFont( aFont ); aStyleSettings.SetAppFont( aFont );
aStyleSettings.SetHelpFont( aFont ); aStyleSettings.SetHelpFont( aFont );
...@@ -2005,7 +2005,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -2005,7 +2005,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore; ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore;
// Font // Font
aFont = toFont( pMenuBar->font(), rSettings.GetUILocale() ); aFont = toFont( pMenuBar->font(), rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetMenuFont( aFont ); aStyleSettings.SetMenuFont( aFont );
} }
...@@ -2013,7 +2013,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -2013,7 +2013,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
KToolBar *pToolBar = qMainWindow.toolBar(); KToolBar *pToolBar = qMainWindow.toolBar();
if ( pToolBar ) if ( pToolBar )
{ {
aFont = toFont( pToolBar->font(), rSettings.GetUILocale() ); aFont = toFont( pToolBar->font(), rSettings.GetUILanguageTag().getLocale() );
aStyleSettings.SetToolFont( aFont ); aStyleSettings.SetToolFont( aFont );
} }
......
vcl/unx/kde4/KDESalFrame.cxx
Dosyayı görüntüle @ 6344b00e
...@@ -192,7 +192,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -192,7 +192,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
pKey = "titleFont"; pKey = "titleFont";
if ( aGroup.hasKey( pKey ) ) if ( aGroup.hasKey( pKey ) )
{ {
Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() ); Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() );
style.SetTitleFont( aFont ); style.SetTitleFont( aFont );
bSetTitleFont = true; bSetTitleFont = true;
} }
...@@ -207,7 +207,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -207,7 +207,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
pKey = "toolbarFont"; pKey = "toolbarFont";
if ( aGroup.hasKey( pKey ) ) if ( aGroup.hasKey( pKey ) )
{ {
Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILocale() ); Font aFont = toFont( aGroup.readEntry( pKey, QFont() ), rSettings.GetUILanguageTag().getLocale() );
style.SetToolFont( aFont ); style.SetToolFont( aFont );
} }
} }
...@@ -263,7 +263,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -263,7 +263,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText ))); style.SetHelpTextColor( toColor( QToolTip::palette().color( QPalette::Active, QPalette::ToolTipText )));
// Font // Font
Font aFont = toFont( kapp->font(), rSettings.GetUILocale() ); Font aFont = toFont( kapp->font(), rSettings.GetUILanguageTag().getLocale() );
style.SetAppFont( aFont ); style.SetAppFont( aFont );
...@@ -284,7 +284,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -284,7 +284,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
} }
style.SetFloatTitleFont( aFont ); style.SetFloatTitleFont( aFont );
style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILocale())); style.SetHelpFont( toFont( QToolTip::font(), rSettings.GetUILanguageTag().getLocale()));
int flash_time = QApplication::cursorFlashTime(); int flash_time = QApplication::cursorFlashTime();
style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME ); style.SetCursorBlinkTime( flash_time != 0 ? flash_time/2 : STYLE_CURSOR_NOBLINKTIME );
...@@ -320,7 +320,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings ) ...@@ -320,7 +320,7 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore; ImplGetSVData()->maNWFData.maMenuBarHighlightTextColor = aMenuFore;
// Font // Font
aFont = toFont( pMenuBar->font(), rSettings.GetUILocale() ); aFont = toFont( pMenuBar->font(), rSettings.GetUILanguageTag().getLocale() );
style.SetMenuFont( aFont ); style.SetMenuFont( aFont );
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment