From 3c502c6fc2c49e660e61cc88c6f1150f65d4ac44 Mon Sep 17 00:00:00 2001 From: fufesou Date: Sun, 19 May 2024 14:07:42 +0800 Subject: [PATCH] refact: replace some option keys (#8090) Signed-off-by: fufesou --- flutter/lib/consts.dart | 5 +++++ .../lib/desktop/pages/desktop_setting_page.dart | 15 +++++++-------- .../lib/desktop/pages/file_manager_tab_page.dart | 4 ++-- flutter/lib/desktop/pages/remote_tab_page.dart | 4 ++-- flutter/lib/desktop/pages/server_page.dart | 4 ++-- flutter/lib/desktop/widgets/tabbar_widget.dart | 6 +++--- 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/flutter/lib/consts.dart b/flutter/lib/consts.dart index 66c768369..84d9b5119 100644 --- a/flutter/lib/consts.dart +++ b/flutter/lib/consts.dart @@ -126,6 +126,11 @@ const String kOptionPeerTabOrder = "peer-tab-order"; const String kOptionPeerTabVisible = "peer-tab-visible"; const String kOptionPeerCardUiType = "peer-card-ui-type"; const String kOptionCurrentAbName = "current-ab-name"; +const String kOptionEnableConfirmClosingTabs = "enable-confirm-closing-tabs"; +const String kOptionAllowAlwaysSoftwareRender = "allow-always-software-render"; +const String kOptionEnableCheckUpdate = "enable-check-update"; +const String kOptionAllowLinuxHeadless = "allow-linux-headless"; +const String kOptionAllowRemoveWallpaper = "allow-remove-wallpaper"; const String kOptionToggleViewOnly = "view-only"; diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index 069c30cdf..54da1306e 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -375,7 +375,7 @@ class _GeneralState extends State<_General> { final children = [ if (!bind.isIncomingOnly()) _OptionCheckBox(context, 'Confirm before closing multiple tabs', - 'enable-confirm-closing-tabs', + kOptionEnableConfirmClosingTabs, isServer: false), _OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr), wallpaper(), @@ -390,19 +390,19 @@ class _GeneralState extends State<_General> { Tooltip( message: translate('software_render_tip'), child: _OptionCheckBox(context, "Always use software rendering", - 'allow-always-software-render'), + kOptionAllowAlwaysSoftwareRender), ), _OptionCheckBox( context, 'Check for software update on startup', - 'enable-check-update', + kOptionEnableCheckUpdate, isServer: false, ) ], ]; - if (bind.mainShowOption(key: 'allow-linux-headless')) { + if (bind.mainShowOption(key: kOptionAllowLinuxHeadless)) { children.add(_OptionCheckBox( - context, 'Allow linux headless', 'allow-linux-headless')); + context, 'Allow linux headless', kOptionAllowLinuxHeadless)); } return _Card(title: 'Other', children: children); } @@ -417,15 +417,14 @@ class _GeneralState extends State<_General> { return support; }(), hasData: (data) { if (data is bool && data == true) { - final option = 'allow-remove-wallpaper'; - bool value = mainGetBoolOptionSync(option); + bool value = mainGetBoolOptionSync(kOptionAllowRemoveWallpaper); return Row( children: [ Flexible( child: _OptionCheckBox( context, 'Remove wallpaper during incoming sessions', - option, + kOptionAllowRemoveWallpaper, update: () { setState(() {}); }, diff --git a/flutter/lib/desktop/pages/file_manager_tab_page.dart b/flutter/lib/desktop/pages/file_manager_tab_page.dart index b9d4f274e..8680806e0 100644 --- a/flutter/lib/desktop/pages/file_manager_tab_page.dart +++ b/flutter/lib/desktop/pages/file_manager_tab_page.dart @@ -131,9 +131,9 @@ class _FileManagerTabPageState extends State { tabController.clear(); return true; } else { - final opt = "enable-confirm-closing-tabs"; final bool res; - if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { + if (!option2bool(kOptionEnableConfirmClosingTabs, + bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) { res = true; } else { res = await closeConfirmDialog(); diff --git a/flutter/lib/desktop/pages/remote_tab_page.dart b/flutter/lib/desktop/pages/remote_tab_page.dart index 31063775b..488e957f2 100644 --- a/flutter/lib/desktop/pages/remote_tab_page.dart +++ b/flutter/lib/desktop/pages/remote_tab_page.dart @@ -384,9 +384,9 @@ class _ConnectionTabPageState extends State { tabController.clear(); return true; } else { - final opt = "enable-confirm-closing-tabs"; final bool res; - if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { + if (!option2bool(kOptionEnableConfirmClosingTabs, + bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) { res = true; } else { res = await closeConfirmDialog(); diff --git a/flutter/lib/desktop/pages/server_page.dart b/flutter/lib/desktop/pages/server_page.dart index 5730bb81d..2ccad8c32 100644 --- a/flutter/lib/desktop/pages/server_page.dart +++ b/flutter/lib/desktop/pages/server_page.dart @@ -289,9 +289,9 @@ class ConnectionManagerState extends State { windowManager.close(); return true; } else { - final opt = "enable-confirm-closing-tabs"; final bool res; - if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { + if (!option2bool(kOptionEnableConfirmClosingTabs, + bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) { res = true; } else { res = await closeConfirmDialog(); diff --git a/flutter/lib/desktop/widgets/tabbar_widget.dart b/flutter/lib/desktop/widgets/tabbar_widget.dart index 9cde22eb9..e89d50c30 100644 --- a/flutter/lib/desktop/widgets/tabbar_widget.dart +++ b/flutter/lib/desktop/widgets/tabbar_widget.dart @@ -812,9 +812,9 @@ Future closeConfirmDialog() async { var confirm = true; final res = await gFFI.dialogManager.show((setState, close, context) { submit() { - final opt = "enable-confirm-closing-tabs"; - String value = bool2option(opt, confirm); - bind.mainSetLocalOption(key: opt, value: value); + String value = bool2option(kOptionEnableConfirmClosingTabs, confirm); + bind.mainSetLocalOption( + key: kOptionEnableConfirmClosingTabs, value: value); close(true); }