Changeset dd6c0135749a94cfae94719893c655fbdf7f912a

Timestamp:

12/07/10 05:31:28 (2 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

5dd853997b0b38e965b436f647841b9d115190ea

Parents:

cf12c2e3e0d97f01ea24b8a9e3a8663a670a1e7e

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-07T05:31:13Z+0200

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-12-07T05:31:28Z+0200

Message:

gui: implement project properties dialog (description and notes). Fix for #90

Files:

• gui/graph_view.c (modified) (1 diff)
• gui/menu.c (modified) (2 diffs)
• gui/project_properties.c (added)
• gui/project_properties.cpp (deleted)
• gui/project_properties.h (moved) (moved from gui/project_properties.hpp) (2 diffs)
• gui/room.c (modified) (1 diff)
• gui/save_project_dialog.c (modified) (2 diffs)
• proxies/room_proxy.c (modified) (13 diffs)
• proxies/room_proxy.h (modified) (2 diffs)
• wscript (modified) (1 diff)

gui/graph_view.c

@@ -114 +114 @@
 }
 
-static void project_properties_changed(void * context, const char * project_dir, const char * project_name)
+static
+void
+project_properties_changed(
+  void * context,
+  const char * project_dir,
+  const char * project_name,
+  const char * project_description,
+  const char * project_notes)
 {
   bool empty;

gui/menu.c

@@ -30 +30 @@
 #include "studio.h"
 #include "dynmenu.h"
+#include "project_properties.h"
 
 static GtkWidget * g_menu_item_new_studio;
@@ -416 +417 @@
     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);
+
     menuitem = gtk_separator_menu_item_new(); /* separator */
     gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);

gui/project_properties.h

@@ -3 +3 @@
  * LADI Session Handler (ladish)
  *
- * Copyright (C) 2008 Nedko Arnaudov <nedko@arnaudov.name>
+ * Copyright (C) 2010 Nedko Arnaudov <nedko@arnaudov.name>
  *
  **************************************************************************
- * This file contains interface of the project_properties_dialog class
+ * This file contains interface for the project properties dialog helpers
  **************************************************************************
  *
@@ -25 +25 @@
  */
 
-#ifndef PROJECT_PROPERTIES_HPP__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED
-#define PROJECT_PROPERTIES_HPP__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED
+#ifndef PROJECT_PROPERTIES_H__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED
+#define PROJECT_PROPERTIES_H__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED
 
-struct project_properties_dialog_impl;
+void ladish_project_properties_dialog_run(void);
 
-class project_properties_dialog
-{
-public:
-  project_properties_dialog();
-  ~project_properties_dialog();
-
-  void run(boost::shared_ptr<project> project_ptr);
-
-private:
-  project_properties_dialog_impl * _impl_ptr;
-};
-
-#endif // #ifndef PROJECT_PROPERTIES_HPP__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED
+#endif // #ifndef PROJECT_PROPERTIES_H__B854A265_3660_4DAA_87E7_104020C5962D__INCLUDED

gui/room.c

@@ -90 +90 @@
 {
   bool new_project;
-  char * project_dir;
-  char * project_name;
+  const char * project_dir;
+  const char * project_name;
 
-  if (!ladish_room_proxy_get_project_properties(graph_view_get_room(get_current_view()), &project_dir, &project_name))
-  {
-    error_message_box("Get project properties failed, please inspect logs.");
-    return;
-  }
+  ladish_room_proxy_get_project_properties(graph_view_get_room(get_current_view()), &project_dir, &project_name, NULL, NULL);
 
   new_project = strlen(project_dir) == 0;
-
-  free(project_name);
-  free(project_dir);
 
   if (new_project)

gui/save_project_dialog.c

@@ -56 +56 @@
   GtkResponseType response;
 
-  char * project_dir;
-  char * project_name;
+  const char * project_dir;
+  const char * project_name;
 
   dialog = get_gtk_builder_widget("project_save_as_dialog");
@@ -66 +66 @@
   g_signal_connect( G_OBJECT(path_button), "clicked", G_CALLBACK(on_path_button_clicked), NULL);
 
-  if (!ladish_room_proxy_get_project_properties(room, &project_dir, &project_name))
-  {
-    error_message_box("Get project properties failed, please inspect logs.");
-    return;
-  }
+  ladish_room_proxy_get_project_properties(room, &project_dir, &project_name, NULL, NULL);
 
   gtk_entry_set_text(path, project_dir);
   gtk_entry_set_text(name, project_name);
-
-  free(project_name);
-  free(project_dir);
 
   gtk_widget_show(dialog);

proxies/room_proxy.c

@@ -37 +37 @@
     void * project_properties_changed_context,
     const char * project_dir,
-    const char * project_name);
+    const char * project_name,
+    const char * project_description,
+    const char * project_notes);
 
   uint64_t project_properties_version;
   char * project_name;
   char * project_dir;
+  char * project_description;
+  char * project_notes;
 };
 
@@ -51 +55 @@
   const char * name;
   const char * dir;
+  const char * description;
+  const char * notes;
   char * name_buffer;
   char * dir_buffer;
+  char * description_buffer;
+  char * notes_buffer;
 
   signature = dbus_message_get_signature(message_ptr);
@@ -58 +66 @@
   {
     log_error("%s signature mismatch. '%s'", context, signature);
-    return false;
+    goto fail;
   }
 
@@ -69 +77 @@
   {
     log_error("%s contains project properties version 0", context);
-    return false;
+    goto fail;
   }
 
   if (proxy_ptr->project_properties_version >= version)
   {
-    return true;
+    goto fail;
   }
 
@@ -85 +93 @@
   {
     dir = "";
+  }
+
+  if (!dbus_iter_get_dict_entry_string(&iter, "description", &description))
+  {
+    description = "";
+  }
+
+  if (!dbus_iter_get_dict_entry_string(&iter, "notes", &notes))
+  {
+    notes = "";
   }
 
@@ -91 +109 @@
   {
     log_error("strdup() failed for project name");
-    return false;
+    goto fail;
   }
 
@@ -98 +116 @@
   {
     log_error("strdup() failed for project dir");
-    free(name_buffer);
-    return false;
+    goto fail_free_name_buffer;
+  }
+
+  description_buffer = strdup(description);
+  if (description_buffer == NULL)
+  {
+    log_error("strdup() failed for project description");
+    goto fail_free_dir_buffer;
+  }
+
+  notes_buffer = strdup(notes);
+  if (notes_buffer == NULL)
+  {
+    log_error("strdup() failed for project notes");
+    goto fail_free_description_buffer;
   }
 
@@ -115 +146 @@
   }
   proxy_ptr->project_dir = dir_buffer;
+
+  if (proxy_ptr->project_description != NULL)
+  {
+    free(proxy_ptr->project_description);
+  }
+  proxy_ptr->project_description = description_buffer;
+
+  if (proxy_ptr->project_notes != NULL)
+  {
+    free(proxy_ptr->project_notes);
+  }
+  proxy_ptr->project_notes = notes_buffer;
 
   /* log_info("Room '%s' project properties changed:", proxy_ptr->object); /\* TODO: cache project name *\/ */
@@ -120 +163 @@
   /* log_info("  Project name: '%s'", proxy_ptr->project_name); */
   /* log_info("  Project dir: '%s'", proxy_ptr->project_dir); */
+  /* log_info("  Project description: '%s'", proxy_ptr->project_description); */
+  /* log_info("  Project notes: '%s'", proxy_ptr->project_notes); */
 
   proxy_ptr->project_properties_changed(
     proxy_ptr->project_properties_changed_context,
     proxy_ptr->project_dir,
-    proxy_ptr->project_name);
-
-  return true;
+    proxy_ptr->project_name,
+    proxy_ptr->project_description,
+    proxy_ptr->project_notes);
+
+  return true;
+
+fail_free_description_buffer:
+  free(description_buffer);
+fail_free_dir_buffer:
+  free(dir_buffer);
+fail_free_name_buffer:
+  free(name_buffer);
+fail:
+  return false;
 }
 
@@ -176 +232 @@
     void * project_properties_changed_context,
     const char * project_dir,
-    const char * project_name),
+    const char * project_name,
+    const char * project_description,
+    const char * project_notes),
   ladish_room_proxy_handle * handle_ptr)
 {
@@ -205 +263 @@
   proxy_ptr->project_name = NULL;
   proxy_ptr->project_dir = NULL;
+  proxy_ptr->project_description = NULL;
+  proxy_ptr->project_notes = NULL;
 
   proxy_ptr->project_properties_changed_context = project_properties_changed_context;
@@ -257 +317 @@
   }
 
+  if (proxy_ptr->project_description != NULL)
+  {
+    free(proxy_ptr->project_description);
+  }
+
+  if (proxy_ptr->project_notes != NULL)
+  {
+    free(proxy_ptr->project_notes);
+  }
+
   free(proxy_ptr->object);
   free(proxy_ptr->service);
@@ -328 +398 @@
 }
 
-bool ladish_room_proxy_get_project_properties(ladish_room_proxy_handle proxy, char ** project_dir, char ** project_name)
-{
-  char * name;
-  char * dir;
-
+void
+ladish_room_proxy_get_project_properties(
+  ladish_room_proxy_handle proxy,
+  const char ** project_dir,
+  const char ** project_name,
+  const char ** project_description,
+  const char ** project_notes)
+{
   ASSERT(proxy_ptr->project_properties_version > 0);
 
-  name = strdup(proxy_ptr->project_name);
-  if (name == NULL)
-  {
-    log_error("strdup() failed for project name");
-    return false;
-  }
-
-  dir = strdup(proxy_ptr->project_dir);
-  if (dir == NULL)
-  {
-    log_error("strdup() failed for project dir");
-    free(name);
-    return false;
-  }
-
-  *project_name = name;
-  *project_dir = dir;
+  if (project_dir != NULL)
+  {
+    *project_dir = proxy_ptr->project_dir;
+  }
+
+  if (project_name != NULL)
+  {
+    *project_name = proxy_ptr->project_name;
+  }
+
+  if (project_description != NULL)
+  {
+    *project_description = proxy_ptr->project_description;
+  }
+
+  if (project_notes != NULL)
+  {
+    *project_notes = proxy_ptr->project_notes;
+  }
+}
+
+bool
+ladish_room_proxy_set_project_description(
+  ladish_room_proxy_handle proxy,
+  const char * description)
+{
+  uint64_t new_version;
+
+  if (!dbus_call(0, proxy_ptr->service, proxy_ptr->object, IFACE_ROOM, "SetProjectDescription", "s", &description, "t", &new_version))
+  {
+    log_error("SetProjectDescription() failed.");
+    return false;
+  }
+
+  return true;
+}
+
+bool
+ladish_room_proxy_set_project_notes(
+  ladish_room_proxy_handle proxy,
+  const char * notes)
+{
+  uint64_t new_version;
+
+  if (!dbus_call(0, proxy_ptr->service, proxy_ptr->object, IFACE_ROOM, "SetProjectNotes", "s", &notes, "t", &new_version))
+  {
+    log_error("SetProjectNotes(%s) failed.", notes);
+    return false;
+  }
 
   return true;

proxies/room_proxy.h

@@ -40 +40 @@
     void * project_properties_changed_context,
     const char * project_dir,
-    const char * project_name),
+    const char * project_name,
+    const char * project_description,
+    const char * project_notes),
   ladish_room_proxy_handle * proxy_ptr);
 
@@ -48 +50 @@
 bool ladish_room_proxy_save_project(ladish_room_proxy_handle proxy, const char * project_dir, const char * project_name);
 bool ladish_room_proxy_unload_project(ladish_room_proxy_handle proxy);
-bool ladish_room_proxy_get_project_properties(ladish_room_proxy_handle proxy, char ** project_dir, char ** project_name);
+
+void
+ladish_room_proxy_get_project_properties(
+  ladish_room_proxy_handle proxy,
+  const char ** project_dir,
+  const char ** project_name,
+  const char ** project_description,
+  const char ** project_notes);
+
+bool
+ladish_room_proxy_set_project_description(
+  ladish_room_proxy_handle proxy,
+  const char * description);
+
+bool
+ladish_room_proxy_set_project_notes(
+  ladish_room_proxy_handle proxy,
+  const char * notes);
 
 bool

wscript

@@ -501 +501 @@
             'load_project_dialog.c',
             'save_project_dialog.c',
+            'project_properties.c',
             'world_tree.c',
             'graph_view.c',