[yast-commit] r47643 - in /trunk/qt/src: CMakeLists.txt YQApplication.cc

Author: coolo Date: Sat May 17 16:36:56 2008 New Revision: 47643 URL: http://svn.opensuse.org/viewcvs/yast?rev=47643&view=rev Log: reinit fontconfig on language change Modified: trunk/qt/src/CMakeLists.txt trunk/qt/src/YQApplication.cc Modified: trunk/qt/src/CMakeLists.txt URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/CMakeLists.txt?rev=47643&r1=47642&r2=47643&view=diff ============================================================================== --- trunk/qt/src/CMakeLists.txt (original) +++ trunk/qt/src/CMakeLists.txt Sat May 17 16:36:56 2008 @@ -147,6 +147,7 @@ TARGET_LINK_LIBRARIES( py2qt ${QT_QTCORE_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt ${QT_QTGUI_LIBRARY} ) TARGET_LINK_LIBRARIES( py2qt dl X11 ) +TARGET_LINK_LIBRARIES( py2qt fontconfig ) SET_TARGET_PROPERTIES( py2qt PROPERTIES SOVERSION 2 ) SET_TARGET_PROPERTIES( py2qt PROPERTIES LINK_FLAGS "-Wl,--no-undefined" ) Modified: trunk/qt/src/YQApplication.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/qt/src/YQApplication.cc?rev=47643&r1=47642&r2=47643&view=diff ============================================================================== --- trunk/qt/src/YQApplication.cc (original) +++ trunk/qt/src/YQApplication.cc Sat May 17 16:36:56 2008 @@ -27,6 +27,9 @@ #include <QDesktopWidget> #include <QMessageBox> #include <QSettings> +#include <QFontDatabase> + +#include #define YUILogComponent "qt-ui" #include "YUILog.h" @@ -75,7 +78,6 @@ YQApplication::setLanguage( const string & language, const string & encoding ) { - yuiMilestone() << "setLanguage " << language << endl; YApplication::setLanguage( language, encoding ); loadPredefinedQtTranslations(); setLangFonts( language, encoding ); @@ -195,14 +197,20 @@ { yuiMilestone() << "New font family: " << _fontFamily << endl; deleteFonts(); + // setting the language loads fonts and we need to tell fontconfig + FcInitReinitialize(); + +#if 0 + QFontDatabase database; + int ret = database.addApplicationFont( "/usr/share/fonts/truetype/ipag.ttf" ); + yuiMilestone() << "families " << qPrintable( database.families().join( "-" ) ) << " " << ret << endl; +#endif foreach (QWidget *widget, QApplication::allWidgets()) { if ( widget->font().family() != oldFontFamily ) - { - yuiMilestone() << "font " << qPrintable( widget->font().family() ) << " family is not " << oldFontFamily << endl; continue; - } + QFont wfont( widget->font() ); wfont.setFamily( _fontFamily ); widget->setFont( wfont ); -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org