Fix/custom client advanced settings (#8066)

* fix: custom client, advanced settings Signed-off-by: fufesou <shuanglongchen@yeah.net> * refact: custom client, default options Signed-off-by: fufesou <shuanglongchen@yeah.net> * fix: cargo test Signed-off-by: fufesou <shuanglongchen@yeah.net> * refact: remove prefix $ and unify option keys Signed-off-by: fufesou <shuanglongchen@yeah.net> * refact: custom client, advanced options Signed-off-by: fufesou <shuanglongchen@yeah.net> * debug custom client, advanced settings Signed-off-by: fufesou <shuanglongchen@yeah.net> * custom client, advanced settings. Add filter-transfer to display settings Signed-off-by: fufesou <shuanglongchen@yeah.net> * custom client, advanced settings Signed-off-by: fufesou <shuanglongchen@yeah.net> * fix: custom client, advanced settings, codec Signed-off-by: fufesou <shuanglongchen@yeah.net> * fix: custom client, advanced settings, whitelist Signed-off-by: fufesou <shuanglongchen@yeah.net> --------- Signed-off-by: fufesou <shuanglongchen@yeah.net>
2025-10-29 17:00:05 +00:00 · 2024-05-17 14:19:11 +08:00
parent 3a4390e0c7
commit 8357d4675a
18 changed files with 707 additions and 364 deletions
--- a/flutter/lib/common/widgets/address_book.dart
+++ b/flutter/lib/common/widgets/address_book.dart
@@ -333,6 +333,7 @@ class _AddressBookState extends State<AddressBook> {

  @protected
  MenuEntryBase<String> syncMenuItem() {
+    final isOptFixed = isOptionFixed(syncAbOption);
    return MenuEntrySwitch<String>(
      switchType: SwitchType.scheckbox,
      text: translate('Sync with recent sessions'),
@@ -343,11 +344,13 @@ class _AddressBookState extends State<AddressBook> {
        gFFI.abModel.setShouldAsync(v);
      },
      dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
    );
  }

  @protected
  MenuEntryBase<String> sortMenuItem() {
+    final isOptFixed = isOptionFixed(sortAbTagsOption);
    return MenuEntrySwitch<String>(
      switchType: SwitchType.scheckbox,
      text: translate('Sort tags'),
@@ -355,15 +358,17 @@ class _AddressBookState extends State<AddressBook> {
        return shouldSortTags();
      },
      setter: (bool v) async {
-        bind.mainSetLocalOption(key: sortAbTagsOption, value: v ? 'Y' : '');
+        bind.mainSetLocalOption(key: sortAbTagsOption, value: v ? 'Y' : defaultOptionNo);
        gFFI.abModel.sortTags.value = v;
      },
      dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
    );
  }

  @protected
  MenuEntryBase<String> filterMenuItem() {
+    final isOptFixed = isOptionFixed(filterAbTagOption);
    return MenuEntrySwitch<String>(
      switchType: SwitchType.scheckbox,
      text: translate('Filter by intersection'),
@@ -371,10 +376,11 @@ class _AddressBookState extends State<AddressBook> {
        return filterAbTagByIntersection();
      },
      setter: (bool v) async {
-        bind.mainSetLocalOption(key: filterAbTagOption, value: v ? 'Y' : '');
+        bind.mainSetLocalOption(key: filterAbTagOption, value: v ? 'Y' : defaultOptionNo);
        gFFI.abModel.filterByIntersection.value = v;
      },
      dismissOnClicked: true,
+      enabled: (!isOptFixed).obs,
    );
  }

--- a/flutter/lib/common/widgets/dialog.dart
+++ b/flutter/lib/common/widgets/dialog.dart
@@ -177,11 +177,14 @@ void changeIdDialog() {
 }

 void changeWhiteList({Function()? callback}) async {
-  var newWhiteList = (await bind.mainGetOption(key: 'whitelist')).split(',');
-  var newWhiteListField = newWhiteList.join('\n');
+  final curWhiteList = await bind.mainGetOption(key: kOptionWhitelist);
+  var newWhiteListField = curWhiteList == defaultOptionWhitelist
+      ? ''
+      : curWhiteList.split(',').join('\n');
  var controller = TextEditingController(text: newWhiteListField);
  var msg = "";
  var isInProgress = false;
+  final isOptFixed = isOptionFixed(kOptionWhitelist);
  gFFI.dialogManager.show((setState, close, context) {
    return CustomAlertDialog(
      title: Text(translate("IP Whitelisting")),
@@ -214,14 +217,15 @@ void changeWhiteList({Function()? callback}) async {
      ),
      actions: [
        dialogButton("Cancel", onPressed: close, isOutline: true),
-        dialogButton("Clear", onPressed: () async {
-          await bind.mainSetOption(key: 'whitelist', value: '');
+        dialogButton("Clear", onPressed: isOptFixed ? null : () async {
+          await bind.mainSetOption(
+              key: kOptionWhitelist, value: defaultOptionWhitelist);
          callback?.call();
          close();
        }, isOutline: true),
        dialogButton(
          "OK",
-          onPressed: () async {
+          onPressed: isOptFixed ? null : () async {
            setState(() {
              msg = "";
              isInProgress = true;
@@ -248,7 +252,11 @@ void changeWhiteList({Function()? callback}) async {
              }
              newWhiteList = ips.join(',');
            }
-            await bind.mainSetOption(key: 'whitelist', value: newWhiteList);
+            if (newWhiteList.trim().isEmpty) {
+              newWhiteList = defaultOptionWhitelist;
+            }
+            await bind.mainSetOption(
+                key: kOptionWhitelist, value: newWhiteList);
            callback?.call();
            close();
          },
@@ -298,7 +306,7 @@ Future<String> changeDirectAccessPort(
        dialogButton("Cancel", onPressed: close, isOutline: true),
        dialogButton("OK", onPressed: () async {
          await bind.mainSetOption(
-              key: 'direct-access-port', value: controller.text);
+              key: kOptionDirectAccessPort, value: controller.text);
          close();
        }),
      ],
@@ -345,7 +353,7 @@ Future<String> changeAutoDisconnectTimeout(String old) async {
        dialogButton("Cancel", onPressed: close, isOutline: true),
        dialogButton("OK", onPressed: () async {
          await bind.mainSetOption(
-              key: 'auto-disconnect-timeout', value: controller.text);
+              key: kOptionAutoDisconnectTimeout, value: controller.text);
          close();
        }),
      ],
--- a/flutter/lib/common/widgets/peer_tab_page.dart
+++ b/flutter/lib/common/widgets/peer_tab_page.dart
@@ -537,7 +537,7 @@ class _PeerTabPageState extends State<PeerTabPage>
        ),
        onTap: () async {
          await bind.mainSetLocalOption(
-              key: "hideAbTagsPanel", value: hideAbTagsPanel.value ? "" : "Y");
+              key: "hideAbTagsPanel", value: hideAbTagsPanel.value ? defaultOptionNo : "Y");
          hideAbTagsPanel.value = !hideAbTagsPanel.value;
        });
  }
--- a/flutter/lib/common/widgets/setting_widgets.dart
+++ b/flutter/lib/common/widgets/setting_widgets.dart
@@ -10,8 +10,8 @@ import 'package:get/get.dart';
 customImageQualityWidget(
    {required double initQuality,
    required double initFps,
-    required Function(double) setQuality,
-    required Function(double) setFps,
+    required Function(double)? setQuality,
+    required Function(double)? setFps,
    required bool showFps,
    required bool showMoreQuality}) {
  if (initQuality < kMinQuality ||
@@ -27,16 +27,12 @@ customImageQualityWidget(
  final RxBool moreQualityChecked = RxBool(qualityValue.value > kMaxQuality);
  final debouncerQuality = Debouncer<double>(
    Duration(milliseconds: 1000),
-    onChanged: (double v) {
-      setQuality(v);
-    },
+    onChanged: setQuality,
    initialValue: qualityValue.value,
  );
  final debouncerFps = Debouncer<double>(
    Duration(milliseconds: 1000),
-    onChanged: (double v) {
-      setFps(v);
-    },
+    onChanged: setFps,
    initialValue: fpsValue.value,
  );

@@ -62,10 +58,12 @@ customImageQualityWidget(
                  divisions: moreQualityChecked.value
                      ? ((kMaxMoreQuality - kMinQuality) / 10).round()
                      : ((kMaxQuality - kMinQuality) / 5).round(),
-                  onChanged: (double value) async {
-                    qualityValue.value = value;
-                    debouncerQuality.value = value;
-                  },
+                  onChanged: setQuality == null
+                      ? null
+                      : (double value) async {
+                          qualityValue.value = value;
+                          debouncerQuality.value = value;
+                        },
                ),
              ),
              Expanded(
@@ -124,10 +122,12 @@ customImageQualityWidget(
                    min: kMinFps,
                    max: kMaxFps,
                    divisions: ((kMaxFps - kMinFps) / 5).round(),
-                    onChanged: (double value) async {
-                      fpsValue.value = value;
-                      debouncerFps.value = value;
-                    },
+                    onChanged: setFps == null
+                        ? null
+                        : (double value) async {
+                            fpsValue.value = value;
+                            debouncerFps.value = value;
+                          },
                  ),
                ),
                Expanded(
@@ -152,21 +152,29 @@ customImageQualitySetting() {
  final qualityKey = 'custom_image_quality';
  final fpsKey = 'custom-fps';

-  var initQuality =
+  final initQuality =
      (double.tryParse(bind.mainGetUserDefaultOption(key: qualityKey)) ??
          kDefaultQuality);
-  var initFps = (double.tryParse(bind.mainGetUserDefaultOption(key: fpsKey)) ??
-      kDefaultFps);
+  final isQuanlityFixed = isOptionFixed(qualityKey);
+  final initFps =
+      (double.tryParse(bind.mainGetUserDefaultOption(key: fpsKey)) ??
+          kDefaultFps);
+  final isFpsFixed = isOptionFixed(fpsKey);

  return customImageQualityWidget(
      initQuality: initQuality,
      initFps: initFps,
-      setQuality: (v) {
-        bind.mainSetUserDefaultOption(key: qualityKey, value: v.toString());
-      },
-      setFps: (v) {
-        bind.mainSetUserDefaultOption(key: fpsKey, value: v.toString());
-      },
+      setQuality: isQuanlityFixed
+          ? null
+          : (v) {
+              bind.mainSetUserDefaultOption(
+                  key: qualityKey, value: v.toString());
+            },
+      setFps: isFpsFixed
+          ? null
+          : (v) {
+              bind.mainSetUserDefaultOption(key: fpsKey, value: v.toString());
+            },
      showFps: true,
      showMoreQuality: true);
 }
@@ -208,23 +216,25 @@ List<Widget> ServerConfigImportExportWidgets(

 List<(String, String)> otherDefaultSettings() {
  List<(String, String)> v = [
-    ('View Mode', 'view_only'),
-    if ((isDesktop || isWebDesktop)) ('show_monitors_tip', kKeyShowMonitorsToolbar),
-    if ((isDesktop || isWebDesktop)) ('Collapse toolbar', 'collapse_toolbar'),
-    ('Show remote cursor', 'show_remote_cursor'),
-    ('Follow remote cursor', 'follow_remote_cursor'),
-    ('Follow remote window focus', 'follow_remote_window'),
-    if ((isDesktop || isWebDesktop)) ('Zoom cursor', 'zoom-cursor'),
-    ('Show quality monitor', 'show_quality_monitor'),
-    ('Mute', 'disable_audio'),
-    if (isDesktop) ('Enable file copy and paste', 'enable_file_transfer'),
-    ('Disable clipboard', 'disable_clipboard'),
-    ('Lock after session end', 'lock_after_session_end'),
-    ('Privacy mode', 'privacy_mode'),
-    if (isMobile) ('Touch mode', 'touch-mode'),
-    ('True color (4:4:4)', 'i444'),
+    ('View Mode', kOptionViewOnly),
+    if ((isDesktop || isWebDesktop))
+      ('show_monitors_tip', kKeyShowMonitorsToolbar),
+    if ((isDesktop || isWebDesktop))
+      ('Collapse toolbar', kOptionCollapseToolbar),
+    ('Show remote cursor', kOptionShowRemoteCursor),
+    ('Follow remote cursor', kOptionFollowRemoteCursor),
+    ('Follow remote window focus', kOptionFollowRemoteWindow),
+    if ((isDesktop || isWebDesktop)) ('Zoom cursor', kOptionZoomCursor),
+    ('Show quality monitor', kOptionShowQualityMonitor),
+    ('Mute', kOptionDisableAudio),
+    if (isDesktop) ('Enable file copy and paste', kOptionEnableFileTransfer),
+    ('Disable clipboard', kOptionDisableClipboard),
+    ('Lock after session end', kOptionLockAfterSessionEnd),
+    ('Privacy mode', kOptionPrivacyMode),
+    if (isMobile) ('Touch mode', kOptionTouchMode),
+    ('True color (4:4:4)', kOptionI444),
    ('Reverse mouse wheel', kKeyReverseMouseWheel),
-    ('swap-left-right-mouse', 'swap-left-right-mouse'),
+    ('swap-left-right-mouse', kOptionSwapLeftRightMouse),
    if (isDesktop && useTextureRender)
      (
        'Show displays as individual windows',
--- a/flutter/lib/common/widgets/toolbar.dart
+++ b/flutter/lib/common/widgets/toolbar.dart
@@ -327,7 +327,7 @@ Future<List<TRadioMenu<String>>> toolbarCodec(
  final alternativeCodecs =
      await bind.sessionAlternativeCodecs(sessionId: sessionId);
  final groupValue = await bind.sessionGetOption(
-          sessionId: sessionId, arg: 'codec-preference') ??
+          sessionId: sessionId, arg: kOptionCodecPreference) ??
      '';
  final List<bool> codecs = [];
  try {
@@ -349,7 +349,7 @@ Future<List<TRadioMenu<String>>> toolbarCodec(
  onChanged(String? value) async {
    if (value == null) return;
    await bind.sessionPeerOption(
-        sessionId: sessionId, name: 'codec-preference', value: value);
+        sessionId: sessionId, name: kOptionCodecPreference, value: value);
    bind.sessionChangePreferCodec(sessionId: sessionId);
  }