diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs index 015f640f5..fb30a159d 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs @@ -33,13 +33,13 @@ namespace Duplicati.GUI.TrayIcon m_themeFolder = System.IO.Path.Combine(System.IO.Path.GetDirectoryName(System.Reflection.Assembly.GetExecutingAssembly().Location), "SVGIcons"); m_themeFolder = System.IO.Path.Combine(m_themeFolder, "dark"); - m_appIndicator = new ApplicationIndicator("duplicati", "duplicati-logo", Category.ApplicationStatus, m_themeFolder); + m_appIndicator = new ApplicationIndicator("duplicati", "normal", Category.ApplicationStatus, m_themeFolder); } protected override void Run(string[] args) { m_appIndicator.Menu.ShowAll(); - m_appIndicator.Status = Status.Attention; + m_appIndicator.Status = Status.Active; Gtk.Application.Run(); } @@ -56,9 +56,29 @@ namespace Duplicati.GUI.TrayIcon { switch(value) { + case TrayIcons.Paused: + m_appIndicator.IconName = "normal-pause"; + m_appIndicator.IconDesc = "Paused"; + break; + case TrayIcons.Running: + m_appIndicator.IconName = "normal-running"; + m_appIndicator.IconDesc = "Running"; + break; + case TrayIcons.IdleError: + m_appIndicator.IconName = "normal-error"; + m_appIndicator.IconDesc = "Error"; + break; + case TrayIcons.RunningError: + m_appIndicator.IconName = "normal-running"; + break; + case TrayIcons.PausedError: + m_appIndicator.IconName = "normal-pause"; + m_appIndicator.IconDesc = "Paused"; + break; case TrayIcons.Idle: default: - m_appIndicator.IconName = "duplicati-logo"; + m_appIndicator.IconName = "normal"; + m_appIndicator.IconDesc = "Ready"; break; } } diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj index 855596c16..de5fe6335 100644 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj @@ -267,7 +267,31 @@ - + + + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + + PreserveNewest + + PreserveNewest diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/duplicati-logo.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/duplicati-logo.svg deleted file mode 100644 index c0ab64c28..000000000 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/duplicati-logo.svg +++ /dev/null @@ -1,79 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-error.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-error.svg new file mode 100644 index 000000000..e85a7eb5b --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-error.svg @@ -0,0 +1,142 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + ! + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-pause.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-pause.svg new file mode 100644 index 000000000..ef871c118 --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-pause.svg @@ -0,0 +1,131 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-running.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-running.svg new file mode 100644 index 000000000..b6b5ad80f --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-running.svg @@ -0,0 +1,112 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal.svg new file mode 100644 index 000000000..64daa739f --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal.svg @@ -0,0 +1,107 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/duplicati-logo.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/duplicati-logo.svg deleted file mode 100644 index 12f97f0ce..000000000 --- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/duplicati-logo.svg +++ /dev/null @@ -1,113 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-error.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-error.svg new file mode 100644 index 000000000..baf2de4db --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-error.svg @@ -0,0 +1,142 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + ! + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-pause.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-pause.svg new file mode 100644 index 000000000..a25da2559 --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-pause.svg @@ -0,0 +1,130 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-running.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-running.svg new file mode 100644 index 000000000..2b7a7b5d7 --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-running.svg @@ -0,0 +1,112 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal.svg new file mode 100644 index 000000000..f4ddc0814 --- /dev/null +++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal.svg @@ -0,0 +1,107 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + +