moved all png to res

Cargo.toml

@@ -142,10 +142,10 @@ hound = "3.5"
 [package.metadata.bundle]
 name = "RustDesk"
 identifier = "com.carriez.rustdesk"
-icon = ["32x32.png", "128x128.png", "128x128@2x.png"]
+icon = ["res/32x32.png", "res/128x128.png", "res/128x128@2x.png"]
 deb_depends = ["libgtk-3-0", "libxcb-randr0", "libxdo3", "libxfixes3", "libxcb-shape0", "libxcb-xfixes0", "libasound2", "libsystemd0", "pulseaudio", "python3-pip", "curl"]
 osx_minimum_system_version = "10.14"
-resources = ["mac-tray-light.png","mac-tray-dark.png"]
+resources = ["res/mac-tray-light.png","res/mac-tray-dark.png"]
 
 #https://github.com/johnthagen/min-sized-rust
 [profile.release]

flutter/pubspec.lock

@@ -140,7 +140,7 @@ packages:
       name: characters
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.2.0"
+    version: "1.2.1"
   charcode:
     dependency: transitive
     description:
@@ -576,7 +576,7 @@ packages:
       name: material_color_utilities
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "0.1.4"
+    version: "0.1.5"
   menu_base:
     dependency: transitive
     description:
@@ -590,7 +590,7 @@ packages:
       name: meta
       url: "https://pub.dartlang.org"
     source: hosted
-    version: "1.7.0"
+    version: "1.8.0"
   mime:
     dependency: transitive
     description:

flutter/pubspec.yaml

@@ -89,7 +89,7 @@ dev_dependencies:
 
 # rerun: flutter pub run flutter_launcher_icons:main
 icons_launcher:
-    image_path: "../128x128@2x.png"
+    image_path: "../res/icon.png"
     platforms:
         android:
             enable: true

res/setup.nsi

@@ -1,112 +1,112 @@
-Unicode true
+Unicode true
-
+
-####################################################################
+####################################################################
-# Includes
+# Includes
-
+
-!include nsDialogs.nsh
+!include nsDialogs.nsh
-!include MUI2.nsh
+!include MUI2.nsh
-!include x64.nsh
+!include x64.nsh
-!include LogicLib.nsh
+!include LogicLib.nsh
-
+
-####################################################################
+####################################################################
-# File Info
+# File Info
-
+
-!define PRODUCT_NAME "RustDesk"
+!define PRODUCT_NAME "RustDesk"
-!define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
+!define PRODUCT_DESCRIPTION "Installer for ${PRODUCT_NAME}"
-!define COPYRIGHT "Copyright © 2021"
+!define COPYRIGHT "Copyright © 2021"
-!define VERSION "1.1.6"
+!define VERSION "1.1.6"
-
+
-VIProductVersion "${VERSION}.0"
+VIProductVersion "${VERSION}.0"
-VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
+VIAddVersionKey "ProductName" "${PRODUCT_NAME}"
-VIAddVersionKey "ProductVersion" "${VERSION}"
+VIAddVersionKey "ProductVersion" "${VERSION}"
-VIAddVersionKey "FileDescription" "${PRODUCT_DESCRIPTION}"
+VIAddVersionKey "FileDescription" "${PRODUCT_DESCRIPTION}"
-VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
+VIAddVersionKey "LegalCopyright" "${COPYRIGHT}"
-VIAddVersionKey "FileVersion" "${VERSION}.0"
+VIAddVersionKey "FileVersion" "${VERSION}.0"
-
+
-####################################################################
+####################################################################
-# Installer Attributes
+# Installer Attributes
-
+
-Name "${PRODUCT_NAME}"
+Name "${PRODUCT_NAME}"
-Outfile "rustdesk-${VERSION}-setup.exe"
+Outfile "rustdesk-${VERSION}-setup.exe"
-Caption "Setup - ${PRODUCT_NAME}"
+Caption "Setup - ${PRODUCT_NAME}"
-BrandingText "${PRODUCT_NAME}"
+BrandingText "${PRODUCT_NAME}"
-
+
-ShowInstDetails show
+ShowInstDetails show
-RequestExecutionLevel admin
+RequestExecutionLevel admin
-SetOverwrite on
+SetOverwrite on
- 
+ 
-InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
+InstallDir "$PROGRAMFILES64\${PRODUCT_NAME}"
-
+
-####################################################################
+####################################################################
-# Pages
+# Pages
-
+
-!define MUI_ICON "src\tray-icon.ico"
+!define MUI_ICON "tray-icon.ico"
-!define MUI_ABORTWARNING
+!define MUI_ABORTWARNING
-!define MUI_LANGDLL_ALLLANGUAGES
+!define MUI_LANGDLL_ALLLANGUAGES
-!define MUI_FINISHPAGE_SHOWREADME ""
+!define MUI_FINISHPAGE_SHOWREADME ""
-!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
+!define MUI_FINISHPAGE_SHOWREADME_NOTCHECKED
-!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
+!define MUI_FINISHPAGE_SHOWREADME_TEXT "Create Desktop Shortcut"
-!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut
+!define MUI_FINISHPAGE_SHOWREADME_FUNCTION CreateDesktopShortcut
-!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_NAME}.exe"
+!define MUI_FINISHPAGE_RUN "$INSTDIR\${PRODUCT_NAME}.exe"
-
+
-!insertmacro MUI_PAGE_DIRECTORY
+!insertmacro MUI_PAGE_DIRECTORY
-!insertmacro MUI_PAGE_INSTFILES
+!insertmacro MUI_PAGE_INSTFILES
-!insertmacro MUI_PAGE_FINISH
+!insertmacro MUI_PAGE_FINISH
-
+
-####################################################################
+####################################################################
-# Language
+# Language
-
+
-!insertmacro MUI_LANGUAGE "English"
+!insertmacro MUI_LANGUAGE "English"
-!insertmacro MUI_LANGUAGE "SimpChinese"
+!insertmacro MUI_LANGUAGE "SimpChinese"
-
+
-####################################################################
+####################################################################
-# Sections
+# Sections
-
+
-Section "Install"
+Section "Install"
-  SetOutPath $INSTDIR
+  SetOutPath $INSTDIR
-
+
-  # Regkeys
+  # Regkeys
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME}.exe"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayIcon" "$INSTDIR\${PRODUCT_NAME}.exe"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME} (x64)"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayName" "${PRODUCT_NAME} (x64)"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "DisplayVersion" "${VERSION}"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\${PRODUCT_NAME}.exe" --uninstall'
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "UninstallString" '"$INSTDIR\${PRODUCT_NAME}.exe" --uninstall'
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "InstallLocation" "$INSTDIR"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "InstallLocation" "$INSTDIR"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "Carriez, Inc."
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "Publisher" "Carriez, Inc."
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "HelpLink" "https://www.rustdesk.com/"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "HelpLink" "https://www.rustdesk.com/"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "https://www.rustdesk.com/"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLInfoAbout" "https://www.rustdesk.com/"
-  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLUpdateInfo" "https://www.rustdesk.com/"
+  WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" "URLUpdateInfo" "https://www.rustdesk.com/"
-
+
-  nsExec::Exec "taskkill /F /IM ${PRODUCT_NAME}.exe"
+  nsExec::Exec "taskkill /F /IM ${PRODUCT_NAME}.exe"
-  Sleep 500 ; Give time for process to be completely killed
+  Sleep 500 ; Give time for process to be completely killed
-  File "${PRODUCT_NAME}.exe"
+  File "${PRODUCT_NAME}.exe"
-
+
-  SetShellVarContext all
+  SetShellVarContext all
-  CreateShortCut "$INSTDIR\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe"
+  CreateShortCut "$INSTDIR\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe"
-  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
+  CreateDirectory "$SMPROGRAMS\${PRODUCT_NAME}"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
-  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe"
+  CreateShortCut "$SMPROGRAMS\${PRODUCT_NAME}\Uninstall ${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--uninstall" "msiexec.exe"
-  CreateShortCut "$SMSTARTUP\${PRODUCT_NAME} Tray.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--tray"
+  CreateShortCut "$SMSTARTUP\${PRODUCT_NAME} Tray.lnk" "$INSTDIR\${PRODUCT_NAME}.exe" "--tray"
-  
+  
-  nsExec::Exec 'sc create ${PRODUCT_NAME} start=auto DisplayName="${PRODUCT_NAME} Service" binPath= "\"$INSTDIR\${PRODUCT_NAME}.exe\" --service"'
+  nsExec::Exec 'sc create ${PRODUCT_NAME} start=auto DisplayName="${PRODUCT_NAME} Service" binPath= "\"$INSTDIR\${PRODUCT_NAME}.exe\" --service"'
-  nsExec::Exec 'netsh advfirewall firewall add rule name="${PRODUCT_NAME} Service" dir=in action=allow program="$INSTDIR\${PRODUCT_NAME}.exe" enable=yes'
+  nsExec::Exec 'netsh advfirewall firewall add rule name="${PRODUCT_NAME} Service" dir=in action=allow program="$INSTDIR\${PRODUCT_NAME}.exe" enable=yes'
-  nsExec::Exec 'sc start ${PRODUCT_NAME}'
+  nsExec::Exec 'sc start ${PRODUCT_NAME}'
-SectionEnd
+SectionEnd
-
+
-####################################################################
+####################################################################
-# Functions
+# Functions
-
+
-Function .onInit
+Function .onInit
-  # RustDesk is 64-bit only
+  # RustDesk is 64-bit only
-  ${IfNot} ${RunningX64}
+  ${IfNot} ${RunningX64}
-    MessageBox MB_ICONSTOP "${PRODUCT_NAME} is 64-bit only!"
+    MessageBox MB_ICONSTOP "${PRODUCT_NAME} is 64-bit only!"
-    Quit
+    Quit
-  ${EndIf}
+  ${EndIf}
-  ${DisableX64FSRedirection}
+  ${DisableX64FSRedirection}
-  SetRegView 64
+  SetRegView 64
-
+
-  !insertmacro MUI_LANGDLL_DISPLAY
+  !insertmacro MUI_LANGDLL_DISPLAY
-FunctionEnd
+FunctionEnd
-
+
-Function CreateDesktopShortcut
+Function CreateDesktopShortcut
-  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
+  CreateShortCut "$DESKTOP\${PRODUCT_NAME}.lnk" "$INSTDIR\${PRODUCT_NAME}.exe"
-FunctionEnd
+FunctionEnd

src/tray.rs

@@ -18,7 +18,7 @@ enum Events {
 pub fn start_tray(options: Arc<Mutex<HashMap<String, String>>>) {
     let event_loop = EventLoop::<Events>::with_user_event();
     let proxy = event_loop.create_proxy();
-    let icon = include_bytes!("./tray-icon.ico");
+    let icon = include_bytes!("../res/tray-icon.ico");
     let mut tray_icon = TrayIconBuilder::new()
         .sender_winit(proxy)
         .icon_from_buffer(icon)