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

QbsProjectManager: inline qbsprofilessettingswidget.ui

Browse Source 
Change-Id: I4e7d1663bac7d21d17092a3510165d6aaf093eed
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Alessandro Portale
2022-08-18 12:41:45 +02:00
parent f160b50bda
commit 706a2af1e1
4 changed files with 57 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/qbsprojectmanager/CMakeLists.txt
View File

@@ -17,7 +17,6 @@ add_qtc_plugin(QbsProjectManager
qbspmlogging.cpp qbspmlogging.h qbspmlogging.cpp qbspmlogging.h
qbsprofilemanager.cpp qbsprofilemanager.h qbsprofilemanager.cpp qbsprofilemanager.h
qbsprofilessettingspage.cpp qbsprofilessettingspage.h qbsprofilessettingspage.cpp qbsprofilessettingspage.h
qbsprofilessettingswidget.ui
qbsproject.cpp qbsproject.h qbsproject.cpp qbsproject.h
qbsprojectimporter.cpp qbsprojectimporter.h qbsprojectimporter.cpp qbsprojectimporter.h
qbsprojectmanager.qrc qbsprojectmanager.qrc

82
src/plugins/qbsprojectmanager/qbsprofilessettingspage.cpp
View File

@@ -2,7 +2,6 @@
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0
#include "qbsprofilessettingspage.h" #include "qbsprofilessettingspage.h"
#include "ui_qbsprofilessettingswidget.h"
#include "qbsprofilemanager.h" #include "qbsprofilemanager.h"
#include "qbsprojectmanagerconstants.h" #include "qbsprojectmanagerconstants.h"
@@ -15,11 +14,15 @@
#include <projectexplorer/projectexplorericons.h> #include <projectexplorer/projectexplorericons.h>
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/layoutbuilder.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QComboBox>
#include <QHash> #include <QHash>
#include <QHeaderView>
#include <QTreeView>
#include <QWidget> #include <QWidget>
using namespace ProjectExplorer; using namespace ProjectExplorer;
@@ -99,8 +102,10 @@ private:
void refreshKitsList(); void refreshKitsList();
void displayCurrentProfile(); void displayCurrentProfile();
Ui::QbsProfilesSettingsWidget m_ui;
ProfileModel m_model; ProfileModel m_model;
QComboBox *m_kitsComboBox;
QLabel *m_profileValueLabel;
QTreeView *m_propertiesView;
}; };
QbsProfilesSettingsPage::QbsProfilesSettingsPage() QbsProfilesSettingsPage::QbsProfilesSettingsPage()
@@ -125,61 +130,88 @@ void QbsProfilesSettingsPage::finish()
QbsProfilesSettingsWidget::QbsProfilesSettingsWidget() QbsProfilesSettingsWidget::QbsProfilesSettingsWidget()
{ {
m_ui.setupUi(this); m_kitsComboBox = new QComboBox;
m_profileValueLabel = new QLabel;
m_propertiesView = new QTreeView;
auto line = new QFrame;
line->setFrameShape(QFrame::HLine);
line->setFrameShadow(QFrame::Sunken);
using namespace Utils::Layouting;
Column {
Form {
tr("Kit:"), m_kitsComboBox, br,
tr("Associated profile:"), m_profileValueLabel, br,
},
line,
tr("Profile properties:"),
Row {
m_propertiesView,
Column {
PushButton {
text(tr("E&xpand All")),
onClicked([this] { m_propertiesView->expandAll(); }),
},
PushButton {
text(tr("&Collapse All")),
onClicked([this] { m_propertiesView->collapseAll(); }),
},
st,
},
},
}.attachTo(this);
connect(QbsProfileManager::instance(), &QbsProfileManager::qbsProfilesUpdated, connect(QbsProfileManager::instance(), &QbsProfileManager::qbsProfilesUpdated,
this, &QbsProfilesSettingsWidget::refreshKitsList); this, &QbsProfilesSettingsWidget::refreshKitsList);
connect(m_ui.expandButton, &QAbstractButton::clicked,
m_ui.propertiesView, &QTreeView::expandAll);
connect(m_ui.collapseButton, &QAbstractButton::clicked,
m_ui.propertiesView, &QTreeView::collapseAll);
refreshKitsList(); refreshKitsList();
} }
void QbsProfilesSettingsWidget::refreshKitsList() void QbsProfilesSettingsWidget::refreshKitsList()
{ {
m_ui.kitsComboBox->disconnect(this); m_kitsComboBox->disconnect(this);
m_ui.propertiesView->setModel(nullptr); m_propertiesView->setModel(nullptr);
m_model.reload(); m_model.reload();
m_ui.profileValueLabel->clear(); m_profileValueLabel->clear();
Utils::Id currentId; Utils::Id currentId;
if (m_ui.kitsComboBox->count() > 0) if (m_kitsComboBox->count() > 0)
currentId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); currentId = Utils::Id::fromSetting(m_kitsComboBox->currentData());
m_ui.kitsComboBox->clear(); m_kitsComboBox->clear();
int newCurrentIndex = -1; int newCurrentIndex = -1;
QList<Kit *> validKits = KitManager::kits(); QList<Kit *> validKits = KitManager::kits();
Utils::erase(validKits, [](const Kit *k) { return !k->isValid(); }); Utils::erase(validKits, [](const Kit *k) { return !k->isValid(); });
const bool hasKits = !validKits.isEmpty(); const bool hasKits = !validKits.isEmpty();
for (const Kit * const kit : qAsConst(validKits)) { for (const Kit * const kit : qAsConst(validKits)) {
if (kit->id() == currentId) if (kit->id() == currentId)
newCurrentIndex = m_ui.kitsComboBox->count(); newCurrentIndex = m_kitsComboBox->count();
m_ui.kitsComboBox->addItem(kit->displayName(), kit->id().toSetting()); m_kitsComboBox->addItem(kit->displayName(), kit->id().toSetting());
} }
if (newCurrentIndex != -1) if (newCurrentIndex != -1)
m_ui.kitsComboBox->setCurrentIndex(newCurrentIndex); m_kitsComboBox->setCurrentIndex(newCurrentIndex);
else if (hasKits) else if (hasKits)
m_ui.kitsComboBox->setCurrentIndex(0); m_kitsComboBox->setCurrentIndex(0);
displayCurrentProfile(); displayCurrentProfile();
connect(m_ui.kitsComboBox, &QComboBox::currentIndexChanged, connect(m_kitsComboBox, &QComboBox::currentIndexChanged,
this, &QbsProfilesSettingsWidget::displayCurrentProfile); this, &QbsProfilesSettingsWidget::displayCurrentProfile);
} }
void QbsProfilesSettingsWidget::displayCurrentProfile() void QbsProfilesSettingsWidget::displayCurrentProfile()
{ {
m_ui.propertiesView->setModel(nullptr); m_propertiesView->setModel(nullptr);
if (m_ui.kitsComboBox->currentIndex() == -1) if (m_kitsComboBox->currentIndex() == -1)
return; return;
const Utils::Id kitId = Utils::Id::fromSetting(m_ui.kitsComboBox->currentData()); const Utils::Id kitId = Utils::Id::fromSetting(m_kitsComboBox->currentData());
const Kit * const kit = KitManager::kit(kitId); const Kit * const kit = KitManager::kit(kitId);
QTC_ASSERT(kit, return); QTC_ASSERT(kit, return);
const QString profileName = QbsProfileManager::ensureProfileForKit(kit); const QString profileName = QbsProfileManager::ensureProfileForKit(kit);
m_ui.profileValueLabel->setText(profileName); m_profileValueLabel->setText(profileName);
for (int i = 0; i < m_model.rowCount(); ++i) { for (int i = 0; i < m_model.rowCount(); ++i) {
const QModelIndex currentProfileIndex = m_model.index(i, 0); const QModelIndex currentProfileIndex = m_model.index(i, 0);
if (m_model.data(currentProfileIndex, Qt::DisplayRole).toString() != profileName) if (m_model.data(currentProfileIndex, Qt::DisplayRole).toString() != profileName)
continue; continue;
m_ui.propertiesView->setModel(&m_model); m_propertiesView->setModel(&m_model);
m_ui.propertiesView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents); m_propertiesView->header()->setSectionResizeMode(0, QHeaderView::ResizeToContents);
m_ui.propertiesView->setRootIndex(currentProfileIndex); m_propertiesView->setRootIndex(currentProfileIndex);
return; return;
} }
} }

121
src/plugins/qbsprojectmanager/qbsprofilessettingswidget.ui
View File

@@ -1,121 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>QbsProjectManager::Internal::QbsProfilesSettingsWidget</class>
<widget class="QWidget" name="QbsProjectManager::Internal::QbsProfilesSettingsWidget">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>537</width>
<height>458</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="kitLabel">
<property name="text">
<string>Kit:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QComboBox" name="kitsComboBox"/>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="profileKeyLabel">
<property name="text">
<string>Associated profile:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="profileValueLabel">
<property name="text">
<string/>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="propertiesLabel">
<property name="text">
<string>Profile properties:</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QTreeView" name="propertiesView"/>
</item>
<item>
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QPushButton" name="expandButton">
<property name="text">
<string>E&amp;xpand All</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="collapseButton">
<property name="text">
<string>&amp;Collapse All</string>
</property>
</widget>
</item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

1
src/plugins/qbsprojectmanager/qbsprojectmanager.qbs
View File

@@ -45,7 +45,6 @@ QtcPlugin {
"qbsprofilemanager.h", "qbsprofilemanager.h",
"qbsprofilessettingspage.cpp", "qbsprofilessettingspage.cpp",
"qbsprofilessettingspage.h", "qbsprofilessettingspage.h",
"qbsprofilessettingswidget.ui",
"qbsproject.cpp", "qbsproject.cpp",
"qbsproject.h", "qbsproject.h",
"qbsprojectimporter.cpp", "qbsprojectimporter.cpp",