Changeset 561 for trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.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)
• tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp (modified) (7 diffs)

trunk/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt Designer 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
 ****************************************************************************/
-
-/*
-TRANSLATOR qdesigner_internal::ConnectionModel
-*/
 
 #include "signalsloteditorwindow.h"
@@ -78 +74 @@
 #include <QtGui/QToolButton>
 #include <QtGui/QButtonGroup>
+
 
 QT_BEGIN_NAMESPACE
@@ -729 +726 @@
     QVBoxLayout *layout = new QVBoxLayout(this);
     layout->setMargin(0);
-    layout->addWidget(m_view);
-
-    QHBoxLayout *layout2 = new QHBoxLayout;
-    layout2->setMargin(3);
-    layout->addLayout(layout2);
-    layout2->addStretch();
+    layout->setSpacing(0);
+
+    QToolBar *toolBar = new QToolBar;
+    toolBar->setIconSize(QSize(22, 22));
+    m_add_button->setIcon(createIconSet(QLatin1String("plus.png")));
+    connect(m_add_button, SIGNAL(clicked()), this, SLOT(addConnection()));
+    toolBar->addWidget(m_add_button);
 
     m_remove_button->setIcon(createIconSet(QLatin1String("minus.png")));
     connect(m_remove_button, SIGNAL(clicked()), this, SLOT(removeConnection()));
-    layout2->addWidget(m_remove_button);
-
-    m_add_button->setIcon(createIconSet(QLatin1String("plus.png")));
-    connect(m_add_button, SIGNAL(clicked()), this, SLOT(addConnection()));
-    layout2->addWidget(m_add_button);
+    toolBar->addWidget(m_remove_button);
+
+    layout->addWidget(toolBar);
+    layout->addWidget(m_view);
 
     connect(core->formWindowManager(),
@@ -762 +759 @@
                     this, SLOT(updateDialogSelection(Connection*)));
         if (integration) {
-            disconnect(integration, SIGNAL(objectNameChanged(QDesignerFormWindowInterface *, QObject *, QString, QString)),
-                    this, SLOT(objectNameChanged(QDesignerFormWindowInterface *, QObject *, QString, QString)));
+            disconnect(integration, SIGNAL(objectNameChanged(QDesignerFormWindowInterfaceQString)),
+                    this, SLOT(objectNameChanged(QDesignerFormWindowInterfaceQString)));
         }
     }
@@ -781 +778 @@
                 this, SLOT(updateDialogSelection(Connection*)));
         if (integration) {
-            connect(integration, SIGNAL(objectNameChanged(QDesignerFormWindowInterface *, QObject *, QString, QString)),
-                    this, SLOT(objectNameChanged(QDesignerFormWindowInterface *, QObject *, QString, QString)));
+            connect(integration, SIGNAL(objectNameChanged(QDesignerFormWindowInterfaceQString)),
+                    this, SLOT(objectNameChanged(QDesignerFormWindowInterfaceQString)));
         }
     }