diff --git a/.github/workflows/flutter-nightly.yml b/.github/workflows/flutter-nightly.yml index 5474183db..17e338edc 100644 --- a/.github/workflows/flutter-nightly.yml +++ b/.github/workflows/flutter-nightly.yml @@ -377,7 +377,7 @@ jobs: run: | ~/.cargo/bin/flutter_rust_bridge_codegen --rust-input ./src/flutter_ffi.rs --dart-output ./flutter/lib/generated_bridge.dart - - name: Upload Artifcat + - name: Upload Artifact uses: actions/upload-artifact@master with: name: bridge-artifact @@ -1012,7 +1012,7 @@ jobs: files: | rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb - - name: Upload Artifcat + - name: Upload Artifact uses: actions/upload-artifact@master if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} with: @@ -1188,7 +1188,7 @@ jobs: files: | rustdesk-${{ env.VERSION }}-${{ matrix.job.target }}-${{ matrix.job.os }}.deb - - name: Upload Artifcat + - name: Upload Artifact uses: actions/upload-artifact@master if: ${{ contains(matrix.job.extra-build-features, 'flatpak') }} with: diff --git a/build.py b/build.py index 127469784..ca91b3581 100755 --- a/build.py +++ b/build.py @@ -21,7 +21,7 @@ skip_cargo = False def custom_os_system(cmd): err = os._system(cmd) if err != 0: - print(f"Error occured when executing: {cmd}. Exiting.") + print(f"Error occurred when executing: {cmd}. Exiting.") sys.exit(-1) # replace prebuilt os.system os._system = os.system diff --git a/fastlane/metadata/android/en-US/full_description.txt b/fastlane/metadata/android/en-US/full_description.txt index 966ad3df8..1f35ef92d 100644 --- a/fastlane/metadata/android/en-US/full_description.txt +++ b/fastlane/metadata/android/en-US/full_description.txt @@ -4,7 +4,7 @@ Doc: https://rustdesk.com/docs/en/manual/mobile/ In order for a remote device to control your Android device via mouse or touch, you need to allow RustDesk to use the "Accessibility" service, RustDesk uses AccessibilityService API to implement Addroid remote control. -In addtion to remote control, you can also transfer files between Android devices and PCs easily with RustDesk. +In addition to remote control, you can also transfer files between Android devices and PCs easily with RustDesk. You have full control of your data, with no concerns about security. You can use our rendezvous/relay server, or self-hosting, or write your own rendezvous/relay server. Self-hosting server is free and open source: https://github.com/rustdesk/rustdesk-server diff --git a/fastlane/metadata/android/en-US/images/icon.png b/fastlane/metadata/android/en-US/images/icon.png index 543fe8346..3668c7106 100644 Binary files a/fastlane/metadata/android/en-US/images/icon.png and b/fastlane/metadata/android/en-US/images/icon.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png index 32e7b3554..e84ed4d21 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/1.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png index 0f9368545..5a83dc1f0 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/2.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png index b59279552..629631ac7 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/3.png differ diff --git a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png index a4048ae69..39a15ba77 100644 Binary files a/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png and b/fastlane/metadata/android/en-US/images/phoneScreenshots/4.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png index 5d726ab36..5574ee7dc 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/5.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png index 2c3fad113..8e0a83a6a 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/6.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png index 5873757f9..0618ae0b6 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/7.png differ diff --git a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png index faea2eb16..560902b03 100644 Binary files a/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png and b/fastlane/metadata/android/en-US/images/sevenInchScreenshots/8.png differ diff --git a/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index b3dc255d5..d5d2c49c8 100644 Binary files a/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index f24291dbf..e30cc5019 100644 Binary files a/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 8a4e80f53..41ccba607 100644 Binary files a/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index 8bb8d570f..c10349d71 100644 Binary files a/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index 2130526a6..52fde7830 100644 Binary files a/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/flutter/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/flutter/assets/logo.png b/flutter/assets/logo.png index f854a1dc3..ede0e00c4 100644 Binary files a/flutter/assets/logo.png and b/flutter/assets/logo.png differ diff --git a/flutter/build_android_deps.sh b/flutter/build_android_deps.sh index f120346cf..a30abd154 100755 --- a/flutter/build_android_deps.sh +++ b/flutter/build_android_deps.sh @@ -1,7 +1,7 @@ #!/bin/bash -# Build libyuv / opus / libvpx / oboe for Android -# Required: +# Build libyuv / opus / libvpx / oboe for Android +# Required: # 1. set VCPKG_ROOT / ANDROID_NDK path environment variables # 2. vcpkg initialized # 3. ndk, version: 22 (if ndk < 22 you need to change LD as `export LD=$TOOLCHAIN/bin/$NDK_LLVM_TARGET-ld`) @@ -23,7 +23,7 @@ HOST_TAG="linux-x86_64" # current platform, set as `ls $ANDROID_NDK/toolchains/l TOOLCHAIN=$ANDROID_NDK/toolchains/llvm/prebuilt/$HOST_TAG function build { - ANDROID_ABI=$1 + ANDROID_ABI=$1 VCPKG_TARGET=$2 NDK_LLVM_TARGET=$3 LIBVPX_TARGET=$4 @@ -111,15 +111,15 @@ patch -N -d build/oboe -p1 < ../src/oboe.patch # x86_64-linux-android # i686-linux-android -# LIBVPX_TARGET : -# arm64-android-gcc -# armv7-android-gcc +# LIBVPX_TARGET : +# arm64-android-gcc +# armv7-android-gcc # x86_64-android-gcc -# x86-android-gcc +# x86-android-gcc # args: ANDROID_ABI VCPKG_TARGET NDK_LLVM_TARGET LIBVPX_TARGET build arm64-v8a arm64-android aarch64-linux-android arm64-android-gcc -build armeabi-v7a arm-android arm-linux-androideabi armv7-android-gcc +build armeabi-v7a arm-android arm-linux-androideabi armv7-android-gcc # rm -rf build/libvpx # rm -rf build/oboe \ No newline at end of file diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index d4ae9af18..c35862a8c 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png index 61c13f60b..900bd13fa 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@1x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png index ed67c27ad..5fc34ce9a 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@2x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png index f974850af..ab315a4c6 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-20x20@3x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png index ff419814d..6d69c01e1 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@1x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png index b3cdc7920..b6c8034cd 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@2x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png index 15b2e086d..cf6c7c775 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-29x29@3x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png index ed67c27ad..5fc34ce9a 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@1x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png index 94665b74e..6928a4e6d 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@2x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png index 3cf8a0dc2..a13129e15 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-40x40@3x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png index 3cf8a0dc2..a13129e15 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@2x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png index 6e21d8ee9..319e70f91 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-60x60@3x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png index 01047f4be..229bdf563 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@1x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png index ceb721793..caffb26a3 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-76x76@2x.png differ diff --git a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png index e416e5517..751104548 100644 Binary files a/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png and b/flutter/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-83.5x83.5@2x.png differ diff --git a/flutter/lib/common.dart b/flutter/lib/common.dart index 46ba90d66..8d047dd0d 100644 --- a/flutter/lib/common.dart +++ b/flutter/lib/common.dart @@ -46,7 +46,7 @@ var isWebDesktop = false; var version = ""; int androidVersion = 0; -/// only avaliable for Windows target +/// only available for Windows target int windowsBuildNumber = 0; DesktopType? desktopType; @@ -1373,7 +1373,7 @@ Future> getHttpHeaders() async { }; } -// Simple wrapper of built-in types for refrence use. +// Simple wrapper of built-in types for reference use. class SimpleWrapper { T value; SimpleWrapper(this.value); @@ -1409,7 +1409,7 @@ Future reloadAllWindows() async { /// Indicate the flutter app is running in portable mode. /// /// [Note] -/// Portable build is only avaliable on Windows. +/// Portable build is only available on Windows. bool isRunningInPortableMode() { if (!Platform.isWindows) { return false; diff --git a/flutter/lib/common/widgets/peer_card.dart b/flutter/lib/common/widgets/peer_card.dart index 44f82575e..a98739606 100644 --- a/flutter/lib/common/widgets/peer_card.dart +++ b/flutter/lib/common/widgets/peer_card.dart @@ -464,7 +464,7 @@ abstract class BasePeerCard extends StatelessWidget { ); } - /// Only avaliable on Windows. + /// Only available on Windows. @protected MenuEntryBase _createShortCutAction(String id) { return MenuEntryButton( diff --git a/flutter/lib/utils/multi_window_manager.dart b/flutter/lib/utils/multi_window_manager.dart index 91cb9a08a..de6750a3f 100644 --- a/flutter/lib/utils/multi_window_manager.dart +++ b/flutter/lib/utils/multi_window_manager.dart @@ -208,7 +208,7 @@ class RustDeskMultiWindowManager { /// Remove active window which has [`windowId`] /// - /// [Avaliability] + /// [Availability] /// This function should only be called from main window. /// For other windows, please post a unregister(hide) event to main window handler: /// `rustDeskWinManager.call(WindowType.Main, kWindowEventHide, {"id": windowId!});` diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png index 9a3310e01..f51492c53 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png index 1e8713fda..97555e4a2 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png index a529bd927..9ea846547 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png index 7d06c1d80..c695fd3a3 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png index 2ce172957..a99d7db5a 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png index 5c192efb8..5ad5a6bcd 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png differ diff --git a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png index c9bf7b6bb..645580310 100644 Binary files a/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png and b/flutter/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png differ diff --git a/flutter/web/icons/Icon-192.png b/flutter/web/icons/Icon-192.png index db3e76713..5d4566850 100644 Binary files a/flutter/web/icons/Icon-192.png and b/flutter/web/icons/Icon-192.png differ diff --git a/flutter/web/icons/Icon-512.png b/flutter/web/icons/Icon-512.png index 6910947a3..2b1abc3f2 100644 Binary files a/flutter/web/icons/Icon-512.png and b/flutter/web/icons/Icon-512.png differ diff --git a/flutter/web/icons/Icon-maskable-192.png b/flutter/web/icons/Icon-maskable-192.png index 36597c1bc..30147e96e 100644 Binary files a/flutter/web/icons/Icon-maskable-192.png and b/flutter/web/icons/Icon-maskable-192.png differ diff --git a/flutter/web/icons/Icon-maskable-512.png b/flutter/web/icons/Icon-maskable-512.png index f2f79e64b..e84ca5bc7 100644 Binary files a/flutter/web/icons/Icon-maskable-512.png and b/flutter/web/icons/Icon-maskable-512.png differ diff --git a/flutter/web/js/gen_js_from_hbb.py b/flutter/web/js/gen_js_from_hbb.py index 0bdde54e4..8ee553b35 100755 --- a/flutter/web/js/gen_js_from_hbb.py +++ b/flutter/web/js/gen_js_from_hbb.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 -import re +import re import os import glob from tabnanny import check @@ -69,7 +69,7 @@ def main(): for ln in open('../../../Cargo.toml', encoding='utf-8'): if ln.startswith('version ='): print('export const ' + ln) - + def removeComment(ln): return re.sub('\s+\/\/.*$', '', ln) diff --git a/flutter/web/js/src/codec.js b/flutter/web/js/src/codec.js index dc579b5f3..27c9565ec 100644 --- a/flutter/web/js/src/codec.js +++ b/flutter/web/js/src/codec.js @@ -22,8 +22,8 @@ import { simd } from "wasm-feature-detect"; export async function loadVp9(callback) { - // Multithreading is used only if `options.threading` is true. - // This requires browser support for the new `SharedArrayBuffer` and `Atomics` APIs, + // Multithreading is used only if `options.threading` is true. + // This requires browser support for the new `SharedArrayBuffer` and `Atomics` APIs, // currently available in Firefox and Chrome with experimental flags enabled. // 所有主流浏览器均默认于2018年1月5日禁用SharedArrayBuffer const isSIMD = await simd(); diff --git a/flutter/windows/runner/win32_window.cpp b/flutter/windows/runner/win32_window.cpp index 9ada9ab2e..2ff6d686c 100644 --- a/flutter/windows/runner/win32_window.cpp +++ b/flutter/windows/runner/win32_window.cpp @@ -116,7 +116,7 @@ bool Win32Window::CreateAndShow(const std::wstring& title, HMONITOR monitor = MonitorFromPoint(target_point, MONITOR_DEFAULTTONEAREST); UINT dpi = FlutterDesktopGetDpiForMonitor(monitor); double scale_factor = dpi / 96.0; - + HWND window = CreateWindow( window_class, title.c_str(), WS_OVERLAPPEDWINDOW, Scale(origin.x, scale_factor), Scale(origin.y, scale_factor), diff --git a/libs/clipboard/docs/assets/scene3.png b/libs/clipboard/docs/assets/scene3.png index 639236460..a65a7ac06 100644 Binary files a/libs/clipboard/docs/assets/scene3.png and b/libs/clipboard/docs/assets/scene3.png differ diff --git a/libs/clipboard/docs/assets/win_A_B.png b/libs/clipboard/docs/assets/win_A_B.png index 0b6b25d0e..b65e571e7 100644 Binary files a/libs/clipboard/docs/assets/win_A_B.png and b/libs/clipboard/docs/assets/win_A_B.png differ diff --git a/libs/clipboard/docs/assets/win_B_A.png b/libs/clipboard/docs/assets/win_B_A.png index 377fa801f..4484b21ac 100644 Binary files a/libs/clipboard/docs/assets/win_B_A.png and b/libs/clipboard/docs/assets/win_B_A.png differ diff --git a/libs/enigo/.vscode/launch.json b/libs/enigo/.vscode/launch.json index a7a40dcfe..123e0bc42 100644 --- a/libs/enigo/.vscode/launch.json +++ b/libs/enigo/.vscode/launch.json @@ -1,7 +1,7 @@ { "version": "0.2.0", "configurations": [ - + { "name": "Debug", "type": "gdb", diff --git a/libs/enigo/src/lib.rs b/libs/enigo/src/lib.rs index 083345e63..a47f9558d 100644 --- a/libs/enigo/src/lib.rs +++ b/libs/enigo/src/lib.rs @@ -21,7 +21,7 @@ //! Possible use cases could be for testing user interfaces on different //! plattforms, //! building remote control applications or just automating tasks for user -//! interfaces unaccessible by a public API or scripting laguage. +//! interfaces unaccessible by a public API or scripting language. //! //! For the keyboard there are currently two modes you can use. The first mode //! is represented by the [key_sequence]() function diff --git a/libs/enigo/src/macos/macos_impl.rs b/libs/enigo/src/macos/macos_impl.rs index 937320f7d..1ae41f0c3 100644 --- a/libs/enigo/src/macos/macos_impl.rs +++ b/libs/enigo/src/macos/macos_impl.rs @@ -68,7 +68,7 @@ extern "C" { ) -> Boolean; fn CGEventPost(tapLocation: CGEventTapLocation, event: *mut MyCGEvent); - // Actually return CFDataRef which is const here, but for coding convienence, return *mut c_void + // Actually return CFDataRef which is const here, but for coding convenience, return *mut c_void fn TISGetInputSourceProperty(source: TISInputSourceRef, property: *const c_void) -> *mut c_void; // not present in servo/core-graphics diff --git a/libs/hbb_common/src/fs.rs b/libs/hbb_common/src/fs.rs index e08414324..fec8b8670 100644 --- a/libs/hbb_common/src/fs.rs +++ b/libs/hbb_common/src/fs.rs @@ -578,7 +578,7 @@ impl TransferJob { /// /// [`Note`] /// Conditions: - /// 1. Files are not waiting for comfirmation by peers. + /// 1. Files are not waiting for confirmation by peers. #[inline] pub fn job_completed(&self) -> bool { // has no error, Condition 2 diff --git a/libs/scrap/src/dxgi/mag.rs b/libs/scrap/src/dxgi/mag.rs index 78f14194c..0de86055e 100644 --- a/libs/scrap/src/dxgi/mag.rs +++ b/libs/scrap/src/dxgi/mag.rs @@ -339,7 +339,7 @@ impl CapturerMag { } // Register the host window class. See the MSDN documentation of the - // Magnification API for more infomation. + // Magnification API for more information. let wcex = WNDCLASSEXA { cbSize: size_of::() as _, style: 0, diff --git a/libs/virtual_display/dylib/src/win10/IddController.c b/libs/virtual_display/dylib/src/win10/IddController.c index a30fa9d0a..c1faccfc2 100644 --- a/libs/virtual_display/dylib/src/win10/IddController.c +++ b/libs/virtual_display/dylib/src/win10/IddController.c @@ -66,7 +66,7 @@ const char* GetLastMsg() BOOL InstallUpdate(LPCWSTR fullInfPath, PBOOL rebootRequired) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); // UpdateDriverForPlugAndPlayDevicesW may return FALSE while driver was successfully installed... if (FALSE == UpdateDriverForPlugAndPlayDevicesW( @@ -96,7 +96,7 @@ BOOL InstallUpdate(LPCWSTR fullInfPath, PBOOL rebootRequired) BOOL Uninstall(LPCWSTR fullInfPath, PBOOL rebootRequired) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); if (FALSE == DiUninstallDriverW( NULL, @@ -122,7 +122,7 @@ BOOL Uninstall(LPCWSTR fullInfPath, PBOOL rebootRequired) BOOL IsDeviceCreated(PBOOL created) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); HDEVINFO hardwareDeviceInfo = SetupDiGetClassDevs( &GUID_DEVINTERFACE_IDD_DRIVER_DEVICE, @@ -181,7 +181,7 @@ BOOL IsDeviceCreated(PBOOL created) BOOL DeviceCreate(PHSWDEVICE hSwDevice) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); if (*hSwDevice != NULL) { @@ -221,7 +221,7 @@ BOOL DeviceCreate(PHSWDEVICE hSwDevice) SW_DEVICE_CREATE_INFO createInfo = { 0 }; PCWSTR description = L"RustDesk Idd Driver"; - // These match the Pnp id's in the inf file so OS will load the driver when the device is created + // These match the Pnp id's in the inf file so OS will load the driver when the device is created PCWSTR instanceId = L"RustDeskIddDriver"; PCWSTR hardwareIds = L"RustDeskIddDriver\0\0"; PCWSTR compatibleIds = L"RustDeskIddDriver\0\0"; @@ -274,7 +274,7 @@ BOOL DeviceCreate(PHSWDEVICE hSwDevice) VOID DeviceClose(HSWDEVICE hSwDevice) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); if (hSwDevice != INVALID_HANDLE_VALUE && hSwDevice != NULL) { @@ -284,7 +284,7 @@ VOID DeviceClose(HSWDEVICE hSwDevice) BOOL MonitorPlugIn(UINT index, UINT edid, INT retries) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); if (retries < 0) { @@ -359,7 +359,7 @@ BOOL MonitorPlugIn(UINT index, UINT edid, INT retries) BOOL MonitorPlugOut(UINT index) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); HANDLE hDevice = DeviceOpenHandle(); if (hDevice == INVALID_HANDLE_VALUE || hDevice == NULL) @@ -400,7 +400,7 @@ BOOL MonitorPlugOut(UINT index) BOOL MonitorModesUpdate(UINT index, UINT modeCount, PMonitorMode modes) { - SetLastMsg("Sucess"); + SetLastMsg("Success"); HANDLE hDevice = DeviceOpenHandle(); if (hDevice == INVALID_HANDLE_VALUE || hDevice == NULL) @@ -721,7 +721,7 @@ Clean0: // https://stackoverflow.com/questions/67164846/createfile-fails-unless-i-disable-enable-my-device HANDLE DeviceOpenHandle() { - SetLastMsg("Sucess"); + SetLastMsg("Success"); // const int maxDevPathLen = 256; TCHAR devicePath[256] = { 0 }; diff --git a/libs/virtual_display/dylib/src/win10/IddController.h b/libs/virtual_display/dylib/src/win10/IddController.h index f92f72647..767d64798 100644 --- a/libs/virtual_display/dylib/src/win10/IddController.h +++ b/libs/virtual_display/dylib/src/win10/IddController.h @@ -14,7 +14,7 @@ extern "C" { * @param rebootRequired [out] Indicates whether a restart is required. * * @return TRUE/FALSE. If FALSE returned, error message can be retrieved by GetLastMsg() - * + * * @see GetLastMsg#GetLastMsg */ BOOL InstallUpdate(LPCTSTR fullInfPath, PBOOL rebootRequired); @@ -34,11 +34,11 @@ BOOL Uninstall(LPCTSTR fullInfPath, PBOOL rebootRequired); /** * @brief Check if RustDeskIddDriver device is created before. * The driver device(adapter) should be single instance. - * + * * @param created [out] Indicates whether the device is created before. * * @return TRUE/FALSE. If FALSE returned, error message can be retrieved by GetLastMsg() - * + * * @see GetLastMsg#GetLastMsg * */ @@ -47,12 +47,12 @@ BOOL IsDeviceCreated(PBOOL created); /** * @brief Create device. * Only one device should be created. - * If device is installed ealier, this function returns FALSE. - * + * If device is installed earlier, this function returns FALSE. + * * @param hSwDevice [out] Handler of software device, used by DeviceCreate(). Should be **NULL**. * * @return TRUE/FALSE. If FALSE returned, error message can be retrieved by GetLastMsg() - * + * * @see GetLastMsg#GetLastMsg * */ @@ -79,9 +79,9 @@ VOID DeviceClose(HSWDEVICE hSwDevice); * 1 means doing once and retry one time... * * @return TRUE/FALSE. If FALSE returned, error message can be retrieved by GetLastMsg() - * + * * @see GetLastMsg#GetLastMsg - * + * * @remark Plug in monitor may fail if device is created in a very short time. * System need some time to prepare the device. * @@ -94,7 +94,7 @@ BOOL MonitorPlugIn(UINT index, UINT edid, INT retries); * @param index [in] Monitor index, should be 0, 1, 2. * * @return TRUE/FALSE. If FALSE returned, error message can be retrieved by GetLastMsg() - * + * * @see GetLastMsg#GetLastMsg * */ @@ -133,9 +133,9 @@ const char* GetLastMsg(); * @brief Set if print error message when debug. * * @param b [in] TRUE to enable printing message. - * + * * @remark For now, no need to read evironment variable to check if should print. - * + * */ VOID SetPrintErrMsg(BOOL b); diff --git a/res/128x128.png b/res/128x128.png index cd35a0bc8..26cbf702c 100644 Binary files a/res/128x128.png and b/res/128x128.png differ diff --git a/res/128x128@2x.png b/res/128x128@2x.png index 3da699f1d..d6f8d20fa 100644 Binary files a/res/128x128@2x.png and b/res/128x128@2x.png differ diff --git a/res/32x32.png b/res/32x32.png index 21440d422..33dc80537 100644 Binary files a/res/32x32.png and b/res/32x32.png differ diff --git a/res/gen_icon.sh b/res/gen_icon.sh index 40b67aa53..83252a6ae 100644 --- a/res/gen_icon.sh +++ b/res/gen_icon.sh @@ -3,5 +3,5 @@ for size in 16 32 64 128 256 512 1024; do #inkscape -z -o $size.png -w $size -h $size icon.svg >/dev/null 2>/dev/null convert icon.png -resize ${size}x${size} app_icon_$size.png done -# from ImageMagick +# from ImageMagick #/bin/rm 16.png 32.png 48.png 128.png 256.png diff --git a/res/icon-margin.png b/res/icon-margin.png index dfc650e9d..6449ec490 100644 Binary files a/res/icon-margin.png and b/res/icon-margin.png differ diff --git a/res/icon.png b/res/icon.png index 573165a06..823967c49 100644 Binary files a/res/icon.png and b/res/icon.png differ diff --git a/res/lang.py b/res/lang.py index 5aa6f4d15..974449f2a 100644 --- a/res/lang.py +++ b/res/lang.py @@ -4,22 +4,22 @@ import os import glob import sys import csv - -def get_lang(lang): - out = {} + +def get_lang(lang): + out = {} for ln in open('./src/lang/%s.rs'%lang): ln = ln.strip() if ln.startswith('("'): k, v = line_split(ln) out[k] = v - return out + return out def line_split(line): - toks = line.split('", "') + toks = line.split('", "') if len(toks) != 2: print(line) assert(0) - k = toks[0][2:] + k = toks[0][2:] v = toks[1][:-3] return k, v @@ -34,8 +34,8 @@ def main(): def expand(): - for fn in glob.glob('./src/lang/*'): - lang = os.path.basename(fn)[:-3] + for fn in glob.glob('./src/lang/*'): + lang = os.path.basename(fn)[:-3] if lang in ['en','cn']: continue print(lang) dict = get_lang(lang) @@ -52,11 +52,11 @@ def expand(): else: fw.write(line) fw.close() - + def to_csv(): - for fn in glob.glob('./src/lang/*.rs'): - lang = os.path.basename(fn)[:-3] + for fn in glob.glob('./src/lang/*.rs'): + lang = os.path.basename(fn)[:-3] csvfile = open('./src/lang/%s.csv'%lang, "wt") csvwriter = csv.writer(csvfile) for line in open(fn): diff --git a/res/mac-tray-dark.png b/res/mac-tray-dark.png index 0ca3a9dd8..ba8ed8c12 100644 Binary files a/res/mac-tray-dark.png and b/res/mac-tray-dark.png differ diff --git a/res/mac-tray-light.png b/res/mac-tray-light.png index c3e107410..ad8bfa396 100644 Binary files a/res/mac-tray-light.png and b/res/mac-tray-light.png differ diff --git a/src/core_main.rs b/src/core_main.rs index eb8721563..1f42f8aad 100644 --- a/src/core_main.rs +++ b/src/core_main.rs @@ -305,7 +305,7 @@ fn core_main_invoke_new_connection(mut args: std::env::Args) -> Option { log::error!("Failed to start server: {}", err); } - _ => { /*no hapen*/ } + _ => { /*no happen*/ } } } std::thread::sleep(std::time::Duration::from_millis(super::SERVICE_INTERVAL)); diff --git a/src/server/connection.rs b/src/server/connection.rs index 394d330a9..5852b2b06 100644 --- a/src/server/connection.rs +++ b/src/server/connection.rs @@ -251,7 +251,7 @@ impl Connection { loop { tokio::select! { - // biased; // video has higher priority // causing test_delay_timer failed while transfering big file + // biased; // video has higher priority // causing test_delay_timer failed while transferring big file Some(data) = rx_from_cm.recv() => { match data { diff --git a/src/server/input_service.rs b/src/server/input_service.rs index 6b678dbdc..a94a7a2ef 100644 --- a/src/server/input_service.rs +++ b/src/server/input_service.rs @@ -223,7 +223,7 @@ lazy_static::lazy_static! { // First call set_uinput() will create keyboard and mouse clients. // The clients are ipc connections that must live shorter than tokio runtime. -// Thus this funtion must not be called in a temporary runtime. +// Thus this function must not be called in a temporary runtime. #[cfg(target_os = "linux")] pub async fn setup_uinput(minx: i32, maxx: i32, miny: i32, maxy: i32) -> ResultType<()> { // Keyboard and mouse both open /dev/uinput diff --git a/src/server/video_qos.rs b/src/server/video_qos.rs index d75596157..47bf49707 100644 --- a/src/server/video_qos.rs +++ b/src/server/video_qos.rs @@ -198,7 +198,7 @@ impl VideoQoS { #[cfg(target_os = "android")] { - // fix when andorid screen shrinks + // fix when android screen shrinks let fix = scrap::Display::fix_quality() as u32; log::debug!("Android screen, fix quality:{}", fix); let base_bitrate = base_bitrate * fix; diff --git a/src/ui/cm.css b/src/ui/cm.css index ff4d422e4..960c8b567 100644 --- a/src/ui/cm.css +++ b/src/ui/cm.css @@ -45,7 +45,7 @@ div.right-panel { div.icon-and-id { flow: horizontal; - border-spacing: 1em; + border-spacing: 1em; } div.icon { @@ -64,7 +64,7 @@ div.id { div.permissions { flow: horizontal; - border-spacing: 0.5em; + border-spacing: 0.5em; } div.permissions > div { @@ -141,7 +141,7 @@ button.elevate>span { } button.elevate>span>span { - margin-left:*; + margin-left:*; margin-right:*; } diff --git a/src/ui/cm.html b/src/ui/cm.html index 4edb4a762..aabaa0294 100644 --- a/src/ui/cm.html +++ b/src/ui/cm.html @@ -4,7 +4,7 @@ @import url(common.css); @import url(cm.css); - diff --git a/src/ui/cm.tis b/src/ui/cm.tis index 74eb6c6d2..716f2c6dd 100644 --- a/src/ui/cm.tis +++ b/src/ui/cm.tis @@ -31,7 +31,7 @@ class Body: Reactor.Component var disconnected = c.disconnected; var show_elevation_btn = handler.can_elevate() && show_elevation && !c.is_file_transfer && c.port_forward.length == 0; var show_accept_btn = handler.get_option('approve-mode') != 'password'; - // below size:* is work around for Linux, it alreayd set in css, but not work, shit sciter + // below size:* is work around for Linux, it already set in css, but not work, shit sciter return
diff --git a/src/ui/common.css b/src/ui/common.css index 1814ad32d..0fb9afcb1 100644 --- a/src/ui/common.css +++ b/src/ui/common.css @@ -56,7 +56,7 @@ button[type=checkbox], button[type=checkbox]:active { button.outline { border: color(border) solid 1px; - background: transparent; + background: transparent; color: color(text); } @@ -115,7 +115,7 @@ textarea:empty { .base:disabled { background: transparent; } .slider:hover { background: grey; } .slider:active { background: grey; } - .base { size: 16px; } + .base { size: 16px; } .corner { background: white; } } @@ -185,7 +185,7 @@ header div.window-icon icon { header caption { size: *; -} +} @media platform != "OSX" { button.window { diff --git a/src/ui/file_transfer.css b/src/ui/file_transfer.css index 9b45ea2b7..7fd4ac7a8 100644 --- a/src/ui/file_transfer.css +++ b/src/ui/file_transfer.css @@ -12,22 +12,22 @@ div#file-transfer { } table -{ +{ font: system; border: 1px solid color(border); flow: table-fixed; prototype: Grid; size: *; padding:0; - border-spacing: 0; + border-spacing: 0; overflow-x: auto; overflow-y: hidden; } - -table > thead { + +table > thead { behavior: column-resizer; border-bottom: color(border) solid 1px; -} +} table > tbody { behavior: select-multiple; @@ -41,20 +41,20 @@ table th { } table th -{ +{ padding: 4px; foreground-repeat: no-repeat; foreground-position: 50% 3px auto auto; border-left: color(border) solid 1px; -} +} -table th.sortable[sort=asc] -{ +table th.sortable[sort=asc] +{ foreground-image: url(stock:arrow-down); -} +} table th.sortable[sort=desc] -{ +{ foreground-image: url(stock:arrow-up); } @@ -81,10 +81,10 @@ table.has_current thead th:current { table tr:nth-child(odd) { background-color: white; } /* each odd row */ table tr:nth-child(even) { background-color: #F4F5F6; } /* each even row */ -table.has_current tr:current /* current row */ -{ - background-color: color(accent); -} +table.has_current tr:current /* current row */ +{ + background-color: color(accent); +} table.has_current tbody tr:checked { @@ -95,9 +95,9 @@ table.has_current tbody tr:checked td { color: highlighttext; } -table td -{ - padding: 4px; +table td +{ + padding: 4px; text-align: left; font-size: 1em; height: 1.4em; @@ -124,11 +124,11 @@ table td:nth-child(4) { section { size: *; margin: 1em; - border-spacing: 0.5em; + border-spacing: 0.5em; } table td:nth-child(1) { - foreground-repeat: no-repeat; + foreground-repeat: no-repeat; foreground-position: 50% 50% } @@ -160,11 +160,11 @@ div.toolbar > div.button:hover { div.toolbar > div.send { flow: horizontal; - border-spacing: 0.5em; + border-spacing: 0.5em; } div.remote > div.send svg { - transform: scale(-1, 1); + transform: scale(-1, 1); } div.navbar { @@ -207,7 +207,7 @@ table.job-table tr td { padding: 0.5em 1em; border-bottom: color(border) 1px solid; flow: horizontal; - border-spacing: 1em; + border-spacing: 1em; height: 3em; overflow-x: hidden; } @@ -217,11 +217,11 @@ table.job-table tr svg { } table.job-table tr.is_remote svg { - transform: scale(-1, 1); + transform: scale(-1, 1); } table.job-table tr.is_remote div.svg_continue svg { - transform: scale(1, 1); + transform: scale(1, 1); } table.job-table tr td div.text { @@ -246,7 +246,7 @@ table#port-forward thead tr th { table#port-forward tr td { height: 3em; - text-align: left; + text-align: left; } table#port-forward input[type=text], table#port-forward input[type=number] { diff --git a/src/ui/header.css b/src/ui/header.css index e248b46d5..8fe408612 100644 --- a/src/ui/header.css +++ b/src/ui/header.css @@ -8,7 +8,7 @@ header #screens { height: 22px; border-radius: 4px; flow: horizontal; - border-spacing: 0.5em; + border-spacing: 0.5em; padding-right: 1em; position: relative; } diff --git a/src/ui/remote.tis b/src/ui/remote.tis index 012205abc..36f997540 100644 --- a/src/ui/remote.tis +++ b/src/ui/remote.tis @@ -26,7 +26,7 @@ handler.setDisplay = function(x, y, w, h, cursor_embeded) { if (recording) handler.record_screen(true, w, h); } -// in case toolbar not shown correclty +// in case toolbar not shown correctly view.windowMinSize = (scaleIt(500), scaleIt(300)); function adaptDisplay() { diff --git a/src/windows.cc b/src/windows.cc index 137ae399e..c4286ebdd 100644 --- a/src/windows.cc +++ b/src/windows.cc @@ -95,7 +95,7 @@ extern "C" CreateEnvironmentBlock(&lpEnvironment, // Environment block hToken, // New token - TRUE); // Inheritence + TRUE); // Inheritance } if (lpEnvironment) {