Changeset 846 for trunk/src/gui/widgets/qdialogbuttonbox.cpp

Timestamp:

May 5, 2011, 5:36:53 AM (14 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.7.2 sources from branches/vendor/nokia/qt.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qdialogbuttonbox.cpp (modified) (11 diffs)

trunk/src/gui/widgets/qdialogbuttonbox.cpp

@@ -1 +1 @@
 /****************************************************************************
 **
-** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** Copyright (C) 201 Nokia Corporation and/or its subsidiary(-ies).
 ** All rights reserved.
 ** Contact: Nokia Corporation ([email protected])
@@ -104 +104 @@
 
     Currently the buttons are laid out in the following way if the button box is horizontal:
-    \table 100%
+    \table
     \row \o \inlineimage buttonbox-gnomelayout-horizontal.png GnomeLayout Horizontal
          \o Button box laid out in horizontal GnomeLayout
@@ -117 +117 @@
     The buttons are laid out the following way if the button box is vertical:
 
-    \table 100%
+    \table
+    \row \o GnomeLayout
+         \o KdeLayout
+         \o MacLayout
+         \o WinLayout
     \row \o \inlineimage buttonbox-gnomelayout-vertical.png GnomeLayout Vertical
-         \o Button box laid out in vertical GnomeLayout
-    \row \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
-         \o Button box laid out in vertical KdeLayout
-    \row \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
-         \o Button box laid out in vertical MacLayout
-    \row \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
-         \o Button box laid out in vertical WinLayout
+         \o \inlineimage buttonbox-kdelayout-vertical.png KdeLayout Vertical
+         \o \inlineimage buttonbox-maclayout-vertical.png MacLayout Vertical
+         \o \inlineimage buttonbox-winlayout-vertical.png WinLayout Vertical
     \endtable
 
     Additionally, button boxes that contain only buttons with ActionRole or
-    HelpRole can be considered modeless and have an alternate look on the mac:
-
-    \table 100%
-    \row \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
-         \o modeless horizontal MacLayout
-    \row \o \inlineimage buttonbox-mac-modeless-vertical.png Screenshot of modeless vertical MacLayout
-         \o modeless vertical MacLayout
+    HelpRole can be considered modeless and have an alternate look on Mac OS X:
+
+    \table
+    \row \o modeless horizontal MacLayout
+         \o \inlineimage buttonbox-mac-modeless-horizontal.png Screenshot of modeless horizontal MacLayout
     \endtable
 
@@ -261 +259 @@
 };
 
+
 class QDialogButtonEnabledProxy : public QObject
 {
@@ -284 +283 @@
     QAction *target;
 };
-
+#endif
 
 class QDialogButtonBoxPrivate : public QWidgetPrivate
@@ -317 +316 @@
     void retranslateStrings();
     const char *standardButtonText(QDialogButtonBox::StandardButton sbutton) const;
-#ifdef QT_SOFTKEYS_ENABLED
+#if
     QAction *createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role);
 #endif
@@ -574 +573 @@
     QObject::connect(button, SIGNAL(destroyed()), q, SLOT(_q_handleButtonDestroyed()));
     buttonLists[role].append(button);
-#ifdef QT_SOFTKEYS_ENABLED
+#if
     QAction *action = createSoftKey(button, role);
     softKeyActions.insert(button, action);
@@ -583 +582 @@
 }
 
-#ifdef QT_SOFTKEYS_ENABLED
+#if
 QAction* QDialogButtonBoxPrivate::createSoftKey(QAbstractButton *button, QDialogButtonBox::ButtonRole role)
 {
@@ -721 +720 @@
             QPushButton *button = it.key();
             button->setText(QDialogButtonBox::tr(buttonText));
-#ifdef QT_SOFTKEYS_ENABLED
+#if
             QAction *action = softKeyActions.value(button, 0);
             if (action)
@@ -1000 +999 @@
         }
     }
-#ifdef QT_SOFTKEYS_ENABLED
+#if
     QAction *action = d->softKeyActions.value(button, 0);
     if (action) {
@@ -1246 +1245 @@
         d->retranslateStrings();
     }
-#ifdef QT_SOFTKEYS_ENABLED
+#if
     else if (event->type() == QEvent::ParentChange) {
         QWidget *dialog = 0;