openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '2309bug-0707' into 'yhkylin/v101' 

网络属性IP页面布局错位问题 报错文案不符合规范问题 fix bug 180057 180139

See merge request kylinos-src/kylin-nm!206
This commit is contained in:
赵世旭 2023-07-07 08:00:54 +00:00
parent 4c05f18a78 a7ed8f4b6d
commit 51aad02f11
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/netdetails/creatnetpage.cpp
View File

@ -101,6 +101,8 @@ void CreatNetPage::initUI()
m_detailLayout->addRow(m_maskLabel, maskWidget);
m_detailLayout->addRow(m_gateWayLabel,gateWayEdit);
m_detailLayout->addRow(gateWayEmptyLabel);
m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT); //解决布局错位问题
m_maskLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
m_detailLayout->addRow(m_dnsWidget);

2
src/frontend/netdetails/ipv4page.cpp
View File

@ -111,6 +111,8 @@ void Ipv4Page::initUI() {
m_detailLayout->addRow(divider);
m_detailLayout->addRow(m_dnsEmptyLabel);
m_detailLayout->addRow(m_dnsWidget);
m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT); //解决布局错位问题
m_maskLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
ipv4ConfigCombox->addItem(tr("Auto(DHCP)")); //"自动(DHCP)"
ipv4ConfigCombox->addItem(tr("Manual")); //"手动"

2
src/frontend/netdetails/ipv6page.cpp
View File

@ -174,6 +174,8 @@ void Ipv6Page::initUI() {
m_detailLayout->addRow(m_subnetEmptyLabel);
m_detailLayout->addRow(m_gateWayLabel,gateWayWidget);
m_detailLayout->addRow(m_dnsWidget);
m_addressLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT); //解决布局错位问题
m_gateWayLabel->setContentsMargins(0, 0, 0, LABEL_HEIGHT);
ipv6ConfigCombox->addItem(tr("Auto(DHCP)")); //"自动(DHCP)"
ipv6ConfigCombox->addItem(tr("Manual")); //"手动"

12
src/translations/kylin-nm_zh_CN.ts
View File

@ -118,12 +118,12 @@
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="172"/>
<source>Invalid address</source>
<translation>无效地址</translation>
<translation>无效的IP地址</translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="181"/>
<source>Invalid subnet mask</source>
<translation>无效子网掩码</translation>
<translation>无效的子网掩码</translation>
</message>
<message>
<location filename="../frontend/netdetails/creatnetpage.cpp" line="201"/>
@ -621,12 +621,12 @@
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="272"/>
<source>Invalid address</source>
<translation>无效地址</translation>
<translation>无效的IP地址</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="281"/>
<source>Invalid subnet mask</source>
<translation>无效子网掩码</translation>
<translation>无效的子网掩码</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv4page.cpp" line="307"/>
@ -689,12 +689,12 @@
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="250"/>
<source>Invalid address</source>
<translation>无效地址</translation>
<translation>无效的IP地址</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="259"/>
<source>Invalid gateway</source>
<translation>无效网关</translation>
<translation>无效的网关地址</translation>
</message>
<message>
<location filename="../frontend/netdetails/ipv6page.cpp" line="303"/>