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

kylin-nm 1.0.4

This commit is contained in:
chenlelin 2019-09-24 13:12:41 +08:00
parent f93003c742
commit 23c5b35bdc
4 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
backthread.cpp
View File

@ -106,11 +106,20 @@ void BackThread::execDisWifi(){
} }
void BackThread::execConnLan(QString connName){ void BackThread::execConnLan(QString connName){
QFile sys_carrier("/sys/class/net/enp3s0/carrier"); QString net_card = "ifconfig>/tmp/kylin-nm-ifconfig";
if(!sys_carrier.open(QIODevice::ReadOnly | QIODevice::Text)) system(net_card.toUtf8().data());
{ QFile file("/tmp/kylin-nm-ifconfig");
qDebug()<<"Can't open the system file carrier!"<<endl; if(!file.open(QIODevice::ReadOnly | QIODevice::Text)) {
qDebug()<<"Can't open the file kylin-nm-ifconfig!"<<endl;
} }
QString txt = file.readLine();
QString strType = txt.mid(0, 6);
QString carrierPath ="/sys/class/net/" + strType + "/carrier";
QFile sys_carrier(carrierPath);
if(!sys_carrier.open(QIODevice::ReadOnly | QIODevice::Text)){
qDebug()<<"Can't open the file carrier in documentary enp1s0"<<endl;
}
QString sys_line = sys_carrier.readLine(); QString sys_line = sys_carrier.readLine();
sys_carrier.close(); sys_carrier.close();
if(sys_line.indexOf("1") != -1){ if(sys_line.indexOf("1") != -1){
@ -125,8 +134,7 @@ void BackThread::execConnLan(QString connName){
} }
void BackThread::execConnWifi(QString connName){ void BackThread::execConnWifi(QString connName){
// QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'"; QString cmd = "/usr/share/kylin-nm/shell/connup.sh '" + connName + "'";
QString cmd = "/home/chenlelin/kylin-nm/kylin-nm/connup.sh '" + connName + "'";
system(cmd.toUtf8().data()); system(cmd.toUtf8().data());
QFile file("/tmp/kylin-nm-btoutput_"); QFile file("/tmp/kylin-nm-btoutput_");

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
kylin-nm (1.0.4-0ubuntu1) eoan; urgency=medium
* Bug-fix:
- Fix the bug which can not show correct icon size when change the height of taskbar
-- handsome_feng <jianfengli@ubuntukylin.com> Mon, 23 Sep 2019 16:51:40 +0800
kylin-nm (1.0.3-0ubuntu1) eoan; urgency=medium kylin-nm (1.0.3-0ubuntu1) eoan; urgency=medium
* Bug-fix: * Bug-fix:

2
kylin-nm.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject> <!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 4.6.2, 2019-09-16T09:14:14. --> <!-- Written by QtCreator 4.6.2, 2019-09-24T13:06:38. -->
<qtcreator> <qtcreator>
<data> <data>
<variable>EnvironmentId</variable> <variable>EnvironmentId</variable>

4
mainwindow.cpp
View File

@ -180,8 +180,8 @@ void MainWindow::createTrayIcon()
trayIcon->setContextMenu(trayIconMenu); trayIcon->setContextMenu(trayIconMenu);
// 初始化托盘所有Icon // 初始化托盘所有Icon
QString iconDir = "/usr/share/icons/ukui-icon-theme/16x16/panel/"; QString iconDir = "/usr/share/icons/ukui-icon-theme/48x48/status/";
iconLanOnline = QIcon(iconDir + "nm-device-wired.png"); iconLanOnline = QIcon(iconDir + "nm-device-wire.png");
iconLanOffline = QIcon(iconDir + "nm-no-connection.png"); iconLanOffline = QIcon(iconDir + "nm-no-connection.png");
iconWifiFull = QIcon(iconDir + "nm-signal-100.png"); iconWifiFull = QIcon(iconDir + "nm-signal-100.png");
iconWifiHigh = QIcon(iconDir + "nm-signal-75.png"); iconWifiHigh = QIcon(iconDir + "nm-signal-75.png");