← Back to branch summary

~ubuntu-branches/ubuntu/quantal/psi/quantal

« back to all changes in this revision

Viewing changes to src/options/opt_appearance.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Jan Niehusmann
  • Date: 2009-09-25 17:49:51 UTC
  • mfrom: (6.1.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090925174951-lvm7kdap82o8xhn3
Tags: 0.13-1
* Updated to upstream version 0.13
* Set Standards-Version to 3.8.3

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/options/opt_appearance.cpp
69
69
//----------------------------------------------------------------------------
70
70
// OptionsTabAppearance
71
71
//----------------------------------------------------------------------------
72
 
OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's Appearance"), "psi/appearance")
 
72
OptionsTabAppearance::OptionsTabAppearance(QObject *parent) : MetaOptionsTab(parent, "appearance", "", tr("Appearance"), tr("Psi's appearance"), "psi/appearance")
73
73
{    
74
74
        addTab( new OptionsTabAppearanceGeneral(this) );
75
75
        addTab( new OptionsTabIconsetEmoticons(this) );
329
329
        int x = (bg_font->buttons()).indexOf(button);
330
330
        font.fromString( le_font[x]->fontName() );
331
331
 
 
332
        // ensure we don't use the new native font dialog on mac with Qt 4.5,
 
333
        //   since it was broken last we checked (qt task #252000)
 
334
#if QT_VERSION >= 0x040500
 
335
        QString fnt = QFontDialog::getFont(&ok, font, parentWidget, QString(), QFontDialog::DontUseNativeDialog).toString();
 
336
#else
332
337
        QString fnt = QFontDialog::getFont(&ok, font, parentWidget).toString();
 
338
#endif
333
339
        le_font[x]->setFont(fnt);
334
340
 
335
341
        if(ok)