[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18896 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18896 - in gnunet-gtk: contrib src/fs |
|
Date: |
Sun, 1 Jan 2012 23:20:47 +0100 |
Author: grothoff
Date: 2012-01-01 23:20:47 +0100 (Sun, 01 Jan 2012)
New Revision: 18896
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
Log:
adding replication level to publishing dialogs to fix #2030
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-01 21:40:35 UTC
(rev 18895)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-01 22:20:47 UTC
(rev 18896)
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0"?>
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
@@ -12,8 +12,246 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
+ <columns>
+ <!-- column-name extractor_meta_type -->
+ <column type="guint"/>
+ <!-- column-name extractor_meta_format -->
+ <column type="guint"/>
+ <!-- column-name extractor_meta_type_string -->
+ <column type="gchararray"/>
+ <!-- column-name extracotr_meta_value -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+ <columns>
+ <!-- column-name peer_identity -->
+ <column type="gchararray"/>
+ <!-- column-name number_of_known_addresses -->
+ <column type="guint"/>
+ <!-- column-name country_name -->
+ <column type="gchararray"/>
+ <!-- column-name country_flag -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name bandwidth -->
+ <column type="guint64"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
+ <columns>
+ <!-- column-name local_name -->
+ <column type="gchararray"/>
+ <!-- column-name namespace_handle -->
+ <column type="gpointer"/>
+ <!-- column-name last_id -->
+ <column type="gchararray"/>
+ <!-- column-name last_uri -->
+ <column type="gchararray"/>
+ <!-- column-name last_meta -->
+ <column type="gpointer"/>
+ <!-- column-name next_id -->
+ <column type="gchararray"/>
+ <!-- column-name last_description_from_meta -->
+ <column type="gchararray"/>
+ <!-- column-name next_id_editable -->
+ <column type="gboolean"/>
+ <!-- column-name current_id_editable -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
+ <columns>
+ <!-- column-name Keyword -->
+ <column type="gchararray"/>
+ <!-- column-name Added -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_publication_metadata_liststore">
+ <columns>
+ <!-- column-name Type -->
+ <column type="guint"/>
+ <!-- column-name Format -->
+ <column type="guint"/>
+ <!-- column-name Type_name -->
+ <column type="gchararray"/>
+ <!-- column-name Value -->
+ <column type="gchararray"/>
+ <!-- column-name Description -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore"
id="GNUNET_GTK_publication_metadata_types_liststore">
+ <columns>
+ <!-- column-name Type -->
+ <column type="gint"/>
+ <!-- column-name Format -->
+ <column type="gint"/>
+ <!-- column-name Type1 -->
+ <column type="gchararray"/>
+ <!-- column-name Description -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_publication_types_liststore">
+ <columns>
+ <!-- column-name Type -->
+ <column type="gint"/>
+ <!-- column-name Type_name -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">0</col>
+ <col id="1" translatable="yes">Generic</col>
+ </row>
+ <row>
+ <col id="0">1</col>
+ <col id="1" translatable="yes">Text</col>
+ </row>
+ <row>
+ <col id="0">2</col>
+ <col id="1" translatable="yes">Music</col>
+ </row>
+ <row>
+ <col id="0">3</col>
+ <col id="1" translatable="yes">Video</col>
+ </row>
+ <row>
+ <col id="0">4</col>
+ <col id="1" translatable="yes">Image</col>
+ </row>
+ <row>
+ <col id="0">5</col>
+ <col id="1" translatable="yes">Software</col>
+ </row>
+ <row>
+ <col id="0">6</col>
+ <col id="1" translatable="yes">Namespace</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore"
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
+ <columns>
+ <!-- column-name human_readable_time -->
+ <column type="gchararray"/>
+ <!-- column-name time_in_ms -->
+ <column type="guint64"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
+ <columns>
+ <!-- column-name namespace_name -->
+ <column type="gchararray"/>
+ <!-- column-name namespace_handle -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="main_window_search_anonymity_liststore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Level -->
+ <column type="guint"/>
+ <!-- column-name Color -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">None</col>
+ <col id="1">0</col>
+ <col id="2" translatable="yes">#AAAA00000000</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Normal</col>
+ <col id="1">1</col>
+ <col id="2" translatable="yes">#000000000000</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">Paranoid</col>
+ <col id="1">10</col>
+ <col id="2" translatable="yes">#0000AAAA0000</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="main_window_search_mime_liststore">
+ <columns>
+ <!-- column-name MIME -->
+ <column type="gchararray"/>
+ <!-- column-name Type -->
+ <column type="gchararray"/>
+ <!-- column-name Extension -->
+ <column type="gchararray"/>
+ <!-- column-name Lossyness -->
+ <column type="gchararray"/>
+ <!-- column-name Freedom -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0"> </col>
+ <col id="1" translatable="yes">Any</col>
+ <col id="2" translatable="yes"> </col>
+ <col id="3" translatable="yes"> </col>
+ <col id="4" translatable="yes"> </col>
+ </row>
+ <row>
+ <col id="0">plain/text</col>
+ <col id="1" translatable="yes">Text</col>
+ <col id="2">txt</col>
+ <col id="3" translatable="yes">N/A</col>
+ <col id="4" translatable="yes">N/A</col>
+ </row>
+ <row>
+ <col id="0">application/zip</col>
+ <col id="1" translatable="yes">Zip</col>
+ <col id="2">zip</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ <row>
+ <col id="0">audio/mpeg</col>
+ <col id="1" translatable="yes">MPEG audio</col>
+ <col id="2">mp3, mp2, mpeg</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Key -->
+ <column type="gpointer"/>
+ <!-- column-name Root -->
+ <column type="gchararray"/>
+ <!-- column-name Tooltip -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore"
id="GNUNET_GTK_file_sharing_publishing_tree_store">
+ <columns>
+ <!-- column-name filesize -->
+ <column type="gchararray"/>
+ <!-- column-name do_index -->
+ <column type="gboolean"/>
+ <!-- column-name filename -->
+ <column type="gchararray"/>
+ <!-- column-name anonymity_level -->
+ <column type="guint"/>
+ <!-- column-name priority -->
+ <column type="guint"/>
+ <!-- column-name file_information_struct -->
+ <column type="gpointer"/>
+ <!-- column-name expiration_time_absolute -->
+ <column type="guint64"/>
+ <!-- column-name replication_level -->
+ <column type="guint"/>
+ </columns>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_edit_publication_window">
- <property name="can_focus">False</property>
<property name="border_width">4</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
@@ -22,17 +260,18 @@
<property name="skip_pager_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">GNUNET_GTK_main_window</property>
- <signal name="realize"
handler="GNUNET_GTK_edit_publication_window_realize_cb" swapped="no"/>
- <signal name="delete-event"
handler="GNUNET_GTK_edit_publication_window_delete_event_cb" swapped="no"/>
+ <signal name="realize"
handler="GNUNET_GTK_edit_publication_window_realize_cb"/>
+ <signal name="delete_event"
handler="GNUNET_GTK_edit_publication_window_delete_event_cb"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_edit_publication_master_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVPaned"
id="GNUNET_GTK_edit_publication_main_vpaned">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHPaned"
id="GNUNET_GTK_edit_publication_top_hpaned">
<property name="visible">True</property>
@@ -41,16 +280,14 @@
<child>
<object class="GtkVBox"
id="GNUNET_GTK_edit_publication_metadata_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">5</property>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_type_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">_Publication type:</property>
<property name="use_underline">True</property>
</object>
@@ -63,10 +300,9 @@
<child>
<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"/>
+ <signal name="changed"
handler="GNUNET_GTK_edit_publication_type_combo_changed_cb"/>
<child>
<object class="GtkCellRendererText"
id="cellrenderertext2"/>
<attributes>
@@ -83,12 +319,11 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_edit_publication_add_button">
<property name="label">gtk-add</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_add_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_add_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -99,13 +334,12 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_edit_publication_delete_button">
<property name="label">gtk-delete</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_delete_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_delete_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -141,17 +375,16 @@
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_metadata_tree_view_type_column">
<property name="resizable">True</property>
- <property name="title"
translatable="yes">Type</property>
+ <property name="title">Type</property>
<property name="clickable">True</property>
<property name="sort_column_id">2</property>
<child>
<object class="GtkCellRendererCombo"
id="GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer">
<property name="editable">True</property>
<property name="has_entry">False</property>
- <property
name="model">GNUNET_GTK_publication_metadata_types_liststore</property>
<property name="text_column">2</property>
- <signal name="changed"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb"
swapped="no"/>
- <signal name="edited"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb"
swapped="no"/>
+ <signal name="edited"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_edited_cb"/>
+ <signal name="changed"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_type_renderer_changed_cb"/>
</object>
<attributes>
<attribute name="text">2</attribute>
@@ -162,14 +395,14 @@
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_metadata_tree_view_description_column">
<property name="sizing">autosize</property>
- <property name="title"
translatable="yes">Value</property>
+ <property name="title">Value</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="sort_column_id">3</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer">
<property name="editable">True</property>
- <signal name="edited"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb"
swapped="no"/>
+ <signal name="edited"
handler="GNUNET_GTK_edit_publication_metadata_tree_view_value_renderer_edited_cb"/>
</object>
<attributes>
<attribute name="text">3</attribute>
@@ -181,8 +414,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -195,24 +426,21 @@
<child>
<object class="GtkFrame"
id="GNUNET_GTK_edit_publication_metadata_preview_frame">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_edit_publication_metadata_preview_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
<object class="GtkVBox"
id="GNUNET_GTK_edit_publication_metadata_preview_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkFileChooserButton"
id="GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="create_folders">False</property>
<property name="title"
translatable="yes">Select file</property>
- <signal name="file-set"
handler="GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb"
swapped="no"/>
+ <signal name="file_set"
handler="GNUNET_GTK_edit_publication_metadata_preview_file_chooser_button_file_set_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -231,14 +459,12 @@
<child>
<object class="GtkViewport"
id="GNUNET_GTK_edit_publication_metadata_preview_image_viewport">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="hadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment</property>
<property
name="vadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment</property>
<property
name="shadow_type">none</property>
<child>
<object class="GtkImage"
id="GNUNET_GTK_edit_publication_metadata_preview_image">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
<property
name="stock">gtk-missing-image</property>
</object>
</child>
@@ -246,8 +472,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -258,7 +482,6 @@
<child type="label">
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">Preview:</property>
<property name="use_markup">True</property>
</object>
@@ -278,23 +501,20 @@
<child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_secondary_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_keyword_list_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_keyword_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">_Keyword:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">GNUNET_GTK_edit_publication_keyword_entry</property>
@@ -309,25 +529,20 @@
<object class="GtkEntry"
id="GNUNET_GTK_edit_publication_keyword_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
+ <property
name="invisible_char">●</property>
<property
name="invisible_char_set">True</property>
<property
name="caps_lock_warning">False</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
- <signal name="key-press-event"
handler="GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb"
swapped="no"/>
+ <signal name="key_press_event"
handler="GNUNET_GTK_edit_publication_keyword_entry_key_press_event_cb"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
@@ -348,7 +563,7 @@
<property name="search_column">0</property>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column">
- <property name="title"
translatable="yes">Keywords</property>
+ <property name="title">Keywords</property>
<property name="clickable">True</property>
<property
name="reorderable">True</property>
<property
name="sort_column_id">0</property>
@@ -364,32 +579,27 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkVBox"
id="GNUNET_GTK_edit_publication_keyword_list_button_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_edit_publication_keyword_list_add_button">
<property name="label">Add key_word</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">add_stock_image</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -400,13 +610,13 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_edit_publication_keyword_list_del_button">
<property name="label">Delete _selected</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="image">del_stock_image</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
@@ -426,8 +636,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">4</property>
<property name="position">0</property>
</packing>
@@ -435,12 +643,10 @@
<child>
<object class="GtkFrame" id="frame3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<child>
<object class="GtkAlignment" id="alignment3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yalign">0</property>
<property name="yscale">0</property>
<property name="left_padding">4</property>
@@ -448,15 +654,89 @@
<child>
<object class="GtkVBox"
id="GNUNET_GTK_edit_publication_misc_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
+ <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_root_hbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_root_label">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label"
translatable="yes">_Root keyword:</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_GTK_edit_publication_root_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="invisible_char">•</property>
+ <property name="text">root</property>
+ <property
name="invisible_char_set">True</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_index_hbox">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_index_label">
+ <property name="visible">True</property>
+ <property name="xalign">1</property>
+ <property name="label"
translatable="yes">_Index file:</property>
+ <property
name="use_underline">True</property>
+ <property
name="mnemonic_widget">GNUNET_GTK_edit_publication_index_checkbutton</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton"
id="GNUNET_GTK_edit_publication_index_checkbutton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_anonymity_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_anonymity_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label"
translatable="yes">A_nonymity:</property>
<property
name="use_underline">True</property>
@@ -471,12 +751,10 @@
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_edit_publication_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_edit_publication_anonymity_combobox">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
<property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
@@ -505,17 +783,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_priority_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_priority_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label"
translatable="yes">_Priority:</property>
<property
name="use_underline">True</property>
@@ -531,10 +807,8 @@
<object class="GtkSpinButton"
id="GNUNET_GTK_edit_publication_priority_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="invisible_char">●</property>
+ <property
name="invisible_char">●</property>
<property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">priority_adjustment</property>
@@ -550,61 +824,15 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="position">3</property>
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_root_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_root_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label"
translatable="yes">_Root keyword:</property>
- <property
name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_GTK_edit_publication_root_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="invisible_char">•</property>
- <property name="text">root</property>
- <property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_edit_publication_expiration_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label"
translatable="yes">_Expriation year:</property>
<property
name="use_underline">True</property>
@@ -621,10 +849,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="max_length">4</property>
- <property
name="invisible_char">•</property>
+ <property
name="invisible_char">•</property>
<property
name="invisible_char_set">True</property>
- <property
name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property
name="primary_icon_sensitive">True</property>
<property
name="secondary_icon_sensitive">True</property>
<property
name="adjustment">expiration_year_adjustment</property>
@@ -641,48 +867,35 @@
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_index_hbox">
+ <object class="GtkHBox" id="hbox9">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_index_label">
+ <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_replication_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="label"
translatable="yes">_Index file:</property>
+ <property name="label"
translatable="yes">_Replication:</property>
<property
name="use_underline">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_edit_publication_index_checkbutton</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton"
id="GNUNET_GTK_edit_publication_index_checkbutton">
- <property
name="use_action_appearance">False</property>
+ <object class="GtkSpinButton"
id="GNUNET_GTK_edit_publication_replication_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="receives_default">False</property>
- <property
name="draw_indicator">True</property>
+ <property
name="invisible_char">●</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</object>
@@ -692,7 +905,6 @@
<child type="label">
<object class="GtkLabel" id="label2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Publication
options:</property>
<property name="use_markup">True</property>
</object>
@@ -712,52 +924,47 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_edit_publication_buttons_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_edit_publication_confirm_button">
- <property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="GNUNET_GTK_edit_publication_cancel_button">
+ <property name="label">gtk-cancel</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
- <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_confirm_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_cancel_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">4</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_edit_publication_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="GNUNET_GTK_edit_publication_confirm_button">
+ <property name="label">gtk-ok</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_edit_publication_cancel_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_confirm_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">4</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -772,159 +979,107 @@
</object>
</child>
</object>
- <object class="GtkTreeStore"
id="GNUNET_GTK_file_sharing_publishing_tree_store">
- <columns>
- <!-- column-name filesize -->
- <column type="gchararray"/>
- <!-- column-name do_index -->
- <column type="gboolean"/>
- <!-- column-name filename -->
- <column type="gchararray"/>
- <!-- column-name anonymity_level -->
- <column type="guint"/>
- <!-- column-name priority -->
- <column type="guint"/>
- <!-- column-name file_information_struct -->
- <column type="gpointer"/>
- </columns>
- </object>
<object class="GtkWindow" id="GNUNET_GTK_main_window">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">gnunet-fs-gtk</property>
<property name="window_position">center</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
<property name="icon_name">gnunet-gtk</property>
- <signal name="delete-event" handler="GNUNET_GTK_quit_cb" after="yes"
swapped="no"/>
- <signal name="realize" handler="GNUNET_GTK_main_window_realize_cb"
swapped="no"/>
+ <signal name="realize" handler="GNUNET_GTK_main_window_realize_cb"/>
+ <signal name="delete_event" handler="GNUNET_GTK_quit_cb" after="yes"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_main_window_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
<object class="GtkMenuBar" id="GNUNET_GTK_main_menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem"
id="GNUNET_GTK_main_menu_file_sharing">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_File
sharing</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu"
id="GNUNET_GTK_main_menu_file_sharing_box">
- <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_create_pseudonym">
<property name="label" translatable="yes">_Create
pseudonym</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Create a pseudonym for publishing content. Note that you
can also publish content anonymously (without using a pseudonym).</property>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Create pseudonym</property>
<property name="use_underline">True</property>
<property name="image">new_stock_imag</property>
<property name="use_stock">False</property>
<accelerator key="n" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_create_pseudonym_activate_cb"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_advertise_pseudonym">
<property name="label" translatable="yes">_Advertise
Pseudonym</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="use_underline">True</property>
<property name="image">index_stock_image</property>
<property name="use_stock">False</property>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb"
swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_publish">
<property name="label"
translatable="yes">_Publish</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Publish files or directories on GNUnet</property>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Publish</property>
<property name="use_underline">True</property>
<property name="image">up_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="a" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb"/>
</object>
</child>
<child>
- <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep1">
- <property name="use_action_appearance">False</property>
- <property name="can_focus">False</property>
- </object>
+ <object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep1"/>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_download_uri">
<property name="label"
translatable="yes">_Download</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Download a file or directory with a known URI.</property>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Download</property>
<property name="use_underline">True</property>
<property name="image">down_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="d" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb"/>
</object>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_open_gnunet_directory">
<property name="label" translatable="yes">_Open GNUnet
directory</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Use
this option to browse a GNUnet directory file that has been previously
downloaded.</property>
<property name="accel_path"><gnunet-fs-gtk>/File
sharing/Open directory</property>
<property name="use_underline">True</property>
<property name="image">open_stock_image</property>
<property name="use_stock">False</property>
<accelerator key="F3" signal="activate"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"
swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"/>
</object>
</child>
<child>
<object class="GtkSeparatorMenuItem"
id="GNUNET_GTK_main_menu_file_sep2">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
</child>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_file_quit">
<property name="label">gtk-quit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Exit
gnunet-fs-gtk. Active file-sharing operations will resume upon
restart.</property>
<property
name="accel_path"><gnunet-fs-gtk>/Quit</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate" handler="GNUNET_GTK_quit_cb"
swapped="no"/>
+ <signal name="activate" handler="GNUNET_GTK_quit_cb"/>
</object>
</child>
</object>
@@ -933,20 +1088,15 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_edit">
- <property name="use_action_appearance">False</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_Edit</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_GTK_main_menu_edit_box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_edit_preferences">
<property name="label">gtk-preferences</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Edit
the system configuration.</property>
<property
name="accel_path"><gnunet-fs-gtk>/Edit/Preferences</property>
<property name="use_underline">True</property>
@@ -959,49 +1109,40 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_view">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_View</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_GTK_main_menu_view_box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_metadata">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
meta data in main window</property>
<property name="label"
translatable="yes">Metadata</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_metadata_toggled_cb"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_view_preview">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
preview (when available)</property>
<property name="label"
translatable="yes">Preview</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_preview_toggled_cb"/>
</object>
</child>
<child>
<object class="GtkCheckMenuItem"
id="GNUNET_GTK_main_menu_search_preview">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Show
search box in main window</property>
<property name="label"
translatable="yes">Search</property>
<property name="use_underline">True</property>
<property name="active">True</property>
- <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_search_toggled_cb" swapped="no"/>
+ <signal name="toggled"
handler="GNUNET_GTK_main_menu_view_search_toggled_cb"/>
</object>
</child>
</object>
@@ -1010,26 +1151,21 @@
</child>
<child>
<object class="GtkMenuItem" id="GNUNET_GTK_main_menu_help">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
<object class="GtkMenu" id="GNUNET_GTK_main_menu_help_abou">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_main_menu_help_about">
<property name="label">gtk-about</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Display information about this version of
gnunet-fs-gtk</property>
<property
name="accel_path"><gnunet-fs-gtk>/Help/About</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_help_about_activate_cb" swapped="no"/>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_help_about_activate_cb"/>
</object>
</child>
</object>
@@ -1039,20 +1175,17 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="main_window_search_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="border_width">3</property>
<property name="spacing">4</property>
<child>
<object class="GtkLabel" id="main_window_search_namespace_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Namespace:</property>
</object>
<packing>
@@ -1064,7 +1197,6 @@
<child>
<object class="GtkLabel"
id="main_window_search_selected_namespace_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"><none></property>
<property name="single_line_mode">True</property>
</object>
@@ -1077,12 +1209,10 @@
<child>
<object class="GtkAlignment"
id="main_window_search_namespace_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="xscale">0</property>
<property name="yscale">0</property>
<child>
<object class="GtkToggleButton"
id="main_window_search_namespace_dropdown_button">
- <property name="use_action_appearance">False</property>
<property name="width_request">21</property>
<property name="height_request">21</property>
<property name="visible">True</property>
@@ -1090,13 +1220,12 @@
<property name="receives_default">True</property>
<property name="events">GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
<property name="image_position">right</property>
- <signal name="toggled"
handler="main_window_search_namespace_dropdown_button_toggled_cb" swapped="no"/>
- <signal name="enter-notify-event"
handler="main_window_search_namespace_dropdown_button_enter_notify_event_cb"
swapped="no"/>
- <signal name="leave-notify-event"
handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/>
+ <signal name="leave_notify_event"
handler="namespace_selector_window_leave_notify_event_cb"/>
+ <signal name="toggled"
handler="main_window_search_namespace_dropdown_button_toggled_cb"/>
+ <signal name="enter_notify_event"
handler="main_window_search_namespace_dropdown_button_enter_notify_event_cb"/>
<child>
<object class="GtkArrow" id="arrow1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="arrow_type">down</property>
</object>
</child>
@@ -1115,17 +1244,15 @@
<child>
<object class="GtkAlignment"
id="main_window_search_button_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkButton" id="main_window_search_button">
<property name="label" translatable="yes">Find:</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">find_stock_image</property>
- <signal name="clicked"
handler="main_window_search_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="main_window_search_button_clicked_cb"/>
</object>
</child>
</object>
@@ -1140,24 +1267,19 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="has_focus">True</property>
- <property name="invisible_char">●</property>
+ <property name="invisible_char">●</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
- <signal name="key-press-event"
handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
+ <signal name="key_press_event"
handler="main_window_search_entry_key_press_event_cb"/>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="main_window_search_anonymity_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Anonymity:</property>
</object>
<packing>
@@ -1169,12 +1291,10 @@
<child>
<object class="GtkAlignment"
id="main_window_search_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="main_window_search_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
@@ -1202,7 +1322,6 @@
<child>
<object class="GtkLabel" id="main_window_search_mime_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Type:</property>
</object>
<packing>
@@ -1214,12 +1333,10 @@
<child>
<object class="GtkAlignment"
id="main_window_search_mime_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="main_window_search_mime_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_mime_liststore</property>
<property name="active">0</property>
<child>
@@ -1286,7 +1403,7 @@
<property name="tab_border">0</property>
<property name="tab_hborder">0</property>
<property name="tab_vborder">0</property>
- <signal name="switch-page"
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes"
swapped="no"/>
+ <signal name="switch_page"
handler="GNUNET_GTK_main_window_notebook_switch_page_cb" after="yes"/>
</object>
<packing>
<property name="resize">True</property>
@@ -1296,13 +1413,11 @@
<child>
<object class="GtkVBox" id="GNUNET_GTK_main_window_extras_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkImage"
id="GNUNET_GTK_main_window_preview_image">
<property name="width_request">128</property>
<property name="height_request">128</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Thumbnail
associated with the currently selected content</property>
<property name="pixel_size">256</property>
@@ -1332,12 +1447,12 @@
<property name="search_column">0</property>
<property name="rubber_banding">True</property>
<property name="enable_grid_lines">both</property>
- <signal name="button-press-event"
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb"
swapped="no"/>
- <signal name="popup-menu"
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb" swapped="no"/>
+ <signal name="button_press_event"
handler="GNUNET_GTK_main_window_metadata_treeview_button_press_event_cb"/>
+ <signal name="popup_menu"
handler="GNUNET_GTK_main_window_metadata_treeview_popup_menu_cb"/>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_metadata_type_column">
<property name="sizing">autosize</property>
- <property name="title"
translatable="yes">Type</property>
+ <property name="title">Type</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -1352,7 +1467,7 @@
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_metadata_value_column">
<property name="sizing">autosize</property>
- <property name="title"
translatable="yes">Value</property>
+ <property name="title">Value</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
@@ -1371,8 +1486,6 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1384,28 +1497,35 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
+ <child>
+ <object class="GtkStatusbar" id="GNUNET_GTK_status_bar">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
</child>
</object>
<object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog">
<property name="height_request">500</property>
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Publish content on
GNUnet</property>
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
<property name="deletable">False</property>
<property name="transient_for">GNUNET_GTK_main_window</property>
- <signal name="realize"
handler="GNUNET_GTK_master_publish_dialog_realize_cb" swapped="no"/>
- <signal name="delete-event"
handler="GNUNET_GTK_master_publish_dialog_delete_event_cb" swapped="no"/>
+ <signal name="realize"
handler="GNUNET_GTK_master_publish_dialog_realize_cb"/>
+ <signal name="delete_event"
handler="GNUNET_GTK_master_publish_dialog_delete_event_cb"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_master_publish_dialog_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="border_width">4</property>
<property name="spacing">7</property>
<child>
@@ -1429,7 +1549,7 @@
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
<property name="sizing">autosize</property>
- <property name="title" translatable="yes">Size</property>
+ <property name="title">Size</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_renderer"/>
<attributes>
@@ -1442,7 +1562,7 @@
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_file_information_filename_column">
<property name="resizable">True</property>
<property name="sizing">autosize</property>
- <property name="title"
translatable="yes">Filename</property>
+ <property name="title">Filename</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
@@ -1459,42 +1579,36 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_master_dialog_modification_button_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkTable"
id="GNUNET_GTK_master_publish_dialog_action_table">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_add_button">
<property name="label" translatable="yes">Add
_File</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_add_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_add_button_clicked_cb"/>
</object>
</child>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_new_button">
<property name="label" translatable="yes">_Create empty
directory</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">new_stock_image</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_new_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_new_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1504,12 +1618,11 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_open_button">
<property name="label" translatable="yes">Add
_Directory</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_open_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_open_button_clicked_cb"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -1519,13 +1632,12 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_edit_button">
<property name="label">gtk-edit</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_edit_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1537,13 +1649,12 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_delete_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1555,7 +1666,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">25</property>
<property name="position">0</property>
</packing>
@@ -1563,20 +1673,18 @@
<child>
<object class="GtkTable"
id="GNUNET_GTK_master_publish_dialog_arrow_table">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">3</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_up_button">
<property name="label">gtk-go-up</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_up_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_up_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1586,14 +1694,13 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_left_button">
<property name="label" translatable="yes">_Left</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">left_stock_image</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_left_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_left_button_clicked_cb"/>
</object>
<packing>
<property name="top_attach">1</property>
@@ -1603,13 +1710,12 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_down_button">
<property name="label">gtk-go-down</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_down_button_clicked_cb" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_down_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1621,14 +1727,13 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_right_button">
<property name="label" translatable="yes">_Right</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="image">right_stock_image</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_right_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_right_button_clicked_cb"/>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1646,7 +1751,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">25</property>
<property name="position">1</property>
</packing>
@@ -1654,7 +1758,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -1680,7 +1783,7 @@
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_pseudonym_name_column">
<property name="resizable">True</property>
- <property name="title"
translatable="yes">Pseudonym</property>
+ <property name="title">Pseudonym</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
<property name="sort_indicator">True</property>
@@ -1696,7 +1799,7 @@
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_column">
<property name="resizable">True</property>
<property name="sizing">autosize</property>
- <property name="title" translatable="yes">Current
identifier</property>
+ <property name="title">Current identifier</property>
<property name="clickable">True</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer"/>
@@ -1712,7 +1815,7 @@
<property name="resizable">True</property>
<property name="sizing">autosize</property>
<property name="fixed_width">5</property>
- <property name="title" translatable="yes">Update
identifier</property>
+ <property name="title">Update identifier</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer"/>
<attributes>
@@ -1724,7 +1827,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
- <property name="title" translatable="yes">Description (of
existing content)</property>
+ <property name="title">Description (of existing
content)</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
<property name="wrap_mode">word</property>
@@ -1739,48 +1842,43 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">2</property>
</packing>
</child>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_master_publish_dialog_master_buttons_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_execute_button">
- <property name="label" translatable="yes">_Execute</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_cancel_button">
+ <property name="label" translatable="yes">_Cancel</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_cancel_button">
- <property name="label" translatable="yes">_Cancel</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="GNUNET_GTK_master_publish_dialog_execute_button">
+ <property name="label" translatable="yes">_Execute</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_cancel_button_clicked_cb"
swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_GTK_master_publish_dialog_execute_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
@@ -1793,23 +1891,10 @@
</object>
</child>
</object>
- <object class="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
- <columns>
- <!-- column-name extractor_meta_type -->
- <column type="guint"/>
- <!-- column-name extractor_meta_format -->
- <column type="guint"/>
- <!-- column-name extractor_meta_type_string -->
- <column type="gchararray"/>
- <!-- column-name extracotr_meta_value -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkTextBuffer"
id="GNUNET_GTK_open_url_dialog_url_textview_buffer">
- <signal name="changed"
handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb"
swapped="no"/>
+ <signal name="changed"
handler="GNUNET_GTK_open_url_dialog_url_textview_buffer_changed_cb"/>
</object>
<object class="GtkWindow" id="GNUNET_GTK_open_url_window">
- <property name="can_focus">False</property>
<property name="title" translatable="yes">Enter the URI to be
downloaded</property>
<property name="modal">True</property>
<property name="default_width">640</property>
@@ -1819,20 +1904,17 @@
<property name="skip_pager_hint">True</property>
<property name="deletable">False</property>
<property name="transient_for">GNUNET_GTK_main_window</property>
- <signal name="delete-event"
handler="GNUNET_GTK_open_url_window_delete_event_cb" swapped="no"/>
+ <signal name="delete_event"
handler="GNUNET_GTK_open_url_window_delete_event_cb"/>
<child>
<object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
<object class="GtkHBox" id="GNUNET_GTK_open_url_dialog_query_hbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_url_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">_URI:</property>
<property name="use_underline">True</property>
<property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
@@ -1847,13 +1929,11 @@
<child>
<object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkAlignment" id="alignment1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkTextView"
id="GNUNET_GTK_open_url_dialog_url_textview">
<property name="visible">True</property>
@@ -1863,7 +1943,7 @@
<property name="indent">20</property>
<property
name="buffer">GNUNET_GTK_open_url_dialog_url_textview_buffer</property>
<property name="accepts_tab">False</property>
- <signal name="key-press-event"
handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb"
swapped="no"/>
+ <signal name="key_press_event"
handler="GNUNET_GTK_open_url_dialog_url_textview_key_press_event_cb"/>
</object>
</child>
</object>
@@ -1873,83 +1953,40 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
- <property name="label">_Execute</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_anonymity_label">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="image">execute_stock_image</property>
+ <property name="label"
translatable="yes">_Anonymity:</property>
<property name="use_underline">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb" swapped="no"/>
+ <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
<property name="padding">4</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="pack_type">end</property>
<property name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
@@ -1975,22 +2012,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_anonymity_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
- <property name="use_underline">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_combobox</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
- </child>
</object>
<packing>
<property name="expand">False</property>
@@ -1998,193 +2019,86 @@
<property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
- <columns>
- <!-- column-name peer_identity -->
- <column type="gchararray"/>
- <!-- column-name number_of_known_addresses -->
- <column type="guint"/>
- <!-- column-name country_name -->
- <column type="gchararray"/>
- <!-- column-name country_flag -->
- <column type="GdkPixbuf"/>
- <!-- column-name bandwidth -->
- <column type="guint64"/>
- </columns>
- </object>
- <object class="GtkTreeStore" id="GNUNET_GTK_pseudonym_tree_store">
- <columns>
- <!-- column-name local_name -->
- <column type="gchararray"/>
- <!-- column-name namespace_handle -->
- <column type="gpointer"/>
- <!-- column-name last_id -->
- <column type="gchararray"/>
- <!-- column-name last_uri -->
- <column type="gchararray"/>
- <!-- column-name last_meta -->
- <column type="gpointer"/>
- <!-- column-name next_id -->
- <column type="gchararray"/>
- <!-- column-name last_description_from_meta -->
- <column type="gchararray"/>
- <!-- column-name next_id_editable -->
- <column type="gboolean"/>
- <!-- column-name current_id_editable -->
- <column type="gboolean"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
- <columns>
- <!-- column-name Keyword -->
- <column type="gchararray"/>
- <!-- column-name Added -->
- <column type="gboolean"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_publication_metadata_liststore">
- <columns>
- <!-- column-name Type -->
- <column type="guint"/>
- <!-- column-name Format -->
- <column type="guint"/>
- <!-- column-name Type_name -->
- <column type="gchararray"/>
- <!-- column-name Value -->
- <column type="gchararray"/>
- <!-- column-name Description -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore"
id="GNUNET_GTK_publication_metadata_types_liststore">
- <columns>
- <!-- column-name Type -->
- <column type="gint"/>
- <!-- column-name Format -->
- <column type="gint"/>
- <!-- column-name Type1 -->
- <column type="gchararray"/>
- <!-- column-name Description -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_publication_types_liststore">
- <columns>
- <!-- column-name Type -->
- <column type="gint"/>
- <!-- column-name Type_name -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">0</col>
- <col id="1" translatable="yes">Generic</col>
- </row>
- <row>
- <col id="0">1</col>
- <col id="1" translatable="yes">Text</col>
- </row>
- <row>
- <col id="0">2</col>
- <col id="1" translatable="yes">Music</col>
- </row>
- <row>
- <col id="0">3</col>
- <col id="1" translatable="yes">Video</col>
- </row>
- <row>
- <col id="0">4</col>
- <col id="1" translatable="yes">Image</col>
- </row>
- <row>
- <col id="0">5</col>
- <col id="1" translatable="yes">Software</col>
- </row>
- <row>
- <col id="0">6</col>
- <col id="1" translatable="yes">Namespace</col>
- </row>
- </data>
- </object>
- <object class="GtkFileChooserDialog"
id="GNUNET_GTK_publish_directory_dialog">
- <property name="can_focus">False</property>
- <property name="can_default">True</property>
- <property name="events">GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK</property>
- <property name="border_width">5</property>
- <property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">dialog</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient_for">GNUNET_GTK_main_window</property>
- <property name="action">select-folder</property>
- <property name="create_folders">False</property>
- <property name="select_multiple">True</property>
- <signal name="response"
handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area6">
+ <child>
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="layout_style">end</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_dialog_cancel_button">
+ <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
+ <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_cancel_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="padding">4</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_directory_dialog_ok_button">
- <property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
+ <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
+ <property name="label">_Execute</property>
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">True</property>
- <property name="can_default">True</property>
<property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="image">execute_stock_image</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="GNUNET_GTK_open_url_dialog_execute_button_clicked_cb"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">1</property>
+ <property name="padding">4</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="padding">4</property>
<property name="pack_type">end</property>
- <property name="position">0</property>
+ <property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ </object>
+ <object class="GtkFileChooserDialog"
id="GNUNET_GTK_publish_directory_dialog">
+ <property name="can_default">True</property>
+ <property name="events">GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK</property>
+ <property name="border_width">5</property>
+ <property name="modal">True</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">dialog</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="transient_for">GNUNET_GTK_main_window</property>
+ <property name="select_multiple">True</property>
+ <property name="create_folders">False</property>
+ <property name="action">select-folder</property>
+ <signal name="response"
handler="GNUNET_GTK_publish_directory_dialog_response_cb"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox1">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton"
id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
<property name="label" translatable="yes">Index
files</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2205,12 +2119,10 @@
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_priority_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">Priority:</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">13</property>
<property name="position">2</property>
</packing>
@@ -2219,10 +2131,8 @@
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">priority_adjustment</property>
@@ -2230,7 +2140,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">20</property>
<property name="position">3</property>
</packing>
@@ -2245,11 +2154,9 @@
<child>
<object class="GtkHBox" id="hbox7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Expiration
year:</property>
</object>
<packing>
@@ -2263,10 +2170,8 @@
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property
name="adjustment">expiration_year_adjustment</property>
@@ -2280,12 +2185,10 @@
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">Anonymity:</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -2293,12 +2196,10 @@
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
@@ -2337,42 +2238,13 @@
<property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GTK_publish_dialog_cancel_button</action-widget>
- <action-widget
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
- <property name="can_focus">False</property>
- <property name="can_default">True</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Publish file...</property>
- <property name="modal">True</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">normal</property>
- <property name="skip_taskbar_hint">True</property>
- <property name="skip_pager_hint">True</property>
- <property name="transient_for">GNUNET_GTK_main_window</property>
- <property name="create_folders">False</property>
- <property name="select_multiple">True</property>
- <signal name="delete-event" handler="gtk_widget_hide_on_delete"
swapped="no"/>
- <signal name="response"
handler="GNUNET_GTK_publish_file_dialog_response_cb" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area5">
+ <object class="GtkHButtonBox" id="dialog-action_area6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_cancel_button">
+ <object class="GtkButton"
id="GNUNET_GTK_publish_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2385,9 +2257,8 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_ok_button">
+ <object class="GtkButton"
id="GNUNET_GTK_publish_directory_dialog_ok_button">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -2403,23 +2274,46 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget
response="-6">GNUNET_GTK_publish_dialog_cancel_button</action-widget>
+ <action-widget
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
+ <property name="can_default">True</property>
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Publish file...</property>
+ <property name="modal">True</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">normal</property>
+ <property name="skip_taskbar_hint">True</property>
+ <property name="skip_pager_hint">True</property>
+ <property name="transient_for">GNUNET_GTK_main_window</property>
+ <property name="select_multiple">True</property>
+ <property name="create_folders">False</property>
+ <signal name="response"
handler="GNUNET_GTK_publish_file_dialog_response_cb"/>
+ <signal name="delete_event" handler="gtk_widget_hide_on_delete"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox5">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
<child>
<object class="GtkVBox" id="vbox1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkCheckButton"
id="GNUNET_GTK_publish_file_dialog_do_index_checkbutton">
<property name="label" translatable="yes">Index
file</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -2440,12 +2334,10 @@
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_file_dialog_priority_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">Priority:</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">13</property>
<property name="position">2</property>
</packing>
@@ -2454,10 +2346,8 @@
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_file_dialog_priority_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property name="adjustment">priority_adjustment</property>
@@ -2465,7 +2355,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">20</property>
<property name="position">3</property>
</packing>
@@ -2480,11 +2369,9 @@
<child>
<object class="GtkHBox" id="hbox5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_file_dialog_expiration_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Expiration
year:</property>
</object>
<packing>
@@ -2498,10 +2385,8 @@
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_file_dialog_expiration_year_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
+ <property name="invisible_char">•</property>
<property name="invisible_char_set">True</property>
- <property name="primary_icon_activatable">False</property>
- <property
name="secondary_icon_activatable">False</property>
<property name="primary_icon_sensitive">True</property>
<property name="secondary_icon_sensitive">True</property>
<property
name="adjustment">expiration_year_adjustment</property>
@@ -2516,12 +2401,10 @@
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_file_dialog_anonymity_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label"
translatable="yes">Anonymity:</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">2</property>
</packing>
@@ -2529,12 +2412,10 @@
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_publish_file_dialog_anonymity_combobox_alignment">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_publish_file_dialog_anonymity_combobox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property
name="model">main_window_search_anonymity_liststore</property>
<property name="active">1</property>
<child>
@@ -2562,7 +2443,6 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -2573,55 +2453,13 @@
<property name="position">2</property>
</packing>
</child>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GTK_publish_file_dialog_cancel_button</action-widget>
- <action-widget
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
- </action-widgets>
- </object>
- <object class="GtkListStore"
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
- <columns>
- <!-- column-name human_readable_time -->
- <column type="gchararray"/>
- <!-- column-name time_in_ms -->
- <column type="guint64"/>
- </columns>
- </object>
- <object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
- <columns>
- <!-- column-name namespace_name -->
- <column type="gchararray"/>
- <!-- column-name namespace_handle -->
- <column type="gpointer"/>
- </columns>
- </object>
- <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
- <property name="can_focus">False</property>
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Select pseudonym...</property>
- <property name="modal">True</property>
- <property name="default_width">400</property>
- <property name="default_height">300</property>
- <property name="destroy_with_parent">True</property>
- <property name="type_hint">normal</property>
- <signal name="realize"
handler="GNUNET_GTK_select_pseudonym_dialog_realize_cb" swapped="no"/>
- <signal name="delete-event"
handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb" swapped="no"/>
- <signal name="response"
handler="GNUNET_GTK_select_pseudonym_dialog_response_cb" swapped="no"/>
- <child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area3">
+ <object class="GtkHButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_select_pseudonym_cancel_button">
+ <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -2634,12 +2472,11 @@
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_select_pseudonym_ok_button">
+ <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_ok_button">
<property name="label">gtk-ok</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="sensitive">False</property>
<property name="can_focus">True</property>
+ <property name="can_default">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
</object>
@@ -2652,11 +2489,32 @@
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
<property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget
response="-6">GNUNET_GTK_publish_file_dialog_cancel_button</action-widget>
+ <action-widget
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkDialog" id="GNUNET_GTK_select_pseudonym_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Select pseudonym...</property>
+ <property name="modal">True</property>
+ <property name="default_width">400</property>
+ <property name="default_height">300</property>
+ <property name="destroy_with_parent">True</property>
+ <property name="type_hint">normal</property>
+ <signal name="realize"
handler="GNUNET_GTK_select_pseudonym_dialog_realize_cb"/>
+ <signal name="response"
handler="GNUNET_GTK_select_pseudonym_dialog_response_cb"/>
+ <signal name="delete_event"
handler="GNUNET_GTK_select_pseudonym_dialog_delete_event_cb"/>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox3">
+ <property name="visible">True</property>
+ <property name="spacing">2</property>
<child>
<object class="GtkScrolledWindow"
id="GNUNET_GTK_select_pseudonym_scrolledwindow">
<property name="visible">True</property>
@@ -2676,7 +2534,7 @@
<property name="search_column">0</property>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_select_pseudonym_tree_view_column">
- <property name="title" translatable="yes">Name</property>
+ <property name="title">Name</property>
<property name="expand">True</property>
<property name="clickable">True</property>
<property name="reorderable">True</property>
@@ -2694,14 +2552,52 @@
</child>
</object>
<packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<placeholder/>
</child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area3">
+ <property name="visible">True</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_select_pseudonym_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_select_pseudonym_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
</object>
</child>
<action-widgets>
@@ -2711,7 +2607,6 @@
</object>
<object class="GtkImage" id="add_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-add</property>
</object>
<object class="GtkAdjustment" id="adjustment1">
@@ -2758,128 +2653,36 @@
</object>
<object class="GtkImage" id="down_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-go-down</property>
</object>
<object class="GtkImage" id="execute_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-execute</property>
</object>
<object class="GtkImage" id="find_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-find</property>
</object>
<object class="GtkImage" id="index_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-index</property>
</object>
<object class="GtkImage" id="left_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-go-back</property>
</object>
- <object class="GtkListStore" id="main_window_search_anonymity_liststore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Level -->
- <column type="guint"/>
- <!-- column-name Color -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes">None</col>
- <col id="1">0</col>
- <col id="2" translatable="yes">#AAAA00000000</col>
- </row>
- <row>
- <col id="0" translatable="yes">Normal</col>
- <col id="1">1</col>
- <col id="2" translatable="yes">#000000000000</col>
- </row>
- <row>
- <col id="0" translatable="yes">Paranoid</col>
- <col id="1">10</col>
- <col id="2" translatable="yes">#0000AAAA0000</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="main_window_search_mime_liststore">
- <columns>
- <!-- column-name MIME -->
- <column type="gchararray"/>
- <!-- column-name Type -->
- <column type="gchararray"/>
- <!-- column-name Extension -->
- <column type="gchararray"/>
- <!-- column-name Lossyness -->
- <column type="gchararray"/>
- <!-- column-name Freedom -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0"> </col>
- <col id="1" translatable="yes">Any</col>
- <col id="2" translatable="yes"> </col>
- <col id="3" translatable="yes"> </col>
- <col id="4" translatable="yes"> </col>
- </row>
- <row>
- <col id="0">plain/text</col>
- <col id="1" translatable="yes">Text</col>
- <col id="2">txt</col>
- <col id="3" translatable="yes">N/A</col>
- <col id="4" translatable="yes">N/A</col>
- </row>
- <row>
- <col id="0">application/zip</col>
- <col id="1" translatable="yes">Zip</col>
- <col id="2">zip</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">free</col>
- </row>
- <row>
- <col id="0">audio/mpeg</col>
- <col id="1" translatable="yes">MPEG audio</col>
- <col id="2">mp3, mp2, mpeg</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- </data>
- </object>
- <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Key -->
- <column type="gpointer"/>
- <!-- column-name Root -->
- <column type="gchararray"/>
- <!-- column-name Tooltip -->
- <column type="gchararray"/>
- </columns>
- </object>
<object class="GtkMenu" id="metadata_popup_menu">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="Copy selection">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Copy selection</property>
<property name="use_underline">True</property>
- <signal name="activate" handler="metadata_copy_selection_activated"
swapped="no"/>
+ <signal name="activate" handler="metadata_copy_selection_activated"/>
</object>
</child>
</object>
<object class="GtkWindow" id="namespace_selector_window">
- <property name="can_focus">False</property>
<property name="events">GDK_LEAVE_NOTIFY_MASK |
GDK_STRUCTURE_MASK</property>
<property name="resizable">False</property>
<property name="destroy_with_parent">True</property>
@@ -2891,8 +2694,8 @@
<property name="deletable">False</property>
<property name="transient_for">GNUNET_GTK_main_window</property>
<property name="mnemonics_visible">False</property>
- <signal name="leave-notify-event"
handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/>
- <signal name="enter-notify-event"
handler="main_window_search_namespace_dropdown_button_enter_notify_event_cb"
swapped="no"/>
+ <signal name="leave_notify_event"
handler="namespace_selector_window_leave_notify_event_cb"/>
+ <signal name="enter_notify_event"
handler="main_window_search_namespace_dropdown_button_enter_notify_event_cb"/>
<child>
<object class="GtkTreeView" id="namespace_selector_treeview">
<property name="visible">True</property>
@@ -2904,12 +2707,12 @@
<property name="hover_selection">True</property>
<property name="hover_expand">True</property>
<property name="tooltip_column">3</property>
- <signal name="button-press-event"
handler="namespace_selector_treeview_button_press_event_cb" swapped="no"/>
- <signal name="button-release-event"
handler="namespace_selector_treeview_button_release_event_cb" swapped="no"/>
+ <signal name="button_press_event"
handler="namespace_selector_treeview_button_press_event_cb"/>
+ <signal name="button_release_event"
handler="namespace_selector_treeview_button_release_event_cb"/>
<child>
<object class="GtkTreeViewColumn" id="name_column">
<property name="sizing">autosize</property>
- <property name="title" translatable="yes">Name</property>
+ <property name="title">Name</property>
<child>
<object class="GtkCellRendererText"
id="namespace_selector_name_column_text_cell"/>
<attributes>
@@ -2921,7 +2724,7 @@
<child>
<object class="GtkTreeViewColumn" id="key_column">
<property name="sizing">autosize</property>
- <property name="title" translatable="yes">Root</property>
+ <property name="title">Root</property>
<child>
<object class="GtkCellRendererText"
id="namespace_selector_key_column_text_cell"/>
<attributes>
@@ -2935,59 +2738,58 @@
</object>
<object class="GtkImage" id="new_stock_imag">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
<object class="GtkImage" id="new_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-new</property>
</object>
<object class="GtkImage" id="open_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-open</property>
</object>
<object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">10000000</property>
<property name="value">1000</property>
+ <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
<object class="GtkImage" id="right_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-go-forward</property>
</object>
<object class="GtkImage" id="up_stock_image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="stock">gtk-go-up</property>
</object>
+ <object class="GtkImage" id="del_stock_image">
+ <property name="visible">True</property>
+ <property name="stock">gtk-delete</property>
+ </object>
<object class="GtkSizeGroup"
id="edit_publication_options_input_widgets_sizegroup">
<widgets>
- <widget name="GNUNET_GTK_edit_publication_anonymity_combobox_alignment"/>
- <widget name="GNUNET_GTK_edit_publication_priority_spin_button"/>
- <widget name="GNUNET_GTK_edit_publication_root_entry"/>
- <widget name="GNUNET_GTK_edit_publication_expiration_year_spin_button"/>
<widget name="GNUNET_GTK_edit_publication_index_checkbutton"/>
+ <widget name="GNUNET_GTK_edit_publication_expiration_year_spin_button"/>
+ <widget name="GNUNET_GTK_edit_publication_root_entry"/>
+ <widget name="GNUNET_GTK_edit_publication_priority_spin_button"/>
+ <widget name="GNUNET_GTK_edit_publication_anonymity_combobox_alignment"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="edit_publication_options_labels_sizegroup">
<widgets>
- <widget name="GNUNET_GTK_edit_publication_anonymity_label"/>
- <widget name="GNUNET_GTK_edit_publication_priority_label"/>
- <widget name="GNUNET_GTK_edit_publication_root_label"/>
- <widget name="GNUNET_GTK_edit_publication_expiration_label"/>
<widget name="GNUNET_GTK_edit_publication_index_label"/>
+ <widget name="GNUNET_GTK_edit_publication_expiration_label"/>
+ <widget name="GNUNET_GTK_edit_publication_root_label"/>
+ <widget name="GNUNET_GTK_edit_publication_priority_label"/>
+ <widget name="GNUNET_GTK_edit_publication_anonymity_label"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
<property name="mode">vertical</property>
<widgets>
- <widget name="main_window_search_entry"/>
- <widget name="main_window_search_anonymity_combobox"/>
<widget name="main_window_search_mime_combobox"/>
+ <widget name="main_window_search_anonymity_combobox"/>
+ <widget name="main_window_search_entry"/>
</widgets>
</object>
<object class="GtkAdjustment" id="expiration_year_adjustment">
@@ -2997,14 +2799,14 @@
</object>
<object class="GtkSizeGroup" id="sizegroup4">
<widgets>
- <widget name="GNUNET_GTK_master_publish_dialog_cancel_button"/>
<widget name="GNUNET_GTK_master_publish_dialog_execute_button"/>
+ <widget name="GNUNET_GTK_master_publish_dialog_cancel_button"/>
</widgets>
</object>
<object class="GtkSizeGroup" id="sizegroup5">
<widgets>
- <widget name="GNUNET_GTK_edit_publication_confirm_button"/>
<widget name="GNUNET_GTK_edit_publication_cancel_button"/>
+ <widget name="GNUNET_GTK_edit_publication_confirm_button"/>
</widgets>
</object>
</interface>
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2012-01-01
21:40:35 UTC (rev 18895)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.c 2012-01-01
22:20:47 UTC (rev 18896)
@@ -98,8 +98,7 @@
{
int do_index;
char *short_fn;
- guint anonymity_level;
- guint priority;
+ struct GNUNET_FS_BlockOptions bo;
struct GNUNET_FS_FileInformation *fip;
gint preview_changed;
gboolean allow_no_keywords;
@@ -827,7 +826,7 @@
}
state->cb (state->cls, state->do_index, state->short_fn,
- state->anonymity_level, state->priority, NULL,
+ &state->bo, NULL,
GTK_RESPONSE_CANCEL);
g_free (state);
g_object_set_data (pubwindow, PUBSTATE, NULL);
@@ -843,7 +842,7 @@
GObject *pubwindow;
struct EditPublicationState *state;
struct FileInformationUpdateContext ctx;
-
+ gint year;
builder = GTK_BUILDER (user_data);
pubwindow =
@@ -866,21 +865,30 @@
state->short_fn = ctx.short_fn;
if (!GNUNET_GTK_get_selected_anonymity_level
(builder, "GNUNET_GTK_edit_publication_anonymity_combobox",
- &state->anonymity_level))
- state->priority =
+ &state->bo.anonymity_level))
+ state->bo.content_priority =
gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object
(builder,
"GNUNET_GTK_edit_publication_priority_spin_button")));
+ state->bo.replication_level =
+ gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_replication_spin_button")));
+
state->do_index =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
(builder,
"GNUNET_GTK_edit_publication_index_checkbutton")));
-
-
+ year = gtk_spin_button_get_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_expiration_year_spin_button")));
+ state->bo.expiration_time = GNUNET_FS_year_to_time (year);
state->cb (state->cls, state->do_index, state->short_fn,
- state->anonymity_level, state->priority, ctx.root,
+ &state->bo, ctx.root,
GTK_RESPONSE_OK);
GNUNET_free_non_null (state->short_fn);
GNUNET_free (state);
@@ -888,6 +896,7 @@
gtk_widget_hide (GTK_WIDGET (pubwindow));
}
+
gboolean
GNUNET_GTK_edit_publication_window_delete_event_cb (GtkWidget * widget,
GdkEvent * event,
@@ -991,6 +1000,11 @@
(builder,
"GNUNET_GTK_edit_publication_priority_spin_button")),
bo->content_priority);
+ gtk_spin_button_set_value (GTK_SPIN_BUTTON
+ (gtk_builder_get_object
+ (builder,
+
"GNUNET_GTK_edit_publication_replication_spin_button")),
+ bo->replication_level);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
(builder,
@@ -1007,7 +1021,7 @@
void
GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
int do_index, const char *short_fn,
- uint32_t anonymity_level, uint32_t priority,
+ const struct GNUNET_FS_BlockOptions *bo,
struct GNUNET_FS_FileInformation *fip,
gboolean allow_no_keywords,
GNUNET_FS_GTK_EditPublishDialogCallback cb,
@@ -1080,8 +1094,7 @@
state->do_index = do_index;
if (NULL != short_fn)
state->short_fn = GNUNET_strdup (short_fn);
- state->anonymity_level = (guint) anonymity_level;
- state->priority = (guint) priority;
+ state->bo = *bo;
state->fip = fip;
state->preview_changed = GNUNET_NO;
state->allow_no_keywords = allow_no_keywords;
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h 2012-01-01
21:40:35 UTC (rev 18895)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-edit_publish_dialog.h 2012-01-01
22:20:47 UTC (rev 18896)
@@ -44,8 +44,7 @@
typedef void (*GNUNET_FS_GTK_EditPublishDialogCallback) (gpointer cls,
int do_index,
const char *short_fn,
- guint anonymity_level,
- guint priority,
+ const struct
GNUNET_FS_BlockOptions *bo,
const char *root,
int ret);
@@ -56,7 +55,7 @@
void
GNUNET_FS_GTK_edit_publish_dialog (GtkBuilder * builder, GtkWindow * parent,
int do_index, const char *short_fn,
- uint32_t anonymity_level, uint32_t priority,
+ const struct GNUNET_FS_BlockOptions *bo,
struct GNUNET_FS_FileInformation *fip,
gboolean allow_no_keywords,
GNUNET_FS_GTK_EditPublishDialogCallback cb,
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2012-01-01
21:40:35 UTC (rev 18895)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2012-01-01
22:20:47 UTC (rev 18896)
@@ -79,8 +79,7 @@
struct GNUNET_FS_Namespace *ns;
int do_index;
const char *short_fn;
- guint anonymity_level;
- guint priority;
+ struct GNUNET_FS_BlockOptions bo;
const char *root;
struct GNUNET_FS_FileInformation *fip;
};
@@ -119,7 +118,7 @@
static void
adv_pseudonym_edit_publish_dialog_cb (gpointer cls, int do_index,
const char *short_fn,
- guint anonymity_level, guint priority,
+ const struct GNUNET_FS_BlockOptions *bo,
const char *root, gint ret)
{
struct NamespaceAdvertisementContext *nds = cls;
@@ -128,8 +127,7 @@
{
nds->do_index = do_index;
nds->short_fn = short_fn;
- nds->anonymity_level = anonymity_level;
- nds->priority = priority;
+ nds->bo = *bo;
nds->root = root;
GNUNET_FS_file_information_inspect (nds->fip, &advertise_namespace, nds);
}
@@ -154,7 +152,6 @@
GtkWindow *transient;
struct NamespaceAdvertisementContext *nds;
struct GNUNET_CONTAINER_MetaData *meta;
- struct GNUNET_FS_BlockOptions bo;
builder = GTK_BUILDER (user_data);
ad = GTK_WIDGET (gtk_builder_get_object
@@ -191,23 +188,22 @@
nds->ns = ns;
nds->do_index = FALSE;
nds->short_fn = NULL;
- nds->anonymity_level = 1;
- nds->priority = 1000;
+ nds->bo.anonymity_level = 1;
+ nds->bo.content_priority = 1000;
nds->root = NULL;
/* This is a bogus fileinfo. It's needed because edit_publish_dialog
* was written to work with fileinfo, and return a fileinfo.
*/
- memset (&bo, 0, sizeof (bo));
- bo.expiration_time =
- GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
- bo.anonymity_level = 1;
+ memset (&nds->bo, 0, sizeof (struct GNUNET_FS_BlockOptions));
+ nds->bo.expiration_time =
+ GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
+ nds->bo.anonymity_level = 1;
nds->fip =
GNUNET_FS_file_information_create_empty_directory (NULL, NULL, NULL,
meta,
- &bo);
+ &nds->bo);
GNUNET_CONTAINER_meta_data_destroy (meta);
GNUNET_FS_GTK_edit_publish_dialog (builder, transient, nds->do_index,
- nds->short_fn, nds->anonymity_level,
- nds->priority, nds->fip, FALSE,
+ nds->short_fn, &nds->bo, nds->fip, FALSE,
&adv_pseudonym_edit_publish_dialog_cb,
nds);
}
Modified: gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-01
21:40:35 UTC (rev 18895)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-01
22:20:47 UTC (rev 18896)
@@ -263,7 +263,10 @@
file_size_fancy = GNUNET_STRINGS_byte_size_fancy (file_size);
gtk_tree_store_set (ts, &pos, 0, file_size_fancy, 1, (gboolean) do_index, 2,
short_fn, 3, (guint) bo->anonymity_level, 4,
- (guint) bo->content_priority, 5, fi, -1);
+ (guint) bo->content_priority, 5, fi,
+ 6, (guint64) bo->expiration_time.abs_value,
+ 7, (guint) bo->replication_level,
+ -1);
GNUNET_free (file_size_fancy);
update_selectivity (data);
}
@@ -310,7 +313,10 @@
GNUNET_CONTAINER_meta_data_destroy (meta);
gtk_tree_store_set (ts, pos, 0, MARKER_DIR_FILE_SIZE, 1, (gboolean)
GNUNET_NO,
2, name, 3, (guint) bo->anonymity_level, 4,
- (guint) bo->content_priority, 5, fi, -1);
+ (guint) bo->content_priority, 5, fi,
+ 6, (guint64) bo->expiration_time.abs_value,
+ 7, (guint) bo->replication_level,
+ -1);
update_selectivity (data);
}
@@ -586,7 +592,9 @@
short_fn = 1 + ss;
gtk_tree_store_set (ts, iter, 0, file_size_fancy, 1, (gboolean) do_index, 2,
short_fn, 3, (guint) bo->anonymity_level, 4,
- (guint) bo->content_priority, 5, fi, -1);
+ (guint) bo->content_priority, 5, fi,
+ 6, (guint64) bo->expiration_time.abs_value,
+ 7, (guint) bo->replication_level, -1);
GNUNET_free (file_size_fancy);
}
@@ -842,6 +850,8 @@
gchar *short_fn;
guint anonymity_level;
guint priority;
+ guint replication_level;
+ guint64 expiration_time_abs;
char *fsf;
GtkTreePath *path;
GtkTreeSelection *sel;
@@ -853,10 +863,13 @@
builder = GTK_BUILDER (data);
gtk_tree_model_get (tm, old, 0, &fsf, 1, &do_index, 2, &short_fn, 3,
- &anonymity_level, 4, &priority, 5, &fip, -1);
+ &anonymity_level, 4, &priority, 5, &fip,
+ 6, &expiration_time_abs, 7, &replication_level, -1);
gtk_tree_store_set (GTK_TREE_STORE (tm), newpos, 0, fsf, 1, do_index, 2,
short_fn, 3, (guint) anonymity_level, 4, (guint)
priority,
- 5, fip, -1);
+ 5, fip,
+ 6, expiration_time_abs,
+ 7, replication_level, -1);
sel = NULL;
tv = NULL;
if (dsel == GNUNET_YES)
@@ -1220,16 +1233,15 @@
* @param cls closure
* @param do_index index flag set?
* @param short_fn short filename
- * @param anonymity_level anonymity degree chosen for publishing
- * @param priority replication setting (rename!)
+ * @param bo block options for publishing
* @param root always NULL here
* @param ret GTK_RESPONSE_OK if the dialog was closed with "OK"
*/
static void
master_publish_edit_publish_dialog_cb (gpointer cls, int do_index,
const char *short_fn,
- uint32_t anonymity_level,
- uint32_t priority, const char *root,
+ const struct GNUNET_FS_BlockOptions *bo,
+ const char *root,
gint ret)
{
struct EditPublishContext *cbargs = cls;
@@ -1237,8 +1249,11 @@
GNUNET_assert (NULL == root);
if (ret == GTK_RESPONSE_OK)
gtk_tree_store_set (GTK_TREE_STORE (cbargs->tm), &cbargs->iter, 1,
do_index,
- 2, short_fn, 3, (guint) anonymity_level, 4,
- (guint) priority, -1);
+ 2, short_fn, 3, (guint) bo->anonymity_level, 4,
+ (guint) bo->content_priority,
+ 6, (guint64) bo->expiration_time.abs_value,
+ 7, (guint) bo->replication_level,
+ -1);
GNUNET_free (cbargs);
}
@@ -1258,6 +1273,9 @@
guint anonymity_level;
guint priority;
struct GNUNET_FS_FileInformation *fip;
+ guint64 abs_etime;
+ guint replication_level;
+ struct GNUNET_FS_BlockOptions bo;
builder = GTK_BUILDER (data);
tv = GTK_TREE_VIEW (gtk_builder_get_object
@@ -1278,11 +1296,17 @@
}
gtk_tree_model_get (tm, &cbargs->iter, 1, &do_index, 2, &short_fn, 3,
- &anonymity_level, 4, &priority, 5, &fip, -1);
+ &anonymity_level, 4, &priority, 5, &fip,
+ 6, &abs_etime,
+ 7, &replication_level,
+ -1);
+ bo.anonymity_level = anonymity_level;
+ bo.content_priority = priority;
+ bo.expiration_time.abs_value = (uint64_t) abs_etime;
+ bo.replication_level = replication_level;
/* FIXME: shouldn't this use a fresh builder? */
GNUNET_FS_GTK_edit_publish_dialog (builder, master_pubdialog, do_index,
- short_fn, (uint32_t) anonymity_level,
- (uint32_t) priority, fip, TRUE,
+ short_fn, &bo, fip, TRUE,
&master_publish_edit_publish_dialog_cb,
cbargs);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18896 - in gnunet-gtk: contrib src/fs,
gnunet <=