Skip to content

V
vlc-gpu
Commit 36f019bb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf
Browse files
Options

Qt: Font setting, restore the value from vlcrc.

parent 34271afb
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/gui/qt4/components/preferences_widgets.cpp
View file @ 36f019bb
...@@ -368,8 +368,6 @@ void DirectoryConfigControl::updateField() ...@@ -368,8 +368,6 @@ void DirectoryConfigControl::updateField()
text->setText( toNativeSepNoSlash( dir ) ); text->setText( toNativeSepNoSlash( dir ) );
} }
#include <QFontComboBox>
/********* String / Font **********/ /********* String / Font **********/
FontConfigControl::FontConfigControl( vlc_object_t *_p_this, FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
module_config_t *_p_item, QWidget *_parent, module_config_t *_p_item, QWidget *_parent,
...@@ -378,6 +376,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this, ...@@ -378,6 +376,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
{ {
label = new QLabel( qtr(p_item->psz_text) ); label = new QLabel( qtr(p_item->psz_text) );
font = new QFontComboBox( _parent ); font = new QFontComboBox( _parent );
font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
if( !_p_layout ) if( !_p_layout )
{ {
QHBoxLayout *layout = new QHBoxLayout(); QHBoxLayout *layout = new QHBoxLayout();
...@@ -399,6 +398,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this, ...@@ -399,6 +398,7 @@ FontConfigControl::FontConfigControl( vlc_object_t *_p_this,
{ {
label = _p_label; label = _p_label;
font = _p_font; font = _p_font;
font->setCurrentFont( QFont( qfu( p_item->value.psz) ) );
} }
/********* String / choice list **********/ /********* String / choice list **********/
......
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