1 files changed, 253 insertions, 47 deletions

diff --git a/src/identity/gnunet-identity-gtk_namespace_manager.c b/src/identity/gnunet-identity-gtk_namespace_manager.c
index ca4a14c5..788c18a3 100644
--- a/src/identity/gnunet-identity-gtk_namespace_manager.c
+++ b/src/identity/gnunet-identity-gtk_namespace_manager.c
@@ -19,60 +19,266 @@
 */
 
 /**
- * @file src/fs/gnunet-fs-gtk_namespace_manager.c
+ * @file src/identity/gnunet-identity-gtk_namespace_manager.c
  * @author LRN
+ * @author Christian Grothoff
  */
-#include "gnunet-fs-gtk_common.h"
-#include "gnunet-fs-gtk.h"
-#include <gnunet/gnunet_util_lib.h>
+#include "gnunet-identity-gtk_namespace_manager.h"
 #include <gnunet/gnunet_fs_service.h>
 
-struct GNUNET_GTK_NamespaceManagerContext
+/**
+ * Types of metadata we offer for namespaces.
+ */
+static gint types[] = {
+  EXTRACTOR_METATYPE_TITLE,
+  EXTRACTOR_METATYPE_KEYWORDS, 
+  EXTRACTOR_METATYPE_SUBJECT,
+  EXTRACTOR_METATYPE_DESCRIPTION,
+  EXTRACTOR_METATYPE_COMMENT, 
+  EXTRACTOR_METATYPE_COPYRIGHT,
+  EXTRACTOR_METATYPE_URI, 
+  EXTRACTOR_METATYPE_CREATOR, 
+  EXTRACTOR_METATYPE_CREATION_DATE,
+  EXTRACTOR_METATYPE_RESERVED
+};
+
+
+/**
+ * Columns in the metadata list store.
+ */
+enum METADATA_ModelColumns
+  {
+    /**
+     * A guint
+     */
+    METADATA_MC_TYPE_AS_ENUM = 0,
+
+    /**
+     * A gchararray 
+     */
+    METADATA_MC_TYPE_AS_STRING = 1,
+
+    /**
+     * A gchararray 
+     */
+    METADATA_MC_VALUE = 2
+
+  };
+
+
+/**
+ * Columns in the keyword list tree store.
+ */
+enum KEYWORDS_ModelColumns
+  {
+
+    /**
+     * A gchararray 
+     */
+    KEYWORDS_MC_KEYWORD = 0
+
+  };
+
+
+/**
+ * Columns in the meta types list tree store.
+ */
+enum METATYPES_ModelColumns
+  {
+
+    /**
+     * A gchararray 
+     */
+    METATYPES_MC_TYPE_AS_STRING = 0,
+
+    /**
+     * A guint
+     */
+    METATYPES_MC_TYPE_AS_ENUM = 1
+
+  };
+
+
+/**
+ * Context for advertisement operations.
+ */
+struct AdvertiseContext
 {
+  /**
+   * Builder for accessing objects in the dialog.
+   */
   GtkBuilder *builder;
-  GtkWidget *known_ns;
-  GtkWidget *ns_order;
-  GtkWidget *ns_details;
-  GtkTreeSelection *known_ns_sel;
-  GtkTreeSelection *ns_order_sel;
-  GtkTreeSelection *ns_details_sel;
-  GtkListStore *ns_order_store;
-  GtkListStore *known_ns_store;
-  GtkListStore *ns_details_store;
-  GtkWindow *namespace_manager;
-  GtkTreeViewColumn *order_rank;
-  GtkTreeViewColumn *order_name;
-  GtkTreeViewColumn *order_id;
-  GtkWidget *details_apply_button;
-  GtkWidget *details_delete_button;
-  int sort_direction;
-  GList *deleted_namespaces;
-  struct GNUNET_CONTAINER_MetaData *uneditable_md;
-  struct GNUNET_GTK_MainWindowContext *main_ctx;
+  
+  /** 
+   * Private key of the namespace we will be advertising.
+   */
+  struct GNUNET_CRYPTO_EccPrivateKey priv;
+
+  /**
+   * Main dialog object.
+   */
+  GtkWidget *dialog;
+  
+  /**
+   * List of keywords to advertise under.
+   */
+  GtkListStore *keywords;
+
+  /**
+   * Metadata to include in the advertisement.
+   */
+  GtkListStore *metadata;
+
+  /**
+   * Model with the meta types.
+   */
+  GtkListStore *meta_types;
+
 };
 
-#define GNUNET_GTK_KNOWN_NAMESPACES_IS_MINE_COLUMN 0
-#define GNUNET_GTK_KNOWN_NAMESPACES_RANK_COLUMN 1
-#define GNUNET_GTK_KNOWN_NAMESPACES_NAME_COLUMN 2
-#define GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_COLUMN 3
-#define GNUNET_GTK_KNOWN_NAMESPACES_IDENTIFIER_BIN_COLUMN 4
-#define GNUNET_GTK_KNOWN_NAMESPACES_ORDER_ROW_REFERENCE_COLUMN 5
-#define GNUNET_GTK_KNOWN_NAMESPACES_METADATA_COLUMN 6
-#define GNUNET_GTK_KNOWN_NAMESPACES_NON_UNIQUE_NAME_COLUMN 7
-
-#define GNUNET_GTK_NAMESPACE_ORDER_RANK_COLUMN 0
-#define GNUNET_GTK_NAMESPACE_ORDER_NAME_COLUMN 1
-#define GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_COLUMN 2
-#define GNUNET_GTK_NAMESPACE_ORDER_IDENTIFIER_BIN_COLUMN 3
-#define GNUNET_GTK_NAMESPACE_ORDER_KNOWN_ROW_REFERENCE_COLUMN 4
-
-#define GNUNET_GTK_NAMESPACE_DETAILS_PLUGIN_NAME_COLUMN 0
-#define GNUNET_GTK_NAMESPACE_DETAILS_TYPE_BIN_COLUMN 1
-#define GNUNET_GTK_NAMESPACE_DETAILS_TYPE_COLUMN 2
-#define GNUNET_GTK_NAMESPACE_DETAILS_FORMAT_COLUMN 3
-#define GNUNET_GTK_NAMESPACE_DETAILS_DATA_MIME_COLUMN 4
-#define GNUNET_GTK_NAMESPACE_DETAILS_VALUE_COLUMN 5
 
+/**
+ * The user terminated the dialog.  Perform the appropriate action.
+ *
+ * @param dialog the advertisement dialog
+ * @param response_id action selected by the user
+ * @param user_data our 'struct AdvertiseContext' (to be cleaned up)
+ */
+void
+GNUNET_GTK_identity_advertise_dialog_response_cb (GtkDialog *dialog,
+                                                  gint response_id,
+                                                  gpointer user_data)
+{
+  struct AdvertiseContext *ac = user_data;
+
+  if (GTK_RESPONSE_OK == response_id)
+    {
+      GNUNET_break (0); // FIXME: not implemented
+    }
+
+  gtk_widget_destroy (ac->dialog);
+  g_object_unref (G_OBJECT (ac->builder));
+  GNUNET_free (ac);
+}
+
+
+/**
+ * FIXME: do we need this event? If so, what do we do?
+ */
+void
+GNUNET_GTK_identity_advertise_keywords_column_clicked_cb ()
+{
+  GNUNET_break (0);
+}
+
+ 
+/**
+ * User edited keywords in the keyword tree view.  Update
+ * the model accordingly.
+ */ 
+void
+GNUNET_GTK_identity_advertise_keywords_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User pushed a key in the metadata tree view.  Check if it was
+ * "DEL" and if so, remove the selected values.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * FIXME: how is this event triggered exactly?
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_treeview_delete_event_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User edited metadata value.  Update sensitivity of the 'add' button.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_value_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User edited metadata type.  Not sure we need to do something here...
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_type_text_edited_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * User clicked the 'add' button, get the type and value and update
+ * the metadata model.
+ */
+void
+GNUNET_GTK_identity_advertise_metadata_add_button_clicked_cb ()
+{
+  GNUNET_break (0);
+}
+
+
+/**
+ * Run the dialog for advertising a namespace.
+ *
+ * @param priv private key of the namespace to advertise
+ */
+void
+GNUNET_IDENTITY_advertise_dialog_start_ (const struct GNUNET_CRYPTO_EccPrivateKey *priv)
+{
+  struct AdvertiseContext *ac;
+  gint i;
+  GtkTreeIter iter;
+
+  ac = GNUNET_new (struct AdvertiseContext);
+  ac->priv = *priv;
+  ac->builder =
+    GNUNET_GTK_get_new_builder ("gnunet_identity_gtk_advertise_dialog.glade",
+                                ac);
+  if (NULL == ac->builder)
+  {
+    GNUNET_break (0);
+    GNUNET_free (ac);
+    return;
+  }
+  ac->dialog = GTK_WIDGET (gtk_builder_get_object
+                           (ac->builder, "GNUNET_GTK_identity_advertise_dialog"));
+  ac->keywords = GTK_LIST_STORE (gtk_builder_get_object
+                                (ac->builder, "GNUNET_GTK_identity_advertise_keywords_liststore"));
+  ac->metadata = GTK_LIST_STORE (gtk_builder_get_object
+                             (ac->builder, "GNUNET_GTK_identity_advertise_metadata_liststore"));
+  ac->meta_types = GTK_LIST_STORE (gtk_builder_get_object
+                                   (ac->builder, "GNUNET_GTK_identity_metadata_types_liststore"));
+  for (i = 0; EXTRACTOR_METATYPE_RESERVED != types[i]; i++)  
+    gtk_list_store_insert_with_values (ac->meta_types,
+                                       &iter, G_MAXINT, 
+                                       METATYPES_MC_TYPE_AS_STRING,
+                                       EXTRACTOR_metatype_to_string (types[i]),
+                                       METATYPES_MC_TYPE_AS_ENUM,
+                                       types[i],
+                                       -1);
+  gtk_window_present (GTK_WINDOW (ac->dialog));
+}
+
+
+#if 0
 
 static void
 sort_order_list (struct GNUNET_GTK_NamespaceManagerContext *ctx,
@@ -1064,6 +1270,6 @@ namespace_selector_manage_namespaces_button_clicked_cb (GtkButton *button, gpoin
 {
   GNUNET_GTK_open_ns_manager (user_data);
 }
+#endif
 
-
-/* end of gnunet-fs-gtk_namespace_manager.c */
+/* end of gnunet-identity-gtk_namespace_manager.c */