Skip to content

Conversation

@GongHeng2017
Copy link
Contributor

-- Add translate

Log: add feature
Task: https://pms.uniontech.com/task-view-384577.html

Copy link

@sourcery-ai sourcery-ai bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry @GongHeng2017, your pull request is larger than the review limit of 150000 diff characters

@deepin-ci-robot
Copy link

deepin pr auto review

Signed-off-by: guoyao guoyao@uniontech.com
##Repo Structure: └── .
├── .github
│ └── ...
├── .obs
│ └── ...
├── .tx
│ └── ...
├── LICENSES
│ └── ...
├── deepin-system-monitor-daemon
│ └── ...
├── deepin-system-monitor-main
│ └── ...
├── deepin-system-monitor-plugin
│ └── ...
├── deepin-system-monitor-plugin-popup
│ └── ...
├── docs
│ └── ...
├── tests
│ └── ...
├── .clog.toml
├── .gitlab-ci.yml
├── .packit.yaml
├── CHANGELOG.md
├── CODE_OF_CONDUCT.md
├── CONTRIBUTING.md
├── README.md
├── README.zh_CN.md
└── gen-deb.sh
##Affected Files: deepin-system-monitor-plugin-popup/main.cpp
##PR Title: fix: 修复插件窗口关闭后进程未退出的问题
##PR Body: None
##PR Commit Message: fix: 修复插件窗口关闭后进程未退出的问题

Signed-off-by: guoyao guoyao@uniontech.com

##File: deepin-system-monitor-plugin-popup/main.cpp

// SPDX-FileCopyrightText: 2022 - 2023 UnionTech Software Technology Co., Ltd.
//
// SPDX-License-Identifier: GPL-3.0-or-later

#include <QApplication>
#include <QTranslator>
#include <DApplication>
#include <DLog>
#include <unistd.h>

#include "gui/mainwindow.h"

DWIDGET_USE_NAMESPACE
DCORE_USE_NAMESPACE

int main(int argc, char *argv[])
{
    // 不允许su启动
    if (getuid() == 0) {
        printf("not allowed to run as root\n");
        return -1;
    }

    DApplication::loadDXcbPlugin();
    QApplication a(argc, argv);

    a.setOrganizationName("deepin");
    a.setApplicationName("deepin-system-monitor-plugin-popup");
    a.setApplicationDisplayName("系统监控插件");
    a.setApplicationVersion("1.0");

    DLogManager::registerConsoleAppender();
    DLogManager::registerFileAppender();

    QTranslator translator;
    translator.load("/usr/share/deepin-system-monitor/translations/deepin-system-monitor_" + QLocale::system().name());
    a.installTranslator(&translator);

    MainWindow w;
    w.show();

    return a.exec();
}

<<<<<<< SEARCH
     translator.load("/usr/share/deepin-system-monitor/translations/deepin-system-monitor_" + QLocale::system().name());
     a.installTranslator(&translator);
 
    MainWindow w;
    w.show();
 
     return a.exec();
 }
=======
     MainWindow w;
    w.show();
 
     return a.exec();
 }
>>>>>>> REPLACE

@deepin-ci-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: GongHeng2017, max-lvs

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@GongHeng2017
Copy link
Contributor Author

/forcemerge

@deepin-bot
Copy link
Contributor

deepin-bot bot commented Dec 10, 2025

This pr force merged! (status: unstable)

@deepin-bot deepin-bot bot merged commit a210683 into linuxdeepin:develop/eagle Dec 10, 2025
15 of 18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants