Changeset 75cba89b1b58616aaaf514ae36ed1b43170e62d4

Timestamp:

12/20/10 18:54:23 (2 years ago)

Author:

Maxim Kachur <mcdebugger@…>

Children:

7c82af029c3c667c830c7315750d59e966db1b66, a0f84c2cbd755b2bce0e9ea7300ad09b2e708feb

Parents:

54aebc4b291ec5fc668d3460c01317732af5ed87, 8e98fc6fb8210706c3e352f1ecb0ecbf8c3e722e

git-committer:

Maxim Kachur <mcdebugger@duganet.ru> / 2010-12-20T19:54:23Z+0300

Message:

Merge branch 'translate'

Files:

• po/ru.po (modified) (19 diffs)
• gui/action.c (modified) (3 diffs)
• gui/dynmenu.c (modified) (8 diffs)
• gui/dynmenu.h (modified) (2 diffs)
• gui/gladish.ui (modified) (1 diff)
• gui/graph_view.c (modified) (3 diffs)
• gui/graph_view.h (modified) (1 diff)
• gui/help/default.txt (deleted)
• gui/help/fr.txt (deleted)
• gui/menu.c (modified) (13 diffs)
• gui/studio_list.c (modified) (3 diffs)
• po/LINGUAS (modified) (1 diff)
• po/de.po (added)
• po/fr.po (modified) (18 diffs)
• po/gladish.pot (modified) (8 diffs)
• wscript (modified) (1 diff)

po/ru.po

@@ -4 +4 @@
 # Nikita Zlobin, <cook60020tmp@mail.ru>, 2010.
 # АлексаМЎр ПрПкуЎОМ <alexandre.prokoudine@gmail.com>, 2010.
+# Maxim Kachur <mcdebugger@duganet.ru>, 2010.
 #
 msgid ""
@@ -10 +11 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-12-18 23:55+0500\n"
-"PO-Revision-Date: 2010-12-18 01:54+0500\n"
-"Last-Translator: АлексаМЎр ПрПкуЎОМ <alexandre.prokoudine@gmail.com>\n"
-"Language-Team: Russian <gnome-cyr@lists.gnome.org>\n"
+"PO-Revision-Date: 2010-12-20 19:50+0300\n"
+"Last-Translator: Maxim Kachur <mcdebugger@duganet.ru>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: UTF-8\n"
+"Content-Type: text/plain; charset=utf-8\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2); 10<=4 && (n%100<10 || n%"
@@ -49 +49 @@
 msgstr "СбрПсОть"
 
-#: gui/action.c:51 gui/action.c:52
+#: gui/action.c:51
+#: gui/action.c:52
 msgid "Zoom 100%"
 msgstr "Масштаб 100%"
 
-#: gui/action.c:56 gui/action.c:57
+#: gui/action.c:56
+#: gui/action.c:57
 msgid "Zoom to fit"
 msgstr "УЌестОть сПЎержОЌПе"
 
-#: gui/action.c:61 gui/action.c:62
+#: gui/action.c:61
+#: gui/action.c:62
 msgid "Zoom in"
 msgstr "УвелОчОть"
 
-#: gui/action.c:66 gui/action.c:67
+#: gui/action.c:66
+#: gui/action.c:67
 msgid "Zoom out"
 msgstr "УЌеМьшОть"
@@ -73 +77 @@
 msgstr "НПвая стуЎОя"
 
-#: gui/control.c:148 gui/studio.c:252 gui/studio.c:294
+#: gui/control.c:148
+#: gui/studio.c:252
+#: gui/studio.c:294
 msgid "Studio name"
 msgstr "НазваМОе стуЎОО"
@@ -79 +85 @@
 #: gui/control.c:152
 msgid "Creation of new studio failed, please inspect logs."
-msgstr "Не уЎалПсь сПзЎать МПвую стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь сПзЎать МПвую стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/control.c:165
 msgid "Studio load failed, please inspect logs."
-msgstr "Не уЎалПсь загрузОть стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь загрузОть стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/control.c:173
@@ -96 +102 @@
 #: gui/control.c:182
 msgid "Studio delete failed, please inspect logs."
-msgstr "Не уЎалПсь уЎалОть стуЎОю, прПверьте журМал."
-
-#: gui/create_room_dialog.c:72 gui/world_tree.c:494 gui/gladish.ui:1629
+msgstr "Не уЎалПсь уЎалОть стуЎОю, пПжалуйста, прПверьте журМал."
+
+#: gui/create_room_dialog.c:72
+#: gui/world_tree.c:494
+#: gui/gladish.ui:1629
 msgid "Name"
 msgstr "НазваМОе"
@@ -111 +119 @@
 "you can only check the log file."
 msgstr ""
-"ВыпПлМеМОе Ме уЎалПсь. ППМятМП, чтП вы Ñ
+"ВыпПлМеМОе Ме уЎалПсь. ППМятМП, чтП Вы Ñ
 ПтОте зМать П прОчОМе бПльше, МП "
-"пПка чтП ЌПжМП лОшь пПчОтать журМал,"
+"пПка чтП Вы ЌПжете лОшь прПверОть журМал."
 
 #: gui/dialogs.c:138
@@ -129 +137 @@
 #: gui/jack.c:57
 msgid "Raw JACK"
-msgstr "ЧОстый JACK"
+msgstr "СырПй JACK"
 
 #: gui/jack.c:93
@@ -171 +179 @@
 msgstr "%u кГц"
 
-#: gui/load_project_dialog.c:187 gui/gladish.ui:702
+#: gui/load_project_dialog.c:187
+#: gui/gladish.ui:702
 msgid "Load project"
 msgstr "ЗагрузОть прПект"
@@ -179 +188 @@
 msgstr "<b><big>ЭтП Ме каталПг прПекта</big></b>"
 
-#: gui/main.c:62 gui/main.c:68 gui/gladish.ui:8
+#: gui/main.c:62
+#: gui/main.c:68
+#: gui/gladish.ui:8
 msgid "LADI Session Handler"
 msgstr "УправлеМОе сеаМсаЌО LADI"
 
-#: gui/menu.c:107 gui/menu.c:116
+#: gui/menu.c:107
+#: gui/menu.c:116
 msgid "Project load failed, please inspect logs."
-msgstr "Не уЎалПсь загрузОть прПект, прПверьте журМал."
-
-#: gui/menu.c:384 gui/gladish.ui:270
+msgstr "Не уЎалПсь загрузОть прПект, пПжалуйста, прПверьте журМал."
+
+#: gui/menu.c:384
+#: gui/gladish.ui:270
 msgid "Run..."
 msgstr "ЗапустОть..."
@@ -221 +234 @@
 msgstr "СПзЎать кПЌМату..."
 
-#: gui/project_properties.c:73 gui/project_properties.c:82
+#: gui/project_properties.c:73
+#: gui/project_properties.c:82
 msgid "Setting of project description failed, please inspect logs."
-msgstr "Не уЎалПсь устаМПвОть ПпОсаМОе прПекта, прПверьте лПгО."
+msgstr "Не уЎалПсь устаМПвОть ПпОсаМОе прПекта, пПжалуйста, прПверьте журМал."
 
 #: gui/room.c:49
 msgid "Room creation failed, please inspect logs."
-msgstr "Не уЎалПсь сПзЎать кПЌМату, прПверьте лПгО."
+msgstr "Не уЎалПсь сПзЎать кПЌМату, пПжалуйста, прПверьте журМал."
 
 #: gui/room.c:72
 msgid "Room deletion failed, please inspect logs."
-msgstr "Не уЎалПсь уЎалОть кПЌМату, прПверьте лПгО."
+msgstr "Не уЎалПсь уЎалОть кПЌМату, пПжалуйста, прПверьте журМал."
 
 #: gui/settings.c:96
@@ -272 +286 @@
 #: gui/studio.c:131
 msgid "Crashed studio, save your work if you can and unload the studio"
-msgstr "СтуЎОя развалОлась, сПÑ
-раМОте рабПту О выгрузОте стуЎОю"
+msgstr "СтуЎОя аварОйМП ПстаМПвлеМа, сПÑ
+раМОте рабПту, еслО ЌПжете, О выгрузОте стуЎОю"
 
 #: gui/studio.c:138
 msgid "failed to get studio name"
-msgstr "Не уЎалПсь пПлучОть ОЌя стуЎОО"
+msgstr "Не уЎалПсь пПлучОть МазваМОе стуЎОО"
 
 #: gui/studio.c:149
@@ -304 +318 @@
 msgid "Studio save failed, please inspect logs."
 msgstr "Не уЎалПсь сПÑ
-раМОть стуЎОю, прПверьте журМал."
+раМОть стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/studio.c:252
@@ -318 +332 @@
 #: gui/studio.c:268
 msgid "Studio start failed, please inspect logs."
-msgstr "Не уЎалПсь запустОть стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь запустОть стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/studio.c:277
 msgid "Studio stop failed, please inspect logs."
-msgstr "Не уЎалПсь ПстаМПвОть стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь ПстаМПвОть стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/studio.c:286
 msgid "Studio unload failed, please inspect logs."
-msgstr "Не уЎалПсь выгрузОть стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь выгрузОть стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/studio.c:294
@@ -334 +348 @@
 #: gui/studio.c:298
 msgid "Studio rename failed, please inspect logs."
-msgstr "Не уЎалПсь переОЌеМПвать стуЎОю, прПверьте журМал."
+msgstr "Не уЎалПсь переОЌеМПвать стуЎОю, пПжалуйста, прПверьте журМал."
 
 #: gui/world_tree.c:255
@@ -562 +576 @@
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
 msgstr ""
-"МеМеЎжер сеаМсПв LADI - свПбПЎМПе прПграЌЌМПе ПбеспечеМОе; вы ЌПжете "
+"ОбрабПтчОк сеаМсПв LADI - свПбПЎМПе прПграЌЌМПе ПбеспечеМОе; вы ЌПжете "
 "распрПстраМять О/ОлО ОзЌеМять егП Ма услПвОяÑ
  ПсМПвМПй ПбществеММПй "
@@ -568 +582 @@
 "лОбП (Ма ваш выбПр) бПлее пПзЎМей версОО.\n"
 "\n"
-"МеМеЎжер сеаМсПв LADI распрПстраМяется в МаЎежЎе прОМестО пПльзу, МП БЕЗ "
+"ОбрабПтчОк сеаМсПв LADI распрПстраМяется в МаЎежЎе прОМестО пПльзу, МП БЕЗ "
 "ГАРАНТИЙ; Ўаже без пПЎразуЌеваеЌПй гараМтОО ПРИГОДНОСТИ ДЛЯ ПРОДАЖИ ОлО "
 "ПРИГОДНОСТИ ДЛЯ КАКОЙ-ЛИБО ЊЕЛИ. ППЎрПбМПстО сЌПтрОте в ПсМПвМПй "
@@ -574 +588 @@
 "\n"
 "Вы ЎПлжМы былО пПлучОть кПпОю ПсМПвМПй ПбществеММПй лОцеМзОО GNU вЌесте с "
-"ЌеМеЎжерПЌ сеаМсПв LADI; еслО этПгП Ме прПОзПшлП, МапОшОте в Free Software "
+"ОбрабПтчОкПЌ сеаМсПв LADI; еслО этПгП Ме прПОзПшлП, МапОшОте в Free Software "
 "Foundaction, Inc.,\n"
 "51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA\n"
 
-#: gui/gladish.ui:737 gui/gladish.ui:1620
+#: gui/gladish.ui:737
+#: gui/gladish.ui:1620
 msgid "Path"
 msgstr "Путь"
@@ -606 +621 @@
 msgstr "УстаМПвОть ОЌя"
 
-#: gui/gladish.ui:1028 gui/gladish.ui:1493
+#: gui/gladish.ui:1028
+#: gui/gladish.ui:1493
 msgid "<b>Name</b>"
 msgstr "<b>ИЌя</b>"

gui/action.c

@@ -30 +30 @@
 #include "jack.h"
 #include "zoom.h"
+#include "menu.h"
+#include "studio.h"
 
 GtkAction * g_clear_xruns_and_max_dsp_action;
@@ -36 +38 @@
 GtkAction * g_zoom_in_action;
 GtkAction * g_zoom_out_action;
+
+static
+gboolean
+load_project_accelerator_activated(
+  GtkAccelGroup * accel_group,
+  GObject * acceleratable,
+  guint keyval,
+  GdkModifierType modifier)
+{
+  graph_view_handle view;
+
+  view = get_current_view();
+  if (get_studio_state() == STUDIO_STATE_STARTED && view != NULL && is_room_view(view))
+  {
+    menu_request_load_project();
+  }
+
+  return TRUE;
+}
+
+static
+gboolean
+unload_project_accelerator_activated(
+  GtkAccelGroup * accel_group,
+  GObject * acceleratable,
+  guint keyval,
+  GdkModifierType modifier)
+{
+  graph_view_handle view;
+
+  view = get_current_view();
+  if (get_studio_state() == STUDIO_STATE_STARTED && view != NULL && is_room_view(view))
+  {
+    menu_request_unload_project();
+  }
+
+  return TRUE;
+}
 
 void init_actions_and_accelerators(void)
@@ -92 +132 @@
   }
 
+  gtk_accel_group_connect(
+    accel_group_ptr,
+    gdk_keyval_from_name("o"),
+    GDK_CONTROL_MASK,
+    GTK_ACCEL_VISIBLE,
+    g_cclosure_new((GCallback)load_project_accelerator_activated, NULL, NULL));
+
+  gtk_accel_group_connect(
+    accel_group_ptr,
+    gdk_keyval_from_name("u"),
+    GDK_CONTROL_MASK,
+    GTK_ACCEL_VISIBLE,
+    g_cclosure_new((GCallback)unload_project_accelerator_activated, NULL, NULL));
+
   gtk_window_add_accel_group(GTK_WINDOW(g_main_win), accel_group_ptr);
 }

gui/dynmenu.c

@@ -41 +41 @@
       const char * name,
       void * data,
+      ladish_dynmenu_item_activate_callback item_activate_callback,
       void (* data_free)()),
     void * context);
-  void (* item_activate_callback)(const char * name, void * data);
+  ladish_dynmenu_item_activate_callback item_activate_callback;
   bool add_sensitive;
   gulong activate_signal_id;
@@ -54 +55 @@
   void * data;
   void (* data_free)();
-  void (* item_activate_callback)(const char * name, void * data);
+  ladish_dynmenu_item_activate_callback item_activate_callback;
 };
 
@@ -90 +91 @@
 #define dynmenu_ptr ((struct ladish_dynmenu *)context)
 
-static void ladish_dynmenu_add_entry(void * context, const char * name, void * data, void (* data_free)())
+static
+void
+ladish_dynmenu_add_entry(
+  void * context,
+  const char * name,
+  void * data,
+  ladish_dynmenu_item_activate_callback item_activate_callback,
+  void (* data_free)())
 {
   struct ladish_dynmenu_item_data * data_ptr;
@@ -98 +106 @@
   data_ptr->data = data;
   data_ptr->data_free = data_free;
-  data_ptr->item_activate_callback = dynmenu_ptr->item_activate_callback;
-
-  data_ptr->item = gtk_menu_item_new_with_label(name);
-  //log_info("refcount == %d", (unsigned int)G_OBJECT(item)->ref_count); // refcount == 2 because of the label
-  gtk_widget_set_sensitive(data_ptr->item, dynmenu_ptr->add_sensitive);
-  gtk_widget_show(data_ptr->item);
-  gtk_menu_shell_append(GTK_MENU_SHELL(dynmenu_ptr->menu), data_ptr->item);
-  g_signal_connect_data(
-    G_OBJECT(data_ptr->item),
-    "activate",
-    G_CALLBACK(on_activate_item),
-    data_ptr,
-    free_item_data,
-    (GConnectFlags)0);
+  data_ptr->item_activate_callback = item_activate_callback != NULL ? item_activate_callback : dynmenu_ptr->item_activate_callback;
+
+  if (name == NULL)
+  {
+    data_ptr->item = gtk_separator_menu_item_new(); /* separator */
+    gtk_widget_show(data_ptr->item);
+    gtk_menu_shell_append(GTK_MENU_SHELL(dynmenu_ptr->menu), data_ptr->item);
+  }
+  else
+  {
+    data_ptr->item = gtk_menu_item_new_with_label(name);
+    //log_info("refcount == %d", (unsigned int)G_OBJECT(item)->ref_count); // refcount == 2 because of the label
+    gtk_widget_set_sensitive(data_ptr->item, dynmenu_ptr->add_sensitive);
+    gtk_widget_show(data_ptr->item);
+    gtk_menu_shell_append(GTK_MENU_SHELL(dynmenu_ptr->menu), data_ptr->item);
+    g_signal_connect_data(
+      G_OBJECT(data_ptr->item),
+      "activate",
+      G_CALLBACK(on_activate_item),
+      data_ptr,
+      free_item_data,
+      (GConnectFlags)0);
+  }
+
   dynmenu_ptr->count++;
 }
@@ -150 +168 @@
   {
     menu_dynmenu_clear(dynmenu_ptr);
-    prefix = _("Error obtaining ");
+    prefix = _("Error filling ");
   }
   else if (dynmenu_ptr->count == 0)
@@ -164 +182 @@
 
   dynmenu_ptr->add_sensitive = false;
-  ladish_dynmenu_add_entry(dynmenu_ptr, text != NULL ? text : prefix, NULL, NULL);
+  ladish_dynmenu_add_entry(dynmenu_ptr, text != NULL ? text : prefix, NULL, NULL, NULL);
 
   free(text);                   /* free(NULL) is safe */
@@ -180 +198 @@
       const char * name,
       void * data,
+      ladish_dynmenu_item_activate_callback item_activate_callback,
       void (* data_free)()),
     void * context),
   const char * description,
-  void (* item_activate_callback)(const char * name, void * data),
+  ladish_dynmenu_item_activate_callback item_activate_callback,
   ladish_dynmenu_handle * dynmenu_handle_ptr)
 {
@@ -218 +237 @@
 
 void
+ladish_dynmenu_fill_external(
+  ladish_dynmenu_handle dynmenu_handle,
+  GtkMenu * menu)
+{
+  GtkWidget * menu_backup;
+  int count_backup;
+
+  menu_backup = dynmenu_ptr->menu;
+  count_backup = dynmenu_ptr->count;
+
+  dynmenu_ptr->menu = GTK_WIDGET(menu);
+  dynmenu_ptr->add_sensitive = true;
+
+  dynmenu_ptr->fill_callback(ladish_dynmenu_add_entry, dynmenu_ptr);
+
+  dynmenu_ptr->menu = menu_backup;
+  dynmenu_ptr->count = count_backup;
+}
+
+void
 ladish_dynmenu_destroy(
   ladish_dynmenu_handle dynmenu_handle)

gui/dynmenu.h

@@ -32 +32 @@
 typedef struct ladish_dynmenu_tag { int unused; } * ladish_dynmenu_handle;
 
+typedef void (* ladish_dynmenu_item_activate_callback)(const char * name, void * data);
+
 bool
 ladish_dynmenu_create(
@@ -43 +45 @@
       const char * name,
       void * data,
+      ladish_dynmenu_item_activate_callback item_activate_callback,
       void (* data_free)()),
     void * context),
   const char * description,
-  void (* item_activate_callback)(const char * name, void * data),
+  ladish_dynmenu_item_activate_callback item_activate_callback,
   ladish_dynmenu_handle * dynmenu_handle_ptr);
+
+void
+ladish_dynmenu_fill_external(
+  ladish_dynmenu_handle dynmenu_handle,
+  GtkMenu * menu);
 
 void

gui/gladish.ui

@@ -188 +188 @@
                   <object class="GtkMenu" id="project_menu">
                     <property name="visible">True</property>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_load_project">
-                        <property name="label" translatable="yes">_Load Project...</property>
-                        <property name="image">image_load_project</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <accelerator key="O" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_unload_project">
-                        <property name="label" translatable="yes">_Unload Project</property>
-                        <property name="image">image_unload_project</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                        <accelerator key="U" signal="activate" modifiers="GDK_CONTROL_MASK"/>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_rename_project">
-                        <property name="label" translatable="yes">_Rename Project...</property>
-                        <property name="image">image_rename_project</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_save_project">
-                        <property name="label" translatable="yes">_Save Project</property>
-                        <property name="image">image_save_project</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_save_as_project">
-                        <property name="label" translatable="yes">Save Project _As...</property>
-                        <property name="image">image_save_as_project</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkSeparatorMenuItem" id="project_menu_separator1">
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
-                    <child>
-                      <object class="GtkImageMenuItem" id="menu_item_recently_loaded_projects">
-                        <property name="label" translatable="yes">R_ecently Loaded</property>
-                        <property name="sensitive">False</property>
-                        <property name="use_stock">False</property>
-                        <property name="use_underline">True</property>
-                        <property name="visible">True</property>
-                      </object>
-                    </child>
                   </object>
                 </child>

gui/graph_view.c

@@ -32 +32 @@
 #include "../proxies/room_proxy.h"
 #include "../common/catdup.h"
-#include "../common/file.h"
 
 struct graph_view
@@ -53 +52 @@
 GtkWidget * g_view_label;
 
-const char * g_view_label_text = NULL;
+const char * g_view_label_text = "";
 
 void view_init(void)
 {
-  g_view_label_text = read_file_contents(DATA_DIR "/help/default.txt");
+  g_view_label_text = _(
+  "If you've started ladish for the first time, you should:\n\n"
+  " 1. Create a new studio (in the menu, Studio -> New Studio)\n"
+  " 2. Configure JACK (in the menu, Tools -> Configure JACK)\n"
+  " 3. Start the studio (in the menu, Studio -> Start Studio)\n"
+  " 4. Start apps (in the menu, Application -> Run)\n"
+  " 5. Connect their ports by click & drag on canvas\n"
+  " 6. Save the studio (in the menu, Studio -> Save Studio)\n");
 
   g_main_scrolledwin = GTK_SCROLLED_WINDOW(get_gtk_builder_widget("main_scrolledwin"));
@@ -478 +484 @@
   return view_ptr->room;
 }
+
+bool room_has_project(graph_view_handle view)
+{
+  return view_ptr->project_name != NULL;
+}

gui/graph_view.h

@@ -55 +55 @@
 const char * get_current_view_room_name(void);
 bool is_room_view(graph_view_handle view);
+bool room_has_project(graph_view_handle view);
 
 ladish_app_supervisor_proxy_handle graph_view_get_app_supervisor(graph_view_handle view);

gui/menu.c

@@ -41 +41 @@
 static GtkWidget * g_menu_item_create_room;
 static GtkWidget * g_menu_item_destroy_room;
-static GtkWidget * g_menu_item_load_project;
-static GtkWidget * g_menu_item_unload_project;
-static GtkWidget * g_menu_item_save_project;
-static GtkWidget * g_menu_item_save_as_project;
+static GtkWidget * g_menu_item_project;
 static GtkWidget * g_menu_item_daemon_exit;
 static GtkWidget * g_menu_item_jack_configure;
@@ -63 +60 @@
 static bool g_latency_changing;
 
-static ladish_dynmenu_handle g_recent_projects_list;
+static ladish_dynmenu_handle g_project_dynmenu;
 
 typedef void (* menu_request_toggle_func)(bool visible);
@@ -89 +86 @@
 struct ladish_recent_projects_list_closure
 {
-  GtkMenu * menu;
   void
   (* callback)(
@@ -95 +91 @@
     const char * name,
     void * data,
+    void (* item_activate_callback)(const char * name, void * data),
     void (* data_free)());
   void * context;
 };
 
-static void on_load_project_main_menu(const char * name, void * data)
-{
-  log_info("Request to load project \"%s\":\"%s\"", name, (const char *)data);
-  if (!ladish_room_proxy_load_project(graph_view_get_room(get_current_view()), data))
-  {
-    error_message_box(_("Project load failed, please inspect logs."));
-  }
-}
-
-static void on_load_project_popup_menu(const char * name, void * data)
+static void on_load_project(const char * name, void * data)
 {
   log_info("Request to load project \"%s\":\"%s\"", name, (const char *)data);
@@ -126 +114 @@
   const char * project_dir)
 {
-  GtkWidget * menuitem;
-
-  if (closure_ptr->menu != NULL)
-  {
-    menuitem = gtk_menu_item_new_with_label(project_name);
-    g_signal_connect_data(
-      menuitem,
-      "activate",
-      (GCallback)on_load_project_popup_menu,
-      strdup(project_dir),
-      (GClosureNotify)free,
-      (GConnectFlags)0);
-    gtk_menu_shell_append(GTK_MENU_SHELL(closure_ptr->menu), menuitem);
-  }
-  else
-  {
-    closure_ptr->callback(closure_ptr->context, project_name, strdup(project_dir), NULL);
-  }
-}
-
-#undef closure_ptr
-
+  closure_ptr->callback(closure_ptr->context, project_name, strdup(project_dir), NULL, free);
+}
+
+static
 bool
-get_recent_projects_list(
+fill_project_dynmenu(
   void (* callback)(
     void * context,
     const char * name,
     void * data,
+    void (* item_activate_callback)(const char * name, void * data),
     void (* data_free)()),
   void * context)
 {
   struct ladish_recent_projects_list_closure closure;
-
-  closure.menu = NULL;
+  bool has_project;
+  graph_view_handle view;
+
   closure.callback = callback;
   closure.context = context;
 
-  return ladish_room_proxy_get_recent_projects(graph_view_get_room(get_current_view()), 10, add_recent_project, &closure);
-}
+  view = get_current_view();
+
+  if (ladish_room_proxy_get_recent_projects(graph_view_get_room(view), 10, add_recent_project, &closure))
+  {
+    callback(context, NULL, NULL, NULL, NULL); /* add separator */
+  }
+
+  callback(context, _("Load Project..."), NULL, (ladish_dynmenu_item_activate_callback)menu_request_load_project, NULL);
+
+  has_project = room_has_project(view);
+
+  if (!has_project)
+  {
+    callback(context, _("Create Project..."), NULL, (ladish_dynmenu_item_activate_callback)menu_request_save_as_project, NULL);
+  }
+
+  callback(context, has_project ? _("Unload Project") : _("Clear Room"), NULL, (ladish_dynmenu_item_activate_callback)menu_request_unload_project, NULL);
+
+  if (has_project)
+  {
+    callback(context, _("Save Project"), NULL, (ladish_dynmenu_item_activate_callback)menu_request_save_project, NULL);
+    callback(context, _("Save Project As..."), NULL, (ladish_dynmenu_item_activate_callback)menu_request_save_as_project, NULL);
+    callback(context, _("Project Properties..."), NULL, (ladish_dynmenu_item_activate_callback)ladish_project_properties_dialog_run, NULL);
+  }
+
+  return true;
+}
+
+#undef closure_ptr
 
 bool menu_init(void)
@@ -178 +177 @@
   g_menu_item_create_room = get_gtk_builder_widget("menu_item_create_room");
   g_menu_item_destroy_room = get_gtk_builder_widget("menu_item_destroy_room");
-  g_menu_item_load_project = get_gtk_builder_widget("menu_item_load_project");
-  g_menu_item_unload_project = get_gtk_builder_widget("menu_item_unload_project");
-  g_menu_item_save_project = get_gtk_builder_widget("menu_item_save_project");
-  g_menu_item_save_as_project = get_gtk_builder_widget("menu_item_save_as_project");
+  g_menu_item_project = get_gtk_builder_widget("project_menu_item");
   g_menu_item_daemon_exit = get_gtk_builder_widget("menu_item_daemon_exit");
   g_menu_item_jack_configure = get_gtk_builder_widget("menu_item_jack_configure");
@@ -214 +210 @@
   g_signal_connect(G_OBJECT(g_menu_item_create_room), "activate", G_CALLBACK(menu_request_create_room), NULL);
   g_signal_connect(G_OBJECT(g_menu_item_destroy_room), "activate", G_CALLBACK(menu_request_destroy_room), NULL);
-  g_signal_connect(G_OBJECT(g_menu_item_load_project), "activate", G_CALLBACK(menu_request_load_project), NULL);
-  g_signal_connect(G_OBJECT(g_menu_item_unload_project), "activate", G_CALLBACK(menu_request_unload_project), NULL);
-  g_signal_connect(G_OBJECT(g_menu_item_save_project), "activate", G_CALLBACK(menu_request_save_project), NULL);
-  g_signal_connect(G_OBJECT(g_menu_item_save_as_project), "activate", G_CALLBACK(menu_request_save_as_project), NULL);
 
   g_signal_connect(G_OBJECT(g_menu_item_jack_latency_32), "toggled", G_CALLBACK(buffer_size_change_request), (gpointer)32);
@@ -230 +222 @@
 
   if (!ladish_dynmenu_create(
-        "menu_item_recently_loaded_projects",
-        "recently_loaded_projects_menu",
-        get_recent_projects_list,
-        "recent projects list",
-        on_load_project_main_menu,
-        &g_recent_projects_list))
+        "project_menu_item",
+        "project_menu",
+        fill_project_dynmenu,
+        "project menu",
+        on_load_project,
+        &g_project_dynmenu))
   {
     return false;
@@ -245 +237 @@
 void menu_uninit(void)
 {
-  ladish_dynmenu_destroy(g_recent_projects_list);
+  ladish_dynmenu_destroy(g_project_dynmenu);
 }
 
 void menu_studio_state_changed(unsigned int studio_state)
 {
+  graph_view_handle view;
+
   gtk_widget_set_sensitive(g_menu_item_start_studio, studio_state == STUDIO_STATE_STOPPED);
   gtk_widget_set_sensitive(g_menu_item_stop_studio, studio_state == STUDIO_STATE_STARTED);
@@ -258 +252 @@
   gtk_widget_set_sensitive(g_menu_item_start_app, studio_state == STUDIO_STATE_STOPPED || studio_state == STUDIO_STATE_STARTED);
   gtk_widget_set_sensitive(g_menu_item_create_room, studio_state == STUDIO_STATE_STOPPED || studio_state == STUDIO_STATE_STARTED);
+
+  view = get_current_view();
+  gtk_widget_set_sensitive(g_menu_item_project, studio_state == STUDIO_STATE_STARTED && view != NULL && is_room_view(view));
 }
 
@@ -330 +327 @@
 {
   gtk_widget_set_sensitive(g_menu_item_destroy_room, room);
-  gtk_widget_set_sensitive(g_menu_item_load_project, room);
-  gtk_widget_set_sensitive(g_menu_item_unload_project, room);
-  gtk_widget_set_sensitive(g_menu_item_save_project, room);
-  gtk_widget_set_sensitive(g_menu_item_save_as_project, room);
-  gtk_widget_set_sensitive(get_gtk_builder_widget("menu_item_recently_loaded_projects"), room);
+  gtk_widget_set_sensitive(g_menu_item_project, room && get_studio_state() == STUDIO_STATE_STARTED);
 }
 
@@ -352 +345 @@
 }
 
-static void on_popup_menu_action_load_project(GtkWidget * menuitem, gpointer userdata)
-{
-  menu_request_load_project();
-}
-
-static void on_popup_menu_action_unload_project(GtkWidget * menuitem, gpointer userdata)
-{
-  menu_request_unload_project();
-}
-
-static void on_popup_menu_action_save_project(GtkWidget * menuitem, gpointer userdata)
-{
-  menu_request_save_project();
-}
-
-static void on_popup_menu_action_save_project_as(GtkWidget * menuitem, gpointer userdata)
-{
-  menu_request_save_as_project();
-}
-
 void fill_view_popup_menu(GtkMenu * menu, graph_view_handle view)
 {
   GtkWidget * menuitem;
-  struct ladish_recent_projects_list_closure closure;
 
   log_info("filling view menu...");
@@ -388 +360 @@
   if (is_room_view(view))
   {
-    closure.menu = menu;
-    closure.callback = NULL;
-    closure.context = NULL;
-
     menuitem = gtk_separator_menu_item_new(); /* separator */
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 
-    if (ladish_room_proxy_get_recent_projects(graph_view_get_room(get_current_view()), 10, add_recent_project, &closure))
-    {
-      menuitem = gtk_separator_menu_item_new(); /* separator */
-      gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-    }
-
-    menuitem = gtk_menu_item_new_with_label(_("Load Project..."));
-    g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_load_project, NULL);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
-    menuitem = gtk_menu_item_new_with_label(_("Unload Project"));
-    g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_unload_project, NULL);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
-    menuitem = gtk_menu_item_new_with_label(_("Save Project..."));
-    g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_save_project, NULL);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
-    menuitem = gtk_menu_item_new_with_label(_("Save Project As..."));
-    g_signal_connect(menuitem, "activate", (GCallback)on_popup_menu_action_save_project_as, NULL);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
-
-    menuitem = gtk_menu_item_new_with_label(_("Project Properties..."));
-    g_signal_connect(menuitem, "activate", (GCallback)ladish_project_properties_dialog_run, NULL);
-    gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
+    ladish_dynmenu_fill_external(g_project_dynmenu, menu);
 
     menuitem = gtk_separator_menu_item_new(); /* separator */

gui/studio_list.c

@@ -40 +40 @@
     const char * name,
     void * data,
+    ladish_dynmenu_item_activate_callback item_activate_callback,
     void (* data_free)());
   void * context;
@@ -52 +53 @@
   const char * studio_name)
 {
-  closure_ptr->callback(closure_ptr->context, studio_name, NULL, NULL);
+  closure_ptr->callback(closure_ptr->context, studio_name, NULL, NULL, NULL);
 }
 
@@ -65 +66 @@
     const char * name,
     void * data,
+    ladish_dynmenu_item_activate_callback item_activate_callback,
     void (* data_free)()),
   void * context)

po/LINGUAS

@@ -1 +1 @@
 # Set of available languages.
-ru fr
+ru fr de

po/fr.po

@@ -69 +69 @@
 #: gui/control.c:148
 msgid "New studio"
-msgstr "Nouveau Studio"
+msgstr "Nouveau studio"
 
 #: gui/control.c:148 gui/studio.c:252 gui/studio.c:294
@@ -124 +124 @@
 msgstr "Vide"
 
+#: gui/graph_view.c:59
+msgid ""
+"If you've started ladish for the first time, you should:\n"
+"\n"
+" 1. Create a new studio (in the menu, Studio -> New Studio)\n"
+" 2. Configure JACK (in the menu, Tools -> Configure JACK)\n"
+" 3. Start the studio (in the menu, Studio -> Start Studio)\n"
+" 4. Start apps (in the menu, Application -> Run)\n"
+" 5. Connect their ports by click & drag on canvas\n"
+" 6. Save the studio (in the menu, Studio -> Save Studio)\n"
+msgstr ""
+"Si vous démarrez ladish pour la premiÚre fois, vous devriez :\n"
+"\n"
+" 1. Créer un nouveau studio (dans le menu, Studio -> Nouveau Studio)\n"
+" 2. Configurer JACK (dans le menu, Outils -> Configurer JACK)\n"
+" 3. Démarrer le studio (dans le menu, Studio -> Démarrer le Studio)\n"
+" 4. Lancer des applications (dans le menu, Application -> Démarrer)\n"
+" 5. Connecter leurs ports en cliquant et traînant sur le canvas\n"
+" 6. Sauver le studio (dans le menu, Studio -> Sauver le Studio)\n"
+
 #: gui/jack.c:57
 msgid "Raw JACK"
@@ -185 +205 @@
 #: gui/menu.c:384 gui/gladish.ui:270
 msgid "Run..."
-msgstr "Lancer..."
+msgstr "Nouvelle Application..."
 
 #: gui/menu.c:404
@@ -209 +229 @@
 #: gui/menu.c:427
 msgid "Destroy Room"
-msgstr "Détruire la Room"
+msgstr "Détruire la room"
 
 #: gui/menu.c:433
 msgid "Create Room..."
-msgstr "Créer une Room"
+msgstr "Créer une room"
 
 #: gui/project_properties.c:73 gui/project_properties.c:82
@@ -221 +241 @@
 #: gui/room.c:49
 msgid "Room creation failed, please inspect logs."
-msgstr "Échec de la création d'une Room, merci d'inspecter les logs."
+msgstr "Échec de la création d'une room, merci d'inspecter les logs."
 
 #: gui/room.c:72
 msgid "Room deletion failed, please inspect logs."
-msgstr "Échec de l'effacement de la Room, merci d'inspecter les logs."
+msgstr "Échec de l'effacement de la room, merci d'inspecter les logs."
 
 #: gui/settings.c:96
@@ -261 +281 @@
 #: gui/studio.c:130
 msgid "Crashed"
-msgstr "Crashé"
+msgstr "Planté"
 
 #: gui/studio.c:131
 msgid "Crashed studio, save your work if you can and unload the studio"
-msgstr "Studio crashé, sauver votre travail si vous le pouvez et décharger le studio"
+msgstr "Studio planté, sauver votre travail si vous le pouvez et décharger le studio"
 
 #: gui/studio.c:138
 msgid "failed to get studio name"
-msgstr "n'arrive pas à prendre un nom de studio"
+msgstr "n'arrive pas à obtenir le nom du studio"
 
 #: gui/studio.c:149
@@ -277 +297 @@
 #: gui/studio.c:153
 msgid "Studio is stopped"
-msgstr "Le studio est stoppé"
+msgstr "Le studio est arrêté"
 
 #: gui/studio.c:160
@@ -288 +308 @@
 "the studio."
 msgstr ""
-"JACK a crashé ou s'est arrêté sans le vouloir. Sauver votre travail, puis "
+"JACK a s'est planté ou s'est arrêté sans le vouloir. Sauver votre travail, puis "
 "décharger et recharger le studio."
 
@@ -361 +381 @@
 #: gui/canvas.cpp:113
 msgid "Disconnect All"
-msgstr "Déconnecter Tout"
+msgstr "Déconnecter tout"
 
 #: gui/gladish.ui:17
@@ -369 +389 @@
 #: gui/gladish.ui:24
 msgid "_New Studio..."
-msgstr "_Nouveau Studio"
+msgstr "_Nouveau studio"
 
 #: gui/gladish.ui:34
 msgid "_Load Studio"
-msgstr "Charger _le Studio"
+msgstr "Charger _le studio"
 
 #: gui/gladish.ui:50
@@ -381 +401 @@
 #: gui/gladish.ui:62
 msgid "Stop Studio"
-msgstr "Arrêter le Studio"
+msgstr "Arrêter le studio"
 
 #: gui/gladish.ui:79
 msgid "_Rename Studio..."
-msgstr "_Renommer le Studio"
+msgstr "_Renommer le studio"
 
 #: gui/gladish.ui:90
 msgid "_Save Studio"
-msgstr "_Sauver le Studio"
+msgstr "_Sauver le studio"
 
 #: gui/gladish.ui:101
 msgid "Save Studio _As..."
-msgstr "S_auver le Studio Sous..."
+msgstr "S_auver le studio sous..."
 
 #: gui/gladish.ui:112
 msgid "_Unload Studio"
-msgstr "Décharger le St_udio"
+msgstr "Décharger le st_udio"
 
 #: gui/gladish.ui:123
 msgid "_Delete Studio"
-msgstr "Effacer le Stu_dio"
+msgstr "Effacer le stu_dio"
 
 #: gui/gladish.ui:151
@@ -409 +429 @@
 #: gui/gladish.ui:158
 msgid "_Create Room..."
-msgstr "_Créer une Room..."
+msgstr "_Créer une room..."
 
 #: gui/gladish.ui:169
 msgid "_Destroy Room"
-msgstr "_Détruire la Room"
+msgstr "_Détruire la room"
 
 #: gui/gladish.ui:184
@@ -423 +443 @@
 msgstr "_Charger un projet..."
 
+#: gui/menu.c:???
+msgid "Clear Room"
+msgstr "Vider la room"
+
+#: gui/menu.c:???
+msgid "Create Project..."
+msgstr "Nouveau projet..."
+
 #: gui/gladish.ui:203
 msgid "_Unload Project"
-msgstr "_Décharger le Projet"
+msgstr "_Décharger le projet"
 
 #: gui/gladish.ui:214
@@ -433 +461 @@
 #: gui/gladish.ui:224
 msgid "_Save Project"
-msgstr "_Sauver le Projet"
+msgstr "_Sauvergarder le projet"
 
 #: gui/gladish.ui:234
 msgid "Save Project _As..."
-msgstr "Sauveg_arder le Projet Sous..."
+msgstr "Sauveg_arder le projet sous..."
 
 #: gui/gladish.ui:249
@@ -449 +477 @@
 #: gui/gladish.ui:285
 msgid "_View"
-msgstr "_Voir"
+msgstr "_Vue"
 
 #: gui/gladish.ui:292
 msgid "_Toolbar"
-msgstr "Barre d'Ou_tils"
+msgstr "Barre d'ou_tils"
 
 #: gui/gladish.ui:337
@@ -577 +605 @@
 #: gui/gladish.ui:863
 msgid "<b>Project name</b>"
-msgstr "<b>Nom du Projet</b>"
+msgstr "<b>Nom du projet</b>"
 
 #: gui/gladish.ui:890
@@ -605 +633 @@
 #: gui/gladish.ui:1218
 msgid "Run in Terminal"
-msgstr "Lancer dans un Terminal"
+msgstr "Lancer dans un terminal"
 
 #: gui/gladish.ui:1234
@@ -625 +653 @@
 #: gui/gladish.ui:1467
 msgid "Create room"
-msgstr "Créer une Room"
+msgstr "Créer une room"
 
 #: gui/gladish.ui:1519

po/gladish.pot

@@ -9 +9 @@
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-18 23:56+0500\n"
+"POT-Creation-Date: 2010-12-19 21:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
@@ -26 +27 @@
 msgstr ""
 
+#: gui/about.c:45
+msgid "Filipe Alexandre Lopes Coelho"
+msgstr ""
+
 #: gui/about.c:46
 msgid "Lapo Calamandrei"
@@ -39 +44 @@
 msgstr ""
 
-#: gui/action.c:46
+#: gui/action.c:86
 msgid "Clear XRuns and Max DSP Load"
 msgstr ""
 
-#: gui/action.c:47
+#: gui/action.c:87
 msgid "Clear"
 msgstr ""
 
-#: gui/action.c:51 gui/action.c:52
+#: gui/action.c:91 gui/action.c:92
 msgid "Zoom 100%"
 msgstr ""
 
-#: gui/action.c:56 gui/action.c:57
+#: gui/action.c:96 gui/action.c:97
 msgid "Zoom to fit"
 msgstr ""
 
-#: gui/action.c:61 gui/action.c:62
+#: gui/action.c:101 gui/action.c:102
 msgid "Zoom in"
 msgstr ""
 
-#: gui/action.c:66 gui/action.c:67
+#: gui/action.c:106 gui/action.c:107
 msgid "Zoom out"
 msgstr ""
 
-#: gui/control.c:138
+#: gui/control.c:136
 msgid "Daemon exit command failed, please inspect logs."
 msgstr ""
 
-#: gui/control.c:148
+#: gui/control.c:146
 msgid "New studio"
 msgstr ""
 
-#: gui/control.c:148 gui/studio.c:252 gui/studio.c:294
+#: gui/control.c:146 gui/studio.c:252 gui/studio.c:294
 msgid "Studio name"
 msgstr ""
 
-#: gui/control.c:152
+#: gui/control.c:150
 msgid "Creation of new studio failed, please inspect logs."
 msgstr ""
 
-#: gui/control.c:165
+#: gui/control.c:163
 msgid "Studio load failed, please inspect logs."
 msgstr ""
 
-#: gui/control.c:173
+#: gui/control.c:171
 msgid "<b><big>Confirm studio delete</big></b>"
 msgstr ""
 
-#: gui/control.c:173
+#: gui/control.c:171
 #, c-format
 msgid "Studio \"%s\" will be deleted. Are you sure?"
 msgstr ""
 
-#: gui/control.c:182
+#: gui/control.c:180
 msgid "Studio delete failed, please inspect logs."
 msgstr ""
 
-#: gui/create_room_dialog.c:72 gui/world_tree.c:494 gui/gladish.ui:1629
+#: gui/create_room_dialog.c:72 gui/world_tree.c:494 gui/gladish.ui:1563
 msgid "Name"
 msgstr ""
@@ -114 +119 @@
 msgstr ""
 
-#: gui/dynmenu.c:152
-msgid "Error obtaining "
-msgstr ""
-
-#: gui/dynmenu.c:156
+#: gui/dynmenu.c:170
+msgid "Error filling "
+msgstr ""
+
+#: gui/dynmenu.c:174
 msgid "Empty "
+msgstr ""
+
+#: gui/graph_view.c:59
+msgid ""
+"If you've started ladish for the first time, you should:\n"
+"\n"
+" 1. Create a new studio (in the menu, Studio -> New Studio)\n"
+" 2. Configure JACK (in the menu, Tools -> Configure JACK)\n"
+" 3. Start the studio (in the menu, Studio -> Start Studio)\n"
+" 4. Start apps (in the menu, Application -> Run)\n"
+" 5. Connect their ports by click & drag on canvas\n"
+" 6. Save the studio (in the menu, Studio -> Save Studio)\n"
 msgstr ""
 
@@ -163 +180 @@
 msgstr ""
 
-#: gui/load_project_dialog.c:187 gui/gladish.ui:702
+#: gui/load_project_dialog.c:187 gui/gladish.ui:636
 msgid "Load project"
 msgstr ""
@@ -171 +188 @@
 msgstr ""
 
-#: gui/main.c:62 gui/main.c:68 gui/gladish.ui:8
+#: gui/main.c:61 gui/main.c:67 gui/gladish.ui:8
 msgid "LADI Session Handler"
 msgstr ""
 
-#: gui/menu.c:107 gui/menu.c:116
+#: gui/menu.c:103
 msgid "Project load failed, please inspect logs."
 msgstr ""
 
-#: gui/menu.c:384 gui/gladish.ui:270
+#: gui/menu.c:144
+msgid "Load Project..."
+msgstr ""
+
+#: gui/menu.c:150
+msgid "Create Project..."
+msgstr ""
+
+#: gui/menu.c:153
+msgid "Unload Project"
+msgstr ""
+
+#: gui/menu.c:153
+msgid "Clear Room"
+msgstr ""
+
+#: gui/menu.c:157
+msgid "Save Project"
+msgstr ""
+
+#: gui/menu.c:158
+msgid "Save Project As..."
+msgstr ""
+
+#: gui/menu.c:159
+msgid "Project Properties..."
+msgstr ""
+
+#: gui/menu.c:355 gui/gladish.ui:204
 msgid "Run..."
 msgstr ""
 
-#: gui/menu.c:404
-msgid "Load Project..."
-msgstr ""
-
-#: gui/menu.c:408
-msgid "Unload Project"
-msgstr ""
-
-#: gui/menu.c:412
-msgid "Save Project..."
-msgstr ""
-
-#: gui/menu.c:416
-msgid "Save Project As..."
-msgstr ""
-
-#: gui/menu.c:420
-msgid "Project Properties..."
-msgstr ""
-
-#: gui/menu.c:427
+#: gui/menu.c:370
 msgid "Destroy Room"
 msgstr ""
 
-#: gui/menu.c:433
+#: gui/menu.c:376
 msgid "Create Room..."
 msgstr ""
@@ -413 +438 @@
 msgstr ""
 
-#: gui/gladish.ui:192
-msgid "_Load Project..."
-msgstr ""
-
-#: gui/gladish.ui:203
-msgid "_Unload Project"
-msgstr ""
-
-#: gui/gladish.ui:214
-msgid "_Rename Project..."
-msgstr ""
-
-#: gui/gladish.ui:224
-msgid "_Save Project"
-msgstr ""
-
-#: gui/gladish.ui:234
-msgid "Save Project _As..."
-msgstr ""
-
-#: gui/gladish.ui:249
-msgid "R_ecently Loaded"
-msgstr ""
-
-#: gui/gladish.ui:262
+#: gui/gladish.ui:196
 msgid "_Application"
 msgstr ""
 
-#: gui/gladish.ui:285
+#: gui/gladish.ui:219
 msgid "_View"
 msgstr ""
 
-#: gui/gladish.ui:292
+#: gui/gladish.ui:226
 msgid "_Toolbar"
 msgstr ""
 
-#: gui/gladish.ui:337
+#: gui/gladish.ui:271
 msgid "_JACK"
 msgstr ""
 
-#: gui/gladish.ui:345
+#: gui/gladish.ui:279
 msgid "_Arrange"
 msgstr ""
 
-#: gui/gladish.ui:361
+#: gui/gladish.ui:295
 msgid "_Tools"
 msgstr ""
 
-#: gui/gladish.ui:379
+#: gui/gladish.ui:313
 msgid "_Settings"
 msgstr ""
 
-#: gui/gladish.ui:388
+#: gui/gladish.ui:322
 msgid "_Configure JACK"
 msgstr ""
 
+#: gui/gladish.ui:332
+msgid "Reactivate ladishd"
+msgstr ""
+
+#: gui/gladish.ui:341
+msgid "JACK _Latency"
+msgstr ""
+
+#: gui/gladish.ui:350
+msgid "32"
+msgstr ""
+
+#: gui/gladish.ui:358
+msgid "64"
+msgstr ""
+
+#: gui/gladish.ui:366
+msgid "128"
+msgstr ""
+
+#: gui/gladish.ui:374
+msgid "256"
+msgstr ""
+
+#: gui/gladish.ui:382
+msgid "512"
+msgstr ""
+
+#: gui/gladish.ui:390
+msgid "1024"
+msgstr ""
+
 #: gui/gladish.ui:398
-msgid "Reactivate ladishd"
-msgstr ""
-
-#: gui/gladish.ui:407
-msgid "JACK _Latency"
-msgstr ""
-
-#: gui/gladish.ui:416
-msgid "32"
-msgstr ""
-
-#: gui/gladish.ui:424
-msgid "64"
-msgstr ""
-
-#: gui/gladish.ui:432
-msgid "128"
-msgstr ""
-
-#: gui/gladish.ui:440
-msgid "256"
-msgstr ""
-
-#: gui/gladish.ui:448
-msgid "512"
-msgstr ""
-
-#: gui/gladish.ui:456
-msgid "1024"
-msgstr ""
-
-#: gui/gladish.ui:464
 msgid "2048"
 msgstr ""
 
-#: gui/gladish.ui:472
+#: gui/gladish.ui:406
 msgid "4096"
 msgstr ""
 
-#: gui/gladish.ui:480
+#: gui/gladish.ui:414
 msgid "8192"
 msgstr ""
 
-#: gui/gladish.ui:494
+#: gui/gladish.ui:428
 msgid "_Help"
 msgstr ""
 
-#: gui/gladish.ui:527
+#: gui/gladish.ui:461
 msgid "Clear XRuns"
 msgstr ""
 
-#: gui/gladish.ui:666
+#: gui/gladish.ui:600
 msgid ""
 "LADI Session Handler is free software; you can redistribute it and/or "
@@ -540 +541 @@
 msgstr ""
 
-#: gui/gladish.ui:737 gui/gladish.ui:1620
+#: gui/gladish.ui:671 gui/gladish.ui:1554
 msgid "Path"
 msgstr ""
 
-#: gui/gladish.ui:760
+#: gui/gladish.ui:694
 msgid "Browse..."
 msgstr ""
 
-#: gui/gladish.ui:833
+#: gui/gladish.ui:767
 msgid "Project properties"
 msgstr ""
 
-#: gui/gladish.ui:863
+#: gui/gladish.ui:797
 msgid "<b>Project name</b>"
 msgstr ""
 
-#: gui/gladish.ui:890
+#: gui/gladish.ui:824
 msgid "<b>Description</b>"
 msgstr ""
 
-#: gui/gladish.ui:928
+#: gui/gladish.ui:862
 msgid "<b>Notes</b>"
 msgstr ""
 
-#: gui/gladish.ui:997
+#: gui/gladish.ui:931
 msgid "Set name"
 msgstr ""
 
-#: gui/gladish.ui:1028 gui/gladish.ui:1493
+#: gui/gladish.ui:962 gui/gladish.ui:1427
 msgid "<b>Name</b>"
 msgstr ""
 
-#: gui/gladish.ui:1177
+#: gui/gladish.ui:1111
 msgid "Command:"
 msgstr ""
 
-#: gui/gladish.ui:1189
+#: gui/gladish.ui:1123
 msgid "Name:"
 msgstr ""
 
-#: gui/gladish.ui:1218
+#: gui/gladish.ui:1152
 msgid "Run in Terminal"
 msgstr ""
 
-#: gui/gladish.ui:1234
+#: gui/gladish.ui:1168
 msgid "Level 0"
 msgstr ""
 
-#: gui/gladish.ui:1251
+#: gui/gladish.ui:1185
 msgid "Level 1"
 msgstr ""
 
-#: gui/gladish.ui:1283
+#: gui/gladish.ui:1217
 msgid "Level 2"
 msgstr ""
 
-#: gui/gladish.ui:1302
+#: gui/gladish.ui:1236
 msgid "Level 3"
 msgstr ""
 
-#: gui/gladish.ui:1467
+#: gui/gladish.ui:1401
 msgid "Create room"
 msgstr ""
 
-#: gui/gladish.ui:1519
+#: gui/gladish.ui:1453
 msgid "<b>Create from template</b>"
 msgstr ""
 
-#: gui/gladish.ui:1643
+#: gui/gladish.ui:1577
 msgid "Default is project directory name"
 msgstr ""
 
-#: gui/gladish.ui:1662
+#: gui/gladish.ui:1596
 msgid "Default is ~/ladish-projects"
 msgstr ""
 
-#: gui/gladish.ui:1763
+#: gui/gladish.ui:1697
 msgid "Start studio on load"
 msgstr ""
 
-#: gui/gladish.ui:1775
+#: gui/gladish.ui:1709
 msgid "Send notifications"
 msgstr ""
 
-#: gui/gladish.ui:1796
+#: gui/gladish.ui:1730
 msgid "Shell to use:"
 msgstr ""
 
-#: gui/gladish.ui:1803
+#: gui/gladish.ui:1737
 msgid "Terminal to use:"
 msgstr ""

wscript

@@ -556 +556 @@
         # GtkBuilder UI definitions (XML)
         bld.install_files('${DATA_DIR}', 'gui/gladish.ui')
-
-        # Help text
-        bld.install_files('${DATA_DIR}/help', 'gui/help/default.txt')
-
+    
     bld.install_files('${PREFIX}/bin', 'ladish_control', chmod=0755)