From 6febb17e6466ad6e8d6bb5babef1f57a1886cb38 Mon Sep 17 00:00:00 2001 From: parhelia512 <0011d3@gmail.com> Date: Tue, 12 Aug 2025 01:38:05 +0800 Subject: [PATCH] fix: import ui layout and fix #603 #620 --- include/ui/profile/dialog_edit_profile.ui | 4 +- include/ui/setting/dialog_basic_settings.ui | 178 +++++++++----------- src/ui/profile/dialog_edit_profile.cpp | 2 +- 3 files changed, 86 insertions(+), 98 deletions(-) diff --git a/include/ui/profile/dialog_edit_profile.ui b/include/ui/profile/dialog_edit_profile.ui index 5531e24..d5ea60a 100644 --- a/include/ui/profile/dialog_edit_profile.ui +++ b/include/ui/profile/dialog_edit_profile.ui @@ -291,7 +291,7 @@ - + 0 0 @@ -299,7 +299,7 @@ 400 - 500 + 0 diff --git a/include/ui/setting/dialog_basic_settings.ui b/include/ui/setting/dialog_basic_settings.ui index ebf746b..6c329e2 100644 --- a/include/ui/setting/dialog_basic_settings.ui +++ b/include/ui/setting/dialog_basic_settings.ui @@ -771,103 +771,91 @@ Geo Assets and Rule-sets - - - - - - - - - - Auto Reset Assets - - - - - - - - Disabled - - - - - Every Day - - - - - Every 3 Days - - - - - Every Week - - - - - - - - - - - - GeoIP URL - - - - - - - - - - - - - - GeoSite URL - - - - - - - - - - - - Download and Replace Geo files - - - - - - - <html><head/><body><p>Remove the + + + + + + 0 + 0 + + + + + Disabled + + + + + Every Day + + + + + Every 3 Days + + + + + Every Week + + + + + + + + Download and Replace Geo files + + + + + + + + + + Auto Reset Assets + + + + + + + + + + GeoSite URL + + + + + + + <html><head/><body><p>Downloads and replaces the geo asstes, and removes all generated rule-sets, then restarts the proxy</p></body></html> + + + Reset All Assets + + + + + + + GeoIP URL + + + + + + + <html><head/><body><p>Remove the currently generated rule-sets so that they can be regenerated</p></body></html> - - - Remove Generated Rule-sets - - - - - - - <html><head/><body><p>Downloads and replaces the geo asstes, and removes all generated rule-sets, then restarts the proxy</p></body></html> - - - Reset All Assets - - - - + + + Remove Generated Rule-sets + diff --git a/src/ui/profile/dialog_edit_profile.cpp b/src/ui/profile/dialog_edit_profile.cpp index c9face1..d130744 100644 --- a/src/ui/profile/dialog_edit_profile.cpp +++ b/src/ui/profile/dialog_edit_profile.cpp @@ -135,7 +135,7 @@ DialogEditProfile::DialogEditProfile(const QString &_type, int profileOrGroupId, emit ui->security->currentTextChanged(ui->security->currentText()); // for fragment - connect(ui->tls_frag, &QCheckBox::checkStateChanged, this, [=,this](bool state) + connect(ui->tls_frag, &QCheckBox::stateChanged, this, [=,this](bool state) { ui->tls_frag_fall_delay->setEnabled(state); });