diff --git a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp index 02e2a1b7..cf3f920e 100644 --- a/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp +++ b/platform/src/application/app_bio_identify/app_bio_identify_srv/CBioIdentifySrv.cpp @@ -66,10 +66,10 @@ bool CBioIdentifySrv::start(int argc, char *argv[], int & /*nStatus*/) return false; } - //< 加载系统建模信息 + //< 加载系统拓扑信息 if (!loadSysInfo()) { - LOGFATAL("加载系统建模信息失败,程序启动失败!"); + LOGFATAL("加载系统拓扑信息失败,程序启动失败!"); return false; } diff --git a/platform/src/dbms/db_manager/pj_manager.cpp b/platform/src/dbms/db_manager/pj_manager.cpp index da4541bd..a5081c1c 100644 --- a/platform/src/dbms/db_manager/pj_manager.cpp +++ b/platform/src/dbms/db_manager/pj_manager.cpp @@ -146,7 +146,7 @@ void pj_manager::loadQss() void pj_manager::initUi() { - setWindowTitle(tr("工程备份")); + setWindowTitle(tr("工程管理")); #ifdef OS_LINUX setWindowIcon( QIcon( ":res/db_manager.png" ) ); #endif diff --git a/platform/src/dbms/db_sync_server/CDbSynService.cpp b/platform/src/dbms/db_sync_server/CDbSynService.cpp index 6c74833d..5ade1d33 100644 --- a/platform/src/dbms/db_sync_server/CDbSynService.cpp +++ b/platform/src/dbms/db_sync_server/CDbSynService.cpp @@ -79,7 +79,7 @@ bool CDbSynService::start( int argc, char *argv[], int & /*nStatus*/) m_ptrRedunSw.reset( new CDbSynSrvRedunSw( this )); if ( !m_ptrRedunSw->loadSysInfo()) { - LOGFATAL( "加载系统建模信息失败,程序启动失败!" ); + LOGFATAL( "加载系统拓扑信息失败,程序启动失败!" ); return false; } diff --git a/platform/src/dbms/tsdb_local_save/CNodeMng.cpp b/platform/src/dbms/tsdb_local_save/CNodeMng.cpp index 21b8cb4f..9f270035 100644 --- a/platform/src/dbms/tsdb_local_save/CNodeMng.cpp +++ b/platform/src/dbms/tsdb_local_save/CNodeMng.cpp @@ -133,7 +133,7 @@ bool CNodeMng::init(const iot_public::SRunAppInfo &stRunAppInfo) //< todo 端口号、数据库名、用户名、密码 暂时写死 /* 为以后搜索方便,保留此注释 - * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统建模中关系库的首链接的数据库配置 + * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统拓扑中关系库的首链接的数据库配置 * 时序库用户名用的数据库名称 */ CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName, @@ -176,7 +176,7 @@ bool CNodeMng::init(const iot_public::SRunAppInfo &stRunAppInfo) //< todo 端口号、数据库名、用户名、密码 暂时写死 /* 为以后搜索方便,保留此注释 - * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统建模中关系库的首链接的数据库配置 + * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统拓扑中关系库的首链接的数据库配置 * 时序库用户名用的数据库名称 */ CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName, diff --git a/platform/src/dbms/tsdb_save/CNodeMng.cpp b/platform/src/dbms/tsdb_save/CNodeMng.cpp index d2ea032f..cc40e302 100644 --- a/platform/src/dbms/tsdb_save/CNodeMng.cpp +++ b/platform/src/dbms/tsdb_save/CNodeMng.cpp @@ -131,7 +131,7 @@ bool CNodeMng::init() //< todo 端口号、数据库名、用户名、密码 暂时写死 /* 为以后搜索方便,保留此注释 - * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统建模中关系库的首链接的数据库配置 + * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统拓扑中关系库的首链接的数据库配置 * 时序库用户名用的数据库名称 */ CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName, @@ -174,7 +174,7 @@ bool CNodeMng::init() //< todo 端口号、数据库名、用户名、密码 暂时写死 /* 为以后搜索方便,保留此注释 - * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统建模中关系库的首链接的数据库配置 + * 取消默认EMS_DEFAULT_DATABASE,时序库使用系统拓扑中关系库的首链接的数据库配置 * 时序库用户名用的数据库名称 */ CNodeThreadPtr ptrNodeThread(new CNodeThread(stDbNodeInfo.strName, diff --git a/platform/src/gui/hmi/CExplorerWnd.cpp b/platform/src/gui/hmi/CExplorerWnd.cpp index 15be8f22..f2f6c91e 100644 --- a/platform/src/gui/hmi/CExplorerWnd.cpp +++ b/platform/src/gui/hmi/CExplorerWnd.cpp @@ -277,7 +277,7 @@ void CExplorerWnd::showCheckDogInfo() } else { - QMessageBox::information(NULL, tr("提示"), tr("加密狗检测正常!")); + QMessageBox::information(NULL, tr("提示"), tr("密钥信息正常!")); } return; } @@ -548,7 +548,7 @@ void CExplorerWnd::setupActions() connect(m_pWinNewGDWinAction, SIGNAL(triggered()), this, SLOT(fileNewGDWin())); CBaseInstance()->getFilePathName(CBase::PATH_TYPE_ICONSET, "com_open.png", iconbuf); - m_pDogInfoAction = new QAction(QPixmap(iconbuf), tr("加密狗状态"), this); + m_pDogInfoAction = new QAction(QPixmap(iconbuf), tr("密钥状态"), this); m_pDogInfoAction->setShortcut(tr("Ctrl+R")); connect(m_pDogInfoAction, SIGNAL(triggered()), this, SLOT(showCheckDogInfo())); diff --git a/platform/src/gui/hmi/CGraphApp.cpp b/platform/src/gui/hmi/CGraphApp.cpp index 644ad0f4..be682a8f 100644 --- a/platform/src/gui/hmi/CGraphApp.cpp +++ b/platform/src/gui/hmi/CGraphApp.cpp @@ -995,7 +995,7 @@ void CGraphApp::checkDogStatus() QMap::const_iterator iter = m_explorerWndMap.cbegin(); for(; iter != m_explorerWndMap.cend(); iter++) { - if(QMessageBox::Ok == QMessageBox::warning(iter.value(), tr("提示"), tr("加密狗检测异常!"))) + if(QMessageBox::Ok == QMessageBox::warning(iter.value(), tr("提示"), tr("密钥信息异常!"))) { sysExit(); } diff --git a/platform/src/gui/hmi/CMenuString.h b/platform/src/gui/hmi/CMenuString.h index 3a9c5290..1a54c3d5 100644 --- a/platform/src/gui/hmi/CMenuString.h +++ b/platform/src/gui/hmi/CMenuString.h @@ -2,7 +2,7 @@ #define CMENUSTRING_H -const char *g_designer_action = QT_TR_NOOP("组态制作"); +const char *g_designer_action = QT_TR_NOOP("图模编辑"); const char *g_explorer_action = QT_TR_NOOP("图形浏览"); const char *g_file_operation = QT_TR_NOOP("文件(&F)"); diff --git a/platform/src/include/tools/model_common/common.h b/platform/src/include/tools/model_common/common.h index dfbc3a49..89cc0b7b 100644 --- a/platform/src/include/tools/model_common/common.h +++ b/platform/src/include/tools/model_common/common.h @@ -128,7 +128,7 @@ private: static QString m_pathTree; static QString m_pathTranslate; static QString m_pathStyle; - static QString m_pathSysModelConfig;//系统建模配置导出路径 + static QString m_pathSysModelConfig;//系统拓扑配置导出路径 static QString m_pathResource; static QString m_pathIscsHome; static QString m_path61850Cfg; diff --git a/platform/src/net/net_msg_bus/CMbServer.cpp b/platform/src/net/net_msg_bus/CMbServer.cpp index 2969e846..1b906a36 100644 --- a/platform/src/net/net_msg_bus/CMbServer.cpp +++ b/platform/src/net/net_msg_bus/CMbServer.cpp @@ -404,7 +404,7 @@ bool CMbServer::loadConfig() m_nH2hPort, m_nH2hRtTimeout); } - //< 加载系统建模信息 + //< 加载系统拓扑信息 { iot_public::CSysInfoInterfacePtr ptrSysInfo; if (!createSysInfoInstance(ptrSysInfo)) diff --git a/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp b/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp index 9b31f064..7af11be1 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoApi.cpp @@ -1,7 +1,7 @@  /******************************************************************************//** * @file SysInfoInterface.cpp -* @brief 系统建模信息访问库接口 +* @brief 系统拓扑信息访问库接口 * @author yikenan * @version 1.0 * @date diff --git a/platform/src/public/pub_sysinfo_api/SysInfoData.cpp b/platform/src/public/pub_sysinfo_api/SysInfoData.cpp index 4802bceb..451d0fd0 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoData.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoData.cpp @@ -1,7 +1,7 @@  /******************************************************************************//** * @file SysInfoData.cpp -* @brief 系统建模信息访问库,配置文件中的数据 +* @brief 系统拓扑信息访问库,配置文件中的数据 * @author yikenan * @version 1.0 * @date diff --git a/platform/src/public/pub_sysinfo_api/SysInfoData.h b/platform/src/public/pub_sysinfo_api/SysInfoData.h index 57ee0e73..0fab5ef2 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoData.h +++ b/platform/src/public/pub_sysinfo_api/SysInfoData.h @@ -1,7 +1,7 @@  /******************************************************************************//** * @file SysInfoData.h -* @brief 系统建模信息访问库,配置文件中的数据 +* @brief 系统拓扑信息访问库,配置文件中的数据 * @author yikenan * @version 1.0 * @date diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp index 084b5cde..77156a7b 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.cpp @@ -1,7 +1,7 @@  /******************************************************************************//** * @file SysInfoImp.h -* @brief 系统建模信息访问库实现 +* @brief 系统拓扑信息访问库实现 * @author yikenan * @version 1.0 * @date diff --git a/platform/src/public/pub_sysinfo_api/SysInfoImp.h b/platform/src/public/pub_sysinfo_api/SysInfoImp.h index a1e89e5f..785f2c7a 100644 --- a/platform/src/public/pub_sysinfo_api/SysInfoImp.h +++ b/platform/src/public/pub_sysinfo_api/SysInfoImp.h @@ -1,7 +1,7 @@  /******************************************************************************//** * @file SysInfoImp.h -* @brief 系统建模信息访问库实现 +* @brief 系统拓扑信息访问库实现 * @author yikenan * @version 1.0 * @date diff --git a/platform/src/service/alarm_server/CAlarmServer.cpp b/platform/src/service/alarm_server/CAlarmServer.cpp index 9cb3fed6..27b40412 100644 --- a/platform/src/service/alarm_server/CAlarmServer.cpp +++ b/platform/src/service/alarm_server/CAlarmServer.cpp @@ -99,10 +99,10 @@ bool CAlarmServer::start(int argc, char *argv[], int & /*nStatus*/) } } - //< 加载系统建模信息 + //< 加载系统拓扑信息 if (!loadSysInfo()) { - LOGFATAL("加载系统建模信息失败,程序启动失败!"); + LOGFATAL("加载系统拓扑信息失败,程序启动失败!"); return false; } diff --git a/platform/src/sys/sys_dog_auth_check/mainwindow.cpp b/platform/src/sys/sys_dog_auth_check/mainwindow.cpp index 3812b998..b8cbeaad 100644 --- a/platform/src/sys/sys_dog_auth_check/mainwindow.cpp +++ b/platform/src/sys/sys_dog_auth_check/mainwindow.cpp @@ -36,12 +36,12 @@ void MainWindow::slot_recheckBtn() int nRet = ptrDogAuth->checkAuthStatus(); if (nRet > 0) { - LOGERROR("加密狗检测错误(FAIL)!"); + LOGERROR("密钥信息错误(FAIL)!"); ui->statusLab->setText(tr("异常,错误码[%1]").arg(nRet)); } else { - LOGERROR("加密狗检测正确(OK)!"); + LOGERROR("密钥信息正确(OK)!"); ui->statusLab->setText(tr("正常")); } } diff --git a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp index 4c9e0296..4f0d3c01 100644 --- a/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp +++ b/platform/src/sys/sys_proc_mng_api/ProcMngApiThread.cpp @@ -63,7 +63,7 @@ void iot_sys::CProcMngApiThread::execute() } #ifndef DISABLE_DOG_AUTH - /* @brief 加密狗检测超时退出 */ + /* @brief 密钥信息超时退出 */ if(m_bNeedCheckAuth) { if(getMonotonicMsec() - m_lLastCheckDogTime >60*1000) //一分钟检查一次狗错误 @@ -75,7 +75,7 @@ void iot_sys::CProcMngApiThread::execute() if((m_nDogTimeOutCount*60) >= DOG_TIMEOUT) { notifyProcToQuit();//< 通知进程退出 - LOGERROR("加密狗检测超时退出,请检查加密狗!"); + LOGERROR("密钥信息超时退出,请检查加密狗!"); } } else diff --git a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp index f66f8bbf..7603f6ee 100644 --- a/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp +++ b/platform/src/tools/model_plugin/FESWidget/kbddevimportdlg.cpp @@ -15,7 +15,8 @@ kbdDevImportDlg::kbdDevImportDlg(QWidget *parent) : CustomDialog(parent) QVBoxLayout* vLayout = new QVBoxLayout; QHBoxLayout* hLayout = new QHBoxLayout; - m_syncDev =new QPushButton(tr("同步设备"),this); + m_syncDev =new QPushButton(tr("同步设备")); + m_syncDev->setStyleSheet("QPushButton { border: none; }"); m_pcsDev = new QRadioButton(tr("网关设备"),this); m_otherDev = new QRadioButton(tr("第三方设备"),this); m_otherDev->setChecked(true); diff --git a/platform/src/tools/model_plugin/SystemConfigWizard/systemconfigwizard.cpp b/platform/src/tools/model_plugin/SystemConfigWizard/systemconfigwizard.cpp index ad53b7aa..9bf12c0a 100644 --- a/platform/src/tools/model_plugin/SystemConfigWizard/systemconfigwizard.cpp +++ b/platform/src/tools/model_plugin/SystemConfigWizard/systemconfigwizard.cpp @@ -21,7 +21,7 @@ SystemConfigWizard::SystemConfigWizard(QWidget *parent) : QWizard(parent) { - setWindowTitle(tr("系统建模配置向导")); + setWindowTitle(tr("系统拓扑配置向导")); setWizardStyle(QWizard::ClassicStyle); addPage(createLocationPage()); addPage(createNodePage()); diff --git a/platform/src/tools/model_studio/loginDialog/logindlg.cpp b/platform/src/tools/model_studio/loginDialog/logindlg.cpp index 1df192ed..d6517b6a 100644 --- a/platform/src/tools/model_studio/loginDialog/logindlg.cpp +++ b/platform/src/tools/model_studio/loginDialog/logindlg.cpp @@ -198,13 +198,13 @@ void LoginDlg::onLoad() m_leDbName->text(), (iot_dbms::EDbType)m_comboxDbType->currentData().toInt()); - //检查是否系统建模 + //检查是否系统拓扑 if(err.isEmpty()) { QString errMsg; if(!checkSysModel(errMsg)) { - err = errMsg + tr(",可能未进行系统建模!"); + err = errMsg + tr(",可能未进行系统拓扑!"); } } diff --git a/platform/src/tools/model_system_config/main.cpp b/platform/src/tools/model_system_config/main.cpp index cebbc2f0..153a7de1 100644 --- a/platform/src/tools/model_system_config/main.cpp +++ b/platform/src/tools/model_system_config/main.cpp @@ -93,7 +93,7 @@ int main(int argc, char *argv[]) QDialog* wid = static_cast(Common::createPluginWidget(nullptr,"system_config_plugin",ptrVec)); if(wid != nullptr) { - if(N_MessageBox::information(nullptr,QObject::tr("消息"),QObject::tr("是否进入系统建模配置向导界面?"),N_MessageBox::Yes,N_MessageBox::No) == N_MessageBox::Yes) + if(N_MessageBox::information(nullptr,QObject::tr("消息"),QObject::tr("是否进入系统拓扑配置向导界面?"),N_MessageBox::Yes,N_MessageBox::No) == N_MessageBox::Yes) wid->exec(); } settings.setValue("SystemConfigWizard/isShow","false"); diff --git a/platform/src/tools/model_system_config/mainwindow.cpp b/platform/src/tools/model_system_config/mainwindow.cpp index e914f032..17f0ef88 100644 --- a/platform/src/tools/model_system_config/mainwindow.cpp +++ b/platform/src/tools/model_system_config/mainwindow.cpp @@ -24,7 +24,7 @@ MainWindow::MainWindow(QWidget *parent) : { ui->setupUi(this); - setWindowTitle(tr("系统建模")); + setWindowTitle(tr("系统拓扑")); QGridLayout *gridLayout = new QGridLayout(); gridLayout->setContentsMargins(5,0,0,0); gridLayout->setSpacing(0); @@ -93,7 +93,7 @@ void MainWindow::onDbError(const QString &err) void MainWindow::onVersion() { - N_MessageBox::about(this,tr("系统建模"),tr("版本号:%1").arg(Common::getSoftwareVersion())); + N_MessageBox::about(this,tr("系统拓扑"),tr("版本号:%1").arg(Common::getSoftwareVersion())); } void MainWindow::onConfigWizard() diff --git a/product/common/sysconfig/sys_startup.json b/product/common/sysconfig/sys_startup.json index 8a84a94e..0087244a 100644 --- a/product/common/sysconfig/sys_startup.json +++ b/product/common/sysconfig/sys_startup.json @@ -10,7 +10,7 @@ "enable":false }, "num1":{ - "zh":"加密狗检测", + "zh":"密钥信息", "en":"Supper\nDog Check", "cmd":"DogCheck", "param":"", @@ -34,7 +34,7 @@ "enable":true }, "num4":{ - "zh":"系统建模", + "zh":"系统拓扑", "en":"System\nmodeling", "cmd":"model_system_config.exe", "param":"", @@ -50,7 +50,7 @@ "enable":true }, "num6":{ - "zh":"组态制作", + "zh":"图模编辑", "en":"Graphic\ndesign", "cmd":"hmi.exe", "param":"", @@ -58,7 +58,7 @@ "enable":true }, "num7":{ - "zh":"工程备份", + "zh":"工程管理", "en":"Project\nmanagement", "cmd":"db_manager.exe", "param":"", @@ -82,7 +82,7 @@ "enable":true }, "num10":{ - "zh":"工程调试", + "zh":"调试助手", "en":"Debug\ntool", "cmd":"debug_tool.exe", "param":"", diff --git a/product/src/application/apc_if_srv/CApcIfSrv.cpp b/product/src/application/apc_if_srv/CApcIfSrv.cpp index ede48def..8eac824f 100644 --- a/product/src/application/apc_if_srv/CApcIfSrv.cpp +++ b/product/src/application/apc_if_srv/CApcIfSrv.cpp @@ -114,10 +114,10 @@ bool CApcIfSrv::start(int argc, char *argv[], int & /*nStatus*/) return false; } - //< 加载系统建模信息 + //< 加载系统拓扑信息 if (!loadSysInfo()) { - LOGFATAL("加载系统建模信息失败,程序启动失败!"); + LOGFATAL("加载系统拓扑信息失败,程序启动失败!"); return false; } diff --git a/product/src/application/application.pro b/product/src/application/application.pro index a29005e1..c1ec3b91 100644 --- a/product/src/application/application.pro +++ b/product/src/application/application.pro @@ -19,7 +19,7 @@ SUBDIRS += \ idong_task_link \ #opc_server \ #qtts_kbd_iflytek \ - #video_server \ + video_server \ #app_ats_timetable \ his_amend \ wave_record_server \ diff --git a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp index 3b66e67e..475854dc 100644 --- a/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp +++ b/product/src/application/fault_recall_srv/CFaultRecallSrv.cpp @@ -98,10 +98,10 @@ bool CFaultRecallSrv::start(int argc, char *argv[], int& /*nStatus*/) return false; } - //< 加载系统建模信息 + //< 加载系统拓扑信息 if (!loadSysInfo()) { - LOGFATAL("加载系统建模信息失败,程序启动失败!"); + LOGFATAL("加载系统拓扑信息失败,程序启动失败!"); return false; } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui b/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui index ffb64146..c563116a 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui +++ b/product/src/gui/plugin/AlarmWidget/CAlarmForm.ui @@ -192,28 +192,6 @@ - - - - true - - - - 0 - 0 - - - - - 60 - 26 - - - - 设置 - - - @@ -349,7 +327,7 @@ 9 - + @@ -368,25 +346,53 @@ - - + + + + + 0 + 0 + + - 0 + 65 0 - 16777215 + 65 26 - - Qt::RightToLeft + + 导出 + + + + + + + + 0 + 0 + + + + + 65 + 0 + + + + + 65 + 26 + - 优先级: + 过滤 @@ -412,57 +418,42 @@ - - - - - 0 - 0 - - + + - 65 + 0 0 - 65 + 16777215 26 + + Qt::RightToLeft + - 过滤 + 优先级: - - - - - 0 - 0 - - + + - 65 - 0 - - - - - 65 + 45 26 - 导出 + 禁止告警 - + false @@ -478,26 +469,23 @@ - - - - - 0 - 0 - - - - - 150 - 0 - + + + + false - 1000 + 65 26 + + + + + 确认 + @@ -522,36 +510,26 @@ - - + + + + + 0 + 0 + + - 45 - 26 + 150 + 0 - - 禁止告警 - - - - - - - false - - 65 + 1000 26 - - - - - 确认 - @@ -570,6 +548,22 @@ + + + + + 250 + 0 + + + + + 16777215 + 26 + + + + @@ -627,22 +621,6 @@ - - - - - 250 - 0 - - - - - 16777215 - 26 - - - - @@ -659,6 +637,28 @@ + + + + true + + + + 0 + 0 + + + + + 60 + 26 + + + + 设置 + + + diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp index 422e6d91..8bb9ce89 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmView.cpp @@ -18,6 +18,7 @@ void CAlarmView::initialize() setSelectionBehavior(QAbstractItemView::SelectRows); //setSelectionMode(QAbstractItemView::MultiSelection); //setHorizontalScrollMode(ScrollPerPixel); + //setStyleSheet("QTableView {font-size:20px;}"); setAutoScroll(false); } diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp index af6644a4..957a1ba0 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp +++ b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.cpp @@ -17,7 +17,7 @@ #include #include #include "pub_logger_api/logger.h" - +#include "pub_utility_api/FileStyle.h" CAlarmWidget::CAlarmWidget(QWidget *parent) : QWidget(parent), m_pView(Q_NULLPTR), @@ -28,6 +28,7 @@ CAlarmWidget::CAlarmWidget(QWidget *parent) m_pConfirmButtonRow2(Q_NULLPTR) { //initialize(); + initStyle(); } CAlarmWidget::~CAlarmWidget() @@ -40,6 +41,22 @@ CAlarmWidget::~CAlarmWidget() qDebug() << "~CAlarmWidget()"; } +void CAlarmWidget::initStyle(){ + QString qss = QString(); + std::string strFullPath = iot_public::CFileStyle::getPathOfStyleFile("alarmForm.qss") ; + QFile qssfile2(QString::fromStdString(strFullPath)); + qssfile2.open(QFile::ReadOnly); + if (qssfile2.isOpen()) + { + qss += QLatin1String(qssfile2.readAll()); + qssfile2.close(); + } + if(!qss.isEmpty()) + { + setStyleSheet(qss); + } + +} void CAlarmWidget::setAlarmModel(CAlarmItemModel *pModel) { if(!pModel) diff --git a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h index bd50b909..b02a2b23 100644 --- a/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h +++ b/product/src/gui/plugin/AlarmWidget/CAlarmWidget.h @@ -17,7 +17,7 @@ public: ~CAlarmWidget(); void setAlarmModel(CAlarmItemModel * pModel); - + void initStyle(); void setRowHeight(const int &height); void setDockColumnVisible(const int &column, const bool &visbile); diff --git a/product/src/sys/sys_startup/ButtonForm.cpp b/product/src/sys/sys_startup/ButtonForm.cpp index 9a0933df..9915505d 100644 --- a/product/src/sys/sys_startup/ButtonForm.cpp +++ b/product/src/sys/sys_startup/ButtonForm.cpp @@ -67,9 +67,9 @@ void ButtonForm::addToolButtons(QVector &buttonVec) //QSize size(45,45); QSize size(10,30); toolBtn->setIconSize(size); - toolBtn->setMaximumHeight(30); - toolBtn->setMinimumHeight(30); - toolBtn->setMaximumWidth(100); + toolBtn->setMaximumHeight(40); + toolBtn->setMinimumHeight(40); + //toolBtn->setMaximumWidth(100); toolBtn->setMinimumWidth(40); //toolBtn->setIcon(icon); toolBtn->setText(m_bIsZh?buttonInfo.m_zh:buttonInfo.m_en); diff --git a/product/src/sys/sys_startup/DataMng.h b/product/src/sys/sys_startup/DataMng.h index 367dfa9f..f6305b08 100644 --- a/product/src/sys/sys_startup/DataMng.h +++ b/product/src/sys/sys_startup/DataMng.h @@ -304,7 +304,7 @@ private: int m_buttom; //节点应用相关 QVector m_nodeVec; //< 所有启用的节点名称 - QMap m_modelAppInfoMap; //< 系统建模应用信息 + QMap m_modelAppInfoMap; //< 系统拓扑应用信息 QMap > m_modelDeployInfoMap; //< 所有需要运行的应用信息 std::vector m_modelProcInfoVec; //< 所需要运行的进程信息 diff --git a/product/src/sys/sys_startup/DogCheck.cpp b/product/src/sys/sys_startup/DogCheck.cpp index f7847f38..a7047889 100644 --- a/product/src/sys/sys_startup/DogCheck.cpp +++ b/product/src/sys/sys_startup/DogCheck.cpp @@ -13,7 +13,7 @@ DogCheck::DogCheck(QWidget *parent) : ui(new Ui::DogCheck) { ui->setupUi(this); - this->setWindowTitle(tr("加密狗检测")); + this->setWindowTitle(tr("密钥信息")); this->setWindowFlags(windowFlags()&~Qt::WindowContextHelpButtonHint); slot_recheckBtn(); ui->recheckBtn->setText(tr("重新检测")); diff --git a/product/src/sys/sys_startup/MainWindow.cpp b/product/src/sys/sys_startup/MainWindow.cpp index 60bf7532..f8a5c01a 100644 --- a/product/src/sys/sys_startup/MainWindow.cpp +++ b/product/src/sys/sys_startup/MainWindow.cpp @@ -91,7 +91,6 @@ MainWindow::MainWindow(bool isZh, QWidget *parent) : // 加载qss样式 initSheet(); - //校验ip verifyIp(); @@ -1052,7 +1051,7 @@ void MainWindow::startSystem(int res,QProcess::ExitStatus exit) //3.检查模型数据是否导出 if(DataMng::instance()->getLocalProcNum() <= 0) { - QMessageBox::StandardButton result = QMessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统建模工具检查配置并导出?")); + QMessageBox::StandardButton result = QMessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统拓扑工具检查配置并导出?")); if(result == QMessageBox::Yes) { const std::string strProc = std::move( iot_public::CFileUtil::getPathOfBinFile( diff --git a/product/src/tools/debug_tool/CDebugTool.cpp b/product/src/tools/debug_tool/CDebugTool.cpp index d111301f..a58245e1 100644 --- a/product/src/tools/debug_tool/CDebugTool.cpp +++ b/product/src/tools/debug_tool/CDebugTool.cpp @@ -14,7 +14,7 @@ CDebugTool::CDebugTool(CSystemResources *pSystemResources, QWidget *parent): { ui->setupUi(this); //setMinimumSize(1200,755); - setWindowTitle(tr("工程调试工具")); + setWindowTitle(tr("调试助手工具")); setWindowIcon(QIcon(":/debug_tool.ico")); CommonSheet sheetStyle; QString sheet; diff --git a/product/src/tools/debug_tool_v2/CDebugTool.cpp b/product/src/tools/debug_tool_v2/CDebugTool.cpp index 9267d5dd..8fb8aa4c 100644 --- a/product/src/tools/debug_tool_v2/CDebugTool.cpp +++ b/product/src/tools/debug_tool_v2/CDebugTool.cpp @@ -15,7 +15,7 @@ CDebugTool::CDebugTool(CSystemResources *pSystemResources, QWidget *parent): ui->setupUi(this); //setMinimumSize(1200,755); - setWindowTitle(tr("工程调试工具")); + setWindowTitle(tr("调试助手工具")); setWindowIcon(QIcon(":/debug_tool.ico")); CommonSheet sheetStyle; QString sheet; diff --git a/product/src/tools/debug_tool_v2/mainwindow.cpp b/product/src/tools/debug_tool_v2/mainwindow.cpp index 493a7353..b4a16253 100644 --- a/product/src/tools/debug_tool_v2/mainwindow.cpp +++ b/product/src/tools/debug_tool_v2/mainwindow.cpp @@ -15,7 +15,7 @@ MainWindow::MainWindow(CSystemResources *pSystemResources, QWidget *parent) : ui->setupUi(this); //setMinimumSize(1200,755); - setWindowTitle(tr("工程调试")); + setWindowTitle(tr("调试助手")); initDebugTool(); setTitleWidget(ui->mainmenu); diff --git a/product/src/tools/file_sync_tool/mainwindow.cpp b/product/src/tools/file_sync_tool/mainwindow.cpp index 7a1a74d8..a4308f68 100644 --- a/product/src/tools/file_sync_tool/mainwindow.cpp +++ b/product/src/tools/file_sync_tool/mainwindow.cpp @@ -272,7 +272,7 @@ void MainWindow::slot_refeshBtnClicked() QString selectHost = m_hostCbm->currentData().toString(); if (selectHost.isEmpty()) { - showMsg("无法获取到本机主机配置,请检查系统建模配置!"); + showMsg("无法获取到本机主机配置,请检查系统拓扑配置!"); return; } @@ -294,7 +294,7 @@ void MainWindow::slot_rootPathBtnClicked() QString selectHost = m_hostCbm->currentData().toString(); if (selectHost.isEmpty()) { - showMsg("无法获取到本机主机配置,请检查系统建模配置!"); + showMsg("无法获取到本机主机配置,请检查系统拓扑配置!"); return; } @@ -319,7 +319,7 @@ void MainWindow::slot_upPathBtnClicked() QString selectHost = m_hostCbm->currentData().toString(); if (selectHost.isEmpty()) { - showMsg("无法获取到本机主机配置,请检查系统建模配置!"); + showMsg("无法获取到本机主机配置,请检查系统拓扑配置!"); return; } startExeTask(); @@ -755,7 +755,7 @@ void MainWindow::slot_treeitemDoubleClicked( QString selectHost = m_hostCbm->currentData().toString(); if (selectHost.isEmpty()) { - showMsg("无法获取到本机主机配置,请检查系统建模配置!"); + showMsg("无法获取到本机主机配置,请检查系统拓扑配置!"); return; } startExeTask(); diff --git a/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp b/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp index 5ad7d683..8a14970e 100644 --- a/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp +++ b/product/src/tools/setup/setup_installer/SetupFuncLinux.cpp @@ -350,9 +350,9 @@ bool createStartProgram(QString &strErr,const QString& path) createDesktopEntry(appDestPath,CDesktopEntry("sys_dog_auth_check", QObject::tr("超级狗检查"), "check system dog authentication",execProdDir+"/sys_dog_auth_check"),strErr); createDesktopEntry(appDestPath,CDesktopEntry("FesSim", QObject::tr("前置调试"),"fes debug tool",execProdDir+"/FesSim",iconDir + "/fes_sim.ico"),strErr); - createDesktopEntry(appDestPath,CDesktopEntry("debug_tool", QObject::tr("工程调试工具"),"debug tool",execProdDir+"/debug_tool",iconDir + "/debug_tool.ico"),strErr); + createDesktopEntry(appDestPath,CDesktopEntry("debug_tool", QObject::tr("调试助手工具"),"debug tool",execProdDir+"/debug_tool",iconDir + "/debug_tool.ico"),strErr); createDesktopEntry(appDestPath,CDesktopEntry("sys_command",QObject::tr("命令窗口"),"bin exec environment",execProdDir+"/sys_command.sh"),strErr); - createDesktopEntry(appDestPath,CDesktopEntry("model_system_config",QObject::tr("系统建模"),"system model configuration",execPlatDir+"/model_system_config",iconDir + "/systemConfig.ico"),strErr); + createDesktopEntry(appDestPath,CDesktopEntry("model_system_config",QObject::tr("系统拓扑"),"system model configuration",execPlatDir+"/model_system_config",iconDir + "/systemConfig.ico"),strErr); createDesktopEntry(appDestPath,CDesktopEntry("model_studio",QObject::tr("设备建模"),"model studio",execPlatDir+"/model_studio",iconDir + "/studio.ico"),strErr); createDesktopEntry(appDestPath,CDesktopEntry("hmi",QObject::tr("画面组态"),"human machine interface app",execPlatDir+"/hmi",iconDir + "/fes_sim.ico"),strErr); createDesktopEntry(appDestPath,CDesktopEntry("fbd_editor",QObject::tr("逻辑编程"),"fbd editor",execPlatDir+"/fbd_designer",iconDir + "/fbd_editor.ico"),strErr); diff --git a/product/src/tools/workBench/MainWindow.cpp b/product/src/tools/workBench/MainWindow.cpp index 19f4d8c3..a2cdb00e 100644 --- a/product/src/tools/workBench/MainWindow.cpp +++ b/product/src/tools/workBench/MainWindow.cpp @@ -1090,7 +1090,7 @@ void MainWindow::startSystem(int res,QProcess::ExitStatus exit) //3.检查模型数据是否导出 if(DataMng::instance()->getLocalProcNum() <= 0) { - int result = N_MessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统建模工具检查配置并导出?") , + int result = N_MessageBox::question(this,tr("错误"),tr("系统模型配置信息异常,是否打开系统拓扑工具检查配置并导出?") , N_MessageBox::Yes | N_MessageBox::No, N_MessageBox::Yes); if(result == N_MessageBox::Yes) { diff --git a/product/src/tools/workBench/tool/DataMng.h b/product/src/tools/workBench/tool/DataMng.h index 41132436..270e1c05 100644 --- a/product/src/tools/workBench/tool/DataMng.h +++ b/product/src/tools/workBench/tool/DataMng.h @@ -299,7 +299,7 @@ private: //节点应用相关 QVector m_nodeVec; //< 所有启用的节点名称 - QMap m_modelAppInfoMap; //< 系统建模应用信息 + QMap m_modelAppInfoMap; //< 系统拓扑应用信息 QMap > m_modelDeployInfoMap; //< 所有需要运行的应用信息 std::vector m_modelProcInfoVec; //< 所需要运行的进程信息 diff --git a/resource/en/style/dark/alarmForm.qss b/resource/en/style/dark/alarmForm.qss index 4e79697a..bd78e09a 100644 --- a/resource/en/style/dark/alarmForm.qss +++ b/resource/en/style/dark/alarmForm.qss @@ -42,3 +42,9 @@ QLineEdit#iconLineEdit QPushButton QFrame#frame{ border: 0px; } +QTableView { + font-size:20px;; +} +CAlarmWidget CAlarmView{ + font-size:20px; +} \ No newline at end of file diff --git a/resource/en/style/light/sys_startup.qss b/resource/en/style/light/sys_startup.qss index 3573a9c3..6dd030a6 100644 --- a/resource/en/style/light/sys_startup.qss +++ b/resource/en/style/light/sys_startup.qss @@ -30,6 +30,7 @@ QToolButton::hover QTabBar::tab { height:40px; + width:110px; } QTabBar::tab:selected, QTabBar::tab:hover { color:#0394d5; diff --git a/resource/zh/style/dark/alarmForm.qss b/resource/zh/style/dark/alarmForm.qss index 4e79697a..bd78e09a 100644 --- a/resource/zh/style/dark/alarmForm.qss +++ b/resource/zh/style/dark/alarmForm.qss @@ -42,3 +42,9 @@ QLineEdit#iconLineEdit QPushButton QFrame#frame{ border: 0px; } +QTableView { + font-size:20px;; +} +CAlarmWidget CAlarmView{ + font-size:20px; +} \ No newline at end of file diff --git a/resource/zh/style/dark/event.qss b/resource/zh/style/dark/event.qss index 2c9895eb..1e1da386 100644 --- a/resource/zh/style/dark/event.qss +++ b/resource/zh/style/dark/event.qss @@ -12,7 +12,9 @@ QAbstractItemView::item:selected:active { background: #5da5fb; color: #FFFFFF; } - +QTableView { + font-size:20px;; +} /* =============================================== */ /* searchButton搜索框 */ /* =============================================== */ diff --git a/resource/zh/style/light/alarm.qss b/resource/zh/style/light/alarm.qss index 9cabea8e..34ec70f0 100644 --- a/resource/zh/style/light/alarm.qss +++ b/resource/zh/style/light/alarm.qss @@ -47,13 +47,6 @@ CMyCalendar QPushButton{ QTreeWidget#area::item { height:23px; } -/* QTableView { - color:#333333; - outline:0px; - border: 1px solid #cccfd9; - alternate-background-color: #f4f8fb; - background-color:white; - font-size:40px; - qproperty-showGrid:false; -}*/ \ No newline at end of file + font-size:20px;; +} \ No newline at end of file diff --git a/resource/zh/style/light/event.qss b/resource/zh/style/light/event.qss index 774ff44e..25335362 100644 --- a/resource/zh/style/light/event.qss +++ b/resource/zh/style/light/event.qss @@ -71,6 +71,9 @@ QTableView { background-color:white; qproperty-showGrid:false; } +QTableView { + font-size:20px;; +} QLineEdit#realSearchEdit, QLineEdit#hisSearchEdit { diff --git a/resource/zh/style/light/sys_startup.qss b/resource/zh/style/light/sys_startup.qss index 3573a9c3..6dd030a6 100644 --- a/resource/zh/style/light/sys_startup.qss +++ b/resource/zh/style/light/sys_startup.qss @@ -30,6 +30,7 @@ QToolButton::hover QTabBar::tab { height:40px; + width:110px; } QTabBar::tab:selected, QTabBar::tab:hover { color:#0394d5;