Diffstat (limited to 'core/settings/launcher/tabdialog.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | core/settings/launcher/tabdialog.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/core/settings/launcher/tabdialog.cpp b/core/settings/launcher/tabdialog.cpp index 86202f0..75a3de5 100644 --- a/core/settings/launcher/tabdialog.cpp +++ b/core/settings/launcher/tabdialog.cpp @@ -298,3 +298,3 @@ TabDialog::TabDialog ( const QPixmap *tabicon, const QString &tabname, TabConfig bgTypeClicked ( tc. m_bg_type ); - m_fontselect-> setSelectedFont ( tc. m_font_family, tc. m_font_style, tc. m_font_size ); + m_fontselect-> setSelectedFont ( QFont ( tc. m_font_family, tc. m_font_size, tc. m_font_weight, tc. m_font_italic )); fontClicked ( m_fontselect-> selectedFont ( )); @@ -443,3 +443,3 @@ void TabDialog::bgTypeClicked ( int t ) else if ( t == TabConfig::Image ) - s = m_bgimage; + s = Resource::findPixmap ( m_bgimage ); @@ -477,3 +477,3 @@ void TabDialog::bgDefaultClicked ( ) { - m_bgimage = Resource::findPixmap ( "launcher/opie-background.jpg" ); + m_bgimage = "launcher/opie-background"; bgTypeClicked ( TabConfig::Image ); @@ -488,5 +488,9 @@ void TabDialog::accept ( ) m_tc. m_text_color = m_iconcolor-> color ( ). name ( ); - m_tc. m_font_family = m_fontselect-> fontFamily ( ); - m_tc. m_font_size = m_fontselect-> fontSize ( ); - m_tc. m_font_style = m_fontselect-> fontStyle ( ); + + QFont f = m_fontselect-> selectedFont ( ); + + m_tc. m_font_family = f. family ( ); + m_tc. m_font_size = f. pointSize ( ); + m_tc. m_font_weight = f. weight ( ); + m_tc. m_font_italic = f. italic ( ); |