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

QmlDesigner: prepand license type to about information

Browse Source 
Task-number: QDS-12849
Change-Id: Ied891021c412af0941f6575a1b2d994ace2345ce
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tim Jenssen
2024-05-30 12:27:52 +02:00
parent 9d872edce0
commit 59ceee6d5c
3 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/coreplugin/icore.cpp
View File

@@ -294,6 +294,7 @@ public:
MainWindow *m_mainwindow = nullptr; MainWindow *m_mainwindow = nullptr;
QTimer m_trimTimer; QTimer m_trimTimer;
QString m_prependAboutInformation;
QStringList m_aboutInformation; QStringList m_aboutInformation;
Context m_highPrioAdditionalContexts; Context m_highPrioAdditionalContexts;
Context m_lowPrioAdditionalContexts{Constants::C_GLOBAL}; Context m_lowPrioAdditionalContexts{Constants::C_GLOBAL};
@@ -1215,7 +1216,9 @@ void ICore::saveSettings(SaveSettingsReason reason)
*/ */
QStringList ICore::additionalAboutInformation() QStringList ICore::additionalAboutInformation()
{ {
return d->m_aboutInformation; auto aboutInformation = d->m_aboutInformation;
aboutInformation.prepend(d->m_prependAboutInformation);
return aboutInformation;
} }
/*! /*!
@@ -1226,6 +1229,14 @@ void ICore::clearAboutInformation()
d->m_aboutInformation.clear(); d->m_aboutInformation.clear();
} }
/*!
\internal
*/
void ICore::setPrependAboutInformation(const QString &line)
{
d->m_prependAboutInformation = line;
}
/*! /*!
\internal \internal
*/ */

1
src/plugins/coreplugin/icore.h
View File

@@ -142,6 +142,7 @@ public:
static Utils::FilePath pathRelativeToActiveProject(const Utils::FilePath &path); static Utils::FilePath pathRelativeToActiveProject(const Utils::FilePath &path);
static QStringList additionalAboutInformation(); static QStringList additionalAboutInformation();
static void clearAboutInformation(); static void clearAboutInformation();
static void setPrependAboutInformation(const QString &line);
static void appendAboutInformation(const QString &line); static void appendAboutInformation(const QString &line);
static QString aboutInformationCompact(); static QString aboutInformationCompact();
static QString aboutInformationHtml(); static QString aboutInformationHtml();

9
src/plugins/qmldesigner/qmldesignerplugin.cpp
View File

@@ -665,12 +665,11 @@ void QmlDesignerPlugin::enforceDelayedInitialize()
FoundLicense license = checkLicense(); FoundLicense license = checkLicense();
if (license == FoundLicense::enterprise) if (license == FoundLicense::enterprise)
Core::ICore::appendAboutInformation(tr("License: Enterprise")); Core::ICore::setPrependAboutInformation("License: Enterprise");
else if (license == FoundLicense::professional) else if (license == FoundLicense::professional)
Core::ICore::appendAboutInformation(tr("License: Professional")); Core::ICore::setPrependAboutInformation("License: Professional");
else if (license == FoundLicense::community)
if (!licensee().isEmpty()) Core::ICore::setPrependAboutInformation("License: Community");
Core::ICore::appendAboutInformation(tr("Licensee: %1").arg(licensee()));
} }
m_delayedInitialized = true; m_delayedInitialized = true;