diff --git a/pkg/com.github.proc-info-plugin_0.0.1_amd64.deb b/pkg/com.github.proc-info-plugin_0.0.1_amd64.deb deleted file mode 100644 index d20dd8dfbbcf7f642ca77335f3849a92c7054f60..0000000000000000000000000000000000000000 Binary files a/pkg/com.github.proc-info-plugin_0.0.1_amd64.deb and /dev/null differ diff --git a/src/appmanagermodel.cpp b/src/appmanagermodel.cpp index 9fce446c19d827e3b4230cb837b0d474768e5b47..8f029fbf9f28ee682b9ff607848dda11e86eeaef 100644 --- a/src/appmanagermodel.cpp +++ b/src/appmanagermodel.cpp @@ -293,8 +293,6 @@ void AppManagerModel::initConnection() connect(this, &AppManagerModel::notifyThreadInstallOhMyDDE, m_appManagerJob, &AppManagerJob::installOhMyDDE); // 安装oh-my-dde完成 connect(m_appManagerJob, &AppManagerJob::installOhMyDDEFinished, this, &AppManagerModel::installOhMyDDEFinished); - // 通知安装proc-info-plugin - connect(this, &AppManagerModel::notifyThreadInstallProcInfoPlugin, m_appManagerJob, &AppManagerJob::installProcInfoPlugin); // 安装proc-info-plugin完成 connect(m_appManagerJob, &AppManagerJob::installProcInfoPluginFinished, this, &AppManagerModel::installProcInfoPluginFinished); diff --git a/src/appmanagermodel.h b/src/appmanagermodel.h index 1eddb17683539860687a781c6966fa97323b0cc3..0be5c0fa278ceeb29499c682791348a240b76868 100644 --- a/src/appmanagermodel.h +++ b/src/appmanagermodel.h @@ -60,8 +60,6 @@ Q_SIGNALS: void notifyThreadInstallOhMyDDE(); // 安装oh-my-dde完成 void installOhMyDDEFinished(bool successed, const QString &err); - // 通知安装proc-info-plugin - void notifyThreadInstallProcInfoPlugin(); // 安装proc-info-plugin完成 void installProcInfoPluginFinished(bool successed, const QString &err); // 软件安装变动 diff --git a/src/job/appmanagerjob.cpp b/src/job/appmanagerjob.cpp index 5d2eac2d7e59b52c2ff5383378b4b414e5feed1d..4f3434ae40f2e5540eda20a43e3d10db737030de 100644 --- a/src/job/appmanagerjob.cpp +++ b/src/job/appmanagerjob.cpp @@ -373,15 +373,6 @@ void AppManagerJob::installOhMyDDE() setRunningStatus(Normal); } -void AppManagerJob::installProcInfoPlugin() -{ - setRunningStatus(Busy); - QString err; - bool successed = installLocalPkg(PROC_INFO_PLUGIN_LOCAL_PKG_PATH, err); - Q_EMIT installProcInfoPluginFinished(successed, err); - setRunningStatus(Normal); -} - void AppManagerJob::holdPkgVersion(const QString &pkgName, bool hold) { const QString &options = QString("echo %1 %2 | sudo dpkg --set-selections") diff --git a/src/job/appmanagerjob.h b/src/job/appmanagerjob.h index 5b1a67fd960282dcd73a6726f53bfa71ff4c47aa..6cfb5ee3ff01179ed436ed9863efdd05d3a5afe7 100644 --- a/src/job/appmanagerjob.h +++ b/src/job/appmanagerjob.h @@ -15,10 +15,9 @@ class QStandardItemModel; QT_END_NAMESPACE #define OH_MY_DDE_PKG_NAME "top.yzzi.youjian" -#define PROC_INFO_PLUGIN_PKG_NAME "com.github.proc-info-plugin" +#define PROC_INFO_PLUGIN_PKG_NAME "com.github.ccc-proc-info-plugin" // 本地安装包路径 #define OH_MY_DDE_LOCAL_PKG_PATH "/opt/apps/com.github.ccc-app-manager/files/pkg/top.yzzi.youjian_1.0.3_amd64.deb" -#define PROC_INFO_PLUGIN_LOCAL_PKG_PATH "/opt/apps/com.github.ccc-app-manager/files/pkg/com.github.proc-info-plugin_0.0.1_amd64.deb" using namespace AM; @@ -54,7 +53,6 @@ public Q_SLOTS: void uninstallPkg(const QString &pkgName); void installOhMyDDE(); - void installProcInfoPlugin(); // 保持软件包版本 void holdPkgVersion(const QString &pkgName, bool hold); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 9f4e6b711c6e423da09043329a60a337ebe75e67..9b77f6c7165c5f6b4fa69d5e90057f0a48ce0a2d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -137,7 +137,7 @@ MainWindow::MainWindow(QWidget *parent) dlg.addButton("是", true, DDialog::ButtonType::ButtonRecommend); int ret = dlg.exec(); if (1 == ret) { - Q_EMIT m_appManagerModel->notifyThreadInstallProcInfoPlugin(); + m_appManagerModel->openSpkStoreAppDetailPage(PROC_INFO_PLUGIN_PKG_NAME); } } });