Merge pull request #4013 from drwtsn32x/warning-tray-icon

Improve tray icon to reflect warning state

8 files changed, 42 insertions, 29 deletions

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs
index 5bd571d6a..8f7f05725 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/AppIndicatorRunner.cs
@@ -65,6 +65,9 @@ namespace Duplicati.GUI.TrayIcon
                 case TrayIcons.Running:

                     m_appIndicator.IconDesc = "Running";

                     break;

+                case TrayIcons.IdleWarning:

+                    m_appIndicator.IconDesc = "Warning";

+                    break;

                 case TrayIcons.IdleError:

                     m_appIndicator.IconDesc = "Error";

                     break;

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/CocoaRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/CocoaRunner.cs
index 2e08c8876..be668b8e8 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/CocoaRunner.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/CocoaRunner.cs
@@ -81,6 +81,7 @@ namespace Duplicati.GUI.TrayIcon
         private static readonly string ICON_NORMAL = ICON_PATH + "normal.png";

         private static readonly string ICON_PAUSED = ICON_PATH + "normal-pause.png";

         private static readonly string ICON_RUNNING = ICON_PATH + "normal-running.png";

+        private static readonly string ICON_WARNING = ICON_PATH + "normal-error.png"; // TODO: create a normal-warning.png, for now use normal-error.png

         private static readonly string ICON_ERROR = ICON_PATH + "normal-error.png";

         

         private NSStatusItem m_statusItem;

@@ -128,6 +129,9 @@ namespace Duplicati.GUI.TrayIcon
                     case Duplicati.GUI.TrayIcon.TrayIcons.IdleError:

                         m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_ERROR));

                         break;

+                    case Duplicati.GUI.TrayIcon.TrayIcons.IdleWarning:

+                        m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_WARNING));

+                        break;

                     case Duplicati.GUI.TrayIcon.TrayIcons.Paused:

                         m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_PAUSED));

                         break;

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
index d5ad3ea1a..4c54d5f7c 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Duplicati.GUI.TrayIcon.csproj
@@ -379,9 +379,6 @@
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

   <ItemGroup />

   <ItemGroup>

-    <Content Include="Resources\TrayNormalWarning.ico">

-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

-    </Content>

     <Content Include="SVGIcons\dark\normal-warning.svg">

       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

     </Content>

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs
index 2ec57649f..21e1d21e2 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/GtkRunner.cs
@@ -235,6 +235,8 @@ namespace Duplicati.GUI.TrayIcon
                     return "normal-pause";

                 case TrayIcons.Running:

                     return "normal-running";

+                case TrayIcons.IdleWarning:

+                    return "normal-warning";

                 case TrayIcons.IdleError:

                     return "normal-error";

                 case TrayIcons.RunningError:

@@ -261,6 +263,9 @@ namespace Duplicati.GUI.TrayIcon
                         case TrayIcons.Running:

                             _images[icon] = ImageToPixbuf(ImageLoader.LoadIcon(ImageLoader.WorkingIcon).ToBitmap());

                             break;

+                        case TrayIcons.IdleWarning:

+                            _images[icon] = ImageToPixbuf(ImageLoader.LoadIcon(ImageLoader.WarningIcon).ToBitmap());

+                            break;

                         case TrayIcons.IdleError:

                             _images[icon] = ImageToPixbuf(ImageLoader.LoadIcon(ImageLoader.ErrorIcon).ToBitmap());

                             break;

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico
index bf7783029..a380fb3ef 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/Resources/TrayNormalWarning.ico
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/RumpsRunner.cs b/Duplicati/GUI/Duplicati.GUI.TrayIcon/RumpsRunner.cs
index 468af31b6..0d8a10fd9 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/RumpsRunner.cs
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/RumpsRunner.cs
@@ -92,6 +92,7 @@ namespace Duplicati.GUI.TrayIcon
         private static readonly string ICON_NORMAL = ICON_PATH + "normal.png";

         private static readonly string ICON_PAUSED = ICON_PATH + "normal-pause.png";

         private static readonly string ICON_RUNNING = ICON_PATH + "normal-running.png";

+        private static readonly string ICON_WARNING = ICON_PATH + "normal-error.png"; // TODO: create a normal-warning.png, for now use normal-error.png

         private static readonly string ICON_ERROR = ICON_PATH + "normal-error.png";

 

         private readonly Dictionary<Duplicati.GUI.TrayIcon.TrayIcons, string> m_images = new Dictionary<Duplicati.GUI.TrayIcon.TrayIcons, string>();

@@ -271,6 +272,9 @@ namespace Duplicati.GUI.TrayIcon
                     case Duplicati.GUI.TrayIcon.TrayIcons.IdleError:

                         m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_ERROR));

                         break;

+                    case Duplicati.GUI.TrayIcon.TrayIcons.IdleWarning:

+                        m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_WARNING));

+                        break;

                     case Duplicati.GUI.TrayIcon.TrayIcons.Paused:

                         m_images[icon] = LoadStream(ASSEMBLY.GetManifestResourceStream(ICON_PAUSED));

                         break;

diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg
index 75bdf818d..99bdaec3c 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/dark/normal-warning.svg
@@ -14,9 +14,9 @@
    y="0px"
    x="0px"
    version="1.1"
-   sodipodi:docname="normal-warning-yellow-5.svg"
+   sodipodi:docname="normal-warning-orange-2.svg"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="C:\Users\Rod.Savard\source\repos\duplicati - icons\normal-warning-yellow-5.png"
+   inkscape:export-filename="normal-warning-orange-2.png"
    inkscape:export-xdpi="3072"
    inkscape:export-ydpi="3072"><sodipodi:namedview
    pagecolor="#ffffff"
@@ -27,20 +27,20 @@
    guidetolerance="10"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-width="2178"
-   inkscape:window-height="1312"
+   inkscape:window-width="2254"
+   inkscape:window-height="1335"
    id="namedview40"
    showgrid="false"
-   inkscape:zoom="90.509668"
-   inkscape:cx="7.3659575"
+   inkscape:zoom="45.254834"
+   inkscape:cx="3.5984041"
    inkscape:cy="8.1646524"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-x="533"
+   inkscape:window-y="61"
    inkscape:window-maximized="0"
-   inkscape:current-layer="big_6_" /><metadata
+   inkscape:current-layer="error" /><metadata
    id="metadata153"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs151" />
 <style
    id="style103"
@@ -157,7 +157,7 @@
 		<g
    id="small_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path123"
    d="m 8.5,13.5 c -1.1,0 -2,-0.9 -2,-2 v -1 c 0,-1.1 0.9,-2 2,-2 h 3 c 1.1,0 2,0.9 2,2 v 1 c 0,1.1 -0.9,2 -2,2 z"
    class="st9"
@@ -172,7 +172,7 @@
 		<g
    id="middle_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path128"
    d="M 3,14.5 C 1.6,14.5 0.5,13.4 0.5,12 V 11 C 0.5,9.6 1.6,8.5 3,8.5 h 3 c 1.4,0 2.5,1.1 2.5,2.5 v 1 c 0,1.4 -1.1,2.5 -2.5,2.5 z"
    class="st9"
@@ -187,7 +187,7 @@
 		<g
    id="big_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path133"
    d="M 7,10.5 C 5.6,10.5 4.5,9.4 4.5,8 V 4 C 4.5,2.6 5.6,1.5 7,1.5 h 6 c 1.4,0 2.5,1.1 2.5,2.5 v 4 c 0,1.4 -1.1,2.5 -2.5,2.5 z"
    class="st9"
diff --git a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg
index 75bdf818d..99bdaec3c 100644
--- a/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg
+++ b/Duplicati/GUI/Duplicati.GUI.TrayIcon/SVGIcons/light/normal-warning.svg
@@ -14,9 +14,9 @@
    y="0px"
    x="0px"
    version="1.1"
-   sodipodi:docname="normal-warning-yellow-5.svg"
+   sodipodi:docname="normal-warning-orange-2.svg"
    inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
-   inkscape:export-filename="C:\Users\Rod.Savard\source\repos\duplicati - icons\normal-warning-yellow-5.png"
+   inkscape:export-filename="normal-warning-orange-2.png"
    inkscape:export-xdpi="3072"
    inkscape:export-ydpi="3072"><sodipodi:namedview
    pagecolor="#ffffff"
@@ -27,20 +27,20 @@
    guidetolerance="10"
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
-   inkscape:window-width="2178"
-   inkscape:window-height="1312"
+   inkscape:window-width="2254"
+   inkscape:window-height="1335"
    id="namedview40"
    showgrid="false"
-   inkscape:zoom="90.509668"
-   inkscape:cx="7.3659575"
+   inkscape:zoom="45.254834"
+   inkscape:cx="3.5984041"
    inkscape:cy="8.1646524"
-   inkscape:window-x="0"
-   inkscape:window-y="0"
+   inkscape:window-x="533"
+   inkscape:window-y="61"
    inkscape:window-maximized="0"
-   inkscape:current-layer="big_6_" /><metadata
+   inkscape:current-layer="error" /><metadata
    id="metadata153"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs151" />
 <style
    id="style103"
@@ -157,7 +157,7 @@
 		<g
    id="small_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path123"
    d="m 8.5,13.5 c -1.1,0 -2,-0.9 -2,-2 v -1 c 0,-1.1 0.9,-2 2,-2 h 3 c 1.1,0 2,0.9 2,2 v 1 c 0,1.1 -0.9,2 -2,2 z"
    class="st9"
@@ -172,7 +172,7 @@
 		<g
    id="middle_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path128"
    d="M 3,14.5 C 1.6,14.5 0.5,13.4 0.5,12 V 11 C 0.5,9.6 1.6,8.5 3,8.5 h 3 c 1.4,0 2.5,1.1 2.5,2.5 v 1 c 0,1.4 -1.1,2.5 -2.5,2.5 z"
    class="st9"
@@ -187,7 +187,7 @@
 		<g
    id="big_6_">
 			<path
-   style="fill:#c8c814;fill-opacity:1"
+   style="fill:#ffa500;fill-opacity:1"
    id="path133"
    d="M 7,10.5 C 5.6,10.5 4.5,9.4 4.5,8 V 4 C 4.5,2.6 5.6,1.5 7,1.5 h 6 c 1.4,0 2.5,1.1 2.5,2.5 v 4 c 0,1.4 -1.1,2.5 -2.5,2.5 z"
    class="st9"