diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 8ce6761..409009b 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -12,9 +12,12 @@ resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); setWindowIcon(QIcon(":/images/CounterRealTime.png")); + QString title = QString("%1(%2)").arg(SettingConfig::getInstance().CLIENT_TITLE).arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备"); + ui->labTitle->setText(title); + trayIcon = new QSystemTrayIcon(this); trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); - trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->setToolTip(title); trayIcon->show(); connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); @@ -73,8 +76,6 @@ file.close(); } - ui->labTitle->setText(QString("钟差测量数据采集软件——%1").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); - if (SettingConfig::getInstance().NEED_KAFKA == 1) { // kafka consumer kafkaConsumer = new QKafkaConsumer(this); diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 8ce6761..409009b 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -12,9 +12,12 @@ resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); setWindowIcon(QIcon(":/images/CounterRealTime.png")); + QString title = QString("%1(%2)").arg(SettingConfig::getInstance().CLIENT_TITLE).arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备"); + ui->labTitle->setText(title); + trayIcon = new QSystemTrayIcon(this); trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); - trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->setToolTip(title); trayIcon->show(); connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); @@ -73,8 +76,6 @@ file.close(); } - ui->labTitle->setText(QString("钟差测量数据采集软件——%1").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); - if (SettingConfig::getInstance().NEED_KAFKA == 1) { // kafka consumer kafkaConsumer = new QKafkaConsumer(this); diff --git a/CounterRealTime/common/utils/SettingConfig.cpp b/CounterRealTime/common/utils/SettingConfig.cpp index eb99b6d..539ef19 100644 --- a/CounterRealTime/common/utils/SettingConfig.cpp +++ b/CounterRealTime/common/utils/SettingConfig.cpp @@ -4,6 +4,7 @@ { filename = "conf/config.ini"; setting = new QSettings(this->filename, QSettings::IniFormat); + setting->setIniCodec("UTF-8"); init(); } @@ -48,6 +49,7 @@ MASTER_PORT = getProperty("client", "masterPort").toInt(); DISPLAY_COUNT = getProperty("client", "displayCount", "4").toInt(); SERVER_PORT = getProperty("client", "serverPort").toInt(); + CLIENT_TITLE = getProperty("client", "title").toString(); DEVICE_ALARM_CODES = getProperty("alarm", "deviceAlarmCodes").toString().split(","); CHANNEL_ALARM_CODES = getProperty("alarm", "channelAlarmCodes").toString().split(","); diff --git a/CounterRealTime/CounterWindowRT.cpp b/CounterRealTime/CounterWindowRT.cpp index 8ce6761..409009b 100644 --- a/CounterRealTime/CounterWindowRT.cpp +++ b/CounterRealTime/CounterWindowRT.cpp @@ -12,9 +12,12 @@ resize(SettingConfig::getInstance().WINDOW_WIDTH, SettingConfig::getInstance().WINDOW_HEIGHT); setWindowIcon(QIcon(":/images/CounterRealTime.png")); + QString title = QString("%1(%2)").arg(SettingConfig::getInstance().CLIENT_TITLE).arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备"); + ui->labTitle->setText(title); + trayIcon = new QSystemTrayIcon(this); trayIcon->setIcon(QIcon(":/images/CounterRealTime.png")); - trayIcon->setToolTip(QString("钟差测量数据采集软件(%1)").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); + trayIcon->setToolTip(title); trayIcon->show(); connect(trayIcon, &QSystemTrayIcon::activated, this, &CounterWindowRT::onTrayIconActived); @@ -73,8 +76,6 @@ file.close(); } - ui->labTitle->setText(QString("钟差测量数据采集软件——%1").arg(SettingConfig::getInstance().MASTER == 1 ? "主" : "备")); - if (SettingConfig::getInstance().NEED_KAFKA == 1) { // kafka consumer kafkaConsumer = new QKafkaConsumer(this); diff --git a/CounterRealTime/common/utils/SettingConfig.cpp b/CounterRealTime/common/utils/SettingConfig.cpp index eb99b6d..539ef19 100644 --- a/CounterRealTime/common/utils/SettingConfig.cpp +++ b/CounterRealTime/common/utils/SettingConfig.cpp @@ -4,6 +4,7 @@ { filename = "conf/config.ini"; setting = new QSettings(this->filename, QSettings::IniFormat); + setting->setIniCodec("UTF-8"); init(); } @@ -48,6 +49,7 @@ MASTER_PORT = getProperty("client", "masterPort").toInt(); DISPLAY_COUNT = getProperty("client", "displayCount", "4").toInt(); SERVER_PORT = getProperty("client", "serverPort").toInt(); + CLIENT_TITLE = getProperty("client", "title").toString(); DEVICE_ALARM_CODES = getProperty("alarm", "deviceAlarmCodes").toString().split(","); CHANNEL_ALARM_CODES = getProperty("alarm", "channelAlarmCodes").toString().split(","); diff --git a/CounterRealTime/common/utils/SettingConfig.h b/CounterRealTime/common/utils/SettingConfig.h index 6027552..4df9a1a 100644 --- a/CounterRealTime/common/utils/SettingConfig.h +++ b/CounterRealTime/common/utils/SettingConfig.h @@ -73,6 +73,7 @@ qint8 DISPLAY_COUNT; // 服务监听端口号 quint16 SERVER_PORT; + QString CLIENT_TITLE; // 设备报警类型 QStringList DEVICE_ALARM_CODES;