chore: connection list icon

sibalma · Jan 12, 2023 · 51e00ee · 51e00ee
1 parent 6a344bc
commit 51e00ee
Show file tree

Hide file tree

Showing 9 changed files with 34 additions and 19 deletions.
diff --git a/res/icon/material/cancel.svg b/res/icon/material/cancel.svg
diff --git a/res/icon/material/history.svg b/res/icon/material/history.svg
diff --git a/res/icon/material/swap-vertical.svg b/res/icon/material/swap-vertical.svg
diff --git a/res/neko.qrc b/res/neko.qrc
@@ -8,6 +8,9 @@
         <file alias="icon/b-system-software-update.svg">icon/system-software-update.svg</file>
         <file>icon/material/lock-open-outline.svg</file>
         <file>icon/material/lock-outline.svg</file>
+        <file>icon/material/cancel.svg</file>
+        <file>icon/material/history.svg</file>
+        <file>icon/material/swap-vertical.svg</file>
     </qresource>
     <qresource prefix="/neko">
         <file alias="nekobox.png">public/nekobox.png</file>

diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts
@@ -1177,11 +1177,11 @@ Split by line.</source>
     </message>
     <message>
         <source>End</source>
-        <translation>پایان</translation>
+        <translation type="vanished">پایان</translation>
     </message>
     <message>
         <source>Active</source>
-        <translation>فعال</translation>
+        <translation type="vanished">فعال</translation>
     </message>
     <message>
         <source>Start: %1

diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts
@@ -1009,11 +1009,11 @@
     </message>
     <message>
         <source>End</source>
-        <translation>结束</translation>
+        <translation type="vanished">结束</translation>
     </message>
     <message>
         <source>Active</source>
-        <translation>活动</translation>
+        <translation type="vanished">活动</translation>
     </message>
     <message>
         <source>Start: %1

diff --git a/ui/Icon.cpp b/ui/Icon.cpp
@@ -4,7 +4,7 @@
 
 #include <QPainter>
 
-QIcon Icon::GetTrayIcon(Icon::TrayIconStatus status) {
+QPixmap Icon::GetTrayIcon(Icon::TrayIconStatus status) {
     QPixmap pixmap;
 
     // software embedded icon
@@ -47,7 +47,7 @@ QIcon Icon::GetTrayIcon(Icon::TrayIconStatus status) {
     return pixmap;
 }
 
-QIcon Icon::GetMaterialIcon(const QString &name) {
+QPixmap Icon::GetMaterialIcon(const QString &name) {
     QPixmap pixmap(":/icon/material/" + name + ".svg");
     return pixmap;
 }
diff --git a/ui/Icon.hpp b/ui/Icon.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <QIcon>
+#include <QPixmap>
 
 namespace Icon {
 
@@ -11,8 +11,8 @@ namespace Icon {
         VPN,
     };
 
-    QIcon GetTrayIcon(TrayIconStatus status);
+    QPixmap GetTrayIcon(TrayIconStatus status);
 
-    QIcon GetMaterialIcon(const QString &name);
+    QPixmap GetMaterialIcon(const QString &name);
 
 } // namespace Icon
diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp
@@ -1438,27 +1438,36 @@ void MainWindow::refresh_connection_list(const QJsonArray &arr) {
         row++;
         ui->tableWidget_conn->insertRow(row);
 
+        auto f0 = std::make_unique<QTableWidgetItem>();
+        f0->setData(114514, item["ID"].toInt());
+
         // C0: Status
-        auto *f = new QTableWidgetItem("");
-        f->setData(114514, item["ID"].toInt());
+        auto c0 = new QLabel;
         auto start_t = item["Start"].toInt();
         auto end_t = item["End"].toInt();
-        if (end_t > 0) {
-            f->setText(tr("End"));
+        // icon
+        auto outboundTag = item["Tag"].toString();
+        if (outboundTag == "block") {
+            c0->setPixmap(Icon::GetMaterialIcon("cancel"));
         } else {
-            f->setText(tr("Active"));
+            if (end_t > 0) {
+                c0->setPixmap(Icon::GetMaterialIcon("history"));
+            } else {
+                c0->setPixmap(Icon::GetMaterialIcon("swap-vertical"));
+            }
         }
-        f->setToolTip(tr("Start: %1\nEnd: %2").arg(DisplayTime(start_t), end_t > 0 ? DisplayTime(end_t) : ""));
-        ui->tableWidget_conn->setItem(row, 0, f);
+        c0->setAlignment(Qt::AlignCenter);
+        c0->setToolTip(tr("Start: %1\nEnd: %2").arg(DisplayTime(start_t), end_t > 0 ? DisplayTime(end_t) : ""));
+        ui->tableWidget_conn->setCellWidget(row, 0, c0);
 
         // C1: Outbound
-        f = f->clone();
+        auto f = f0->clone();
         f->setToolTip("");
-        f->setText(item["Tag"].toString());
+        f->setText(outboundTag);
         ui->tableWidget_conn->setItem(row, 1, f);
 
         // C2: Destination
-        f = f->clone();
+        f = f0->clone();
         QString target1 = item["Dest"].toString();
         QString target2 = item["RDest"].toString();
         if (target2.isEmpty() || target1 == target2) {