forked from qt-creator/qt-creator
Project settings: Fix missing IDs for global settings links
Change-Id: Id99bf5f9d45dd399c589011ca724914046305c53 Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
@@ -279,7 +279,7 @@ GitLabOptionsPage::GitLabOptionsPage(GitLabParameters *p, QObject *parent)
|
|||||||
: Core::IOptionsPage{parent}
|
: Core::IOptionsPage{parent}
|
||||||
, m_parameters(p)
|
, m_parameters(p)
|
||||||
{
|
{
|
||||||
setId("GitLab");
|
setId(Constants::GITLAB_SETTINGS);
|
||||||
setDisplayName(tr("GitLab"));
|
setDisplayName(tr("GitLab"));
|
||||||
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
|
setCategory(VcsBase::Constants::VCS_SETTINGS_CATEGORY);
|
||||||
}
|
}
|
||||||
|
@@ -40,6 +40,10 @@ QT_END_NAMESPACE
|
|||||||
|
|
||||||
namespace GitLab {
|
namespace GitLab {
|
||||||
|
|
||||||
|
namespace Constants {
|
||||||
|
const char GITLAB_SETTINGS[] = "GitLab";
|
||||||
|
} // namespace Constants
|
||||||
|
|
||||||
class GitLabServerWidget : public QWidget
|
class GitLabServerWidget : public QWidget
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
@@ -136,6 +136,7 @@ GitLabProjectSettingsWidget::GitLabProjectSettingsWidget(ProjectExplorer::Projec
|
|||||||
{
|
{
|
||||||
setUseGlobalSettingsCheckBoxVisible(false);
|
setUseGlobalSettingsCheckBoxVisible(false);
|
||||||
setUseGlobalSettingsLabelVisible(true);
|
setUseGlobalSettingsLabelVisible(true);
|
||||||
|
setGlobalSettingsId(Constants::GITLAB_SETTINGS);
|
||||||
// setup ui
|
// setup ui
|
||||||
auto verticalLayout = new QVBoxLayout(this);
|
auto verticalLayout = new QVBoxLayout(this);
|
||||||
verticalLayout->setContentsMargins(0, 0, 0, 0);
|
verticalLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
|
@@ -31,6 +31,8 @@
|
|||||||
namespace Todo {
|
namespace Todo {
|
||||||
namespace Constants {
|
namespace Constants {
|
||||||
|
|
||||||
|
const char TODO_SETTINGS[] = "TodoSettings";
|
||||||
|
|
||||||
// Settings entries
|
// Settings entries
|
||||||
const char SETTINGS_GROUP[] = "TodoPlugin";
|
const char SETTINGS_GROUP[] = "TodoPlugin";
|
||||||
const char SCANNING_SCOPE[] = "ScanningScope";
|
const char SCANNING_SCOPE[] = "ScanningScope";
|
||||||
|
@@ -212,7 +212,7 @@ void OptionsDialog::apply()
|
|||||||
|
|
||||||
TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function<void ()> &onApply)
|
TodoOptionsPage::TodoOptionsPage(Settings *settings, const std::function<void ()> &onApply)
|
||||||
{
|
{
|
||||||
setId("TodoSettings");
|
setId(Constants::TODO_SETTINGS);
|
||||||
setDisplayName(OptionsDialog::tr("To-Do"));
|
setDisplayName(OptionsDialog::tr("To-Do"));
|
||||||
setCategory("To-Do");
|
setCategory("To-Do");
|
||||||
setDisplayCategory(OptionsDialog::tr("To-Do"));
|
setDisplayCategory(OptionsDialog::tr("To-Do"));
|
||||||
|
@@ -44,6 +44,7 @@ TodoProjectSettingsWidget::TodoProjectSettingsWidget(ProjectExplorer::Project *p
|
|||||||
ui->setupUi(this);
|
ui->setupUi(this);
|
||||||
|
|
||||||
setExcludedPatternsButtonsEnabled();
|
setExcludedPatternsButtonsEnabled();
|
||||||
|
setGlobalSettingsId(Constants::TODO_SETTINGS);
|
||||||
connect(ui->addExcludedPatternButton, &QPushButton::clicked,
|
connect(ui->addExcludedPatternButton, &QPushButton::clicked,
|
||||||
this, &TodoProjectSettingsWidget::addExcludedPatternButtonClicked);
|
this, &TodoProjectSettingsWidget::addExcludedPatternButtonClicked);
|
||||||
connect(ui->removeExcludedPatternButton, &QPushButton::clicked,
|
connect(ui->removeExcludedPatternButton, &QPushButton::clicked,
|
||||||
|
Reference in New Issue
Block a user