[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r1867 - in gnunet-gtk: . src/plugins/fs
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r1867 - in gnunet-gtk: . src/plugins/fs |
|
Date: |
Tue, 23 Aug 2005 01:42:05 -0700 (PDT) |
Author: grothoff
Date: 2005-08-23 01:42:03 -0700 (Tue, 23 Aug 2005)
New Revision: 1867
Modified:
gnunet-gtk/gnunet-gtk.glade
gnunet-gtk/src/plugins/fs/meta.c
gnunet-gtk/src/plugins/fs/namespace.c
Log:
fixing mantis 885
Modified: gnunet-gtk/gnunet-gtk.glade
===================================================================
--- gnunet-gtk/gnunet-gtk.glade 2005-08-23 07:41:43 UTC (rev 1866)
+++ gnunet-gtk/gnunet-gtk.glade 2005-08-23 08:42:03 UTC (rev 1867)
@@ -1880,7 +1880,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image16">
+ <widget class="GtkImage" id="image37">
<property name="visible">True</property>
<property name="stock">gtk-new</property>
<property name="icon_size">1</property>
@@ -1932,7 +1932,7 @@
<property name="use_underline">True</property>
<child internal-child="image">
- <widget class="GtkImage" id="image17">
+ <widget class="GtkImage" id="image38">
<property name="visible">True</property>
<property name="stock">gtk-delete</property>
<property name="icon_size">1</property>
@@ -3666,19 +3666,19 @@
<property name="spacing">0</property>
<child>
- <widget class="GtkButton" id="namespaceInsertButton">
+ <widget class="GtkButton" id="addButton">
<property name="visible">True</property>
- <property name="tooltip" translatable="yes">Add additional files
to this namespace.</property>
+ <property name="tooltip" translatable="yes">Add content to the
namespace</property>
<property name="can_focus">True</property>
<property name="label">gtk-add</property>
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked" handler="on_namespaceInsertButton_clicked"
object="namespaceContentFrame" last_modification_time="Mon, 23 May 2005
19:00:01 GMT"/>
+ <signal name="clicked" handler="on_namespaceInsertButton_clicked"
last_modification_time="Tue, 23 Aug 2005 08:23:21 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
+ <property name="expand">False</property>
<property name="fill">True</property>
</packing>
</child>
@@ -5466,7 +5466,7 @@
<property name="right_padding">0</property>
<child>
- <widget class="GtkComboBox" id="combobox1">
+ <widget class="GtkComboBox"
id="namespaceInsertMetaTypeComboBox">
<property agent="glademm"
name="cxx_visibility">public</property>
<property name="visible">True</property>
<property name="add_tearoffs">False</property>
@@ -5530,7 +5530,7 @@
</child>
<child>
- <widget class="GtkButton" id="button10">
+ <widget class="GtkButton" id="namespaceInsertAddButton">
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Add the given
description to the meta-data describing the uploaded file.</property>
<property name="can_focus">True</property>
@@ -5538,7 +5538,7 @@
<property name="use_stock">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
- <signal name="clicked"
handler="on_metaDataDialogMetaDataAddButton_clicked"
last_modification_time="Thu, 02 Jun 2005 12:44:47 GMT"/>
+ <signal name="clicked"
handler="on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked"
last_modification_time="Tue, 23 Aug 2005 08:41:20 GMT"/>
</widget>
<packing>
<property name="padding">0</property>
@@ -5575,7 +5575,7 @@
<property name="visible">True</property>
<property name="tooltip" translatable="yes">Select entries
and use the context menu (right click) in order to delete keywords.</property>
<property name="can_focus">True</property>
- <property name="headers_visible">False</property>
+ <property name="headers_visible">True</property>
<property name="rules_hint">True</property>
<property name="reorderable">True</property>
<property name="enable_search">True</property>
@@ -5664,7 +5664,7 @@
<property name="shadow_type">GTK_SHADOW_IN</property>
<child>
- <widget class="GtkImage" id="image24">
+ <widget class="GtkImage" id="namespaceInsertPreview">
<property agent="glademm"
name="cxx_visibility">public</property>
<property name="visible">True</property>
<property name="xalign">0.5</property>
Modified: gnunet-gtk/src/plugins/fs/meta.c
===================================================================
--- gnunet-gtk/src/plugins/fs/meta.c 2005-08-23 07:41:43 UTC (rev 1866)
+++ gnunet-gtk/src/plugins/fs/meta.c 2005-08-23 08:42:03 UTC (rev 1867)
@@ -89,7 +89,8 @@
ECRS_getMetaData(init,
&publishMetaData,
metamodel);
- if (previewName == NULL)
+ if ( (previewName == NULL) ||
+ (init == NULL) )
return;
preview = glade_xml_get_widget(xml,
previewName);
Modified: gnunet-gtk/src/plugins/fs/namespace.c
===================================================================
--- gnunet-gtk/src/plugins/fs/namespace.c 2005-08-23 07:41:43 UTC (rev
1866)
+++ gnunet-gtk/src/plugins/fs/namespace.c 2005-08-23 08:42:03 UTC (rev
1867)
@@ -654,6 +654,14 @@
}
}
+void on_namespaceUpdateMetaDataDialogMetaDataAddButton_clicked(GtkWidget *
dummy1,
+ GtkWidget *
dummy2) {
+ handleMetaDataListUpdate(metaXML,
+ "namespaceInsertMetaTypeComboBox",
+ "metaDataValueEntry",
+ "metaDataTreeView");
+}
+
void on_namespaceInsertButton_clicked(GtkWidget * dummy1,
GtkWidget * dummy2) {
const char * identifierName;
@@ -662,16 +670,10 @@
GtkWidget * nameLine;
GtkWidget * page;
GtkWidget * notebook;
- GtkWidget * metaList;
GtkWidget * dialog;
GtkWidget * spin;
GtkWidget * update;
- GtkListStore * metamodel;
- GtkCellRenderer * renderer;
- GtkTreeIter iter;
struct ECRS_MetaData * meta;
- EXTRACTOR_KeywordType type;
- char * mvalue;
HashCode512 nextId;
GtkWidget * contentList;
GtkTreeSelection * selection;
@@ -716,34 +718,17 @@
metaXML
= glade_xml_new(getGladeFileName(),
- "namespaceMetaDataDialog",
+ "namespaceInsertDialog",
PACKAGE_NAME);
connectGladeWithPlugins(metaXML);
+ createMetaDataListTreeView(metaXML,
+ "metaDataTreeView",
+ "namespaceInsertPreview",
+ NULL);
+ createMetaTypeComboBox(metaXML,
+ "namespaceInsertMetaTypeComboBox");
dialog = glade_xml_get_widget(metaXML,
- "namespaceMetaDataDialog");
- metamodel
- = gtk_list_store_new(META_NUM,
- G_TYPE_INT,
- G_TYPE_STRING,
- G_TYPE_STRING);
- metaList = glade_xml_get_widget(metaXML,
- "namespaceMetaDataDialogMetaDataList");
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
- -1,
- _("Category"),
- renderer,
- "text", META_STYPE,
- NULL);
- renderer = gtk_cell_renderer_text_new();
- gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(metaList),
- -1,
- _("Value"),
- renderer,
- "text", META_VALUE,
- NULL);
- gtk_tree_view_set_model(GTK_TREE_VIEW(metaList),
- GTK_TREE_MODEL(metamodel));
+ "namespaceInsertDialog");
gtk_dialog_set_default_response(GTK_DIALOG(dialog),
GTK_RESPONSE_OK);
if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) {
@@ -772,21 +757,9 @@
return;
}
- meta = ECRS_createMetaData();
- if (gtk_tree_model_get_iter_first(GTK_TREE_MODEL(metamodel),
- &iter)) {
- do {
- gtk_tree_model_get(GTK_TREE_MODEL(metamodel),
- &iter,
- META_TYPE, &type,
- META_VALUE, &mvalue,
- -1);
- ECRS_addToMetaData(meta,
- type,
- mvalue);
- } while (gtk_tree_model_iter_next(GTK_TREE_MODEL(metamodel),
- &iter));
- }
+ meta = getMetaDataFromList(metaXML,
+ "metaDataTreeView",
+ "namespaceInsertPreview");
spin = glade_xml_get_widget(metaXML,
"anonymitySpinButton");
cls.anonymityLevel
@@ -814,7 +787,6 @@
cls.nextId = &nextId;
}
cls.meta = meta;
-
gtk_tree_selection_selected_foreach
(selection,
&initiateUpload,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r1867 - in gnunet-gtk: . src/plugins/fs,
grothoff <=