mirror of
https://github.com/Palm1r/QodeAssist.git
synced 2026-02-12 10:10:44 -05:00
Compare commits
3 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 31145f191b | |||
| 9096adde6f | |||
| b8e578d2d7 |
4
.github/workflows/build_cmake.yml
vendored
4
.github/workflows/build_cmake.yml
vendored
@ -13,8 +13,8 @@ on:
|
|||||||
env:
|
env:
|
||||||
PLUGIN_NAME: QodeAssist
|
PLUGIN_NAME: QodeAssist
|
||||||
QT_VERSION: 6.8.1
|
QT_VERSION: 6.8.1
|
||||||
QT_CREATOR_VERSION: 15.0.0
|
QT_CREATOR_VERSION: 15.0.1
|
||||||
QT_CREATOR_VERSION_INTERNAL: 15.0.0
|
QT_CREATOR_VERSION_INTERNAL: 15.0.1
|
||||||
MACOS_DEPLOYMENT_TARGET: "11.0"
|
MACOS_DEPLOYMENT_TARGET: "11.0"
|
||||||
CMAKE_VERSION: "3.29.6"
|
CMAKE_VERSION: "3.29.6"
|
||||||
NINJA_VERSION: "1.12.1"
|
NINJA_VERSION: "1.12.1"
|
||||||
|
|||||||
@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"Id" : "qodeassist",
|
"Id" : "qodeassist",
|
||||||
"Name" : "QodeAssist",
|
"Name" : "QodeAssist",
|
||||||
"Version" : "0.4.7",
|
"Version" : "0.4.9",
|
||||||
"Vendor" : "Petr Mironychev",
|
"Vendor" : "Petr Mironychev",
|
||||||
"VendorId" : "petrmironychev",
|
"VendorId" : "petrmironychev",
|
||||||
"Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
|
"Copyright" : "(C) ${IDE_COPYRIGHT_YEAR} Petr Mironychev, (C) ${IDE_COPYRIGHT_YEAR} The Qt Company Ltd",
|
||||||
|
|||||||
@ -155,7 +155,9 @@ private:
|
|||||||
|
|
||||||
void handleUpdateCheckResult(const PluginUpdater::UpdateInfo &info)
|
void handleUpdateCheckResult(const PluginUpdater::UpdateInfo &info)
|
||||||
{
|
{
|
||||||
if (!info.isUpdateAvailable)
|
if (!info.isUpdateAvailable
|
||||||
|
|| QVersionNumber::fromString(info.currentIdeVersion)
|
||||||
|
> QVersionNumber::fromString(info.targetIdeVersion))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (m_statusWidget)
|
if (m_statusWidget)
|
||||||
|
|||||||
@ -159,9 +159,7 @@ void PluginUpdater::handleDownloadFinished()
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
QString downloadPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation)
|
QString downloadPath = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
|
||||||
+ QDir::separator() + "qodeassisttemp";
|
|
||||||
QDir().mkpath(downloadPath);
|
|
||||||
|
|
||||||
QString filePath = downloadPath + "/" + m_lastUpdateInfo.fileName;
|
QString filePath = downloadPath + "/" + m_lastUpdateInfo.fileName;
|
||||||
QFile file(filePath);
|
QFile file(filePath);
|
||||||
@ -175,16 +173,7 @@ void PluginUpdater::handleDownloadFinished()
|
|||||||
file.write(reply->readAll());
|
file.write(reply->readAll());
|
||||||
file.close();
|
file.close();
|
||||||
|
|
||||||
if (!Core::executePluginInstallWizard(Utils::FilePath::fromString(filePath))) {
|
emit downloadFinished(filePath);
|
||||||
emit downloadError(tr("Failed to install the update"));
|
|
||||||
} else {
|
|
||||||
emit downloadFinished(filePath);
|
|
||||||
}
|
|
||||||
|
|
||||||
auto tempDir = QDir(downloadPath);
|
|
||||||
if (tempDir.exists()) {
|
|
||||||
tempDir.removeRecursively();
|
|
||||||
}
|
|
||||||
|
|
||||||
reply->deleteLater();
|
reply->deleteLater();
|
||||||
}
|
}
|
||||||
|
|||||||
@ -60,6 +60,12 @@ UpdateDialog::UpdateDialog(QWidget *parent)
|
|||||||
m_versionLabel->setAlignment(Qt::AlignCenter);
|
m_versionLabel->setAlignment(Qt::AlignCenter);
|
||||||
m_layout->addWidget(m_versionLabel);
|
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) {
|
if (!m_changelogLabel) {
|
||||||
m_changelogLabel = new QLabel(tr("Release Notes:"), this);
|
m_changelogLabel = new QLabel(tr("Release Notes:"), this);
|
||||||
m_layout->addWidget(m_changelogLabel);
|
m_layout->addWidget(m_changelogLabel);
|
||||||
@ -75,7 +81,7 @@ UpdateDialog::UpdateDialog(QWidget *parent)
|
|||||||
m_layout->addWidget(m_progress);
|
m_layout->addWidget(m_progress);
|
||||||
|
|
||||||
auto *buttonLayout = new QHBoxLayout;
|
auto *buttonLayout = new QHBoxLayout;
|
||||||
m_downloadButton = new QPushButton(tr("Download and Install"), this);
|
m_downloadButton = new QPushButton(tr("Download"), this);
|
||||||
m_downloadButton->setEnabled(false);
|
m_downloadButton->setEnabled(false);
|
||||||
buttonLayout->addWidget(m_downloadButton);
|
buttonLayout->addWidget(m_downloadButton);
|
||||||
|
|
||||||
@ -104,6 +110,10 @@ void UpdateDialog::checkForUpdatesAndShow(QWidget *parent)
|
|||||||
|
|
||||||
void UpdateDialog::handleUpdateInfo(const PluginUpdater::UpdateInfo &info)
|
void UpdateDialog::handleUpdateInfo(const PluginUpdater::UpdateInfo &info)
|
||||||
{
|
{
|
||||||
|
m_releaseLink->setText(
|
||||||
|
tr("<a href='https://github.com/Palm1r/QodeAssist/releases'>You can also download "
|
||||||
|
"from GitHub Releases</a>"));
|
||||||
|
|
||||||
if (info.incompatibleIdeVersion) {
|
if (info.incompatibleIdeVersion) {
|
||||||
m_titleLabel->setText(tr("Incompatible Qt Creator Version"));
|
m_titleLabel->setText(tr("Incompatible Qt Creator Version"));
|
||||||
m_versionLabel->setText(tr("This update requires Qt Creator %1, current is %2.\n"
|
m_versionLabel->setText(tr("This update requires Qt Creator %1, current is %2.\n"
|
||||||
@ -156,11 +166,7 @@ void UpdateDialog::updateProgress(qint64 received, qint64 total)
|
|||||||
void UpdateDialog::handleDownloadFinished(const QString &path)
|
void UpdateDialog::handleDownloadFinished(const QString &path)
|
||||||
{
|
{
|
||||||
m_progress->setVisible(false);
|
m_progress->setVisible(false);
|
||||||
QMessageBox::information(
|
QMessageBox::information(this, tr("Update Successful"), tr("Update has been downloaded."));
|
||||||
this,
|
|
||||||
tr("Update Successful"),
|
|
||||||
tr("Update has been downloaded and installed. "
|
|
||||||
"Please restart Qt Creator to apply changes."));
|
|
||||||
accept();
|
accept();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -52,6 +52,7 @@ private:
|
|||||||
QVBoxLayout *m_layout;
|
QVBoxLayout *m_layout;
|
||||||
QLabel *m_titleLabel;
|
QLabel *m_titleLabel;
|
||||||
QLabel *m_versionLabel;
|
QLabel *m_versionLabel;
|
||||||
|
QLabel *m_releaseLink;
|
||||||
QLabel *m_changelogLabel{nullptr};
|
QLabel *m_changelogLabel{nullptr};
|
||||||
QTextEdit *m_changelogText{nullptr};
|
QTextEdit *m_changelogText{nullptr};
|
||||||
QProgressBar *m_progress;
|
QProgressBar *m_progress;
|
||||||
|
|||||||
Reference in New Issue
Block a user