Added log viewer

[gregoa/zavai.git] / src / app_main.vala

diff --git a/src/app_main.vala b/src/app_main.vala
index d8265f1911fbb750e8d46816d621158029e9220c..0faa7274ba4bb6c9080dc64caea93693db686940 100644 (file)
--- a/src/app_main.vala
+++ b/src/app_main.vala
@@ -43,6 +43,7 @@ public class Clock : Gtk.VBox
     protected zavai.clock.SourceType last_time_type;
     protected time_t last_deadline;
     protected string last_deadline_label;
+    protected Log log;
 
     construct
     {
@@ -66,6 +67,9 @@ public class Clock : Gtk.VBox
         l_deadline.set_justify(Gtk.Justification.CENTER);
         pack_start(l_deadline, false, false, 0);
 
+        log = new Log();
+        pack_start(log, false, false, 0);
+
         zavai.clock.clock.minute_changed += on_minute_changed;
         zavai.clock.clock.schedule_changed += on_schedule_changed;
         on_schedule_changed(zavai.clock.clock.next_alarm());
@@ -75,7 +79,7 @@ public class Clock : Gtk.VBox
 
     private void on_date_clicked(Gtk.Button b)
     {
-        zavai.app.push_applet("ui.calendar");
+        zavai.app.push_applet(zavai.ui.calendar.calendar);
     }
 
     private void on_schedule_changed(zavai.clock.Alarm? next)
@@ -130,6 +134,8 @@ public class Status : Applet
 {
     public Gtk.HBox status_icons;
     public Clock clock;
+    public Gtk.Label gsm_status;
+    public Gtk.Label gsm_info;
     public AppletPushLink menu;
 
     public Status(string label)
@@ -137,11 +143,25 @@ public class Status : Applet
         _label = label;
         status_icons = new Gtk.HBox(false, 0);
         clock = new Clock();
-        menu = new AppletPushLink("menu.main");
+        gsm_status = new Gtk.Label("");
+        gsm_info = new Gtk.Label("");
+        menu = new AppletPushLink(zavai.menu_main);
 
         pack_start(status_icons, false, false, 0);
         pack_start(clock, false, false, 0);
+        pack_start(gsm_status, false, false, 0);
+        pack_start(gsm_info, false, false, 0);
+        // pack_start(music.player, false, false, 0);
         pack_end(menu, false, false, 0);
+
+        zavai.gsm.gsm.status_changed += (msg) => { gsm_status.set_text(msg); };
+        zavai.gsm.gsm.info_changed += () => {
+stderr.printf("NEW INFO %s %s %d\n", zavai.gsm.gsm.info_provider, zavai.gsm.gsm.info_registration, zavai.gsm.gsm.info_signal_strength);
+            string text = "%s (%s)".printf(zavai.gsm.gsm.info_provider, zavai.gsm.gsm.info_registration);
+            if (zavai.gsm.gsm.info_signal_strength != -1)
+                text = "%s %d%%".printf(text, zavai.gsm.gsm.info_signal_strength);
+            gsm_info.set_text(text);
+        };
     }
 }
 
@@ -391,6 +411,43 @@ public class AddRelativeDeadline : AddDeadline
     }
 }
 
+public class Log : Gtk.VBox
+{
+    protected Gtk.Label l_info;
+    protected Gtk.Button l_info_button;
+
+    construct
+    {
+        l_info = new Gtk.Label("");
+        // l_info.modify_font(Pango.FontDescription.from_string("Sans 60"));
+        pack_start(l_info, false, false, 0);
+
+        l_info_button = new Gtk.Button();
+        l_info_button.set_image(l_info);
+        l_info_button.relief = Gtk.ReliefStyle.NONE;
+        l_info_button.clicked += (b) => {
+            zavai.app.push_applet(zavai.ui.logview.log);
+        };
+        pack_start(l_info_button, false, false, 0);
+
+        zavai.log.log.entries_changed += refresh;
+
+        refresh();
+    }
+
+    public void refresh()
+    {
+        int count = 0;
+        zavai.log.log.list_entries((d, f) => {
+            ++count;
+            return true;
+        });
+        l_info.set_text("%d log entries".printf(count));
+        l_info_button.set_sensitive(count != 0);
+        //zavai.log.Log l = zavai.log.log.load(args[2]);
+    }
+}
+
 /*
 public class AddDailyDeadline : Applet
 {
@@ -401,28 +458,23 @@ public class AddDailyDeadline : Applet
 }
 */
 
-Status status;
-AddAbsoluteDeadline aad;
-AddRelativeDeadline ard;
+public Status status;
+public AddAbsoluteDeadline aad;
+public AddRelativeDeadline ard;
 //AddDailyDeadline add;
 
 public void init()
 {
     status = new Status("Zavai");
-    zavai.registry.register_applet("zavai.status", status);
-
     aad = new AddAbsoluteDeadline();
-    zavai.registry.register_applet("clock.addabsolute", aad);
     ard = new AddRelativeDeadline();
-    zavai.registry.register_applet("clock.addrelative", ard);
     /*
     add = new AddDailyDeadline();
     zavai.registry.register_applet("clock.adddaily", add);
     */
 
-    var menu_misc = zavai.registry.getmenu("menu.misc");
-    menu_misc.add_applet("clock.addabsolute");
-    menu_misc.add_applet("clock.addrelative");
+    zavai.menu_misc.add_applet(aad);
+    zavai.menu_misc.add_applet(ard);
     //menu_misc.add_applet("clock.adddaily");
 }