diff options
Diffstat (limited to 'src/gui/dialogs/qfontdialog.cpp')
| -rw-r--r-- | src/gui/dialogs/qfontdialog.cpp | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/src/gui/dialogs/qfontdialog.cpp b/src/gui/dialogs/qfontdialog.cpp index bb53abe..ca882c5 100644 --- a/src/gui/dialogs/qfontdialog.cpp +++ b/src/gui/dialogs/qfontdialog.cpp @@ -65,6 +65,10 @@ #include <private/qdialog_p.h> #include <private/qfont_p.h> +#if defined(Q_WS_S60) +#include <QtGui/qdesktopwidget.h> +#endif + QT_BEGIN_NAMESPACE class QFontListView : public QListView @@ -312,6 +316,8 @@ void QFontDialogPrivate::init() #if defined(Q_WS_WINCE) q->resize(180, 120); +#elif defined(Q_WS_S60) + q->resize(QApplication::desktop()->availableGeometry(QCursor::pos()).size()); #else q->resize(500, 360); #endif // Q_WS_WINCE @@ -768,7 +774,11 @@ void QFontDialogPrivate::retranslateStrings() familyAccel->setText(QFontDialog::tr("&Font")); styleAccel->setText(QFontDialog::tr("Font st&yle")); sizeAccel->setText(QFontDialog::tr("&Size")); +#ifndef Q_WS_S60 + // Removed the title due to lack of screen estate in small S60 screen. + // The effects are descriptive without a title (strikeout, underline). effects->setTitle(QFontDialog::tr("Effects")); +#endif strikeout->setText(QFontDialog::tr("Stri&keout")); underline->setText(QFontDialog::tr("&Underline")); sample->setTitle(QFontDialog::tr("Sample")); @@ -792,7 +802,7 @@ void QFontDialog::changeEvent(QEvent *e) \property QFontDialog::currentFont \brief the current font of the dialog. -*/ +*/ /*! \since 4.5 @@ -816,7 +826,7 @@ void QFontDialog::setCurrentFont(const QFont &font) d->updateFamilies(); #ifdef Q_WS_MAC - if (d->delegate) + if (d->delegate) QFontDialogPrivate::setFont(d->delegate, font); #endif } |