-LRN: make publication type selector do something - #2028

2 files changed, 75 insertions, 17 deletions

diff --git a/contrib/gnunet_fs_gtk_main_window.glade b/contrib/gnunet_fs_gtk_main_window.glade
index 6536f10c..dc5bc596 100644
--- a/contrib/gnunet_fs_gtk_main_window.glade
+++ b/contrib/gnunet_fs_gtk_main_window.glade
@@ -61,11 +61,12 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkComboBox" id="_GNUNET_GTK_edit_publication_type_combo">
+                          <object class="GtkComboBox" id="GNUNET_GTK_edit_publication_type_combo">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                             <property name="model">GNUNET_GTK_publication_types_liststore</property>
                             <property name="active">0</property>
+                            <signal name="changed" handler="GNUNET_GTK_edit_publication_type_combo_changed_cb" swapped="no"/>
                             <child>
                               <object class="GtkCellRendererText" id="cellrenderertext2"/>
                               <attributes>
@@ -2165,12 +2166,12 @@
     <columns>
       <!-- column-name Type -->
       <column type="gint"/>
-      <!-- column-name Type1 -->
+      <!-- column-name Type_name -->
       <column type="gchararray"/>
     </columns>
     <data>
       <row>
-        <col id="0">-1</col>
+        <col id="0">0</col>
         <col id="1" translatable="yes">Generic</col>
       </row>
       <row>
diff --git a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
index 955cf655..f4ea52a4 100644
--- a/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
+++ b/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
@@ -30,6 +30,60 @@
 
 #define PUBSTATE "edit-publication-state"
 
+#include "metatypes.c"
+
+void change_metatypes (GtkBuilder *builder, gint code)
+{
+  GtkListStore *metatypes_list;
+  gint pub_type = 0, i;
+  gint pubtype_count = 0;
+  gint max_type;
+  GtkTreeIter iter;
+  metatypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
+      "GNUNET_GTK_publication_metadata_types_liststore"));
+
+  for (pub_type = 0; types[pub_type] != NULL; pub_type++)
+    pubtype_count += 1;
+
+  if (code < pubtype_count)
+    pub_type = code;
+  else
+    pub_type = 0;
+
+  gtk_list_store_clear (metatypes_list);
+  max_type = EXTRACTOR_metatype_get_max ();
+  for (i = 0; types[pub_type][i] != EXTRACTOR_METATYPE_RESERVED; i++)
+  {
+    if (types[pub_type][i] < max_type && types[pub_type][i] > 0)
+      gtk_list_store_insert_with_values (metatypes_list, &iter, G_MAXINT,
+          0, types[pub_type][i],
+          1, EXTRACTOR_METAFORMAT_UTF8,
+          2, EXTRACTOR_metatype_to_string (types[pub_type][i]),
+          3, EXTRACTOR_metatype_to_description (types[pub_type][i]), -1);
+  }
+}
+
+void
+GNUNET_GTK_edit_publication_type_combo_changed_cb (GtkComboBox *widget,
+    gpointer user_data)
+{
+  GtkTreeIter iter;
+  GtkBuilder *builder;
+  GtkListStore *pubtypes_list;
+  gint code;
+
+  if (!gtk_combo_box_get_active_iter (widget, &iter))
+    return;
+  builder = GTK_BUILDER (user_data);
+
+  pubtypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
+      "GNUNET_GTK_publication_types_liststore"));
+
+  gtk_tree_model_get (GTK_TREE_MODEL (pubtypes_list), &iter, 0, &code, -1);
+
+  change_metatypes (builder, code);
+}
+
 struct EditPublicationState
 {
   int do_index;
@@ -105,16 +159,10 @@ GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget,
                                                gpointer user_data)
 {
   GtkBuilder *builder;
-  GtkListStore *metatypes_list;
-  GtkTreeIter iter;
   GtkTreeView *tv;
   GtkTreeSelection *sel;
-  guint type;
-  guint max_type;
 
   builder = GTK_BUILDER (user_data);
-  metatypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
-      "GNUNET_GTK_publication_metadata_types_liststore"));
 
   tv = GTK_TREE_VIEW (gtk_builder_get_object (builder,
       "GNUNET_GTK_edit_publication_metadata_tree_view"));
@@ -127,14 +175,6 @@ GNUNET_GTK_edit_publication_window_realize_cb (GtkWidget *widget,
   sel = gtk_tree_view_get_selection (tv);
   g_signal_connect (G_OBJECT (sel), "changed",
                     G_CALLBACK (keywords_selection_changed_cb), builder);
-
-  max_type = EXTRACTOR_metatype_get_max ();
-  for (type = 1; type < max_type - 1; type++)
-    gtk_list_store_insert_with_values (metatypes_list, &iter, G_MAXINT,
-        0, type,
-        1, EXTRACTOR_METAFORMAT_UTF8,
-        2, EXTRACTOR_metatype_to_string (type),
-        3, EXTRACTOR_metatype_to_description (type), -1);
 }
 
 
@@ -1036,6 +1076,10 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder,
   GtkEntry *entry;
   GtkWidget *ok;
   struct EditPublicationState *state;
+  GtkListStore *pubtypes_list;
+  GtkComboBox *pubtypes_combo;
+  GtkTreeIter iter;
+  gint code;
 
   GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
   if (GNUNET_FS_file_information_is_directory (fip))
@@ -1067,6 +1111,19 @@ GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder *builder,
                                                "GNUNET_GTK_edit_publication_window"));
   gtk_window_set_title (GTK_WINDOW (dialog), short_fn);
 
+  pubtypes_list = GTK_LIST_STORE (gtk_builder_get_object (builder,
+      "GNUNET_GTK_publication_types_liststore"));
+  pubtypes_combo = GTK_COMBO_BOX (gtk_builder_get_object (builder,
+      "GNUNET_GTK_edit_publication_type_combo"));
+
+  if (gtk_combo_box_get_active_iter (pubtypes_combo, &iter))
+  {
+    gtk_tree_model_get (GTK_TREE_MODEL (pubtypes_list), &iter, 0, &code, -1);
+    change_metatypes (builder, 0);
+  }
+  else
+    gtk_combo_box_set_active (pubtypes_combo, 0);
+
   state = GNUNET_malloc (sizeof (struct EditPublicationState));
   state->do_index = do_index;
   if (NULL != short_fn)