Merge pull request #15 from kjlaw89/tray-bugs

Fixes a few issues with the tray Closes #13, #11, #14
kjlaw89 · May 5, 2018 · 40a06d9 · 40a06d9
2 parents 2078f6d + dbeb51a
commit 40a06d9
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 4 deletions.
diff --git a/data/com.github.kjlaw89.webwatcher.appdata.xml b/data/com.github.kjlaw89.webwatcher.appdata.xml
@@ -40,7 +40,19 @@
           <li>Does not require an external service (uses local network to check sites)</li>
           <li>Runs in background automatically once started via System tray indicator</li>
         </ul>
-    </description> 
+    </description>
+    <releases>
+      <release version="1.0.1" date="2018-05-04">
+        <description>
+          <p>Fixed an issue where tray does not appear on first load making it hard to close app</p>
+        </description>
+      </release>
+      <release version="1.0.0" date="2018-05-04">
+        <description>
+          <p>Initial 1.0.0 release!</p>
+        </description>
+      </release>
+    </releases>
     <content_rating type="oars-1.1">
       <content_attribute id="violence-cartoon">none</content_attribute>
       <content_attribute id="violence-fantasy">none</content_attribute>

diff --git a/src/controllers/AppController.vala b/src/controllers/AppController.vala
@@ -95,7 +95,7 @@ namespace App.Controllers {
                     // Watch online/offline events
                     site.status_changed.connect (this.site_status_changed);
 
-                    if (site.status == "bad") {
+                    if (site.active && site.status == "bad") {
                         this.offlineCount++;
                     }
                 }
@@ -124,6 +124,7 @@ namespace App.Controllers {
 
                         sites.add (site);
                         this.View.siteListView.addSite (site);
+                        this.indicatorView.addSite (site);
                         break;
                 }
             });
@@ -151,7 +152,7 @@ namespace App.Controllers {
         }
 
         private void site_status_changed (SiteModel site, SiteEvent status) {
-            if (!site.notify) {
+            if (!site.notify || !site.active) {
                 return;
             }
 

diff --git a/src/views/AppIndicatorView.vala b/src/views/AppIndicatorView.vala
@@ -38,7 +38,7 @@ namespace App.Views {
          */
 		public AppIndicatorView (AppIndicator.Indicator indicator) {
             this.indicator = indicator;
-            this.show_all ();
+            build_menu ();
         }
 
         public void addSite (SiteModel site) {
@@ -85,6 +85,10 @@ namespace App.Views {
             }
 
             foreach (var entry in sitesList.entries) {
+                if (entry.key.active == false) {
+                    continue;
+                }
+
                 this.add (entry.value);
             }
 

diff --git a/src/widgets/IndicatorItem.vala b/src/widgets/IndicatorItem.vala
@@ -34,6 +34,7 @@ namespace App.Widgets {
 
         private string previousLabel;
         private string previousStatus;
+        private bool?   previousActiveStatus;
         private SiteModel _site;
 
         public signal void changed ();
@@ -91,6 +92,11 @@ namespace App.Widgets {
 
                 this.previousStatus = Site.status;
             }
+
+            if (this.previousActiveStatus == null || this.previousActiveStatus != Site.active) {
+                this.previousActiveStatus = Site.active;
+                this.changed ();
+            }
         }
     }
 }