Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 09:23:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(dock): 修改了任务栏和控制中心名称不一致以及当有两个有线网卡时，dock显示框一个有线网的ip问题

Browse Source 
修改了任务栏和控制中心名称不一致以及两个有线网卡时，dock显示一个有线网ip

Log: 任务栏仅显示1个网卡图标(任务栏和控制中心名称不一致)
Bug: https://pms.uniontech.com/zentao/bug-view-48751.html
Change-Id: I6bc144bdf66a297a89ea56ee0b63a1a2f1548704
Reviewed-on: http://gerrit.uniontech.com/c/dde-dock/+/6481
Reviewed-by: <mailman@uniontech.com>
Reviewed-by: fanpengcheng <fanpengcheng@uniontech.com>
Tested-by: <mailman@uniontech.com>
This commit is contained in:
Li Tao 2020-09-28 09:20:02 +08:00 committed by litao
parent 3aa4ab50ca
commit 7043cc251b
1 changed files with 32 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
plugins/network/networkitem.cpp
View File

@ -1165,6 +1165,8 @@ void NetworkItem::refreshTips()
case Connected: {
QString strTips;
QStringList textList;
int wirelessIndex = 1;
int wireIndex = 1;
for (auto wirelessItem : m_connectedWirelessDevice) {
if (wirelessItem) {
auto info = wirelessItem->getActiveWirelessConnectionInfo();
@ -1173,7 +1175,11 @@ void NetworkItem::refreshTips()
const QJsonObject ipv4 = info.value("Ip4").toObject();
if (!ipv4.contains("Address"))
break;
strTips = tr("Wireless connection: %1").arg(ipv4.value("Address").toString()) + '\n';
if (m_connectedWirelessDevice.size() == 1) {
strTips = tr("Wireless connection: %1").arg(ipv4.value("Address").toString()) + '\n';
} else {
strTips = tr("Wireless Network").append(QString("%1").arg(wirelessIndex++)).append(":"+ipv4.value("Address").toString()) + '\n';
}
strTips.chop(1);
textList << strTips;
}
@ -1186,7 +1192,11 @@ void NetworkItem::refreshTips()
const QJsonObject ipv4 = info.value("Ip4").toObject();
if (!ipv4.contains("Address"))
break;
strTips = tr("Wired connection: %1").arg(ipv4.value("Address").toString()) + '\n';
if (m_connectedWiredDevice.size() == 1) {
strTips = tr("Wired connection: %1").arg(ipv4.value("Address").toString()) + '\n';
} else {
strTips = tr("Wired Network").append(QString("%1").arg(wireIndex++)).append(":"+ipv4.value("Address").toString()) + '\n';
}
strTips.chop(1);
textList << strTips;
}
@ -1196,6 +1206,8 @@ void NetworkItem::refreshTips()
break;
case Aconnected: {
QString strTips;
int wirelessIndex=1;
QStringList textList;
for (auto wirelessItem : m_connectedWirelessDevice) {
if (wirelessItem) {
auto info = wirelessItem->getActiveWirelessConnectionInfo();
@ -1204,15 +1216,22 @@ void NetworkItem::refreshTips()
const QJsonObject ipv4 = info.value("Ip4").toObject();
if (!ipv4.contains("Address"))
break;
strTips = tr("Wireless connection: %1").arg(ipv4.value("Address").toString()) + '\n';
if (m_connectedWiredDevice.size() == 1) {
strTips = tr("Wireless connection: %1").arg(ipv4.value("Address").toString()) + '\n';
} else {
strTips = tr("Wireless Network").append(QString("%1").arg(wirelessIndex++)).append(":"+ipv4.value("Address").toString()) + '\n';
}
strTips.chop(1);
textList << strTips;
}
}
strTips.chop(1);
m_tipsWidget->setText(strTips);
m_tipsWidget->setTextList(textList);
}
break;
case Bconnected: {
QString strTips;
QStringList textList;
int wireIndex = 1;
for (auto wiredItem : m_connectedWiredDevice) {
if (wiredItem) {
auto info = wiredItem->getActiveWiredConnectionInfo();
@ -1221,11 +1240,16 @@ void NetworkItem::refreshTips()
const QJsonObject ipv4 = info.value("Ip4").toObject();
if (!ipv4.contains("Address"))
break;
strTips = tr("Wired connection: %1").arg(ipv4.value("Address").toString()) + '\n';
if (m_connectedWiredDevice.size() == 1) {
strTips = tr("Wired connection: %1").arg(ipv4.value("Address").toString()) + '\n';
} else {
strTips = tr("Wired Network").append(QString("%1").arg(wireIndex++)).append(":"+ipv4.value("Address").toString()) + '\n';
}
strTips.chop(1);
textList << strTips;
}
}
strTips.chop(1);
m_tipsWidget->setText(strTips);
m_tipsWidget->setTextList(textList);
}
break;
case Disconnected: