Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-17 20:44:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

optimize title

Browse Source
This commit is contained in:
arm64v8a
2023-07-25 14:15:01 +09:00
parent f69fec5ac7
commit 23f4256e18
5 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
translations/fa_IR.ts
View File

@@ -1377,10 +1377,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Not Running</source> <source>Not Running</source>
<translation>در حال اجرا نیست</translation> <translation>در حال اجرا نیست</translation>
</message> </message>
<message>
<source>Running: %1</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>None</source> <source>None</source>
<translatorcomment>هیچ یک</translatorcomment> <translatorcomment>هیچ یک</translatorcomment>

2
translations/ru_RU.ts
View File

@@ -1404,7 +1404,7 @@ https://matsuridayo.github.io/n-configuration/#vpn-tun</translation>
</message> </message>
<message> <message>
<source>Running: %1</source> <source>Running: %1</source>
<translation>Работает: %1</translation> <translation type="vanished">Работает: %1</translation>
</message> </message>
<message> <message>
<source>None</source> <source>None</source>

2
translations/zh_CN.ts
View File

@@ -1199,7 +1199,7 @@ This needs to be run NekoBox with administrator privileges.</source>
</message> </message>
<message> <message>
<source>Running: %1</source> <source>Running: %1</source>
<translation>正在运行: %1</translation> <translation type="vanished">正在运行: %1</translation>
</message> </message>
<message> <message>
<source>None</source> <source>None</source>

15
ui/mainwindow.cpp
View File

@@ -840,9 +840,15 @@ void MainWindow::refresh_status(const QString &traffic_update) {
refresh_speed_label(); refresh_speed_label();
// From UI // 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()) { if (last_test_time.addSecs(2) < QTime::currentTime()) {
auto txt = running == nullptr ? tr("Not Running") 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); ui->label_running->setText(txt);
} }
// //
@@ -869,14 +875,15 @@ void MainWindow::refresh_status(const QString &traffic_update) {
if (!isTray && NekoGui::IsAdmin()) tt << "[Admin]"; if (!isTray && NekoGui::IsAdmin()) tt << "[Admin]";
if (select_mode) tt << "[" + tr("Select") + "]"; if (select_mode) tt << "[" + tr("Select") + "]";
if (!title_error.isEmpty()) tt << "[" + title_error + "]"; if (!title_error.isEmpty()) tt << "[" + title_error + "]";
if (NekoGui::dataStore->spmode_vpn) tt << "[VPN]"; if (NekoGui::dataStore->spmode_vpn && !NekoGui::dataStore->spmode_system_proxy) tt << "[Tun]";
if (NekoGui::dataStore->spmode_system_proxy) tt << "[" + tr("System Proxy") + "]"; 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; tt << software_name;
if (!isTray) tt << "(" + QString(NKR_VERSION) + ")"; if (!isTray) tt << "(" + QString(NKR_VERSION) + ")";
if (!NekoGui::dataStore->active_routing.isEmpty() && NekoGui::dataStore->active_routing != "Default") { if (!NekoGui::dataStore->active_routing.isEmpty() && NekoGui::dataStore->active_routing != "Default") {
tt << "[" + NekoGui::dataStore->active_routing + "]"; 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" : " "); return tt.join(isTray ? "\n" : " ");
}; };

3
ui/mainwindow.ui
View File

@@ -256,6 +256,9 @@
<property name="horizontalScrollMode"> <property name="horizontalScrollMode">
<enum>QAbstractItemView::ScrollPerPixel</enum> <enum>QAbstractItemView::ScrollPerPixel</enum>
</property> </property>
<property name="wordWrap">
<bool>false</bool>
</property>
<attribute name="horizontalHeaderMinimumSectionSize"> <attribute name="horizontalHeaderMinimumSectionSize">
<number>16</number> <number>16</number>
</attribute> </attribute>