changes
This commit is contained in:
47
.github/patches/removeNewVersionNotif.diff
vendored
47
.github/patches/removeNewVersionNotif.diff
vendored
@@ -1,22 +1,41 @@
|
||||
diff --git a/flutter/lib/desktop/pages/desktop_home_page.dart b/flutter/lib/desktop/pages/desktop_home_page.dart
|
||||
index ba724eed5..cb66cdaed 100644
|
||||
index ba724eed5..1604c429f 100644
|
||||
--- a/flutter/lib/desktop/pages/desktop_home_page.dart
|
||||
+++ b/flutter/lib/desktop/pages/desktop_home_page.dart
|
||||
@@ -424,7 +424,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
||||
@@ -424,21 +424,21 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
||||
}
|
||||
|
||||
Widget buildHelpCards(String updateUrl) {
|
||||
- if (!bind.isCustomClient() &&
|
||||
+ /*if (!bind.isCustomClient() &&
|
||||
updateUrl.isNotEmpty &&
|
||||
!isCardClosed &&
|
||||
bind.mainUriPrefixSync().contains('rustdesk')) {
|
||||
@@ -435,7 +435,7 @@ class _DesktopHomePageState extends State<DesktopHomePage>
|
||||
final Uri url = Uri.parse('https://rustdesk.com/download');
|
||||
await launchUrl(url);
|
||||
}, closeButton: true);
|
||||
- updateUrl.isNotEmpty &&
|
||||
- !isCardClosed &&
|
||||
- bind.mainUriPrefixSync().contains('rustdesk')) {
|
||||
- return buildInstallCard(
|
||||
- "Status",
|
||||
- "${translate("new-version-of-{${bind.mainGetAppNameSync()}}-tip")} (${bind.mainGetNewVersion()}).",
|
||||
- "Click to download", () async {
|
||||
- final Uri url = Uri.parse('https://rustdesk.com/download');
|
||||
- await launchUrl(url);
|
||||
- }, closeButton: true);
|
||||
- }
|
||||
+ }*/
|
||||
if (systemError.isNotEmpty) {
|
||||
return buildInstallCard("", systemError, "", () {});
|
||||
}
|
||||
- if (systemError.isNotEmpty) {
|
||||
- return buildInstallCard("", systemError, "", () {});
|
||||
- }
|
||||
+ // if (!bind.isCustomClient() &&
|
||||
+ // updateUrl.isNotEmpty &&
|
||||
+ // !isCardClosed &&
|
||||
+ // bind.mainUriPrefixSync().contains('rustdesk')) {
|
||||
+ // return buildInstallCard(
|
||||
+ // "Status",
|
||||
+ // "${translate("new-version-of-{${bind.mainGetAppNameSync()}}-tip")} (${bind.mainGetNewVersion()}).",
|
||||
+ // "Click to download", () async {
|
||||
+ // final Uri url = Uri.parse('https://rustdesk.com/download');
|
||||
+ // await launchUrl(url);
|
||||
+ // }, closeButton: true);
|
||||
+ // }
|
||||
+ // if (systemError.isNotEmpty) {
|
||||
+ // return buildInstallCard("", systemError, "", () {});
|
||||
+ // }
|
||||
|
||||
if (isWindows && !bind.isDisableInstallation()) {
|
||||
if (!bind.mainIsInstalled()) {
|
||||
|
||||
33
.github/patches/statussort.diff
vendored
33
.github/patches/statussort.diff
vendored
@@ -1,33 +0,0 @@
|
||||
diff --git a/flutter/lib/common/widgets/peers_view.dart b/flutter/lib/common/widgets/peers_view.dart
|
||||
index 3e34f882d..68d82116b 100644
|
||||
--- a/flutter/lib/common/widgets/peers_view.dart
|
||||
+++ b/flutter/lib/common/widgets/peers_view.dart
|
||||
@@ -25,13 +25,13 @@ class PeerSortType {
|
||||
static const String remoteId = 'Remote ID';
|
||||
static const String remoteHost = 'Remote Host';
|
||||
static const String username = 'Username';
|
||||
- // static const String status = 'Status';
|
||||
+ static const String status = 'Status';
|
||||
|
||||
static List<String> values = [
|
||||
PeerSortType.remoteId,
|
||||
PeerSortType.remoteHost,
|
||||
PeerSortType.username,
|
||||
- // PeerSortType.status
|
||||
+ PeerSortType.status
|
||||
];
|
||||
}
|
||||
|
||||
@@ -384,9 +384,9 @@ class _PeersViewState extends State<_PeersView>
|
||||
peers.sort((p1, p2) =>
|
||||
p1.username.toLowerCase().compareTo(p2.username.toLowerCase()));
|
||||
break;
|
||||
- // case PeerSortType.status:
|
||||
- // peers.sort((p1, p2) => p1.online ? -1 : 1);
|
||||
- // break;
|
||||
+ case PeerSortType.status:
|
||||
+ peers.sort((p1, p2) => p1.online ? -1 : 1);
|
||||
+ break;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user