feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

ProjectExplorer: Use LayoutBuilder in KitManagerConfigWidget

Browse Source 
Change-Id: I271e0abc371a385d5e6ace29444ba021a38dd5d7
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
hjk
2020-09-18 03:52:48 +02:00
parent 250c55f308
commit 7e50cd4841
2 changed files with 11 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
View File

@@ -24,6 +24,7 @@
****************************************************************************/ ****************************************************************************/
#include "kitmanagerconfigwidget.h" #include "kitmanagerconfigwidget.h"
#include "projectconfiguration.h"
#include "devicesupport/idevicefactory.h" #include "devicesupport/idevicefactory.h"
#include "kit.h" #include "kit.h"
@@ -62,7 +63,6 @@ namespace ProjectExplorer {
namespace Internal { namespace Internal {
KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) : KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) :
m_layout(new QGridLayout),
m_iconButton(new QToolButton), m_iconButton(new QToolButton),
m_nameEdit(new QLineEdit), m_nameEdit(new QLineEdit),
m_fileSystemFriendlyNameLineEdit(new QLineEdit), m_fileSystemFriendlyNameLineEdit(new QLineEdit),
@@ -72,34 +72,27 @@ KitManagerConfigWidget::KitManagerConfigWidget(Kit *k) :
static auto alignment static auto alignment
= static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment)); = static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment));
m_layout->addWidget(m_nameEdit, 0, WidgetColumn);
m_layout->addWidget(m_iconButton, 0, ButtonColumn);
setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred); setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
LayoutBuilder builder(this, LayoutBuilder::GridLayout);
QLabel *label = createLabel(tr("Name:"), tr("Kit name and icon."));
builder.startNewRow().addItems({label, 1, alignment}, m_nameEdit, m_iconButton);
QString toolTip = QString toolTip =
tr("<html><head/><body><p>The name of the kit suitable for generating " tr("<html><head/><body><p>The name of the kit suitable for generating "
"directory names. This value is used for the variable <i>%1</i>, " "directory names. This value is used for the variable <i>%1</i>, "
"which for example determines the name of the shadow build directory." "which for example determines the name of the shadow build directory."
"</p></body></html>").arg(QLatin1String(Constants::VAR_CURRENTKIT_FILESYSTEMNAME)); "</p></body></html>").arg(QLatin1String(Constants::VAR_CURRENTKIT_FILESYSTEMNAME));
QLabel *label = createLabel(tr("File system name:"), toolTip);
m_layout->addWidget(label, 1, LabelColumn, alignment);
m_fileSystemFriendlyNameLineEdit->setToolTip(toolTip); m_fileSystemFriendlyNameLineEdit->setToolTip(toolTip);
QRegularExpression fileSystemFriendlyNameRegexp(QLatin1String("^[A-Za-z0-9_-]*$")); QRegularExpression fileSystemFriendlyNameRegexp(QLatin1String("^[A-Za-z0-9_-]*$"));
Q_ASSERT(fileSystemFriendlyNameRegexp.isValid()); Q_ASSERT(fileSystemFriendlyNameRegexp.isValid());
m_fileSystemFriendlyNameLineEdit->setValidator(new QRegularExpressionValidator(fileSystemFriendlyNameRegexp, m_fileSystemFriendlyNameLineEdit)); m_fileSystemFriendlyNameLineEdit->setValidator(new QRegularExpressionValidator(fileSystemFriendlyNameRegexp, m_fileSystemFriendlyNameLineEdit));
m_layout->addWidget(m_fileSystemFriendlyNameLineEdit, 1, WidgetColumn);
label = createLabel(tr("File system name:"), toolTip);
builder.startNewRow().addItems({label, 1, alignment}, m_fileSystemFriendlyNameLineEdit);
connect(m_fileSystemFriendlyNameLineEdit, &QLineEdit::textChanged, connect(m_fileSystemFriendlyNameLineEdit, &QLineEdit::textChanged,
this, &KitManagerConfigWidget::setFileSystemFriendlyName); this, &KitManagerConfigWidget::setFileSystemFriendlyName);
auto inner = new QWidget;
inner->setLayout(m_layout);
auto mainLayout = new QGridLayout(this);
mainLayout->setContentsMargins(1, 1, 1, 1);
mainLayout->addWidget(inner, 0, 0);
label = createLabel(tr("Name:"), tr("Kit name and icon."));
m_layout->addWidget(label, 0, LabelColumn, alignment);
m_iconButton->setToolTip(tr("Kit icon.")); m_iconButton->setToolTip(tr("Kit icon."));
auto setIconAction = new QAction(tr("Select Icon..."), this); auto setIconAction = new QAction(tr("Select Icon..."), this);
m_iconButton->addAction(setIconAction); m_iconButton->addAction(setIconAction);
@@ -244,15 +237,12 @@ void KitManagerConfigWidget::addAspectToWorkingCopy(KitAspect *aspect)
m_actions << action; m_actions << action;
int row = m_layout->rowCount();
m_layout->addWidget(widget->mainWidget(), row, WidgetColumn);
if (QWidget *button = widget->buttonWidget())
m_layout->addWidget(button, row, ButtonColumn);
static auto alignment static auto alignment
= static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment)); = static_cast<const Qt::Alignment>(style()->styleHint(QStyle::SH_FormLayoutLabelAlignment));
QLabel *label = createLabel(name, toolTip); QLabel *label = createLabel(name, toolTip);
m_layout->addWidget(label, row, LabelColumn, alignment); LayoutBuilder builder(layout());
builder.startNewRow().addItems({label, 1, alignment}, widget->mainWidget(), widget->buttonWidget());
m_widgets.append(widget); m_widgets.append(widget);
m_labels.append(label); m_labels.append(label);
} }

2
src/plugins/projectexplorer/kitmanagerconfigwidget.h
View File

@@ -32,7 +32,6 @@
#include <memory> #include <memory>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QGridLayout;
class QLabel; class QLabel;
class QLineEdit; class QLineEdit;
class QToolButton; class QToolButton;
@@ -92,7 +91,6 @@ private:
void showEvent(QShowEvent *event) override; void showEvent(QShowEvent *event) override;
QLabel *createLabel(const QString &name, const QString &toolTip); QLabel *createLabel(const QString &name, const QString &toolTip);
QGridLayout *m_layout;
QToolButton *m_iconButton; QToolButton *m_iconButton;
QLineEdit *m_nameEdit; QLineEdit *m_nameEdit;
QLineEdit *m_fileSystemFriendlyNameLineEdit; QLineEdit *m_fileSystemFriendlyNameLineEdit;