Merge branch '1209' into 'dbus-interface'
bug#96758 Esc关闭窗口 #97277翻译 See merge request kylin-desktop/kylin-nm!475
This commit is contained in:
commit
8a0e466901
|
@ -169,11 +169,7 @@ void NetDetail::initUI()
|
|||
securityPage = new SecurityPage(this);
|
||||
createNetPage = new CreatNetPage(this);
|
||||
|
||||
detailPage->installEventFilter(this);
|
||||
ipv4Page->installEventFilter(this);
|
||||
ipv6Page->installEventFilter(this);
|
||||
securityPage->installEventFilter(this);
|
||||
createNetPage->installEventFilter(this);
|
||||
this->installEventFilter(this);
|
||||
|
||||
centerWidget = new QWidget(this);
|
||||
bottomWidget = new QWidget(this);
|
||||
|
@ -929,8 +925,10 @@ bool NetDetail::eventFilter(QObject *w, QEvent *event)
|
|||
emit confimBtn->clicked();
|
||||
}
|
||||
return true;
|
||||
} else if (mEvent->key() == Qt::Key_Escape) {
|
||||
close();
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
return QWidget::eventFilter(w, event);
|
||||
}
|
||||
|
|
Binary file not shown.
|
@ -644,7 +644,7 @@
|
|||
<message>
|
||||
<location filename="../src/frontend/netdetails/netdetail.cpp" line="266"/>
|
||||
<source>Add Lan Connect</source>
|
||||
<translation>添加有线连接</translation>
|
||||
<translation>添加有线网络</translation>
|
||||
</message>
|
||||
<message>
|
||||
<location filename="../src/frontend/netdetails/netdetail.cpp" line="275"/>
|
||||
|
|
Loading…
Reference in New Issue