From 2f2a7d1f89ccfb1684fff70fc6b7d962c56c6110 Mon Sep 17 00:00:00 2001 From: dignow Date: Sun, 8 Oct 2023 22:32:48 +0800 Subject: [PATCH] feat, multi flutter ui sessions, change settings to 'Display' Signed-off-by: dignow --- flutter/lib/common/widgets/peer_card.dart | 2 +- .../desktop/pages/desktop_setting_page.dart | 48 +++++++++---------- src/lang/ar.rs | 4 +- src/lang/ca.rs | 4 +- src/lang/cn.rs | 4 +- src/lang/cs.rs | 4 +- src/lang/da.rs | 4 +- src/lang/de.rs | 4 +- src/lang/el.rs | 4 +- src/lang/eo.rs | 4 +- src/lang/es.rs | 4 +- src/lang/fa.rs | 4 +- src/lang/fr.rs | 4 +- src/lang/hu.rs | 4 +- src/lang/id.rs | 4 +- src/lang/it.rs | 4 +- src/lang/ja.rs | 4 +- src/lang/ko.rs | 4 +- src/lang/kz.rs | 4 +- src/lang/lt.rs | 4 +- src/lang/lv.rs | 4 +- src/lang/nl.rs | 4 +- src/lang/pl.rs | 4 +- src/lang/pt_PT.rs | 4 +- src/lang/ptbr.rs | 4 +- src/lang/ro.rs | 4 +- src/lang/ru.rs | 4 +- src/lang/sk.rs | 4 +- src/lang/sl.rs | 4 +- src/lang/sq.rs | 4 +- src/lang/sr.rs | 4 +- src/lang/sv.rs | 4 +- src/lang/template.rs | 4 +- src/lang/th.rs | 4 +- src/lang/tr.rs | 4 +- src/lang/tw.rs | 4 +- src/lang/ua.rs | 4 +- src/lang/vn.rs | 4 +- 38 files changed, 97 insertions(+), 97 deletions(-) diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart index a843c3d41..922f88225 100644 --- a/flutter/lib/common/widgets/peer_card.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -600,7 +600,7 @@ abstract class BasePeerCard extends StatelessWidget { await _openNewConnInAction(id, 'Open in New Tab', kOptionOpenInTabs); _openInWindowsAction(String id) async => await _openNewConnInAction( - id, 'Open in New Window', kOptionOpenInWindows); + id, 'Open in new window', kOptionOpenInWindows); _openNewConnInOptAction(String id) async => mainGetLocalBoolOptionSync(kOptionOpenNewConnInTabs) diff --git a/flutter/lib/desktop/pages/desktop_setting_page.dart b/flutter/lib/desktop/pages/desktop_setting_page.dart index 905c082a0..9daaea9f6 100644 --- a/flutter/lib/desktop/pages/desktop_setting_page.dart +++ b/flutter/lib/desktop/pages/desktop_setting_page.dart @@ -269,7 +269,6 @@ class _GeneralState extends State<_General> { service(), theme(), hwcodec(), - chooseDisplay(), audio(context), record(context), _Card(title: 'Language', children: [language()]), @@ -378,29 +377,6 @@ class _GeneralState extends State<_General> { ); } - Widget chooseDisplay() { - if (!useTextureRender) return const Offstage(); - - var current = getChooseDisplayBehavior(); - onChanged(String value) { - bind.mainSetOption(key: kKeyChooseDisplayBehavior, value: value); - setState(() {}); - } - - return _Card(title: 'Choose Display Behavior', children: [ - _Radio(context, - value: kChooseDisplayBehaviorSwitch, - groupValue: current, - label: 'Switch Display', - onChanged: onChanged), - _Radio(context, - value: kChooseDisplayBehaviorOpen, - groupValue: current, - label: 'Open in New Window', - onChanged: onChanged), - ]); - } - Widget audio(BuildContext context) { String getDefault() { if (Platform.isWindows) return translate('System Sound'); @@ -1148,6 +1124,7 @@ class _DisplayState extends State<_Display> { controller: scrollController, physics: DraggableNeverScrollableScrollPhysics(), children: [ + chooseDisplay(context), viewStyle(context), scrollStyle(context), imageQuality(context), @@ -1156,6 +1133,29 @@ class _DisplayState extends State<_Display> { ]).marginOnly(bottom: _kListViewBottomMargin)); } + Widget chooseDisplay(BuildContext context) { + if (!useTextureRender) return const Offstage(); + + var current = getChooseDisplayBehavior(); + onChanged(String value) { + bind.mainSetOption(key: kKeyChooseDisplayBehavior, value: value); + setState(() {}); + } + + return _Card(title: 'Choose Display Behavior', children: [ + _Radio(context, + value: kChooseDisplayBehaviorSwitch, + groupValue: current, + label: 'Switch display', + onChanged: onChanged), + _Radio(context, + value: kChooseDisplayBehaviorOpen, + groupValue: current, + label: 'Open in new window', + onChanged: onChanged), + ]); + } + Widget viewStyle(BuildContext context) { final key = 'view_style'; onChanged(String value) async { diff --git a/src/lang/ar.rs b/src/lang/ar.rs index 30c8bea5f..99bb7c3e0 100644 --- a/src/lang/ar.rs +++ b/src/lang/ar.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ca.rs b/src/lang/ca.rs index d9c570796..b4938f8e5 100644 --- a/src/lang/ca.rs +++ b/src/lang/ca.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/cn.rs b/src/lang/cn.rs index 24d2ec78a..15a74e11c 100644 --- a/src/lang/cn.rs +++ b/src/lang/cn.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", "没有显示器。"), ("elevated_switch_display_msg", "切换到主显示器，因为提权后，不支持多显示器画面。"), ("Choose Display Behavior", "选择显示器的行为"), - ("Switch Display", "切换显示器"), - ("Open in New Window", "在新的窗口中打开"), + ("Switch display", "切换显示器"), + ("Open in new window", "在新的窗口中打开"), ].iter().cloned().collect(); } diff --git a/src/lang/cs.rs b/src/lang/cs.rs index 4f54e0540..df57c1d9e 100644 --- a/src/lang/cs.rs +++ b/src/lang/cs.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/da.rs b/src/lang/da.rs index 17792e10b..6f9092230 100644 --- a/src/lang/da.rs +++ b/src/lang/da.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/de.rs b/src/lang/de.rs index 0628846d3..55f7b2dd0 100644 --- a/src/lang/de.rs +++ b/src/lang/de.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/el.rs b/src/lang/el.rs index fa545e182..597829043 100644 --- a/src/lang/el.rs +++ b/src/lang/el.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/eo.rs b/src/lang/eo.rs index 56f24354c..03692ff77 100644 --- a/src/lang/eo.rs +++ b/src/lang/eo.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/es.rs b/src/lang/es.rs index 46b0dc63c..de1ec9fed 100644 --- a/src/lang/es.rs +++ b/src/lang/es.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fa.rs b/src/lang/fa.rs index 802b6473c..07829de99 100644 --- a/src/lang/fa.rs +++ b/src/lang/fa.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/fr.rs b/src/lang/fr.rs index bec161910..810dbddc1 100644 --- a/src/lang/fr.rs +++ b/src/lang/fr.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/hu.rs b/src/lang/hu.rs index 9fb02464e..ce8cb5add 100644 --- a/src/lang/hu.rs +++ b/src/lang/hu.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/id.rs b/src/lang/id.rs index ac6b1276d..f1f18ca5c 100644 --- a/src/lang/id.rs +++ b/src/lang/id.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/it.rs b/src/lang/it.rs index 8d6f94b00..be1157776 100644 --- a/src/lang/it.rs +++ b/src/lang/it.rs @@ -564,7 +564,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ja.rs b/src/lang/ja.rs index 7bad54921..43daac2de 100644 --- a/src/lang/ja.rs +++ b/src/lang/ja.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ko.rs b/src/lang/ko.rs index 5d0b7eab7..94ad160f8 100644 --- a/src/lang/ko.rs +++ b/src/lang/ko.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/kz.rs b/src/lang/kz.rs index 24f97be4b..81003b1b2 100644 --- a/src/lang/kz.rs +++ b/src/lang/kz.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lt.rs b/src/lang/lt.rs index b35f33498..d77e543ac 100644 --- a/src/lang/lt.rs +++ b/src/lang/lt.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/lv.rs b/src/lang/lv.rs index ffa33d061..d10238608 100644 --- a/src/lang/lv.rs +++ b/src/lang/lv.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/nl.rs b/src/lang/nl.rs index f67b3dd23..f5a1d5322 100644 --- a/src/lang/nl.rs +++ b/src/lang/nl.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pl.rs b/src/lang/pl.rs index 81c23ef84..4f0fe343c 100644 --- a/src/lang/pl.rs +++ b/src/lang/pl.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/pt_PT.rs b/src/lang/pt_PT.rs index 360cfd4fa..e794b9996 100644 --- a/src/lang/pt_PT.rs +++ b/src/lang/pt_PT.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ptbr.rs b/src/lang/ptbr.rs index 8df3e9ea8..a75da7507 100644 --- a/src/lang/ptbr.rs +++ b/src/lang/ptbr.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ro.rs b/src/lang/ro.rs index 1822d79f2..f03d0b96d 100644 --- a/src/lang/ro.rs +++ b/src/lang/ro.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ru.rs b/src/lang/ru.rs index a0be18469..302a4e209 100644 --- a/src/lang/ru.rs +++ b/src/lang/ru.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sk.rs b/src/lang/sk.rs index 75bb447f4..be35fa666 100644 --- a/src/lang/sk.rs +++ b/src/lang/sk.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sl.rs b/src/lang/sl.rs index 5f9f8d5f3..311106d74 100755 --- a/src/lang/sl.rs +++ b/src/lang/sl.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sq.rs b/src/lang/sq.rs index 3fef0845d..31a2096bf 100644 --- a/src/lang/sq.rs +++ b/src/lang/sq.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sr.rs b/src/lang/sr.rs index 3382ac2b6..dc11a8af0 100644 --- a/src/lang/sr.rs +++ b/src/lang/sr.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/sv.rs b/src/lang/sv.rs index eca0c4f19..ffeaea2fc 100644 --- a/src/lang/sv.rs +++ b/src/lang/sv.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/template.rs b/src/lang/template.rs index 256bb7d76..a62790a5d 100644 --- a/src/lang/template.rs +++ b/src/lang/template.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/th.rs b/src/lang/th.rs index 5477cb666..eb9dd789f 100644 --- a/src/lang/th.rs +++ b/src/lang/th.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tr.rs b/src/lang/tr.rs index c8d323d8a..acf67740d 100644 --- a/src/lang/tr.rs +++ b/src/lang/tr.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/tw.rs b/src/lang/tw.rs index ad37066f3..a89a4b547 100644 --- a/src/lang/tw.rs +++ b/src/lang/tw.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/ua.rs b/src/lang/ua.rs index 7b510a224..5e10c9383 100644 --- a/src/lang/ua.rs +++ b/src/lang/ua.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); } diff --git a/src/lang/vn.rs b/src/lang/vn.rs index 309d34f7a..860cd2dbd 100644 --- a/src/lang/vn.rs +++ b/src/lang/vn.rs @@ -563,7 +563,7 @@ pub static ref T: std::collections::HashMap<&'static str, &'static str> = ("No displays", ""), ("elevated_switch_display_msg", ""), ("Choose Display Behavior", ""), - ("Switch Display", ""), - ("Open in New Window", ""), + ("Switch display", ""), + ("Open in new window", ""), ].iter().cloned().collect(); }