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

Restore object names lost while inlining

Browse Source 
Amends 715e5800a5
Amends e070d826e5
Amends f3bceeda53

Change-Id: Ifafc0b79fc751696443d1b1288d3a272851445b9
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Robert Löhning
2022-09-30 12:35:35 +02:00
parent b6c8ce20e6
commit f5c725cf23
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/projectintropage.cpp
View File

@@ -82,17 +82,20 @@ ProjectIntroPage::ProjectIntroPage(QWidget *parent) :
d->m_pathChooser->setDisabled(d->m_forceSubProject);
d->m_projectsDirectoryCheckBox = new QCheckBox(tr("Use as default project location"));
d->m_projectsDirectoryCheckBox->setObjectName("projectsDirectoryCheckBox");
d->m_projectsDirectoryCheckBox->setDisabled(d->m_forceSubProject);
d->m_projectComboBox = new QComboBox;
d->m_projectComboBox->setVisible(d->m_forceSubProject);
d->m_stateLabel = new Utils::InfoLabel(this);
d->m_stateLabel->setObjectName("stateLabel");
d->m_stateLabel->setWordWrap(true);
d->m_stateLabel->setFilled(true);
hideStatusLabel();
d->m_nameLineEdit->setPlaceholderText(tr("Enter project name"));
d->m_nameLineEdit->setObjectName("nameLineEdit");
d->m_nameLineEdit->setFocus();
d->m_nameLineEdit->setValidationFunction([this](FancyLineEdit *edit, QString *errorString) {
return validateProjectName(edit->text(), errorString);

3
src/plugins/coreplugin/dialogs/newdialogwidget.cpp
View File

@@ -177,6 +177,7 @@ NewDialogWidget::NewDialogWidget(QWidget *parent)
auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel | QDialogButtonBox::Ok,
Qt::Horizontal);
m_templateCategoryView->setObjectName("templateCategoryView");
m_templateCategoryView->setStyleSheet(QString::fromUtf8(" QTreeView::branch {\n"
" background: transparent;\n"
" }"));
@@ -186,10 +187,12 @@ NewDialogWidget::NewDialogWidget(QWidget *parent)
m_templateCategoryView->setHeaderHidden(true);
m_templateCategoryView->header()->setVisible(false);
m_templatesView->setObjectName("templatesView");
m_templatesView->setSelectionBehavior(QAbstractItemView::SelectRows);
m_templatesView->setVerticalScrollMode(QAbstractItemView::ScrollPerPixel);
m_templatesView->setUniformItemSizes(false);
m_templateDescription->setObjectName("templateDescription");
m_templateDescription->setFocusPolicy(Qt::NoFocus);
m_templateDescription->setFrameShape(QFrame::NoFrame);

2
src/plugins/projectexplorer/projectwizardpage.cpp
View File

@@ -272,9 +272,11 @@ ProjectWizardPage::ProjectWizardPage(QWidget *parent)
m_additionalInfo = new QLabel;
m_addToVersionControlLabel = new QLabel(tr("Add to &version control:"));
m_addToVersionControlComboBox = new QComboBox;
m_addToVersionControlComboBox->setObjectName("addToVersionControlComboBox");
m_vcsManageButton = new QPushButton(ICore::msgShowOptionsDialog());
m_vcsManageButton->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
m_filesLabel = new QLabel;
m_filesLabel->setObjectName("filesLabel");
m_filesLabel->setAlignment(Qt::AlignBottom);
m_filesLabel->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextSelectableByKeyboard);
auto scrollArea = new QScrollArea;