Changeset 561 for trunk/src/gui/dialogs/qfontdialog.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/dialogs/qfontdialog.cpp (modified) (20 diffs)

trunk/src/gui/dialogs/qfontdialog.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
 **
-** In addition, as a special exception, Nokia gives you certain
-** additional rights. These rights are described in the Nokia Qt LGPL
-** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -66 +66 @@
 #include <private/qfont_p.h>
 
+#if defined(Q_WS_S60)
+#include <QtGui/qdesktopwidget.h>
+#endif
+
 QT_BEGIN_NAMESPACE
 
@@ -113 +117 @@
 /*!
   \class QFontDialog
-  \ingroup dialogs
-  \ingroup text
-  \mainclass
+  \ingroup standard-dialogs
+
   \brief The QFontDialog class provides a dialog widget for selecting a font.
 
@@ -312 +315 @@
     QObject::connect(buttonBox, SIGNAL(rejected()), q, SLOT(reject()));
 
-#if defined(Q_OS_WINCE)
+#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_OS_WINCE
+#endif // Q_WS_WINCE
 
     sizeEdit->installEventFilter(q);
@@ -338 +343 @@
 QFontDialog::~QFontDialog()
 {
+#ifdef Q_WS_MAC
+    Q_D(QFontDialog);
+    if (d->delegate) {
+        QFontDialogPrivate::closeCocoaFontPanel(d->delegate);
+        QFontDialogPrivate::sharedFontPanelAvailable = true;
+        return;
+    }
+#endif
 }
 
@@ -494 +507 @@
     Q_Q(QFontDialog);
 
-    familyList->blockSignals(true);
-
     enum match_t { MATCH_NONE = 0, MATCH_LAST_RESORT = 1, MATCH_APP = 2, MATCH_FAMILY = 3 };
 
@@ -549 +560 @@
         familyEdit->selectAll();
 
-    familyList->blockSignals(false);
     updateStyles();
 }
@@ -560 +570 @@
 {
     Q_Q(QFontDialog);
-
-    styleList->blockSignals(true);
-
     QStringList styles = fdb.styles(familyList->currentText());
     styleList->model()->setStringList(styles);
@@ -596 +603 @@
             if (!found)
                 styleList->setCurrentItem(0);
+        } else {
+            styleList->setCurrentItem(0);
         }
 
@@ -606 +615 @@
     }
 
-    styleList->blockSignals(false);
-
     updateSizes();
 }
@@ -620 +627 @@
 {
     Q_Q(QFontDialog);
-
-    sizeList->blockSignals(true);
 
     if (!familyList->currentText().isEmpty()) {
@@ -652 +657 @@
     }
 
-    sizeList->blockSignals(false);
     _q_updateSample();
 }
@@ -773 +777 @@
     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"));
@@ -797 +805 @@
     \property QFontDialog::currentFont
     \brief the current font of the dialog.
-*/    
+*/
 
 /*!
@@ -821 +829 @@
 
 #ifdef Q_WS_MAC
-    if (d->delegate) 
+    if (d->delegate)
         QFontDialogPrivate::setFont(d->delegate, font);
 #endif
@@ -933 +941 @@
     \overload
 
-    Opens the dialog and connects its accepted() signal to the slot specified
+    Opens the dialog and connects its fontSelected() signal to the slot specified
     by \a receiver and \a member.
 
@@ -941 +949 @@
 {
     Q_D(QFontDialog);
-    connect(this, SIGNAL(fontSelected(const QFont&)), receiver, member);
+    connect(this, SIGNAL(fontSelected(QFont)), receiver, member);
     d->receiverToDisconnectOnClose = receiver;
     d->memberToDisconnectOnClose = member;
@@ -1031 +1039 @@
     }
     if (d->receiverToDisconnectOnClose) {
-        disconnect(this, SIGNAL(fontSelected(const QFont&)),
+        disconnect(this, SIGNAL(fontSelected(QFont)),
                    d->receiverToDisconnectOnClose, d->memberToDisconnectOnClose);
         d->receiverToDisconnectOnClose = 0;