From b8e578d2d72f65ff9929422b911c49cae3136e67 Mon Sep 17 00:00:00 2001 From: Petr Mironychev <9195189+Palm1r@users.noreply.github.com> Date: Fri, 24 Jan 2025 13:29:44 +0100 Subject: [PATCH] chore: Update plugin to QtCreator 15.0.1 * fix: Additional check qtc version * build: Upgrade plugin to QtC 15.0.1 * chore: Upgrade plugin version to 0.4.8 --- .github/workflows/build_cmake.yml | 4 ++-- QodeAssist.json.in | 2 +- qodeassist.cpp | 4 +++- settings/UpdateDialog.cpp | 10 ++++++++++ settings/UpdateDialog.hpp | 1 + 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build_cmake.yml b/.github/workflows/build_cmake.yml index 163d1e8..adac24d 100644 --- a/.github/workflows/build_cmake.yml +++ b/.github/workflows/build_cmake.yml @@ -13,8 +13,8 @@ on: env: PLUGIN_NAME: QodeAssist QT_VERSION: 6.8.1 - QT_CREATOR_VERSION: 15.0.0 - QT_CREATOR_VERSION_INTERNAL: 15.0.0 + QT_CREATOR_VERSION: 15.0.1 + QT_CREATOR_VERSION_INTERNAL: 15.0.1 MACOS_DEPLOYMENT_TARGET: "11.0" CMAKE_VERSION: "3.29.6" NINJA_VERSION: "1.12.1" diff --git a/QodeAssist.json.in b/QodeAssist.json.in index 36c0e12..2cf6646 100644 --- a/QodeAssist.json.in +++ b/QodeAssist.json.in @@ -1,7 +1,7 @@ { "Id" : "qodeassist", "Name" : "QodeAssist", - "Version" : "0.4.7", + "Version" : "0.4.8", "Vendor" : "Petr Mironychev", "VendorId" : "petrmironychev", "Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd", diff --git a/qodeassist.cpp b/qodeassist.cpp index 7ff2c6b..8c4dcc5 100644 --- a/qodeassist.cpp +++ b/qodeassist.cpp @@ -155,7 +155,9 @@ private: void handleUpdateCheckResult(const PluginUpdater::UpdateInfo &info) { - if (!info.isUpdateAvailable) + if (!info.isUpdateAvailable + || QVersionNumber::fromString(info.currentIdeVersion) + > QVersionNumber::fromString(info.targetIdeVersion)) return; if (m_statusWidget) diff --git a/settings/UpdateDialog.cpp b/settings/UpdateDialog.cpp index 63d7ced..f72ca1f 100644 --- a/settings/UpdateDialog.cpp +++ b/settings/UpdateDialog.cpp @@ -60,6 +60,12 @@ UpdateDialog::UpdateDialog(QWidget *parent) m_versionLabel->setAlignment(Qt::AlignCenter); m_layout->addWidget(m_versionLabel); + m_releaseLink = new QLabel(this); + m_releaseLink->setOpenExternalLinks(true); + m_releaseLink->setTextFormat(Qt::RichText); + m_releaseLink->setAlignment(Qt::AlignCenter); + m_layout->addWidget(m_releaseLink); + if (!m_changelogLabel) { m_changelogLabel = new QLabel(tr("Release Notes:"), this); m_layout->addWidget(m_changelogLabel); @@ -104,6 +110,10 @@ void UpdateDialog::checkForUpdatesAndShow(QWidget *parent) void UpdateDialog::handleUpdateInfo(const PluginUpdater::UpdateInfo &info) { + m_releaseLink->setText( + tr("You can also download " + "from GitHub Releases")); + if (info.incompatibleIdeVersion) { m_titleLabel->setText(tr("Incompatible Qt Creator Version")); m_versionLabel->setText(tr("This update requires Qt Creator %1, current is %2.\n" diff --git a/settings/UpdateDialog.hpp b/settings/UpdateDialog.hpp index 4ddc863..be7d44e 100644 --- a/settings/UpdateDialog.hpp +++ b/settings/UpdateDialog.hpp @@ -52,6 +52,7 @@ private: QVBoxLayout *m_layout; QLabel *m_titleLabel; QLabel *m_versionLabel; + QLabel *m_releaseLink; QLabel *m_changelogLabel{nullptr}; QTextEdit *m_changelogText{nullptr}; QProgressBar *m_progress;