Move Run program inside Current Apps (next to back link)

diff --git a/TODO b/TODO
index ba51d0456b400c10e998753b4e3a9bcc54af59c4..bd70ee04f6d549505094d9ea97c730da56ad9b4c 100644 (file)
--- a/TODO
+++ b/TODO
@@ -27,6 +27,7 @@ Features to add:
     - remember unexpired alarms persistently (again, a table in sqlite?) so
       that they can be reinstated if zavai is restarted
     - show active alarms and allow to delete them
     - remember unexpired alarms persistently (again, a table in sqlite?) so
       that they can be reinstated if zavai is restarted
     - show active alarms and allow to delete them

+ - Move Run program inside Current Apps (next to back link)

  - GPX status icon (off, waiting for fix, recording)
  - GPX waypoint using AUX button
  - GPX + Audio track
  - GPX status icon (off, waiting for fix, recording)
  - GPX waypoint using AUX button
  - GPX + Audio track

diff --git a/src/app_wm.vala b/src/app_wm.vala
index 08015dc2fdfa745d97057314cf363f6680546059..7aa688e57253eda8f78e16f0bc3402cd00e52d92 100644 (file)
--- a/src/app_wm.vala
+++ b/src/app_wm.vala
@@ -124,13 +124,17 @@ public class CloseOrBack : Gtk.StatusIcon
 
 public class WindowList : Applet
 {
 
 public class WindowList : Applet
 {

-       Wnck.Tasklist selector;
+       protected Wnck.Tasklist selector;
+       protected AppletPushLink launcher_link;

 
        public WindowList(string label)
        {
                _label = label;
                selector = new Wnck.Tasklist(Wnck.Screen.get_default());
                pack_start(selector, true, true, 0);
 
        public WindowList(string label)
        {
                _label = label;
                selector = new Wnck.Tasklist(Wnck.Screen.get_default());
                pack_start(selector, true, true, 0);

+
+               launcher_link = new AppletPushLink("wm.launcher");
+        button_box.pack_start(launcher_link, true, true, 0);

        }
 }
 
        }
 }
 


@@ -274,13 +278,14 @@ public void init()
        close_or_back = new CloseOrBack();
        close_or_back.set_visible(true);
 
        close_or_back = new CloseOrBack();
        close_or_back.set_visible(true);
 

+       launcher = new Launcher("Run program");
+       zavai.registry.register_applet("wm.launcher", launcher);
+

        window_list = new WindowList("Current apps");
        zavai.registry.register_applet("wm.list", window_list);
        zavai.registry.getmenu("menu.main").add_applet("wm.list");
 
        window_list = new WindowList("Current apps");
        zavai.registry.register_applet("wm.list", window_list);
        zavai.registry.getmenu("menu.main").add_applet("wm.list");
 

-       launcher = new Launcher("Run program");
-       zavai.registry.register_applet("wm.launcher", launcher);
-       zavai.registry.getmenu("menu.main").add_applet("wm.launcher");
+       //zavai.registry.getmenu("menu.main").add_applet("wm.launcher");

 }
 
 }
 }
 
 }