refact: replace some option keys (#8090)

Signed-off-by: fufesou <shuanglongchen@yeah.net>
This commit is contained in:
fufesou 2024-05-19 14:07:42 +08:00 committed by GitHub
parent 72d59af7b0
commit 3c502c6fc2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 21 additions and 17 deletions

View File

@ -126,6 +126,11 @@ const String kOptionPeerTabOrder = "peer-tab-order";
const String kOptionPeerTabVisible = "peer-tab-visible"; const String kOptionPeerTabVisible = "peer-tab-visible";
const String kOptionPeerCardUiType = "peer-card-ui-type"; const String kOptionPeerCardUiType = "peer-card-ui-type";
const String kOptionCurrentAbName = "current-ab-name"; 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"; const String kOptionToggleViewOnly = "view-only";

View File

@ -375,7 +375,7 @@ class _GeneralState extends State<_General> {
final children = <Widget>[ final children = <Widget>[
if (!bind.isIncomingOnly()) if (!bind.isIncomingOnly())
_OptionCheckBox(context, 'Confirm before closing multiple tabs', _OptionCheckBox(context, 'Confirm before closing multiple tabs',
'enable-confirm-closing-tabs', kOptionEnableConfirmClosingTabs,
isServer: false), isServer: false),
_OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr), _OptionCheckBox(context, 'Adaptive bitrate', kOptionEnableAbr),
wallpaper(), wallpaper(),
@ -390,19 +390,19 @@ class _GeneralState extends State<_General> {
Tooltip( Tooltip(
message: translate('software_render_tip'), message: translate('software_render_tip'),
child: _OptionCheckBox(context, "Always use software rendering", child: _OptionCheckBox(context, "Always use software rendering",
'allow-always-software-render'), kOptionAllowAlwaysSoftwareRender),
), ),
_OptionCheckBox( _OptionCheckBox(
context, context,
'Check for software update on startup', 'Check for software update on startup',
'enable-check-update', kOptionEnableCheckUpdate,
isServer: false, isServer: false,
) )
], ],
]; ];
if (bind.mainShowOption(key: 'allow-linux-headless')) { if (bind.mainShowOption(key: kOptionAllowLinuxHeadless)) {
children.add(_OptionCheckBox( children.add(_OptionCheckBox(
context, 'Allow linux headless', 'allow-linux-headless')); context, 'Allow linux headless', kOptionAllowLinuxHeadless));
} }
return _Card(title: 'Other', children: children); return _Card(title: 'Other', children: children);
} }
@ -417,15 +417,14 @@ class _GeneralState extends State<_General> {
return support; return support;
}(), hasData: (data) { }(), hasData: (data) {
if (data is bool && data == true) { if (data is bool && data == true) {
final option = 'allow-remove-wallpaper'; bool value = mainGetBoolOptionSync(kOptionAllowRemoveWallpaper);
bool value = mainGetBoolOptionSync(option);
return Row( return Row(
children: [ children: [
Flexible( Flexible(
child: _OptionCheckBox( child: _OptionCheckBox(
context, context,
'Remove wallpaper during incoming sessions', 'Remove wallpaper during incoming sessions',
option, kOptionAllowRemoveWallpaper,
update: () { update: () {
setState(() {}); setState(() {});
}, },

View File

@ -131,9 +131,9 @@ class _FileManagerTabPageState extends State<FileManagerTabPage> {
tabController.clear(); tabController.clear();
return true; return true;
} else { } else {
final opt = "enable-confirm-closing-tabs";
final bool res; final bool res;
if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { if (!option2bool(kOptionEnableConfirmClosingTabs,
bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) {
res = true; res = true;
} else { } else {
res = await closeConfirmDialog(); res = await closeConfirmDialog();

View File

@ -384,9 +384,9 @@ class _ConnectionTabPageState extends State<ConnectionTabPage> {
tabController.clear(); tabController.clear();
return true; return true;
} else { } else {
final opt = "enable-confirm-closing-tabs";
final bool res; final bool res;
if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { if (!option2bool(kOptionEnableConfirmClosingTabs,
bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) {
res = true; res = true;
} else { } else {
res = await closeConfirmDialog(); res = await closeConfirmDialog();

View File

@ -289,9 +289,9 @@ class ConnectionManagerState extends State<ConnectionManager> {
windowManager.close(); windowManager.close();
return true; return true;
} else { } else {
final opt = "enable-confirm-closing-tabs";
final bool res; final bool res;
if (!option2bool(opt, bind.mainGetLocalOption(key: opt))) { if (!option2bool(kOptionEnableConfirmClosingTabs,
bind.mainGetLocalOption(key: kOptionEnableConfirmClosingTabs))) {
res = true; res = true;
} else { } else {
res = await closeConfirmDialog(); res = await closeConfirmDialog();

View File

@ -812,9 +812,9 @@ Future<bool> closeConfirmDialog() async {
var confirm = true; var confirm = true;
final res = await gFFI.dialogManager.show<bool>((setState, close, context) { final res = await gFFI.dialogManager.show<bool>((setState, close, context) {
submit() { submit() {
final opt = "enable-confirm-closing-tabs"; String value = bool2option(kOptionEnableConfirmClosingTabs, confirm);
String value = bool2option(opt, confirm); bind.mainSetLocalOption(
bind.mainSetLocalOption(key: opt, value: value); key: kOptionEnableConfirmClosingTabs, value: value);
close(true); close(true);
} }