diff --git a/.github/patches/removeNewVersionNotif.diff b/.github/patches/removeNewVersionNotif.diff index 162eeee..a1899b8 100644 --- a/.github/patches/removeNewVersionNotif.diff +++ b/.github/patches/removeNewVersionNotif.diff @@ -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 +@@ -424,21 +424,21 @@ class _DesktopHomePageState extends State } 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 - 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()) { diff --git a/.github/patches/statussort.diff b/.github/patches/statussort.diff deleted file mode 100644 index bb9a18d..0000000 --- a/.github/patches/statussort.diff +++ /dev/null @@ -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 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; - } - } - diff --git a/.github/workflows/generator-android.yml b/.github/workflows/generator-android.yml index b65b6fd..dbcbe49 100644 --- a/.github/workflows/generator-android.yml +++ b/.github/workflows/generator-android.yml @@ -372,7 +372,7 @@ jobs: run: | sed -i -e '/const KEY:/,/};/d' ./src/common.rs sed -i -e '/let Ok(data) = sign::verify(&data, &pk)/,/};/d' ./src/common.rs - sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml + # sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml - name: fix connection delay continue-on-error: true @@ -402,13 +402,6 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/hidecm.diff git apply hidecm.diff - - name: statussort - continue-on-error: true - if: fromJson(inputs.extras).statussort == 'true' - run: | - wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff - git apply statussort.diff - - name: removeNewVersionNotif continue-on-error: true if: fromJson(inputs.extras).removeNewVersionNotif == 'true' diff --git a/.github/workflows/generator-linux.yml b/.github/workflows/generator-linux.yml index effc3ea..0f55f48 100644 --- a/.github/workflows/generator-linux.yml +++ b/.github/workflows/generator-linux.yml @@ -298,7 +298,7 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/removeSetupServerTip.diff git apply removeSetupServerTip.diff echo -n "${{ inputs.custom }}" | cat > ./custom.txt - sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml + # sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs - name: change url to custom @@ -350,13 +350,6 @@ jobs: run: | wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/hidecm.diff git apply hidecm.diff - - - name: statussort - continue-on-error: true - if: fromJson(inputs.extras).statussort == 'true' - run: | - wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff - git apply statussort.diff - name: removeNewVersionNotif continue-on-error: true diff --git a/.github/workflows/generator-macos.yml b/.github/workflows/generator-macos.yml index a29e57e..98da387 100644 --- a/.github/workflows/generator-macos.yml +++ b/.github/workflows/generator-macos.yml @@ -468,13 +468,6 @@ jobs: wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/hidecm.diff git apply hidecm.diff - - name: statussort - continue-on-error: true - if: fromJson(inputs.extras).statussort == 'true' - run: | - wget https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff - git apply statussort.diff - - name: removeNewVersionNotif continue-on-error: true if: fromJson(inputs.extras).removeNewVersionNotif == 'true' diff --git a/.github/workflows/generator-windows.yml b/.github/workflows/generator-windows.yml index fa8e927..123fef4 100644 --- a/.github/workflows/generator-windows.yml +++ b/.github/workflows/generator-windows.yml @@ -64,7 +64,6 @@ env: LLVM_VERSION: "15.0.6" FLUTTER_VERSION: "3.24.5" ANDROID_FLUTTER_VERSION: "3.24.5" - FLUTTER_RUST_BRIDGE_VERSION: "1.80.1" # for arm64 linux because official Dart SDK does not work FLUTTER_ELINUX_VERSION: "3.16.9" TAG_NAME: "${{ inputs.upload-tag }}" @@ -236,7 +235,7 @@ jobs: sed -i -e 's|OeVuKk5nlHiXp+APNn0Y3pC1Iwpwn44JGqrQCsWqmBw=|${{ inputs.key }}|' ./libs/hbb_common/src/config.rs sed -i -e 's|https://admin.rustdesk.com|${{ inputs.apiServer }}|' ./src/common.rs # ./flutter/pubspec.yaml - sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml + # sed -i '/intl:/a \ \ archive: ^3.6.1' ./flutter/pubspec.yaml - name: allow custom.txt continue-on-error: true @@ -401,13 +400,6 @@ jobs: Invoke-WebRequest -Uri https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/hidecm.diff -OutFile hidecm.diff git apply hidecm.diff - - name: statussort - continue-on-error: true - if: fromJson(inputs.extras).statussort == 'true' - run: | - Invoke-WebRequest -Uri https://raw.githubusercontent.com/bryangerlach/rdgen/refs/heads/master/.github/patches/statussort.diff -OutFile statussort.diff - git apply statussort.diff - - name: removeNewVersionNotif continue-on-error: true if: fromJson(inputs.extras).removeNewVersionNotif == 'true' diff --git a/rdgenerator/forms.py b/rdgenerator/forms.py index b2158d4..244de0e 100644 --- a/rdgenerator/forms.py +++ b/rdgenerator/forms.py @@ -77,7 +77,6 @@ class GenerateForm(forms.Form): cycleMonitor = forms.BooleanField(initial=False, required=False) xOffline = forms.BooleanField(initial=False, required=False) hidecm = forms.BooleanField(initial=False, required=False) - statussort = forms.BooleanField(initial=False, required=False) removeNewVersionNotif = forms.BooleanField(initial=False, required=False) def clean_iconfile(self): diff --git a/rdgenerator/templates/generator.html b/rdgenerator/templates/generator.html index 4c24a09..7773600 100644 --- a/rdgenerator/templates/generator.html +++ b/rdgenerator/templates/generator.html @@ -282,7 +282,6 @@


-

diff --git a/rdgenerator/views.py b/rdgenerator/views.py index 7d1eb06..800e412 100644 --- a/rdgenerator/views.py +++ b/rdgenerator/views.py @@ -26,7 +26,6 @@ def generator_view(request): cycleMonitor = form.cleaned_data['cycleMonitor'] xOffline = form.cleaned_data['xOffline'] hidecm = form.cleaned_data['hidecm'] - statussort = form.cleaned_data['statussort'] removeNewVersionNotif = form.cleaned_data['removeNewVersionNotif'] server = form.cleaned_data['serverIP'] key = form.cleaned_data['key'] @@ -176,7 +175,6 @@ def generator_view(request): extras['cycleMonitor'] = 'true' if cycleMonitor else 'false' extras['xOffline'] = 'true' if xOffline else 'false' extras['hidecm'] = 'true' if hidecm else 'false' - extras['statussort'] = 'true' if statussort else 'false' extras['removeNewVersionNotif'] = 'true' if removeNewVersionNotif else 'false' extras['compname'] = compname extra_input = json.dumps(extras)