diff --git a/nmqrc.qrc b/nmqrc.qrc
index 7051d9fd..809d1154 100644
--- a/nmqrc.qrc
+++ b/nmqrc.qrc
@@ -14,18 +14,6 @@
res/s/conning-b/11.png
res/s/conning-b/12.png
res/g/down_arrow.png
- res/s/conning-s/1.png
- res/s/conning-s/2.png
- res/s/conning-s/3.png
- res/s/conning-s/4.png
- res/s/conning-s/5.png
- res/s/conning-s/6.png
- res/s/conning-s/7.png
- res/s/conning-s/8.png
- res/s/conning-s/9.png
- res/s/conning-s/10.png
- res/s/conning-s/11.png
- res/s/conning-s/12.png
res/s/rescan/1.png
res/s/rescan/2.png
res/s/rescan/3.png
@@ -77,5 +65,17 @@
qss/style.qss
res/g/close_black.png
res/g/close_white.png
+ res/s/conning-s/1.png
+ res/s/conning-s/2.png
+ res/s/conning-s/3.png
+ res/s/conning-s/4.png
+ res/s/conning-s/5.png
+ res/s/conning-s/6.png
+ res/s/conning-s/7.png
+ res/s/conning-s/8.png
+ res/s/conning-s/9.png
+ res/s/conning-s/10.png
+ res/s/conning-s/11.png
+ res/s/conning-s/12.png
diff --git a/res/s/conning-s/1.png b/res/s/conning-s/1.png
index ca0f327b..69747259 100644
Binary files a/res/s/conning-s/1.png and b/res/s/conning-s/1.png differ
diff --git a/res/s/conning-s/10.png b/res/s/conning-s/10.png
index 5c7a8b59..964a3009 100644
Binary files a/res/s/conning-s/10.png and b/res/s/conning-s/10.png differ
diff --git a/res/s/conning-s/11.png b/res/s/conning-s/11.png
index 40cada11..d4659b52 100644
Binary files a/res/s/conning-s/11.png and b/res/s/conning-s/11.png differ
diff --git a/res/s/conning-s/12.png b/res/s/conning-s/12.png
index e287a158..cb0272e3 100644
Binary files a/res/s/conning-s/12.png and b/res/s/conning-s/12.png differ
diff --git a/res/s/conning-s/1x/1.png b/res/s/conning-s/1x/1.png
new file mode 100644
index 00000000..258bd704
Binary files /dev/null and b/res/s/conning-s/1x/1.png differ
diff --git a/res/s/conning-s/1x/10.png b/res/s/conning-s/1x/10.png
new file mode 100644
index 00000000..88398b80
Binary files /dev/null and b/res/s/conning-s/1x/10.png differ
diff --git a/res/s/conning-s/1x/11.png b/res/s/conning-s/1x/11.png
new file mode 100644
index 00000000..7157960f
Binary files /dev/null and b/res/s/conning-s/1x/11.png differ
diff --git a/res/s/conning-s/1x/12.png b/res/s/conning-s/1x/12.png
new file mode 100644
index 00000000..60b88e98
Binary files /dev/null and b/res/s/conning-s/1x/12.png differ
diff --git a/res/s/conning-s/1x/2.png b/res/s/conning-s/1x/2.png
new file mode 100644
index 00000000..45eedb2b
Binary files /dev/null and b/res/s/conning-s/1x/2.png differ
diff --git a/res/s/conning-s/1x/3.png b/res/s/conning-s/1x/3.png
new file mode 100644
index 00000000..96cfdad7
Binary files /dev/null and b/res/s/conning-s/1x/3.png differ
diff --git a/res/s/conning-s/1x/4.png b/res/s/conning-s/1x/4.png
new file mode 100644
index 00000000..c8a9a982
Binary files /dev/null and b/res/s/conning-s/1x/4.png differ
diff --git a/res/s/conning-s/1x/5.png b/res/s/conning-s/1x/5.png
new file mode 100644
index 00000000..0595e6b9
Binary files /dev/null and b/res/s/conning-s/1x/5.png differ
diff --git a/res/s/conning-s/1x/6.png b/res/s/conning-s/1x/6.png
new file mode 100644
index 00000000..274f5a8f
Binary files /dev/null and b/res/s/conning-s/1x/6.png differ
diff --git a/res/s/conning-s/1x/7.png b/res/s/conning-s/1x/7.png
new file mode 100644
index 00000000..c49a271f
Binary files /dev/null and b/res/s/conning-s/1x/7.png differ
diff --git a/res/s/conning-s/1x/8.png b/res/s/conning-s/1x/8.png
new file mode 100644
index 00000000..94946d6a
Binary files /dev/null and b/res/s/conning-s/1x/8.png differ
diff --git a/res/s/conning-s/1x/9.png b/res/s/conning-s/1x/9.png
new file mode 100644
index 00000000..87f74199
Binary files /dev/null and b/res/s/conning-s/1x/9.png differ
diff --git a/res/s/conning-s/2.png b/res/s/conning-s/2.png
index d831e68e..eb6a4a41 100644
Binary files a/res/s/conning-s/2.png and b/res/s/conning-s/2.png differ
diff --git a/res/s/conning-s/3.png b/res/s/conning-s/3.png
index 34b099d2..f985e8cf 100644
Binary files a/res/s/conning-s/3.png and b/res/s/conning-s/3.png differ
diff --git a/res/s/conning-s/4.png b/res/s/conning-s/4.png
index fc2cb87d..e8645dc4 100644
Binary files a/res/s/conning-s/4.png and b/res/s/conning-s/4.png differ
diff --git a/res/s/conning-s/5.png b/res/s/conning-s/5.png
index 976bdf5e..089e6710 100644
Binary files a/res/s/conning-s/5.png and b/res/s/conning-s/5.png differ
diff --git a/res/s/conning-s/6.png b/res/s/conning-s/6.png
index 76983cb9..aee7edf2 100644
Binary files a/res/s/conning-s/6.png and b/res/s/conning-s/6.png differ
diff --git a/res/s/conning-s/7.png b/res/s/conning-s/7.png
index 920b387e..914deea1 100644
Binary files a/res/s/conning-s/7.png and b/res/s/conning-s/7.png differ
diff --git a/res/s/conning-s/8.png b/res/s/conning-s/8.png
index 14d6a635..b3de2879 100644
Binary files a/res/s/conning-s/8.png and b/res/s/conning-s/8.png differ
diff --git a/res/s/conning-s/9.png b/res/s/conning-s/9.png
index 0c5dd348..ffbdb739 100644
Binary files a/res/s/conning-s/9.png and b/res/s/conning-s/9.png differ
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 2b747e36..911b1c4b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -587,25 +587,25 @@ void MainWindow::createTrayIcon()
trayIcon->setContextMenu(trayIconMenu);
// 初始化托盘所有Icon
- iconLanOnline = QIcon::fromTheme("nm-device-wired");
- iconLanOffline = QIcon::fromTheme("nm-no-connection");
- iconWifiFull = QIcon::fromTheme("nm-signal-100");
- iconWifiHigh = QIcon::fromTheme("nm-signal-75");
- iconWifiMedium = QIcon::fromTheme("nm-signal-50");
- iconWifiLow = QIcon::fromTheme("nm-signal-25");
+ iconLanOnline = QIcon::fromTheme("network-wired-symbolic");
+ iconLanOffline = QIcon::fromTheme("network-wired-offline-symbolic");
+ iconWifiFull = QIcon::fromTheme("network-wireless-signal-excellent-symbolic");
+ iconWifiHigh = QIcon::fromTheme("network-wireless-signal-good-symbolic");
+ iconWifiMedium = QIcon::fromTheme("network-wireless-signal-ok");
+ iconWifiLow = QIcon::fromTheme("network-wireless-signal-low");
- loadIcons.append(QIcon(":/res/s/conning-s/1.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/2.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/3.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/4.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/5.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/6.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/7.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/8.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/9.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/10.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/11.png"));
- loadIcons.append(QIcon(":/res/s/conning-s/12.png"));
+ loadIcons.append(QIcon::fromTheme("network-1"));
+ loadIcons.append(QIcon::fromTheme("network-2"));
+ loadIcons.append(QIcon::fromTheme("network-3"));
+ loadIcons.append(QIcon::fromTheme("network-4"));
+ loadIcons.append(QIcon::fromTheme("network-5"));
+ loadIcons.append(QIcon::fromTheme("network-6"));
+ loadIcons.append(QIcon::fromTheme("network-7"));
+ loadIcons.append(QIcon::fromTheme("network-8"));
+ loadIcons.append(QIcon::fromTheme("network-9"));
+ loadIcons.append(QIcon::fromTheme("network-10"));
+ loadIcons.append(QIcon::fromTheme("network-11"));
+ loadIcons.append(QIcon::fromTheme("network-12"));
iconTimer = new QTimer(this);
connect(iconTimer, SIGNAL(timeout()), this, SLOT(iconStep()));
@@ -691,7 +691,7 @@ void MainWindow::handleIconClicked()
int n = objKyDBus->getTaskBarPos("position");
int m = objKyDBus->getTaskBarHeight("height");
- int d = 3; //窗口边沿到任务栏距离
+ int d = 2; //窗口边沿到任务栏距离
if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){
if(n == 0){
@@ -751,7 +751,7 @@ void MainWindow::showTrayIconMenu()
int n = objKyDBus->getTaskBarPos("position");
int m = objKyDBus->getTaskBarHeight("height");
- int d = 3; //窗口边沿到任务栏距离
+ int d = 4; //窗口边沿到任务栏距离
int s = 80; //窗口边沿到屏幕边沿距离
if (screenGeometry.width() == availableGeometry.width() && screenGeometry.height() == availableGeometry.height()){