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

feat: allow access from LAN (tray action)

Browse Source
This commit is contained in:
arm64v8a
2022-08-27 09:44:32 +08:00
parent 6873a7e1ba
commit b48583ae1b
7 changed files with 56 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ui/mainwindow.cpp
View File

@@ -262,7 +262,7 @@ MainWindow::MainWindow(QWidget *parent)
connect(ui->menu_program, &QMenu::aboutToShow, this, [=]() {
ui->actionRemember_last_proxy->setChecked(NekoRay::dataStore->remember_enable);
ui->actionStart_with_system->setChecked(GetProcessAutoRunSelf());
ui->actionStart_minimal->setChecked(NekoRay::dataStore->start_minimal);
ui->actionAllow_LAN->setChecked(NekoRay::dataStore->inbound_address == "0.0.0.0");
// active server
for (const auto &old: ui->menuActive_Server->actions()) {
ui->menuActive_Server->removeAction(old);
@@ -304,7 +304,7 @@ MainWindow::MainWindow(QWidget *parent)
r.load_control_force = true;
r.fn = "routes/" + fn;
if (r.Load()) {
auto btn = QMessageBox::question(nullptr, "NekoRay",
auto btn = QMessageBox::question(GetMessageBoxParent(), "NekoRay",
tr("Load routing and apply: %1").arg(fn) + "\n" + r.toString());
if (btn == QMessageBox::Yes) {
NekoRay::Routing::SetToActive(fn);
@@ -324,9 +324,9 @@ MainWindow::MainWindow(QWidget *parent)
connect(ui->actionStart_with_system, &QAction::triggered, this, [=](bool checked) {
SetProcessAutoRunSelf(checked);
});
connect(ui->actionStart_minimal, &QAction::triggered, this, [=](bool checked) {
NekoRay::dataStore->start_minimal = checked;
NekoRay::dataStore->Save();
connect(ui->actionAllow_LAN, &QAction::triggered, this, [=](bool checked) {
NekoRay::dataStore->inbound_address = checked ? "0.0.0.0" : "127.0.0.1";
dialog_message(Dialog_DialogManageRoutes, "UpdateDataStore,RouteChanged");
});
//
connect(ui->checkBox_VPN, &QCheckBox::clicked, this, [=](bool checked) {
@@ -489,8 +489,8 @@ void MainWindow::dialog_message_impl(const QString &sender, const QString &info)
if (info.contains("VPNChanged") && title_spmode == NekoRay::SystemProxyMode::VPN) {
MessageBoxWarning(tr("VPN settings changed"), tr("Restart VPN to take effect."));
} else if (changed && NekoRay::dataStore->started_id >= 0 &&
QMessageBox::question(this, tr("Confirmation"), tr("Settings changed, restart proxy?")
) == QMessageBox::StandardButton::Yes) {
QMessageBox::question(GetMessageBoxParent(), tr("Confirmation"),
tr("Settings changed, restart proxy?")) == QMessageBox::StandardButton::Yes) {
neko_start(NekoRay::dataStore->started_id);
}
refresh_status();
@@ -507,8 +507,7 @@ void MainWindow::dialog_message_impl(const QString &sender, const QString &info)
// 订阅完毕
refresh_proxy_list();
if (!info.contains("dingyue")) {
QMessageBox::information(this, "NekoRay",
tr("Imported %1 profile(s)").arg(NekoRay::dataStore->imported_count));
MessageBoxInfo("NekoRay", tr("Imported %1 profile(s)").arg(NekoRay::dataStore->imported_count));
}
} else if (sender == "ExternalProcess") {
if (info == "Crashed") {
@@ -880,14 +879,20 @@ void MainWindow::on_proxyListTable_itemDoubleClicked(QTableWidgetItem *item) {
connect(dialog, &QDialog::finished, dialog, &QDialog::deleteLater);
}
#define NO_ADD_TO_SUBSCRIPTION_GROUP \
if (!NekoRay::profileManager->CurrentGroup()->url.isEmpty()) { \
MessageBoxWarning("NekoRay", MainWindow::tr("Manual addition of profiles is not allowed in subscription groupings.")); \
return; \
}
void MainWindow::on_menu_add_from_input_triggered() {
if (!NekoRay::profileManager->CurrentGroup()->url.isEmpty()) return;
NO_ADD_TO_SUBSCRIPTION_GROUP
auto dialog = new DialogEditProfile("socks", NekoRay::dataStore->current_group, this);
connect(dialog, &QDialog::finished, dialog, &QDialog::deleteLater);
}
void MainWindow::on_menu_add_from_clipboard_triggered() {
if (!NekoRay::profileManager->CurrentGroup()->url.isEmpty()) return;
NO_ADD_TO_SUBSCRIPTION_GROUP
auto clipboard = QApplication::clipboard()->text();
NekoRay::sub::groupUpdater->AsyncUpdate(clipboard);
}
@@ -896,9 +901,7 @@ void MainWindow::on_menu_clone_triggered() {
auto ents = get_now_selected();
if (ents.isEmpty()) return;
auto btn = QMessageBox::question(nullptr,
tr("Clone"),
tr("Clone %1 item(s)").arg(ents.count()));
auto btn = QMessageBox::question(this, tr("Clone"), tr("Clone %1 item(s)").arg(ents.count()));
if (btn != QMessageBox::Yes) return;
QStringList sls;
@@ -961,7 +964,7 @@ void MainWindow::on_menu_reset_traffic_triggered() {
void MainWindow::on_menu_profile_debug_info_triggered() {
auto ents = get_now_selected();
if (ents.count() != 1) return;
auto btn = QMessageBox::information(nullptr, "NekoRay", ents.first()->ToJsonBytes(), "OK", "Edit", "Reload", 0, 0);
auto btn = QMessageBox::information(this, "NekoRay", ents.first()->ToJsonBytes(), "OK", "Edit", "Reload", 0, 0);
if (btn == 1) {
QDesktopServices::openUrl(QUrl::fromLocalFile(
QFileInfo(QString("profiles/%1.json").arg(ents.first()->id)).absoluteFilePath()
@@ -1068,7 +1071,7 @@ void MainWindow::display_qr_link(bool nkrFormat) {
}
void MainWindow::on_menu_scan_qr_triggered() {
if (!NekoRay::profileManager->CurrentGroup()->url.isEmpty()) return;
NO_ADD_TO_SUBSCRIPTION_GROUP
#ifndef NKR_NO_EXTERNAL
using namespace ZXingQt;