Merge branch '1209' into 'dbus-interface'

bug#96758 Esc关闭窗口 #97277翻译

See merge request kylin-desktop/kylin-nm!475
This commit is contained in:
ren peijia 2021-12-16 02:27:35 +00:00
commit 8a0e466901
3 changed files with 5 additions and 7 deletions

View File

@ -169,11 +169,7 @@ void NetDetail::initUI()
securityPage = new SecurityPage(this); securityPage = new SecurityPage(this);
createNetPage = new CreatNetPage(this); createNetPage = new CreatNetPage(this);
detailPage->installEventFilter(this); this->installEventFilter(this);
ipv4Page->installEventFilter(this);
ipv6Page->installEventFilter(this);
securityPage->installEventFilter(this);
createNetPage->installEventFilter(this);
centerWidget = new QWidget(this); centerWidget = new QWidget(this);
bottomWidget = new QWidget(this); bottomWidget = new QWidget(this);
@ -929,8 +925,10 @@ bool NetDetail::eventFilter(QObject *w, QEvent *event)
emit confimBtn->clicked(); emit confimBtn->clicked();
} }
return true; return true;
} else if (mEvent->key() == Qt::Key_Escape) {
close();
return true;
} }
} }
return QWidget::eventFilter(w, event); return QWidget::eventFilter(w, event);
} }

Binary file not shown.

View File

@ -644,7 +644,7 @@
<message> <message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="266"/> <location filename="../src/frontend/netdetails/netdetail.cpp" line="266"/>
<source>Add Lan Connect</source> <source>Add Lan Connect</source>
<translation>线</translation> <translation>线</translation>
</message> </message>
<message> <message>
<location filename="../src/frontend/netdetails/netdetail.cpp" line="275"/> <location filename="../src/frontend/netdetails/netdetail.cpp" line="275"/>