diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index e3d90aa43..05f41e1c8 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -140,6 +140,7 @@ + @@ -382,6 +383,12 @@ + + PreserveNewest + + + PreserveNewest + PreserveNewest @@ -391,6 +398,9 @@ PreserveNewest + + PreserveNewest + PreserveNewest @@ -455,6 +465,7 @@ copy /Y '%USERPROFILE%\.nuget\packages\alphavss\1.4.0\lib\net45\AlphaVSS.*.dll' - + + \ No newline at end of file diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs index be35ef172..f796cfc90 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/ImageLoader.cs @@ -77,6 +77,7 @@ namespace Duplicati.GUI.TrayIcon } public const string NormalIcon = "Resources.TrayNormal.ico"; + public const string WarningIcon = "Resources.TrayNormalWarning.ico"; public const string ErrorIcon = "Resources.TrayNormalError.ico"; public const string PauseIcon = "Resources.TrayNormalPause.ico"; public const string WorkingIcon = "Resources.TrayWorking.ico"; diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico new file mode 100644 index 000000000..bf7783029 Binary files /dev/null and b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico differ diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg new file mode 100644 index 000000000..75bdf818d --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg @@ -0,0 +1,228 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg new file mode 100644 index 000000000..75bdf818d --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg @@ -0,0 +1,228 @@ + +image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/TrayIconBase.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/TrayIconBase.cs index 47734f84e..1ffb51a37 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/TrayIconBase.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/TrayIconBase.cs @@ -35,6 +35,7 @@ namespace Duplicati.GUI.TrayIcon Idle, Paused, Running, + IdleWarning, IdleError, PausedError, RunningError @@ -194,7 +195,7 @@ namespace Duplicati.GUI.TrayIcon this.SetIcon(TrayIcons.IdleError); break; case SuggestedStatusIcon.ReadyWarning: - this.SetIcon(TrayIcons.IdleError); + this.SetIcon(TrayIcons.IdleWarning); break; case SuggestedStatusIcon.Paused: this.SetIcon(TrayIcons.Paused); diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/WinFormsRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/WinFormsRunner.cs index a9ce14aeb..136cda4d4 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/WinFormsRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/WinFormsRunner.cs @@ -204,6 +204,9 @@ namespace Duplicati.GUI.TrayIcon.Windows case TrayIcons.IdleError: m_trayIcon.Icon = ImageLoader.LoadIcon(ImageLoader.ErrorIcon, System.Windows.Forms.SystemInformation.SmallIconSize); break; + case TrayIcons.IdleWarning: + m_trayIcon.Icon = ImageLoader.LoadIcon(ImageLoader.WarningIcon, System.Windows.Forms.SystemInformation.SmallIconSize); + break; case TrayIcons.Paused: m_trayIcon.Icon = ImageLoader.LoadIcon(ImageLoader.PauseIcon, System.Windows.Forms.SystemInformation.SmallIconSize); break;