Changeset 67a1dd501331bba8bcb39ddb141685879f82c944

Timestamp:

12/03/09 01:49:08 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

094d7ba9d7b4e9483c1f14d8280c3d7a31057015

Parents:

94c197fe3390887d8841edc20b9c2a0b16c76ad0

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2009-12-03T01:49:08Z+0200

Message:

gui: dialog for starting programs now starts them through ladishd

Files:

• gui/app_supervisor_proxy.c (added)
• gui/app_supervisor_proxy.h (added)
• gui/graph_view.c (modified) (7 diffs)
• gui/graph_view.h (modified) (2 diffs)
• gui/main.c (modified) (4 diffs)
• wscript (modified) (1 diff)

gui/graph_view.c

@@ -29 +29 @@
 #include "glade.h"
 #include "world_tree.h"
+#include "app_supervisor_proxy.h"
 
 struct graph_view
@@ -37 +38 @@
   graph_proxy_handle graph;
   GtkWidget * canvas_widget;
+  ladish_app_supervisor_proxy_handle app_supervisor;
 };
 
@@ -57 +59 @@
   const char * object,
   bool graph_dict_supported,
+  bool app_supervisor_supported,
   bool force_activate,
   graph_view_handle * handle_ptr)
@@ -76 +79 @@
   }
 
+  if (app_supervisor_supported)
+  {
+    if (!ladish_app_supervisor_proxy_create(service, object, &view_ptr->app_supervisor))
+    {
+      goto free_name;
+    }
+  }
+  else
+  {
+    view_ptr->app_supervisor = NULL;
+  }
+
   if (!graph_proxy_create(service, object, graph_dict_supported, &view_ptr->graph))
   {
-    goto free_name;
+    goto free_app_supervisor;
   }
 
@@ -114 +129 @@
 destroy_graph:
   graph_proxy_destroy(view_ptr->graph);
+free_app_supervisor:
+  if (view_ptr->app_supervisor != NULL)
+  {
+    ladish_app_supervisor_proxy_destroy(view_ptr->app_supervisor);
+  }
 free_name:
   free(view_ptr->name);
@@ -178 +198 @@
   graph_canvas_destroy(view_ptr->graph_canvas);
   graph_proxy_destroy(view_ptr->graph);
+
+  if (view_ptr->app_supervisor != NULL)
+  {
+    ladish_app_supervisor_proxy_destroy(view_ptr->app_supervisor);
+  }
+
   free(view_ptr->name);
   free(view_ptr);
@@ -226 +252 @@
   return graph_canvas_get_canvas(g_current_view->graph_canvas);
 }
+
+bool app_run_custom(graph_view_handle view, const char * command, const char * name, bool run_in_terminal)
+{
+  return ladish_app_supervisor_proxy_run_custom(view_ptr->app_supervisor, command, name, run_in_terminal);
+}

gui/graph_view.h

@@ -40 +40 @@
   const char * object,
   bool graph_dict_supported,
+  bool app_supervisor_supported,
   bool force_activate,
   graph_view_handle * handle_ptr);
@@ -49 +50 @@
 canvas_handle get_current_canvas();
 
+bool app_run_custom(graph_view_handle view, const char * command, const char * name, bool run_in_terminal);
+
 /* not very good place for this prototype, because it is not implemented in graph_view.c */
 void set_main_window_title(graph_view_handle view);

gui/main.c

@@ -42 +42 @@
 #include "../studio_proxy.h"
 #include "ask_dialog.h"
+#include "app_supervisor_proxy.h"
 
 GtkWidget * g_main_win;
@@ -247 +248 @@
   {
     log_info("'%s':'%s' %s", gtk_entry_get_text(name_entry), gtk_entry_get_text(command_entry), gtk_toggle_button_get_active(terminal_button) ? "terminal" : "shell");
+    if (!app_run_custom(g_studio_view, gtk_entry_get_text(command_entry), gtk_entry_get_text(name_entry), gtk_toggle_button_get_active(terminal_button)))
+    {
+      error_message_box("Execution failed. I know you want to know more for the reson but currently you can only check the log file.");
+    }
   }
 
@@ -491 +496 @@
   }
 
-  if (!create_view(name, SERVICE_NAME, STUDIO_OBJECT_PATH, true, false, &g_studio_view))
+  if (!create_view(name, SERVICE_NAME, STUDIO_OBJECT_PATH, true, true, false, &g_studio_view))
   {
     log_error("create_view() failed for studio");
@@ -579 +584 @@
 
 #if defined(SHOW_RAW_JACK)
-  if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, true, &g_jack_view))
+  if (!create_view("Raw JACK", JACKDBUS_SERVICE_NAME, JACKDBUS_OBJECT_PATH, false, false, true, &g_jack_view))
   {
     log_error("create_view() failed for jack");

wscript

@@ -297 +297 @@
             'glade.c',
             'control_proxy.c',
+            'app_supervisor_proxy.c',
             'ask_dialog.c',
             ]: