diff --git a/translations/fa_IR.ts b/translations/fa_IR.ts index dd49f38..1949bc1 100644 --- a/translations/fa_IR.ts +++ b/translations/fa_IR.ts @@ -1377,10 +1377,6 @@ This needs to be run NekoBox with administrator privileges. Not Running در حال اجرا نیست - - Running: %1 - - None هیچ یک diff --git a/translations/ru_RU.ts b/translations/ru_RU.ts index 7c9d86d..b103325 100644 --- a/translations/ru_RU.ts +++ b/translations/ru_RU.ts @@ -1404,7 +1404,7 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun Running: %1 - Работает: %1 + Работает: %1 None diff --git a/translations/zh_CN.ts b/translations/zh_CN.ts index 4eeff52..a1b8e91 100644 --- a/translations/zh_CN.ts +++ b/translations/zh_CN.ts @@ -1199,7 +1199,7 @@ This needs to be run NekoBox with administrator privileges. Running: %1 - 正在运行: %1 + 正在运行: %1 None diff --git a/ui/mainwindow.cpp b/ui/mainwindow.cpp index f8ca55b..914303b 100644 --- a/ui/mainwindow.cpp +++ b/ui/mainwindow.cpp @@ -840,9 +840,15 @@ void MainWindow::refresh_status(const QString &traffic_update) { refresh_speed_label(); // From UI + QString group_name; + if (running != nullptr) { + auto group = NekoGui::profileManager->GetGroup(running->gid); + if (group != nullptr) group_name = group->name; + } + if (last_test_time.addSecs(2) < QTime::currentTime()) { auto txt = running == nullptr ? tr("Not Running") - : tr("Running: %1").arg(running->bean->DisplayName().left(50)); + : QString("[%1] %2").arg(group_name, running->bean->DisplayName()).left(30); ui->label_running->setText(txt); } // @@ -869,14 +875,15 @@ void MainWindow::refresh_status(const QString &traffic_update) { if (!isTray && NekoGui::IsAdmin()) tt << "[Admin]"; if (select_mode) tt << "[" + tr("Select") + "]"; if (!title_error.isEmpty()) tt << "[" + title_error + "]"; - if (NekoGui::dataStore->spmode_vpn) tt << "[VPN]"; - if (NekoGui::dataStore->spmode_system_proxy) tt << "[" + tr("System Proxy") + "]"; + if (NekoGui::dataStore->spmode_vpn && !NekoGui::dataStore->spmode_system_proxy) tt << "[Tun]"; + if (!NekoGui::dataStore->spmode_vpn && NekoGui::dataStore->spmode_system_proxy) tt << "[" + tr("System Proxy") + "]"; + if (NekoGui::dataStore->spmode_vpn && NekoGui::dataStore->spmode_system_proxy) tt << "[Tun+" + tr("System Proxy") + "]"; tt << software_name; if (!isTray) tt << "(" + QString(NKR_VERSION) + ")"; if (!NekoGui::dataStore->active_routing.isEmpty() && NekoGui::dataStore->active_routing != "Default") { tt << "[" + NekoGui::dataStore->active_routing + "]"; } - if (running != nullptr) tt << running->bean->DisplayTypeAndName(); + if (running != nullptr) tt << running->bean->DisplayTypeAndName() + "@" + group_name; return tt.join(isTray ? "\n" : " "); }; diff --git a/ui/mainwindow.ui b/ui/mainwindow.ui index c3f59b2..f0a018d 100644 --- a/ui/mainwindow.ui +++ b/ui/mainwindow.ui @@ -256,6 +256,9 @@ QAbstractItemView::ScrollPerPixel + + false + 16