Revert "Split non-ui functions in separate lib"

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

diff --git a/src/app.vala b/src/app.vala
index 24a94c2839a204d4e87e44dcceed20b231865add..5281f56aeccd09531b180d64a53fc9e8372f35e8 100644 (file)
--- a/src/app.vala
+++ b/src/app.vala
@@ -1,7 +1,7 @@
 /*
  * app - zavai main window
  *
- * Copyright (C) 2009  Enrico Zini <enrico@enricozini.org>
+ * Copyright (C) 2009-2010  Enrico Zini <enrico@enricozini.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -35,6 +35,7 @@ public class Zavai : Gtk.Window, zavai.Resource
         current = null;
         destroy += Gtk.main_quit;
         set_events(get_events() | Gdk.EventMask.VISIBILITY_NOTIFY_MASK);
+        set_position(Gtk.WindowPosition.MOUSE);
         visibility_notify_event += on_visibility;
         set_skip_pager_hint(true);
         set_skip_taskbar_hint(true);
@@ -148,7 +149,14 @@ public class Zavai : Gtk.Window, zavai.Resource
     {
         set_size_request(300, 500);
         //fullscreen();
-        show_all();
+        if (zavai.config.profile == "laptop")
+        {
+            visibility = false;
+            zavai.app.ensure_hidden();
+            zavai.ui.wm.raise_icon.update_icon();
+        } else {
+            show_all();
+        }
     }
 
     public void run_script(string command)
@@ -168,6 +176,19 @@ public class Zavai : Gtk.Window, zavai.Resource
             zavai.log.error("Running " + command + ": " + e.message);
         }
     }
+
+    public int run_script_sync(string command, out string std_out, out string std_err)
+    {
+        int status = -1;
+        zavai.log.info("Run program: " + command);
+        string[] args = command.split(" ");
+        try {
+            bool res = Process.spawn_sync(Environment.get_home_dir(), args, null, SpawnFlags.SEARCH_PATH, null, out std_out, out std_err, out status);
+        } catch (SpawnError e) {
+            zavai.log.error("Running " + command + ": " + e.message);
+        }
+        return status;
+    }
 }
 
 public abstract class Applet : Gtk.VBox, Resource
@@ -361,13 +382,21 @@ public class ServiceRequestLink : Gtk.ToggleButton
         set_label(get_active() ? label_stop : label_start);
     }
 
+    private void on_service_toggled(bool val)
+    {
+        set_active(val);
+        //set_label(val ? label_stop : label_start);
+    }
+
     public ServiceRequestLink(Service service, string label_start, string label_stop)
     {
         this.service = service;
         this.label_start = label_start;
         this.label_stop = label_stop;
         set_size_request(0, zavai.config.min_button_height);
+        set_active(service.started);
         toggled += on_toggled;
+        service.toggled += on_service_toggled;
 
         set_label(get_active() ? label_stop : label_start);
     }