diff options
| author | Bill King <bill.king@nokia.com> | 2009-11-13 02:48:10 (GMT) |
|---|---|---|
| committer | Bill King <bill.king@nokia.com> | 2009-11-13 02:48:10 (GMT) |
| commit | c7ef9c969fb368027135c5e7b0e9b6f53c465702 (patch) | |
| tree | a9dccb0f6d3380ee13577502365117754768f356 /tools/designer | |
| parent | e80adac9902abfd423aae23dd22f490a33763228 (diff) | |
| parent | 99b19431e6846a36a65f23d21a95140a081d1f1a (diff) | |
| download | Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.zip Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.tar.gz Qt-c7ef9c969fb368027135c5e7b0e9b6f53c465702.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'tools/designer')
| -rw-r--r-- | tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp index 7ab7cb4..e36e828 100644 --- a/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp +++ b/tools/designer/src/components/signalsloteditor/signalsloteditorwindow.cpp @@ -73,6 +73,7 @@ #include <QtGui/QVBoxLayout> #include <QtGui/QToolButton> #include <QtGui/QButtonGroup> +#include <QtGui/QToolBar> QT_BEGIN_NAMESPACE @@ -724,20 +725,20 @@ SignalSlotEditorWindow::SignalSlotEditorWindow(QDesignerFormEditorInterface *cor QVBoxLayout *layout = new QVBoxLayout(this); layout->setMargin(0); - layout->addWidget(m_view); + layout->setSpacing(0); - QHBoxLayout *layout2 = new QHBoxLayout; - layout2->setMargin(3); - layout->addLayout(layout2); - layout2->addStretch(); + 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); + toolBar->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); + layout->addWidget(toolBar); + layout->addWidget(m_view); connect(core->formWindowManager(), SIGNAL(activeFormWindowChanged(QDesignerFormWindowInterface*)), |