Merge branch '1025' into 'dbus-interface'

deactive wired or wireless connection through right button #bug86527

See merge request kylin-desktop/kylin-nm!364
This commit is contained in:
ren peijia 2021-10-28 01:27:03 +00:00
commit 1d9daf0110
8 changed files with 246 additions and 161 deletions

View File

@ -25,6 +25,9 @@ LanListItem::LanListItem(const KyConnectItem *lanConnectItem,
m_itemFrame->installEventFilter(this);
connect(this->m_infoButton, &InfoButton::clicked, this, &LanListItem::onInfoButtonClicked);
m_menu = new QMenu(this);//右键菜单
connect(m_menu, &QMenu::triggered, this, &LanListItem::onMenuTriggered);
}
@ -38,6 +41,11 @@ LanListItem::LanListItem(QWidget *parent) : ListItem(parent)
this->m_infoButton->hide();
}
LanListItem::~LanListItem()
{
qDebug()<<"[LanPage] lan list item is deleted." << m_lanConnectItem.m_connectName;
}
void LanListItem::setIcon(bool isOn)
{
if (isOn) {
@ -78,12 +86,7 @@ void LanListItem::onNetButtonClicked()
return;
}
if (Activated == m_lanConnectItem.m_connectState) {
//已连接接,点击后断开
m_connectOperation->deactivateWiredConnection(m_lanConnectItem.m_connectName, m_lanConnectItem.m_connectUuid);
qDebug() << LOG_FLAG << "it will disconnect connection" << m_lanConnectItem.m_connectName
<< ". it's device is" << m_deviceName;
} else if (Deactivated == m_lanConnectItem.m_connectState) {
if (Deactivated == m_lanConnectItem.m_connectState) {
//断开的连接,点击激活连接
if (m_deviceResource->wiredDeviceCarriered(m_deviceName)) {
m_connectOperation->activateWiredConnection(m_lanConnectItem.m_connectUuid, m_deviceName);
@ -95,7 +98,7 @@ void LanListItem::onNetButtonClicked()
}
} else {
qDebug() << LOG_FLAG <<"the connection" << m_lanConnectItem.m_connectName
<< "is activing or deactiving, so it can not be operation.";
<< "is not deactived, so it can not be operation.";
}
return;
@ -105,8 +108,38 @@ void LanListItem::onNetButtonClicked()
void LanListItem::onRightButtonClicked()
{
//右键点击事件
qDebug()<< LOG_FLAG <<"onRightButtonClicked";
if (!m_menu) {
return;
}
m_menu->clear();
if (Activated == m_lanConnectItem.m_connectState || Activating == m_lanConnectItem.m_connectState) {
m_menu->addAction(new QAction(tr("Disconnect"), this));
} else if (Deactivated == m_lanConnectItem.m_connectState) {
m_menu->addAction(new QAction(tr("Connect"), this));
} else {
return;
}
m_menu->move(cursor().pos());
m_menu->show();
return;
}
void LanListItem::onMenuTriggered(QAction *action)
{
if (action->text() == tr("Connect")) {
this->onNetButtonClicked();
} else if (action->text() == tr("Disconnect")) {
m_connectOperation->deactivateWiredConnection(m_lanConnectItem.m_connectName, m_lanConnectItem.m_connectUuid);
qDebug() << LOG_FLAG << "it will disconnect connection" << m_lanConnectItem.m_connectName
<< ". it's device is" << m_deviceName;
}
return;
}
void LanListItem::onInfoButtonClicked()
{
if (m_lanConnectItem.m_connectUuid.isEmpty()) {

View File

@ -5,6 +5,8 @@
#include <QDBusInterface>
#include <QEvent>
#include <QMenu>
#include <QAction>
class LanListItem : public ListItem
{
@ -14,7 +16,7 @@ public:
LanListItem(const KyConnectItem *lanConnectItem, const QString &deviceName, QWidget *parent = nullptr);
LanListItem(QWidget *parent = nullptr);
~LanListItem() = default;
~LanListItem();
public:
void updateConnectionState(ConnectState state);
@ -35,6 +37,7 @@ private:
private slots:
void onInfoButtonClicked();
void onNetButtonClicked();
void onMenuTriggered(QAction *action);
private:
KyConnectItem m_lanConnectItem;
@ -43,6 +46,7 @@ private:
KyNetworkDeviceResourse *m_deviceResource = nullptr;
QString m_deviceName = "";
QMenu *m_menu = nullptr;
};
#endif // LANLISTITEM_H

View File

@ -73,7 +73,7 @@ void ListItem::showDesktopNotify(const QString &message)
void ListItem::mousePressEvent(QMouseEvent *event)
{
qDebug()<<"[WlanListItem]"<<"mousePressEvent";
qDebug()<<"[ListItem]"<<"mousePressEvent";
if (event->button() == Qt::LeftButton) {
onNetButtonClicked();
} else if (event->button() == Qt::RightButton) {

View File

@ -18,7 +18,7 @@ WlanListItem::WlanListItem(KyWirelessNetItem &wirelessNetItem, QString device, Q
connect(this->m_infoButton, &InfoButton::clicked, this, &WlanListItem::onInfoButtonClicked);
m_menu = new QMenu();//右键菜单
m_menu = new QMenu(this);//右键菜单
connect(m_menu, &QMenu::triggered, this, &WlanListItem::onMenuTriggered);
m_wirelessConnectOperation = new KyWirelessConnectOperation(this);
@ -124,10 +124,11 @@ void WlanListItem::onRightButtonClicked()
m_menu->clear();
if (Activated == m_connectState) {
if (Activated == m_connectState || Activating == m_connectState) {
m_menu->addAction(new QAction(tr("Disconnect"), this));
} else if (Deactivated == m_connectState) {
m_menu->addAction(new QAction(tr("Connect"), this));
qDebug() << "add connect action";
} else {
return;
}
@ -353,17 +354,9 @@ void WlanListItem::onNetButtonClicked()
return;
}
if ((Activating == m_connectState || Deactivating == m_connectState)) {
qDebug() << LOG_FLAG << "On wlan clicked! But there is nothing to do because it is already activating/deactivating!"
<< Q_FUNC_INFO << __LINE__;
return;
}
//执行连接或断开
if (Activated == m_connectState) {
m_wirelessConnectOperation->deActivateWirelessConnection(m_wlanDevice, m_wirelessNetItem.m_connectUuid);
qDebug()<<"[WlanListItem] Clicked on connected wifi, it will be inactivated. ssid = "
<< m_wirelessNetItem.m_NetSsid << Q_FUNC_INFO << __LINE__;
if (Deactivated != m_connectState) {
qDebug() << LOG_FLAG <<"the connection" << m_wirelessNetItem.m_connName
<< "is not deactived, so it can not be operation." << Q_FUNC_INFO << __LINE__;
return;
}
@ -496,9 +489,11 @@ void WlanListItem::updateConnectState(ConnectState state)
m_netButton->stopLoading();
m_netButton->setActive(true);
} else if(Deactivated == state) {
qDebug() << "[WlanListItem] stop loading connect state:" << state;
m_netButton->stopLoading();
m_netButton->setActive(false);
} else {
qDebug() << "[WlanListItem] start loading connect state:" << state;
m_netButton->startLoading();
}
@ -507,8 +502,12 @@ void WlanListItem::updateConnectState(ConnectState state)
void WlanListItem::onMenuTriggered(QAction *action)
{
if (action->text() == tr("Disconnect") || action->text() == tr("Connect")) {
if (action->text() == tr("Connect")) {
this->onNetButtonClicked();
} else if (action->text() == tr("Disconnect")) {
m_wirelessConnectOperation->deActivateWirelessConnection(m_wlanDevice, m_wirelessNetItem.m_connectUuid);
qDebug()<<"[WlanListItem] Clicked on connected wifi, it will be inactivated. ssid = "
<< m_wirelessNetItem.m_NetSsid << Q_FUNC_INFO << __LINE__;
} else if (action->text() == tr("Forget")) {
m_wirelessConnectOperation->deleteWirelessConnect(m_wirelessNetItem.m_connectUuid);
}

View File

@ -4,47 +4,47 @@
<context>
<name>CreatNetPage</name>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="30"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<source>Connection Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<source>Ipv4Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<source>Netmask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="37"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="47"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<source>Auto(DHCP)</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="49"/>
<source>Manual</source>
<translation type="unfinished"></translation>
</message>
@ -224,45 +224,57 @@
<context>
<name>LanListItem</name>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="37"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="39"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="68"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="92"/>
<source>Wired Device not carried</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="113"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="129"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="127"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="161"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="178"/>
<source>No ethernet device avaliable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="689"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="698"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="692"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="701"/>
<source>Activated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="700"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="709"/>
<source>Inactivated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="772"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="792"/>
<source>LAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="809"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="813"/>
<source>LAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>
@ -284,27 +296,27 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="115"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<location filename="../src/frontend/mainwindow.cpp" line="180"/>
<source>kylin-nm</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="144"/>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<location filename="../src/frontend/mainwindow.cpp" line="148"/>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="176"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="175"/>
<location filename="../src/frontend/mainwindow.cpp" line="177"/>
<source>Show MainWindow</source>
<translation type="unfinished"></translation>
</message>
@ -537,27 +549,27 @@
<context>
<name>TabPage</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="45"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="48"/>
<source>Current Device</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="49"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="52"/>
<source>Devices Closed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="92"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="124"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<source>Kylin NM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="130"/>
<source>kylin network applet desktop message</source>
<translation type="unfinished"></translation>
</message>
@ -608,69 +620,72 @@
<context>
<name>WlanListItem</name>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="34"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="35"/>
<source>Not connected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="116"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<source>Disconnect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="117"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="216"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="118"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="219"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="493"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="123"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="497"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="125"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="499"/>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="235"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="238"/>
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WlanMoreItem</name>
<message>
<location filename="../src/frontend/list-items/wlanmoreitem.cpp" line="8"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="69"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="65"/>
<source>WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="70"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="66"/>
<source>Activated WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="71"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="67"/>
<source>Other WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="94"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="142"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="124"/>
<source>No wireless network card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="752"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="731"/>
<source>WLAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="748"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="727"/>
<source>WLAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>

View File

@ -102,47 +102,47 @@
<context>
<name>CreatNetPage</name>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="30"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<source>Connection Name</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<source>Ipv4Config</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<source>Address</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<source>Netmask</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<source>Default Gateway</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<source>Prefs DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="37"/>
<source>Alternative DNS</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="47"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<source>Auto(DHCP)</source>
<translation type="unfinished">Oto(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="49"/>
<source>Manual</source>
<translation type="unfinished">Elle</translation>
</message>
@ -1250,45 +1250,57 @@
<context>
<name>LanListItem</name>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="37"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="39"/>
<source>Not connected</source>
<translation type="unfinished">Bağlanamadı</translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="68"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="92"/>
<source>Wired Device not carried</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="113"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="129"/>
<source>Disconnect</source>
<translation type="unfinished">Bağlantıyı Kes</translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="127"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="161"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="178"/>
<source>No ethernet device avaliable</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="689"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="698"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="692"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="701"/>
<source>Activated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="700"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="709"/>
<source>Inactivated LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="772"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="792"/>
<source>LAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="809"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="813"/>
<source>LAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>
@ -1310,7 +1322,7 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="115"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<location filename="../src/frontend/mainwindow.cpp" line="180"/>
<source>kylin-nm</source>
<translation></translation>
</message>
@ -1331,17 +1343,17 @@
<translation type="vanished">Gizli ı Bağlan</translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="144"/>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<source>LAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<location filename="../src/frontend/mainwindow.cpp" line="148"/>
<source>WLAN</source>
<translation>WLAN</translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="176"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
@ -1358,7 +1370,7 @@
<translation type="vanished">HotSpot</translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="175"/>
<location filename="../src/frontend/mainwindow.cpp" line="177"/>
<source>Show MainWindow</source>
<translation>Ana Pencereyi Göster</translation>
</message>
@ -1877,27 +1889,27 @@
<context>
<name>TabPage</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="45"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="48"/>
<source>Current Device</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="49"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="52"/>
<source>Devices Closed!</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="92"/>
<source>Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="124"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<source>Kylin NM</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="130"/>
<source>kylin network applet desktop message</source>
<translation type="unfinished">Kylin uygulaması masaüstü mesajı</translation>
</message>
@ -1955,69 +1967,72 @@
<context>
<name>WlanListItem</name>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="34"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="35"/>
<source>Not connected</source>
<translation type="unfinished">Bağlanamadı</translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="116"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<source>Disconnect</source>
<translation type="unfinished">Bağlantıyı Kes</translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="117"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="216"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="118"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="219"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="493"/>
<source>Connect</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="123"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="497"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="125"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="499"/>
<source>Forget</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="235"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="238"/>
<source>Auto Connect</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WlanMoreItem</name>
<message>
<location filename="../src/frontend/list-items/wlanmoreitem.cpp" line="8"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
</context>
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="69"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="65"/>
<source>WLAN</source>
<translation type="unfinished">WLAN</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="70"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="66"/>
<source>Activated WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="71"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="67"/>
<source>Other WLAN</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="94"/>
<source>More...</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="142"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="124"/>
<source>No wireless network card detected</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="752"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="731"/>
<source>WLAN Connected Successfully</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="748"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="727"/>
<source>WLAN Disconnected Successfully</source>
<translation type="unfinished"></translation>
</message>

Binary file not shown.

View File

@ -35,47 +35,47 @@
<context>
<name>CreatNetPage</name>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="30"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<source>Connection Name</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="31"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<source>Ipv4Config</source>
<translation>Ipv4配置</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="32"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<source>Address</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="33"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<source>Netmask</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="34"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<source>Default Gateway</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="35"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<source>Prefs DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="36"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="37"/>
<source>Alternative DNS</source>
<translation>DNS</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="47"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<source>Auto(DHCP)</source>
<translation>(DHCP)</translation>
</message>
<message>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="48"/>
<location filename="../src/frontend/netdetails/creatnetpage.cpp" line="49"/>
<source>Manual</source>
<translation></translation>
</message>
@ -485,45 +485,57 @@
<context>
<name>LanListItem</name>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="37"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="39"/>
<source>Not connected</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="68"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="92"/>
<source>Wired Device not carried</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="113"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="129"/>
<source>Disconnect</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/lanlistitem.cpp" line="127"/>
<source>Connect</source>
<translation></translation>
</message>
</context>
<context>
<name>LanPage</name>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="161"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="178"/>
<source>No ethernet device avaliable</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="689"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="698"/>
<source>LAN</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="692"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="701"/>
<source>Activated LAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="700"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="709"/>
<source>Inactivated LAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="809"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="813"/>
<source>LAN Disconnected Successfully</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="772"/>
<location filename="../src/frontend/tab-pages/lanpage.cpp" line="792"/>
<source>LAN Connected Successfully</source>
<translation>线</translation>
</message>
@ -545,29 +557,29 @@
<name>MainWindow</name>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="115"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<location filename="../src/frontend/mainwindow.cpp" line="180"/>
<source>kylin-nm</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="144"/>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<source>LAN</source>
<translatorcomment>线</translatorcomment>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="146"/>
<location filename="../src/frontend/mainwindow.cpp" line="148"/>
<source>WLAN</source>
<translatorcomment>线</translatorcomment>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="175"/>
<location filename="../src/frontend/mainwindow.cpp" line="177"/>
<source>Show MainWindow</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/mainwindow.cpp" line="176"/>
<location filename="../src/frontend/mainwindow.cpp" line="178"/>
<source>Settings</source>
<translatorcomment></translatorcomment>
<translation></translation>
@ -686,7 +698,7 @@
<message>
<location filename="../src/frontend/list-items/oneconnform.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>Connect</source>
@ -714,7 +726,7 @@
<message>
<location filename="../src/frontend/list-items/onelancform.ui" line="14"/>
<source>Form</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<source>Connect</source>
@ -857,27 +869,27 @@
<context>
<name>TabPage</name>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="45"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="48"/>
<source>Current Device</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="49"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="52"/>
<source>Devices Closed!</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="89"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="92"/>
<source>Settings</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="124"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<source>Kylin NM</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="127"/>
<location filename="../src/frontend/tab-pages/tabpage.cpp" line="130"/>
<source>kylin network applet desktop message</source>
<translation></translation>
</message>
@ -887,7 +899,7 @@
<message>
<location filename="../src/frontend/wificonfigdialog.ui" line="14"/>
<source>Dialog</source>
<translation type="unfinished"></translation>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/wificonfigdialog.cpp" line="21"/>
@ -928,69 +940,76 @@
<context>
<name>WlanListItem</name>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="34"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="35"/>
<source>Not connected</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="115"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="116"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<source>Disconnect</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="117"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="216"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="495"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="118"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="219"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="493"/>
<source>Connect</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="123"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="497"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="125"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="499"/>
<source>Forget</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="235"/>
<location filename="../src/frontend/list-items/wlanlistitem.cpp" line="238"/>
<source>Auto Connect</source>
<translation></translation>
</message>
</context>
<context>
<name>WlanMoreItem</name>
<message>
<location filename="../src/frontend/list-items/wlanmoreitem.cpp" line="8"/>
<source>More...</source>
<translation>...</translation>
</message>
</context>
<context>
<name>WlanPage</name>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="69"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="65"/>
<source>WLAN</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="142"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="124"/>
<source>No wireless network card detected</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="70"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="66"/>
<source>Activated WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="71"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="67"/>
<source>Other WLAN</source>
<translation></translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="94"/>
<source>More...</source>
<translation>...</translation>
<translation type="vanished">...</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="752"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="731"/>
<source>WLAN Connected Successfully</source>
<translation>线</translation>
</message>
<message>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="748"/>
<location filename="../src/frontend/tab-pages/wlanpage.cpp" line="727"/>
<source>WLAN Disconnected Successfully</source>
<translation>线</translation>
</message>