Merge pull request #30 from manexim/develop

Release version 0.4.1
manexim · Aug 7, 2019 · 6190dd9 · 6190dd9
2 parents cbb2afa + d8ddca3
commit 6190dd9
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 3 deletions.
diff --git a/data/com.github.manexim.home.appdata.xml.in b/data/com.github.manexim.home.appdata.xml.in
@@ -21,6 +21,29 @@
     <binary>com.github.manexim.home</binary>
   </provides>
   <releases>
+    <release date="2019-08-07" version="0.4.1">
+      <description>
+        <p>New:</p>
+        <ul>
+        </ul>
+        <p>Improved:</p>
+        <ul>
+        </ul>
+        <p>Fixed:</p>
+        <ul>
+          <li>Show loading page if no device is found</li>
+        </ul>
+        <p>Translations:</p>
+        <ul>
+          <li>Russian (by camellan)</li>
+          <li>French (by NathanBnm)</li>
+          <li>German (by meisenzahl)</li>
+          <li>Japanese (by ryonakano)</li>
+          <li>Portuguese (by aimproxy)</li>
+          <li>Polish (by oskarkunik)</li>
+        </ul>
+      </description>
+    </release>
     <release date="2019-08-04" version="0.4.0">
       <description>
         <p>New:</p>

diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,19 @@
+com.github.manexim.home (0.4.1) bionic; urgency=medium
+
+[NEW]
+[IMPROVED]
+[FIXED]
+ * Show loading page if no device is found
+[TRANSLATIONS]
+ * Russian (by camellan)
+ * French (by NathanBnm)
+ * German (by meisenzahl)
+ * Japanese (by ryonakano)
+ * Portuguese (by aimproxy)
+ * Polish (by oskarkunik)
+
+ -- Marius Meisenzahl <[email protected]>  Wed, 07 Aug 2019 06:56:37 +0200
+
 com.github.manexim.home (0.4.0) bionic; urgency=medium
 
 [NEW]

diff --git a/src/config/Constants.vala b/src/config/Constants.vala
@@ -23,5 +23,5 @@ namespace Config {
     public const string APP_ID = "com.github.manexim.home";
     public const string APP_AUTHOR = "Manexim";
     public const string APP_NAME = "Home";
-    public const string APP_VERSION = "0.4.0";
+    public const string APP_VERSION = "0.4.1";
 }
diff --git a/src/views/Overview.vala b/src/views/Overview.vala
@@ -27,6 +27,12 @@ public class Views.Overview : Gtk.ScrolledWindow {
         grid.margin = 12;
         add (grid);
 
+        var loading_revealer = new Gtk.Revealer ();
+        loading_revealer.add (new Pages.LoadingPage ());
+        loading_revealer.reveal_child = true;
+
+        grid.attach (loading_revealer, 0, 1, 1, 1);
+
         var devices_label = new Gtk.Label (_("Devices"));
         devices_label.get_style_context ().add_class (Granite.STYLE_CLASS_H4_LABEL);
         devices_label.xalign = 0;
@@ -43,10 +49,14 @@ public class Views.Overview : Gtk.ScrolledWindow {
         var devices_revealer = new Gtk.Revealer ();
         devices_revealer.add (devices_grid);
 
-        grid.attach (devices_revealer, 0, 0, 1, 1);
+        grid.attach (devices_revealer, 0, 1, 1, 1);
 
         devices_controller = Controllers.DevicesController.instance;
         devices_controller.on_new_device.connect ((device) => {
+            if (loading_revealer.child_revealed) {
+                loading_revealer.reveal_child = false;
+            }
+
             devices_carousel.add_thing (device);
             devices_revealer.reveal_child = true;
         });
@@ -78,10 +88,14 @@ public class Views.Overview : Gtk.ScrolledWindow {
         var hubs_revealer = new Gtk.Revealer ();
         hubs_revealer.add (hubs_grid);
 
-        grid.attach (hubs_revealer, 0, 1, 1, 1);
+        grid.attach (hubs_revealer, 0, 2, 1, 1);
 
         var philipsHueService = Philips.Hue.Service.instance;
         philipsHueService.on_new_bridge.connect ((bridge) => {
+            if (loading_revealer.child_revealed) {
+                loading_revealer.reveal_child = false;
+            }
+
             hubs_carousel.add_thing (bridge);
             hubs_revealer.reveal_child = true;
         });