diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp index 56c03d4..cb5aec3 100644 --- a/db/ConfigBuilder.cpp +++ b/db/ConfigBuilder.cpp @@ -860,7 +860,7 @@ namespace NekoRay { // experimental QJsonObject experimentalObj; - if (NekoRay::dataStore->core_box_clash_api > 0) { + if (!status->forTest && NekoRay::dataStore->core_box_clash_api > 0) { QJsonObject clash_api = { {"external_controller", "127.0.0.1:" + Int2String(NekoRay::dataStore->core_box_clash_api)}, {"secret", NekoRay::dataStore->core_box_clash_api_secret}, diff --git a/main/main.cpp b/main/main.cpp index a093598..2c1b3c0 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -147,18 +147,19 @@ int main(int argc, char* argv[]) { // Load coreType auto coreLoaded = ReadFileText("groups/coreType"); if (coreLoaded.isEmpty()) { + NekoRay::coreType = -1; loadTranslate(QLocale().name()); auto dialogFirstSetup = new DialogFirstSetup; - auto coreSelected = dialogFirstSetup->exec(); + dialogFirstSetup->exec(); dialogFirstSetup->deleteLater(); - if (coreSelected < 0) { + if (NekoRay::coreType < 0) { return 0; } else { - NekoRay::coreType = coreSelected; + QDir().mkdir("groups"); QFile file; file.setFileName("groups/coreType"); file.open(QIODevice::ReadWrite | QIODevice::Truncate); - file.write(Int2String(coreSelected).toUtf8()); + file.write(Int2String(NekoRay::coreType).toUtf8()); file.close(); } } else { diff --git a/ui/dialog_first_setup.cpp b/ui/dialog_first_setup.cpp index 23b5e49..93bfc6c 100644 --- a/ui/dialog_first_setup.cpp +++ b/ui/dialog_first_setup.cpp @@ -14,10 +14,9 @@ DialogFirstSetup::~DialogFirstSetup() { void DialogFirstSetup::onButtonClicked() { auto s = sender(); if (s == ui->v2ray) { - done(NekoRay::CoreType::V2RAY); + NekoRay::coreType = NekoRay::CoreType::V2RAY; } else if (s == ui->singbox) { - done(NekoRay::CoreType::SING_BOX); - } else { - done(-1); + NekoRay::coreType = NekoRay::CoreType::SING_BOX; } + done(0); } diff --git a/ui/dialog_first_setup.ui b/ui/dialog_first_setup.ui index 27177ae..b85e613 100644 --- a/ui/dialog_first_setup.ui +++ b/ui/dialog_first_setup.ui @@ -26,6 +26,16 @@ These settings can be changed later. + + + + <html><head/><body><p><a href="https://matsuridayo.github.io/n-configuration/#nekobox"><span style=" text-decoration: underline; color:#2980b9;">Help</span></a></p></body></html> + + + true + + + diff --git a/ui/edit/dialog_edit_profile.ui b/ui/edit/dialog_edit_profile.ui index 2685b3a..107b9bb 100644 --- a/ui/edit/dialog_edit_profile.ui +++ b/ui/edit/dialog_edit_profile.ui @@ -509,7 +509,7 @@ security (QUIC) Reality public key. If not empty, turn TLS into REALITY. - Realty Pbk + Reality Pbk