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

GitLab: Use IntegerAspect instead of QSpinBox

Browse Source 
Change-Id: I06e9d907a6a65f8cf135031f0aed3cd3eca9281b
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Christian Stenger
2022-07-06 21:51:02 +02:00
parent ae1e006426
commit 674cca18a7
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/gitlab/gitlaboptionspage.cpp
View File

@@ -80,9 +80,9 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
: Utils::StringAspect::LineEditDisplay); : Utils::StringAspect::LineEditDisplay);
m_token.setVisible(m == Edit); m_token.setVisible(m == Edit);
m_port.setLabelText(GitLabOptionsPage::tr("Port:"));
m_port.setRange(1, 65535); m_port.setRange(1, 65535);
m_port.setValue(GitLabServer::defaultPort); m_port.setValue(GitLabServer::defaultPort);
auto portLabel = new QLabel(GitLabOptionsPage::tr("Port:"), this);
m_port.setEnabled(m == Edit); m_port.setEnabled(m == Edit);
m_secure.setLabelText(GitLabOptionsPage::tr("HTTPS:")); m_secure.setLabelText(GitLabOptionsPage::tr("HTTPS:"));
m_secure.setLabelPlacement(Utils::BoolAspect::LabelPlacement::InExtraLabel); m_secure.setLabelPlacement(Utils::BoolAspect::LabelPlacement::InExtraLabel);
@@ -90,17 +90,15 @@ GitLabServerWidget::GitLabServerWidget(Mode m, QWidget *parent)
m_secure.setEnabled(m == Edit); m_secure.setEnabled(m == Edit);
using namespace Utils::Layouting; using namespace Utils::Layouting;
const Break nl;
Row { Row {
Form { Form {
m_host, m_host,
m_description, m_description,
m_token, m_token,
portLabel, &m_port, nl, m_port,
m_secure m_secure
}, },
Stretch()
}.attachTo(this, m == Edit); }.attachTo(this, m == Edit);
} }
@@ -209,7 +207,6 @@ void GitLabOptionsWidget::showEditServerDialog()
connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject);
layout->addWidget(buttons); layout->addWidget(buttons);
d.setLayout(layout); d.setLayout(layout);
d.resize(300, 200);
if (d.exec() != QDialog::Accepted) if (d.exec() != QDialog::Accepted)
return; return;
@@ -231,7 +228,6 @@ void GitLabOptionsWidget::showAddServerDialog()
connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject); connect(buttons->button(QDialogButtonBox::Cancel), &QPushButton::clicked, &d, &QDialog::reject);
layout->addWidget(buttons); layout->addWidget(buttons);
d.setLayout(layout); d.setLayout(layout);
d.resize(300, 200);
if (d.exec() != QDialog::Accepted) if (d.exec() != QDialog::Accepted)
return; return;

3
src/plugins/gitlab/gitlaboptionspage.h
View File

@@ -31,7 +31,6 @@
#include <utils/aspects.h> #include <utils/aspects.h>
#include <QPointer> #include <QPointer>
#include <QSpinBox>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QComboBox; class QComboBox;
@@ -56,7 +55,7 @@ private:
Utils::StringAspect m_host; Utils::StringAspect m_host;
Utils::StringAspect m_description; Utils::StringAspect m_description;
Utils::StringAspect m_token; Utils::StringAspect m_token;
QSpinBox m_port; Utils::IntegerAspect m_port;
Utils::BoolAspect m_secure; Utils::BoolAspect m_secure;
}; };