Skip to content
Snippets Groups Projects
Commit 2ee9ee9b authored by hjk's avatar hjk
Browse files

QtSupport: Make changed Qt version names bold in version dialog


Mimic what other Build&Run views do.

Change-Id: I6abb13816b5fe17f9aeeb38b0041c1f9b11a98ec
Reviewed-by: default avatarTobias Hunger <tobias.hunger@qt.io>
parent d5de4577
No related branches found
No related tags found
No related merge requests found
...@@ -102,6 +102,12 @@ public: ...@@ -102,6 +102,12 @@ public:
return m_version->qmakeCommand().toUserOutput(); return m_version->qmakeCommand().toUserOutput();
} }
if (role == Qt::FontRole && m_changed) {
QFont font;
font.setBold(true);
return font;
}
if (role == Qt::DecorationRole && column == 0) if (role == Qt::DecorationRole && column == 0)
return m_icon; return m_icon;
...@@ -134,11 +140,20 @@ public: ...@@ -134,11 +140,20 @@ public:
m_toolChainId = id; m_toolChainId = id;
} }
void setChanged(bool changed)
{
if (changed == m_changed)
return;
m_changed = changed;
update();
}
private: private:
BaseQtVersion *m_version = 0; BaseQtVersion *m_version = 0;
QIcon m_icon; QIcon m_icon;
QString m_buildLog; QString m_buildLog;
QByteArray m_toolChainId; QByteArray m_toolChainId;
bool m_changed = false;
}; };
/// ///
...@@ -744,6 +759,7 @@ void QtOptionsPageWidget::updateCurrentQtName() ...@@ -744,6 +759,7 @@ void QtOptionsPageWidget::updateCurrentQtName()
if (!item || !item->version()) if (!item || !item->version())
return; return;
item->setChanged(true);
item->version()->setUnexpandedDisplayName(m_versionUi->nameEdit->text()); item->version()->setUnexpandedDisplayName(m_versionUi->nameEdit->text());
updateDescriptionLabel(); updateDescriptionLabel();
...@@ -755,21 +771,18 @@ void QtOptionsPageWidget::apply() ...@@ -755,21 +771,18 @@ void QtOptionsPageWidget::apply()
disconnect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, disconnect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged,
this, &QtOptionsPageWidget::updateQtVersions); this, &QtOptionsPageWidget::updateQtVersions);
QtVersionManager::setNewQtVersions(versions()); QList<BaseQtVersion *> versions;
connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged, m_model->forSecondLevelItems([this, &versions](QtVersionItem *item) {
this, &QtOptionsPageWidget::updateQtVersions); item->setChanged(false);
} versions.append(item->version()->clone());
});
QList<BaseQtVersion *> QtOptionsPageWidget::versions() const QtVersionManager::setNewQtVersions(versions);
{
QList<BaseQtVersion *> result;
m_model->forSecondLevelItems([this, &result](QtVersionItem *item) {
result.append(item->version()->clone());
});
return result; connect(QtVersionManager::instance(), &QtVersionManager::qtVersionsChanged,
this, &QtOptionsPageWidget::updateQtVersions);
} }
} // namespace Internal } // namespace Internal
......
...@@ -62,7 +62,6 @@ class QtOptionsPageWidget : public QWidget ...@@ -62,7 +62,6 @@ class QtOptionsPageWidget : public QWidget
public: public:
QtOptionsPageWidget(QWidget *parent = 0); QtOptionsPageWidget(QWidget *parent = 0);
~QtOptionsPageWidget(); ~QtOptionsPageWidget();
QList<BaseQtVersion *> versions() const;
void apply(); void apply();
private: private:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment