From 02068b8ef1d5dd615eb53478d01ff881cda73b74 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Tue, 21 Apr 2015 13:17:27 +0200 Subject: ToolChain: Add scrollbar to config widget This is necessary for the custom tool chain that has its widgets squashed together. Task-number: QTCREATORBUG-10329 Change-Id: I53f125721c1e018bca07503049f412fec3725c22 Reviewed-by: Friedemann Kleint Reviewed-by: Tobias Hunger --- .../projectexplorer/toolchainconfigwidget.cpp | 25 +++++++++++++++++++--- .../projectexplorer/toolchainconfigwidget.h | 4 ++-- 2 files changed, 24 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp index 65e1e13d09..362e463b5c 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp +++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp @@ -31,6 +31,7 @@ #include "toolchainconfigwidget.h" #include "toolchain.h" +#include #include #include @@ -38,6 +39,8 @@ #include #include #include +#include +#include namespace ProjectExplorer { @@ -46,10 +49,26 @@ ToolChainConfigWidget::ToolChainConfigWidget(ToolChain *tc) : { Q_ASSERT(tc); - m_nameLineEdit = new QLineEdit(this); - m_mainLayout = new QFormLayout(this); - m_nameLineEdit->setText(tc->displayName()); + Utils::DetailsWidget *centralWidget = new Utils::DetailsWidget; + centralWidget->setState(Utils::DetailsWidget::NoSummary); + + setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + setFrameShape(QFrame::NoFrame); + setWidgetResizable(true); + setFocusPolicy(Qt::NoFocus); + + setWidget(centralWidget); + + QWidget *detailsBox = new QWidget(); + + m_mainLayout = new QFormLayout(detailsBox); + m_mainLayout->setContentsMargins(0, 0, 0, 0); + centralWidget->setWidget(detailsBox); m_mainLayout->setFieldGrowthPolicy(QFormLayout::ExpandingFieldsGrow); // for the Macs... + + m_nameLineEdit = new QLineEdit; + m_nameLineEdit->setText(tc->displayName()); + m_mainLayout->addRow(tr("Name:"), m_nameLineEdit); connect(m_nameLineEdit, SIGNAL(textChanged(QString)), SIGNAL(dirty())); diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h index 13df6d3ae7..a1e5ba5b94 100644 --- a/src/plugins/projectexplorer/toolchainconfigwidget.h +++ b/src/plugins/projectexplorer/toolchainconfigwidget.h @@ -33,7 +33,7 @@ #include "projectexplorer_export.h" -#include +#include QT_BEGIN_NAMESPACE class QFormLayout; @@ -50,7 +50,7 @@ class ToolChain; // ToolChainConfigWidget // -------------------------------------------------------------------------- -class PROJECTEXPLORER_EXPORT ToolChainConfigWidget : public QWidget +class PROJECTEXPLORER_EXPORT ToolChainConfigWidget : public QScrollArea { Q_OBJECT -- cgit v1.2.1