Mirrors/nekoray
1
0
Fork 0
mirror of https://github.com/MatsuriDayo/nekoray.git synced 2025-12-18 13:04:37 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

update ui

Browse Source
This commit is contained in:
arm64v8a
2023-06-05 14:34:15 +09:00
parent 1e9fa7eab4
commit 292a36eefb
18 changed files with 237 additions and 162 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
db/Database.cpp
View File

@@ -136,12 +136,11 @@ namespace NekoGui {
if (latency < 0) { if (latency < 0) {
return Qt::red; return Qt::red;
} else if (latency > 0) { } else if (latency > 0) {
if (latency < 100) { auto greenMs = dataStore->test_latency_url.startsWith("https://") ? 200 : 100;
if (latency < greenMs) {
return Qt::darkGreen; return Qt::darkGreen;
} else if (latency < 200) {
return Qt::darkYellow;
} else { } else {
return Qt::red; return Qt::darkYellow;
} }
} else { } else {
return {}; return {};

2
fmt/CustomBean.hpp
View File

@@ -31,7 +31,7 @@ namespace NekoGui_fmt {
return core; return core;
}; };
QString DisplayCoreType() override { return NeedExternal(false) ? core : software_core_name; }; QString DisplayCoreType() override { return NeedExternal(true) == 0 ? software_core_name : core; };
QString DisplayAddress() override { QString DisplayAddress() override {
if (core == "internal") { if (core == "internal") {

2
fmt/HysteriaBean.hpp
View File

@@ -63,7 +63,7 @@ namespace NekoGui_fmt {
return ::DisplayAddress(serverAddress, serverPort); return ::DisplayAddress(serverAddress, serverPort);
} }
QString DisplayCoreType() override { return NeedExternal(false) == 0 ? software_core_name : "Hysteria"; }; QString DisplayCoreType() override { return NeedExternal(true) == 0 ? software_core_name : "Hysteria"; };
QString DisplayType() override { return "Hysteria"; }; QString DisplayType() override { return "Hysteria"; };

12
go/cmd/updater/launcher.go Normal file
View File

@@ -0,0 +1,12 @@
//go:build !linux
package main
import (
"log"
"runtime"
)
func Launcher() {
log.Fatalln("launcher is not for your platform", runtime.GOOS)
}

5
go/cmd/updater/launcher_darwin.go
View File

@@ -1,5 +0,0 @@
package main
func Launcher() {
println("?")
}

10
go/cmd/updater/launcher_windows.go
View File

@@ -1,10 +0,0 @@
package main
import (
"log"
"runtime"
)
func Launcher() {
log.Fatalf("launcher is not for your platform", runtime.GOOS)
}

7
go/cmd/updater/msgbox.go Normal file
View File

@@ -0,0 +1,7 @@
//go:build !windows
package main
func MessageBoxPlain(title, caption string) int {
return 0
}

26
go/cmd/updater/msgbox_windows.go Normal file
View File

@@ -0,0 +1,26 @@
package main
import (
"syscall"
"unsafe"
)
// MessageBoxPlain of Win32 API.
func MessageBoxPlain(title, caption string) int {
const (
NULL = 0
MB_OK = 0
)
return MessageBox(NULL, caption, title, MB_OK)
}
// MessageBox of Win32 API.
func MessageBox(hwnd uintptr, caption, title string, flags uint) int {
ret, _, _ := syscall.NewLazyDLL("user32.dll").NewProc("MessageBoxW").Call(
uintptr(hwnd),
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(caption))),
uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(title))),
uintptr(flags))
return int(ret)
}

1
go/cmd/updater/updater.go
View File

@@ -64,6 +64,7 @@ func Updater() {
// update move // update move
err := Mv("./nekoray_update/nekoray", "./") err := Mv("./nekoray_update/nekoray", "./")
if err != nil { if err != nil {
MessageBoxPlain("NekoGui Updater", "Update failed. Please close the running instance and run the updater again.\n\n"+err.Error())
log.Fatalln(err.Error()) log.Fatalln(err.Error())
} }

10
main/NekoGui_Utils.cpp
View File

@@ -5,6 +5,7 @@
#include <random> #include <random>
#include <QApplication>
#include <QUrlQuery> #include <QUrlQuery>
#include <QTcpServer> #include <QTcpServer>
#include <QTimer> #include <QTimer>
@@ -194,9 +195,12 @@ QString DisplayTime(long long time, int formatType) {
} }
QWidget *GetMessageBoxParent() { QWidget *GetMessageBoxParent() {
if (mainwindow == nullptr) return nullptr; auto activeWindow = QApplication::activeWindow();
if (mainwindow->isVisible()) return mainwindow; if (activeWindow == nullptr && mainwindow != nullptr) {
return nullptr; if (mainwindow->isVisible()) return mainwindow;
return nullptr;
}
return activeWindow;
} }
int MessageBoxWarning(const QString &title, const QString &text) { int MessageBoxWarning(const QString &title, const QString &text) {

12
translations/fa_IR.ts
View File

@@ -769,6 +769,10 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Select Profile</source> <source>Select Profile</source>
<translation>انتخاب کردن پروفایل</translation> <translation>انتخاب کردن پروفایل</translation>
</message> </message>
<message>
<source>Name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditCustom</name> <name>EditCustom</name>
@@ -816,6 +820,10 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Please fill the complete config.</source> <source>Please fill the complete config.</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Name cannot be empty.</source>
<translation type="unfinished"></translation>
</message>
</context> </context>
<context> <context>
<name>EditHysteria</name> <name>EditHysteria</name>
@@ -1360,10 +1368,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Remove %1 item(s) ?</source> <source>Remove %1 item(s) ?</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>
</message> </message>
<message>
<source>Reset traffic of %1 item(s) ?</source>
<translation type="unfinished"></translation>
</message>
<message> <message>
<source>Copied %1 item(s)</source> <source>Copied %1 item(s)</source>
<translation type="unfinished"></translation> <translation type="unfinished"></translation>

12
translations/zh_CN.ts
View File

@@ -767,6 +767,10 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Traffic order is from top to bottom</source> <source>Traffic order is from top to bottom</source>
<translation>流量顺序是从上到下（最后一个配置为流量的出口）</translation> <translation>流量顺序是从上到下（最后一个配置为流量的出口）</translation>
</message> </message>
<message>
<source>Name cannot be empty.</source>
<translation>名称 不能为空</translation>
</message>
</context> </context>
<context> <context>
<name>EditCustom</name> <name>EditCustom</name>
@@ -814,6 +818,10 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Please fill the complete config.</source> <source>Please fill the complete config.</source>
<translation>请填写完整配置。</translation> <translation>请填写完整配置。</translation>
</message> </message>
<message>
<source>Name cannot be empty.</source>
<translation>名称 不能为空</translation>
</message>
</context> </context>
<context> <context>
<name>EditHysteria</name> <name>EditHysteria</name>
@@ -1169,10 +1177,6 @@ This needs to be run NekoBox with administrator privileges.</source>
<source>Remove %1 item(s) ?</source> <source>Remove %1 item(s) ?</source>
<translation>删除 %1 个项目？</translation> <translation>删除 %1 个项目？</translation>
</message> </message>
<message>
<source>Reset traffic of %1 item(s) ?</source>
<translation>重置 %1 个项目的流量？</translation>
</message>
<message> <message>
<source>Config copied</source> <source>Config copied</source>
<translation>配置已复制</translation> <translation>配置已复制</translation>

233
ui/dialog_basic_settings.ui
View File

@@ -522,113 +522,88 @@
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_3"> <layout class="QVBoxLayout" name="verticalLayout_3">
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_22"> <widget class="QWidget" name="assest_group" native="true">
<item> <layout class="QGridLayout" name="gridLayout_2">
<widget class="QLabel" name="label_12"> <item row="0" column="0">
<property name="text"> <widget class="QLabel" name="label_12">
<string>Asset Location</string> <property name="text">
</property> <string>Asset Location</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="MyLineEdit" name="core_v2ray_asset"> <item row="0" column="1">
<property name="placeholderText"> <layout class="QGridLayout" name="gridLayout_4">
<string>Default: dir of &quot;nekoray&quot;</string> <item row="0" column="0">
</property> <widget class="MyLineEdit" name="core_v2ray_asset">
</widget> <property name="placeholderText">
</item> <string>Default: dir of &quot;nekoray&quot;</string>
<item> </property>
<widget class="QPushButton" name="core_v2ray_asset_pick"> </widget>
<property name="text"> </item>
<string>Select</string> <item row="0" column="1">
</property> <widget class="QPushButton" name="core_v2ray_asset_pick">
</widget> <property name="text">
</item> <string>Select</string>
</layout> </property>
</item> </widget>
<item> </item>
<layout class="QHBoxLayout" name="horizontalLayout_21"> </layout>
<item> </item>
<widget class="QLabel" name="label_10"> <item row="1" column="0">
<property name="text"> <widget class="QLabel" name="label_3">
<string>Switch core</string> <property name="text">
</property> <string notr="true">Loglevel</string>
</widget> </property>
</item> </widget>
<item> </item>
<widget class="QRadioButton" name="switch_core_v2ray"> <item row="1" column="1">
<property name="text"> <widget class="QComboBox" name="log_level">
<string notr="true">V2Ray</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
</widget> <horstretch>0</horstretch>
</item> <verstretch>0</verstretch>
<item> </sizepolicy>
<widget class="QRadioButton" name="switch_core_sing_box"> </property>
<property name="text"> </widget>
<string notr="true">sing-box</string> </item>
</property> <item row="2" column="0">
</widget> <widget class="QLabel" name="label_6">
</item> <property name="text">
</layout> <string>Multiplex (mux)</string>
</item> </property>
</layout> </widget>
</widget> </item>
</item> <item row="2" column="1">
<item> <layout class="QHBoxLayout" name="horizontalLayout">
<widget class="QGroupBox" name="groupBox_log"> <item>
<property name="sizePolicy"> <widget class="QComboBox" name="mux_protocol"/>
<sizepolicy hsizetype="Preferred" vsizetype="Maximum"> </item>
<horstretch>0</horstretch> <item>
<verstretch>0</verstretch> <widget class="QLabel" name="label_7">
</sizepolicy> <property name="text">
</property> <string>concurrency</string>
<layout class="QHBoxLayout" name="horizontalLayout"> </property>
<item> </widget>
<widget class="QLabel" name="label_3"> </item>
<property name="text"> <item>
<string notr="true">Loglevel</string> <widget class="QLineEdit" name="mux_concurrency"/>
</property> </item>
<item>
<widget class="QCheckBox" name="mux_default_on">
<property name="text">
<string>Default On</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="log_level"/> <widget class="QPushButton" name="core_settings">
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_mux">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_17">
<item>
<widget class="QLabel" name="label_6">
<property name="text"> <property name="text">
<string>Multiplex (mux)</string> <string>Core Options</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="mux_protocol"/>
</item>
<item>
<widget class="QLabel" name="label_7">
<property name="text">
<string>concurrency</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="mux_concurrency"/>
</item>
<item>
<widget class="QCheckBox" name="mux_default_on">
<property name="text">
<string>Default On</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -636,10 +611,52 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="core_settings"> <widget class="QGroupBox" name="groupBox">
<property name="text"> <property name="title">
<string>Core Options</string> <string>Switch core</string>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout_21">
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QRadioButton" name="switch_core_v2ray">
<property name="text">
<string notr="true">V2Ray</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="switch_core_sing_box">
<property name="text">
<string notr="true">sing-box</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@@ -662,8 +679,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>568</width> <width>198</width>
<height>297</height> <height>58</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_6"> <layout class="QVBoxLayout" name="verticalLayout_6">

10
ui/edit/dialog_edit_profile.cpp
View File

@@ -333,16 +333,16 @@ void DialogEditProfile::typeSelected(const QString &newType) {
} }
bool DialogEditProfile::onEnd() { bool DialogEditProfile::onEnd() {
// 左边
ent->bean->name = ui->name->text();
ent->bean->serverAddress = ui->address->text();
ent->bean->serverPort = ui->port->text().toInt();
// bean // bean
if (!innerEditor->onEnd()) { if (!innerEditor->onEnd()) {
return false; return false;
} }
// 左边
ent->bean->name = ui->name->text();
ent->bean->serverAddress = ui->address->text();
ent->bean->serverPort = ui->port->text().toInt();
// 右边 stream // 右边 stream
auto stream = GetStreamSettings(ent->bean.get()); auto stream = GetStreamSettings(ent->bean.get());
if (stream != nullptr) { if (stream != nullptr) {

5
ui/edit/edit_chain.cpp
View File

@@ -25,6 +25,11 @@ void EditChain::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
} }
bool EditChain::onEnd() { bool EditChain::onEnd() {
if (get_edit_text_name().isEmpty()) {
MessageBoxWarning(software_name, tr("Name cannot be empty."));
return false;
}
auto bean = this->ent->ChainBean(); auto bean = this->ent->ChainBean();
QList<int> idList; QList<int> idList;

14
ui/edit/edit_custom.cpp
View File

@@ -129,15 +129,19 @@ void EditCustom::onStart(std::shared_ptr<NekoGui::ProxyEntity> _ent) {
} }
bool EditCustom::onEnd() { bool EditCustom::onEnd() {
auto bean = this->ent->CustomBean(); if (get_edit_text_name().isEmpty()) {
MessageBoxWarning(software_name, tr("Name cannot be empty."));
SAVE_CUSTOM_BEAN return false;
}
if (bean->core.isEmpty()) { if (ui->core->currentText().isEmpty()) {
MessageBoxWarning(software_name, tr("Please pick a core.")); MessageBoxWarning(software_name, tr("Please pick a core."));
return false; return false;
} }
auto bean = this->ent->CustomBean();
SAVE_CUSTOM_BEAN
return true; return true;
} }

28
ui/mainwindow.cpp
View File

@@ -529,13 +529,19 @@ void MainWindow::dialog_message_impl(const QString &sender, const QString &info)
refresh_status(); refresh_status();
} }
if (info.contains("UpdateDataStore")) { if (info.contains("UpdateDataStore")) {
auto changed = NekoGui::dataStore->Save(); auto suggestRestartProxy = NekoGui::dataStore->Save();
if (info.contains("RouteChanged")) changed = true; if (info.contains("RouteChanged")) {
suggestRestartProxy = true;
}
if (info.contains("NeedRestart")) {
suggestRestartProxy = false;
}
refresh_proxy_list(); refresh_proxy_list();
if (info.contains("VPNChanged") && NekoGui::dataStore->spmode_vpn) { if (info.contains("VPNChanged") && NekoGui::dataStore->spmode_vpn) {
MessageBoxWarning(tr("VPN settings changed"), tr("Restart VPN to take effect.")); MessageBoxWarning(tr("VPN settings changed"), tr("Restart VPN to take effect."));
} else if (changed && NekoGui::dataStore->started_id >= 0 && }
QMessageBox::question(GetMessageBoxParent(), tr("Confirmation"), tr("Settings changed, restart proxy?")) == QMessageBox::StandardButton::Yes) { if (suggestRestartProxy && NekoGui::dataStore->started_id >= 0 &&
QMessageBox::question(GetMessageBoxParent(), tr("Confirmation"), tr("Settings changed, restart proxy?")) == QMessageBox::StandardButton::Yes) {
neko_start(NekoGui::dataStore->started_id); neko_start(NekoGui::dataStore->started_id);
} }
refresh_status(); refresh_status();
@@ -1141,12 +1147,10 @@ void MainWindow::on_menu_delete_triggered() {
void MainWindow::on_menu_reset_traffic_triggered() { void MainWindow::on_menu_reset_traffic_triggered() {
auto ents = get_now_selected(); auto ents = get_now_selected();
if (ents.count() == 0) return; if (ents.count() == 0) return;
if (QMessageBox::question(this, tr("Confirmation"), QString(tr("Reset traffic of %1 item(s) ?")).arg(ents.count())) == QMessageBox::StandardButton::Yes) { for (const auto &ent: ents) {
for (const auto &ent: ents) { ent->traffic_data->Reset();
ent->traffic_data->Reset(); ent->Save();
ent->Save(); refresh_proxy_list(ent->id);
refresh_proxy_list(ent->id);
}
} }
} }
@@ -1193,10 +1197,10 @@ void MainWindow::on_menu_export_config_triggered() {
auto ents = get_now_selected(); auto ents = get_now_selected();
if (ents.count() != 1) return; if (ents.count() != 1) return;
auto ent = ents.first(); auto ent = ents.first();
QString config_core; if (ent->bean->DisplayCoreType() != software_core_name) return;
auto result = BuildConfig(ent, false, true); auto result = BuildConfig(ent, false, true);
config_core = QJsonObject2QString(result->coreConfig, true); QString config_core = QJsonObject2QString(result->coreConfig, true);
QApplication::clipboard()->setText(config_core); QApplication::clipboard()->setText(config_core);
QMessageBox msg(QMessageBox::Information, tr("Config copied"), config_core); QMessageBox msg(QMessageBox::Information, tr("Config copied"), config_core);

3
ui/mainwindow.ui
View File

@@ -684,6 +684,9 @@
<property name="text"> <property name="text">
<string>Export %1 config</string> <string>Export %1 config</string>
</property> </property>
<property name="shortcut">
<string notr="true">Ctrl+E</string>
</property>
</action> </action>
<action name="menu_reset_traffic"> <action name="menu_reset_traffic">
<property name="text"> <property name="text">