feat, multi flutter ui sessions, change settings to 'Display'

Signed-off-by: dignow <linlong1265@gmail.com>

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)

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<String>(context,
-          value: kChooseDisplayBehaviorSwitch,
-          groupValue: current,
-          label: 'Switch Display',
-          onChanged: onChanged),
-      _Radio<String>(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<String>(context,
+          value: kChooseDisplayBehaviorSwitch,
+          groupValue: current,
+          label: 'Switch display',
+          onChanged: onChanged),
+      _Radio<String>(context,
+          value: kChooseDisplayBehaviorOpen,
+          groupValue: current,
+          label: 'Open in new window',
+          onChanged: onChanged),
+    ]);
+  }
+
   Widget viewStyle(BuildContext context) {
     final key = 'view_style';
     onChanged(String value) async {

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", "切换显示器"),
+        ("Switch display", "切换显示器"),
-        ("Open in New Window", "在新的窗口中打开"),
+        ("Open in new window", "在新的窗口中打开"),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }

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", ""),
+        ("Switch display", ""),
-        ("Open in New Window", ""),
+        ("Open in new window", ""),
     ].iter().cloned().collect();
 }