Merge lp:~ken-vandine/gwibber/status_bar into lp:gwibber

[Ken VanDine]

Adds new StatusBar widget.

[David Klasinc (bigwhale)]

Looks good to me.

review: Approve

=== modified file 'client/Makefile.am'
--- client/Makefile.am	2011-08-30 17:57:21 +0000
+++ client/Makefile.am	2012-02-16 06:09:17 +0000
@@ -16,6 +16,7 @@
 	public-item.vala \
 	messages-item.vala \
 	stream-entry.vala \
+	status-bar.vala \
 	tab-bar.vala \
 	tab-bar-item.vala \
 	tab-bar-widgets.vala

=== modified file 'client/gwibber-client.vala'
--- client/gwibber-client.vala	2012-02-13 22:20:12 +0000
+++ client/gwibber-client.vala	2012-02-16 06:09:17 +0000
@@ -19,12 +19,14 @@
 public class Client : Gtk.Window
 {
   private Gwibber.Streams streams_service;
+  private Gwibber.Service _service;
   private GLib.Settings state_settings;
   public Gee.HashMap <string, Dee.Model?> streams_map;
   public Gee.HashMap <string, TabBarItem?> items_map;
   public TabBar tabbar;
   public GwibberGtk.StreamView view;
   public Gtk.UIManager manager;
+  private StatusBar _status_bar;
   private int _sort_order = 1;
 
   public int sort_order {
@@ -87,6 +89,37 @@
     tabbar = new TabBar ();
 
     var main_box = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+    _status_bar = new StatusBar ();
+    /* We don't need this yet
+    _status_bar.add_button (Gtk.Stock.OK, Gtk.ResponseType.OK);
+    _status_bar.response.connect((r) => {
+      _status_bar.showing = false;
+    });
+    */
+    main_box.pack_end (_status_bar, false, false, 0);
+    _status_bar.notify["showing"].connect (()=>
+    {
+      debug ("StatusBar showing changed");
+    });
+
+    _service = new Gwibber.Service ();
+    _service.loading_started.connect((source) => {
+      debug ("Loading started");
+      if (!_status_bar.showing)
+      {
+        _status_bar.reset ();
+        _status_bar.set_message_type (Gtk.MessageType.OTHER);
+        _status_bar.message = _("Refreshing");
+        _status_bar.showing = true;
+      }
+    });
+    _service.loading_complete.connect((source) => {
+      debug ("Loading completed");
+      if (_status_bar.showing)
+        _status_bar.showing = false;
+    });
+
     main_box.pack_end (tabbar, true, true, 0);
     add (main_box);
 

=== added file 'client/status-bar.vala'
--- client/status-bar.vala	1970-01-01 00:00:00 +0000
+++ client/status-bar.vala	2012-02-16 06:09:17 +0000
@@ -0,0 +1,93 @@
+/*
+ * Copyright (C) 2011 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by Ken VanDine <[e-mail]>
+ */
+
+public class StatusBar : Gtk.InfoBar
+{
+  private string _message;
+  private Gtk.Label _message_label;
+  private Gtk.Container _content_area;
+
+  private Gwibber.Service _service;
+
+  private bool _showing = false;
+
+  public bool showing {
+    get {
+      return _showing;
+    }
+    set {
+      _showing = value;
+      if (_showing)
+      {
+        show ();
+        queue_draw ();
+      }
+      else
+      {
+        hide ();
+        queue_draw ();
+      }
+    }
+  }
+
+  public string message {
+    get {
+      return _message;
+    }
+    set {
+      if (_message != value)
+      {
+        _message = value;
+        _message_label.set_markup ("<b>" + _message + "</b>");
+      }
+    }
+  }
+
+  public StatusBar ()
+  {
+    Object ();
+  }
+
+  construct
+  {
+    _message = "";
+    set_no_show_all (true);
+    set_message_type (Gtk.MessageType.OTHER);
+    _content_area = get_content_area () as Gtk.Container;
+    _message_label = new Gtk.Label (message);
+    _message_label.set_alignment (0.0f, 0.5f);
+    _message_label.set_use_markup (true);
+    _content_area.add (_message_label);
+    _message_label.show ();
+
+    notify["showing"].connect (()=>
+    {
+    });
+  }
+  
+  public void reset () 
+  {
+    message = "";
+    var _action_area = get_action_area () as Gtk.Container;
+    foreach (var _w in _action_area.get_children ())
+    {
+      if (_w is Gtk.Widget)
+        _w.destroy ();
+    }
+  }
+}