Merge branch 'master' of https://github.com/rustdesk/rustdesk

flutter/lib/common/widgets/peer_card.dart

@@ -1,6 +1,7 @@
 import 'package:contextmenu/contextmenu.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:get/get.dart';
 
 import '../../common.dart';
@@ -161,13 +162,7 @@ class _PeerCardState extends State<_PeerCard>
                         mainAxisAlignment: MainAxisAlignment.center,
                         children: [
                           Row(children: [
-                            Padding(
+                            getOnline(4, peer.online),
-                                padding: const EdgeInsets.fromLTRB(0, 4, 4, 4),
-                                child: CircleAvatar(
-                                    radius: 5,
-                                    backgroundColor: peer.online
-                                        ? Colors.green
-                                        : Colors.yellow)),
                             Expanded(
                                 child: Text(
                               alias.isEmpty ? formatID(peer.id) : alias,
@@ -261,13 +256,7 @@ class _PeerCardState extends State<_PeerCard>
                     children: [
                       Expanded(
                           child: Row(children: [
-                        Padding(
+                        getOnline(4, peer.online),
-                            padding: const EdgeInsets.fromLTRB(0, 4, 8, 4),
-                            child: CircleAvatar(
-                                radius: 5,
-                                backgroundColor: peer.online
-                                    ? Colors.green
-                                    : Colors.yellow)),
                         Expanded(
                             child: Text(
                           peer.alias.isEmpty ? formatID(peer.id) : peer.alias,
@@ -1001,3 +990,13 @@ void _rdpDialog(String id) async {
     );
   });
 }
+
+Widget getOnline(int rightMargin, bool online) {
+  return Tooltip(
+      message: translate(online ? 'Online' : 'Offline'),
+      waitDuration: const Duration(seconds: 1),
+      child: Padding(
+          padding: const EdgeInsets.fromLTRB(0, 4, 8, 4),
+          child: CircleAvatar(
+              radius: 3, backgroundColor: online ? Colors.green : kColorWarn)));
+}

flutter/lib/consts.dart

@@ -11,6 +11,8 @@ const String kAppTypeDesktopPortForward = "port forward";
 const String kTabLabelHomePage = "Home";
 const String kTabLabelSettingPage = "Settings";
 
+const Color kColorWarn = Color.fromARGB(255, 245, 133, 59);
+
 const int kMobileDefaultDisplayWidth = 720;
 const int kMobileDefaultDisplayHeight = 1280;
 

flutter/lib/desktop/pages/connection_page.dart

@@ -5,6 +5,7 @@ import 'dart:convert';
 
 import 'package:flutter/material.dart';
 import 'package:flutter_hbb/common/widgets/address_book.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:get/get.dart';
 import 'package:url_launcher/url_launcher_string.dart';
 
@@ -13,6 +14,7 @@ import '../../common/formatter/id_formatter.dart';
 import '../../common/widgets/peer_tab_page.dart';
 import '../../common/widgets/peers_view.dart';
 import '../../models/platform_model.dart';
+import '../widgets/button.dart';
 
 /// Connection page for connecting to a remote peer.
 class ConnectionPage extends StatefulWidget {
@@ -108,10 +110,6 @@ class _ConnectionPageState extends State<ConnectionPage> {
   /// UI for the remote ID TextField.
   /// Search for a peer and connect to it if the id exists.
   Widget _buildRemoteIDTextField(BuildContext context) {
-    RxBool ftHover = false.obs;
-    RxBool ftPressed = false.obs;
-    RxBool connHover = false.obs;
-    RxBool connPressed = false.obs;
     RxBool inputFocused = false.obs;
     FocusNode focusNode = FocusNode();
     focusNode.addListener(() {
@@ -190,87 +188,17 @@ class _ConnectionPageState extends State<ConnectionPage> {
               child: Row(
                 mainAxisAlignment: MainAxisAlignment.end,
                 children: [
-                  Obx(() => InkWell(
+                  Button(
-                        onTapDown: (_) => ftPressed.value = true,
+                    isOutline: true,
-                        onTapUp: (_) => ftPressed.value = false,
+                    onTap: () {
-                        onTapCancel: () => ftPressed.value = false,
+                      onConnect(isFileTransfer: true);
-                        onHover: (value) => ftHover.value = value,
+                    },
-                        onTap: () {
+                    text: "Transfer File",
-                          onConnect(isFileTransfer: true);
+                  ),
-                        },
-                        child: Container(
-                          height: 27,
-                          alignment: Alignment.center,
-                          decoration: BoxDecoration(
-                            color: ftPressed.value
-                                ? MyTheme.accent
-                                : Colors.transparent,
-                            border: Border.all(
-                              color: ftPressed.value
-                                  ? MyTheme.accent
-                                  : ftHover.value
-                                      ? MyTheme.hoverBorder
-                                      : MyTheme.border,
-                            ),
-                            borderRadius: BorderRadius.circular(5),
-                          ),
-                          child: Text(
-                            translate(
-                              "Transfer File",
-                            ),
-                            style: TextStyle(
-                                fontSize: 12,
-                                color: ftPressed.value
-                                    ? Theme.of(context).backgroundColor
-                                    : Theme.of(context)
-                                        .textTheme
-                                        .titleLarge
-                                        ?.color),
-                          ).marginSymmetric(horizontal: 12),
-                        ),
-                      )),
                   const SizedBox(
                     width: 17,
                   ),
-                  Obx(
+                  Button(onTap: onConnect, text: "Connect"),
-                    () => InkWell(
-                      onTapDown: (_) => connPressed.value = true,
-                      onTapUp: (_) => connPressed.value = false,
-                      onTapCancel: () => connPressed.value = false,
-                      onHover: (value) => connHover.value = value,
-                      onTap: onConnect,
-                      child: ConstrainedBox(
-                          constraints: BoxConstraints(
-                            minWidth: 80.0,
-                          ),
-                          child: Container(
-                            height: 27,
-                            decoration: BoxDecoration(
-                              color: connPressed.value
-                                  ? MyTheme.accent
-                                  : MyTheme.button,
-                              border: Border.all(
-                                color: connPressed.value
-                                    ? MyTheme.accent
-                                    : connHover.value
-                                        ? MyTheme.hoverBorder
-                                        : MyTheme.button,
-                              ),
-                              borderRadius: BorderRadius.circular(5),
-                            ),
-                            child: Center(
-                              child: Text(
-                                translate(
-                                  "Connect",
-                                ),
-                                style: TextStyle(
-                                    fontSize: 12,
-                                    color: Theme.of(context).backgroundColor),
-                              ),
-                            ).marginSymmetric(horizontal: 12),
-                          )),
-                    ),
-                  ),
                 ],
               ),
             )
@@ -302,7 +230,11 @@ class _ConnectionPageState extends State<ConnectionPage> {
       width: 8,
       decoration: BoxDecoration(
         borderRadius: BorderRadius.circular(20),
-        color: svcStopped.value ? Colors.redAccent : Colors.green,
+        color: svcStopped.value || svcStatusCode.value == 0
+            ? kColorWarn
+            : (svcStatusCode.value == 1
+                ? Color.fromARGB(255, 50, 190, 166)
+                : Color.fromARGB(255, 224, 79, 95)),
       ),
     ).paddingSymmetric(horizontal: 12.0);
     if (svcStopped.value) {

flutter/lib/desktop/pages/desktop_home_page.dart

@@ -26,6 +26,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
     with TrayListener, WindowListener, AutomaticKeepAliveClientMixin {
   @override
   bool get wantKeepAlive => true;
+  var updateUrl = '';
 
   @override
   void onWindowClose() async {
@@ -74,6 +75,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
             buildTip(context),
             buildIDBoard(context),
             buildPasswordBoard(context),
+            buildHelpCards(),
           ],
         ),
       ),
@@ -293,6 +295,46 @@ class _DesktopHomePageState extends State<DesktopHomePage>
     );
   }
 
+  Widget buildHelpCards() {
+    if (Platform.isWindows) {
+      if (!bind.mainIsInstalled()) {
+        return buildInstallCard();
+      } else if (bind.mainIsInstalledLowerVersion()) {
+        return buildUpgradeCard();
+      }
+    }
+    if (updateUrl.isNotEmpty) {
+      return buildUpdateCard();
+    }
+    if (Platform.isMacOS) {}
+    if (bind.mainIsInstalledLowerVersion()) {}
+    return Container();
+  }
+
+  Widget buildUpdateCard() {
+    return Container();
+  }
+
+  Widget buildUpgradeCard() {
+    return Container();
+  }
+
+  Widget buildInstallCard() {
+    return Container(
+      margin: EdgeInsets.only(top: 20),
+      child: Column(
+        mainAxisAlignment: MainAxisAlignment.start,
+        crossAxisAlignment: CrossAxisAlignment.start,
+        children: [
+          Text(
+            translate("install_tip"),
+            style: TextStyle(fontWeight: FontWeight.normal, fontSize: 19),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   void onTrayMenuItemClick(MenuItem menuItem) {
     debugPrint('click ${menuItem.key}');
@@ -310,6 +352,10 @@ class _DesktopHomePageState extends State<DesktopHomePage>
   @override
   void initState() {
     super.initState();
+    Timer(const Duration(seconds: 5), () async {
+      updateUrl = await bind.mainGetSoftwareUpdateUrl();
+      if (updateUrl.isNotEmpty) setState(() {});
+    });
     trayManager.addListener(this);
     windowManager.addListener(this);
     rustDeskWinManager.setMethodHandler((call, fromWindowId) async {

flutter/lib/desktop/pages/desktop_setting_page.dart

@@ -4,6 +4,7 @@ import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter/services.dart';
 import 'package:flutter_hbb/common.dart';
+import 'package:flutter_hbb/consts.dart';
 import 'package:flutter_hbb/desktop/pages/desktop_home_page.dart';
 import 'package:flutter_hbb/models/platform_model.dart';
 import 'package:flutter_hbb/models/server_model.dart';
@@ -474,7 +475,7 @@ class _SafetyState extends State<_Safety> with AutomaticKeepAliveClientMixin {
       _OptionCheckBox(context, 'Deny remote access', 'stop-service',
           checkedIcon: const Icon(
             Icons.warning_amber_rounded,
-            color: Color.fromARGB(255, 255, 204, 0),
+            color: kColorWarn,
           ),
           enabled: enabled),
       Offstage(

flutter/lib/desktop/widgets/button.dart

@@ -0,0 +1,73 @@
+import 'package:flutter/material.dart';
+import 'package:get/get.dart';
+
+import '../../common.dart';
+
+class Button extends StatefulWidget {
+  GestureTapCallback onTap;
+  String text;
+  double? minWidth;
+  bool isOutline;
+
+  Button({
+    Key? key,
+    this.minWidth,
+    this.isOutline = false,
+    required this.onTap,
+    required this.text,
+  }) : super(key: key);
+
+  @override
+  State<Button> createState() => _ButtonState();
+}
+
+class _ButtonState extends State<Button> {
+  RxBool hover = false.obs;
+  RxBool pressed = false.obs;
+
+  @override
+  Widget build(BuildContext context) {
+    return Obx(() => InkWell(
+          onTapDown: (_) => pressed.value = true,
+          onTapUp: (_) => pressed.value = false,
+          onTapCancel: () => pressed.value = false,
+          onHover: (value) => hover.value = value,
+          onTap: widget.onTap,
+          child: ConstrainedBox(
+              constraints: BoxConstraints(
+                minWidth: widget.minWidth ?? 80.0,
+              ),
+              child: Container(
+                height: 27,
+                alignment: Alignment.center,
+                decoration: BoxDecoration(
+                  color: pressed.value
+                      ? MyTheme.accent
+                      : (widget.isOutline
+                          ? Colors.transparent
+                          : MyTheme.button),
+                  border: Border.all(
+                    color: pressed.value
+                        ? MyTheme.accent
+                        : hover.value
+                            ? MyTheme.hoverBorder
+                            : (widget.isOutline
+                                ? MyTheme.border
+                                : MyTheme.button),
+                  ),
+                  borderRadius: BorderRadius.circular(5),
+                ),
+                child: Text(
+                  translate(
+                    widget.text,
+                  ),
+                  style: TextStyle(
+                      fontSize: 12,
+                      color: pressed.value || !widget.isOutline
+                          ? Theme.of(context).backgroundColor
+                          : Theme.of(context).textTheme.titleLarge?.color),
+                ).marginSymmetric(horizontal: 12),
+              )),
+        ));
+  }
+}

flutter/linux/my_application.cc

@@ -59,7 +59,12 @@ static void my_application_activate(GApplication* application) {
 
   FlView* view = fl_view_new(project);
   gtk_widget_show(GTK_WIDGET(view));
-  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(view));
+  
+  auto border_frame = gtk_frame_new(nullptr);
+  gtk_frame_set_shadow_type(GTK_FRAME(border_frame), GTK_SHADOW_ETCHED_IN);
+  gtk_container_add(GTK_CONTAINER(border_frame), GTK_WIDGET(view));
+  gtk_widget_show(GTK_WIDGET(border_frame));
+  gtk_container_add(GTK_CONTAINER(window), GTK_WIDGET(border_frame));
 
   fl_register_plugins(FL_PLUGIN_REGISTRY(view));
 

flutter/pubspec.yaml

@@ -64,7 +64,7 @@ dependencies:
     desktop_multi_window:
         git:
             url: https://github.com/Kingtous/rustdesk_desktop_multi_window
-            ref: fee851fa43116e0b91c39acd0ec37063dc6015f8
+            ref: 1818097611168f6148317f4c527aa45ff29d5850
     freezed_annotation: ^2.0.3
     tray_manager:
         git: