[vlc-devel] commit: Qt: Font setting, restore the value from vlcrc. ( Jean-Baptiste Kempf )

git version control git at videolan.org
Mon Aug 3 21:46:06 CEST 2009


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Aug  3 21:35:01 2009 +0200| [36f019bb3e3779f44bc01d1aa0a7e92d7ae6976d] | committer: Jean-Baptiste Kempf 

Qt: Font setting, restore the value from vlcrc.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=36f019bb3e3779f44bc01d1aa0a7e92d7ae6976d
---

 modules/gui/qt4/components/preferences_widgets.cpp |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/gui/qt4/components/preferences_widgets.cpp b/modules/gui/qt4/components/preferences_widgets.cpp
index 3474f7d..2b6c992 100644
--- a/modules/gui/qt4/components/preferences_widgets.cpp
+++ b/modules/gui/qt4/components/preferences_widgets.cpp
@@ -368,8 +368,6 @@ void DirectoryConfigControl::updateField()
     text->setText( toNativeSepNoSlash( dir ) );
 }
 
-#include <QFontComboBox>
-
 /********* String / Font **********/
 FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
                         module_config_t *_p_item, QWidget *_parent,
@@ -378,6 +376,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
 {
     label = new QLabel( qtr(p_item->psz_text) );
     font = new QFontComboBox( _parent );
+    font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
     if( !_p_layout )
     {
         QHBoxLayout *layout = new QHBoxLayout();
@@ -399,6 +398,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
 {
     label = _p_label;
     font = _p_font;
+    font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
 }
 
 /********* String / choice list **********/




More information about the vlc-devel mailing list