diff --git a/db/ConfigBuilder.cpp b/db/ConfigBuilder.cpp index a3ca8d7..71a8d11 100644 --- a/db/ConfigBuilder.cpp +++ b/db/ConfigBuilder.cpp @@ -528,8 +528,7 @@ namespace NekoRay { status->result = result; // Log - result->coreConfig["log"] = QJsonObject{ - {"level", dataStore->log_level.replace("warning", "warn").replace("none", "panic")}}; + result->coreConfig["log"] = QJsonObject{{"level", dataStore->log_level}}; // Inbounds diff --git a/ui/dialog_basic_settings.cpp b/ui/dialog_basic_settings.cpp index f592cae..3a88a74 100644 --- a/ui/dialog_basic_settings.cpp +++ b/ui/dialog_basic_settings.cpp @@ -55,6 +55,16 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent) // Common + if (IS_NEKO_BOX) { + ui->groupBox_mux->hide(); + ui->groupBox_http->hide(); + ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed")); + ui->hlayout_l2->addWidget(ui->groupBox_log); + ui->log_level->addItems(QString("trace debug info warn error fatal panic").split(" ")); + } else { + ui->log_level->addItems({"debug", "info", "warning", "none"}); + } + ui->socks_ip->setText(NekoRay::dataStore->inbound_address); ui->log_level->setCurrentText(NekoRay::dataStore->log_level); CACHE.custom_inbound = NekoRay::dataStore->custom_inbound; @@ -68,13 +78,6 @@ DialogBasicSettings::DialogBasicSettings(QWidget *parent) C_EDIT_JSON_ALLOW_EMPTY(custom_inbound) }); - if (IS_NEKO_BOX) { - ui->groupBox_mux->hide(); - ui->groupBox_http->hide(); - ui->inbound_socks_port_l->setText(ui->inbound_socks_port_l->text().replace("Socks", "Mixed")); - ui->hlayout_l2->addWidget(ui->groupBox_log); - } - // Style if (IS_NEKO_BOX) { ui->connection_statistics_box->setDisabled(true); diff --git a/ui/dialog_basic_settings.ui b/ui/dialog_basic_settings.ui index a7a2031..7671295 100644 --- a/ui/dialog_basic_settings.ui +++ b/ui/dialog_basic_settings.ui @@ -162,28 +162,7 @@ - - - - debug - - - - - info - - - - - warning - - - - - none - - - + diff --git a/updater/updater.go b/updater/updater.go index e549602..eefbe62 100644 --- a/updater/updater.go +++ b/updater/updater.go @@ -50,7 +50,6 @@ func Updater() { } // remove old file - removeAll("./*.exe") removeAll("./*.dll") removeAll("./*.dmp")