[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r18994 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r18994 - in gnunet-gtk: contrib src/fs |
|
Date: |
Thu, 5 Jan 2012 11:53:25 +0100 |
Author: grothoff
Date: 2012-01-05 11:53:25 +0100 (Thu, 05 Jan 2012)
New Revision: 18994
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
Log:
-LRN: unbuildering publish directory dialog and fixes
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2012-01-05
10:37:57 UTC (rev 18993)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2012-01-05
10:53:25 UTC (rev 18994)
@@ -2,15 +2,31 @@
<interface>
<requires lib="gtk+" version="2.24"/>
<!-- interface-naming-policy project-wide -->
- <object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <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="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
+ <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>
@@ -50,31 +66,15 @@
</row>
</data>
</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 class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</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 class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
<columns>
@@ -349,106 +349,48 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox"
id="GNUNET_GTK_edit_publication_keyword_list_hbox">
+ <object class="GtkVBox" id="vbox2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkVBox" id="vbox2">
+ <object class="GtkHBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <object class="GtkLabel"
id="GNUNET_GTK_edit_publication_keyword_label">
<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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkEntry"
id="GNUNET_GTK_edit_publication_keyword_entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_KEY_PRESS_MASK |
GDK_STRUCTURE_MASK</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>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label"
translatable="yes">_Keyword:</property>
+ <property name="use_underline">True</property>
+ <property
name="mnemonic_widget">GNUNET_GTK_edit_publication_keyword_entry</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
+ <property name="fill">False</property>
+ <property name="padding">2</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkScrolledWindow"
id="GNUNET_GTK_edit_publication_keyword_scrolled_window">
- <property name="width_request">400</property>
- <property name="height_request">120</property>
+ <object class="GtkEntry"
id="GNUNET_GTK_edit_publication_keyword_entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property
name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_publication_keywords_liststore</property>
- <property name="search_column">0</property>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column">
- <property name="title">Keywords</property>
- <property name="clickable">True</property>
- <property
name="reorderable">True</property>
- <property
name="sort_column_id">0</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
+ <property name="events">GDK_KEY_PRESS_MASK |
GDK_STRUCTURE_MASK</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>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="padding">2</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>
<child>
<object class="GtkButton"
id="GNUNET_GTK_edit_publication_keyword_list_add_button">
<property name="label">Add key_word</property>
@@ -456,49 +398,87 @@
<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="image">add_stock_image1</property>
<property name="use_underline">True</property>
<signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_add_button_clicked_cb"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="position">0</property>
+ <property name="padding">2</property>
+ <property name="position">2</property>
</packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow"
id="GNUNET_GTK_edit_publication_keyword_scrolled_window">
+ <property name="width_request">400</property>
+ <property name="height_request">120</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="vscrollbar_policy">automatic</property>
+ <property name="shadow_type">in</property>
<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>
+ <object class="GtkTreeView"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view">
<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"/>
+ <property
name="model">GNUNET_GTK_publication_keywords_liststore</property>
+ <property name="search_column">0</property>
+ <child>
+ <object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column">
+ <property name="title">Keywords</property>
+ <property name="clickable">True</property>
+ <property name="reorderable">True</property>
+ <property name="sort_column_id">0</property>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_renderer"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">5</property>
- <property name="pack_type">end</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <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_image1</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked"
handler="GNUNET_GTK_edit_publication_keyword_list_del_button_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">5</property>
- <property name="position">1</property>
+ <property name="padding">2</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">4</property>
+ <property name="padding">2</property>
<property name="position">0</property>
</packing>
</child>
@@ -632,7 +612,6 @@
<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>
<object class="GtkCellRendererText"
id="GNUNET_GTK_edit_publication_anonymity_combobox_renderer"/>
@@ -890,23 +869,33 @@
<property name="can_focus">False</property>
<property name="stock">gtk-add</property>
</object>
+ <object class="GtkImage" id="add_stock_image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-add</property>
+ </object>
<object class="GtkImage" id="del_stock_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-delete</property>
</object>
+ <object class="GtkImage" id="del_stock_image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </object>
<object class="GtkAdjustment" id="expiration_year_adjustment">
<property name="upper">9999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">10000000</property>
+ <object class="GtkAdjustment" id="replication_adjustment">
+ <property name="upper">999999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment" id="replication_adjustment">
- <property name="upper">999999</property>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -930,4 +919,16 @@
<widget name="GNUNET_GTK_edit_publication_replication_label"/>
</widgets>
</object>
+ <object class="GtkSizeGroup" id="sizegroup3">
+ <widgets>
+ <widget name="GNUNET_GTK_edit_publication_cancel_button"/>
+ <widget name="GNUNET_GTK_edit_publication_confirm_button"/>
+ </widgets>
+ </object>
+ <object class="GtkSizeGroup" id="sizegroup4">
+ <widgets>
+ <widget name="GNUNET_GTK_edit_publication_add_button"/>
+ <widget name="GNUNET_GTK_edit_publication_delete_button"/>
+ </widgets>
+ </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-05 10:37:57 UTC
(rev 18993)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-05 10:53:25 UTC
(rev 18994)
@@ -12,6 +12,26 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</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="GtkListStore" id="GNUNET_GTK_meta_data_list_store">
<columns>
<!-- column-name extractor_meta_type -->
@@ -234,289 +254,6 @@
<column type="guint64"/>
</columns>
</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>
- <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">
- <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">
- <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>
- </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_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>
- <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="fill">True</property>
- <property name="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkVBox" id="vbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <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>
- </child>
- <child>
- <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_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>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">20</property>
- <property name="position">3</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="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>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <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_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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <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>
- </child>
- <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>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
- <attributes>
- <attribute name="foreground">2</attribute>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
- <attributes>
- <attribute name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox10">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_replication_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">_Replication:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</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="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">1</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <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>
@@ -546,9 +283,12 @@
<property name="label">gtk-cancel</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>
+ <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" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1133,7 +873,7 @@
<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="image">new_stock_image</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"/>
@@ -1767,11 +1507,6 @@
</object>
</child>
</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>
@@ -1811,11 +1546,6 @@
<widget name="main_window_search_mime_combobox"/>
</widgets>
</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"/>
- </widgets>
- </object>
+ <object class="GtkSizeGroup" id="sizegroup4"/>
<object class="GtkSizeGroup" id="sizegroup5"/>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2012-01-05
10:37:57 UTC (rev 18993)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2012-01-05
10:53:25 UTC (rev 18994)
@@ -28,7 +28,6 @@
<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="transient_for">GNUNET_GTK_main_window</property>
<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" swapped="no"/>
<child>
@@ -292,8 +291,8 @@
<object class="GtkScrolledWindow"
id="GNUNET_GTK_master_publish_dialog_pseudonym_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hadjustment">adjustment7</property>
- <property name="vadjustment">adjustment8</property>
+ <property name="hadjustment">adjustment1</property>
+ <property name="vadjustment">adjustment2</property>
<property name="hscrollbar_policy">automatic</property>
<property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
@@ -302,8 +301,8 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="model">GNUNET_GTK_pseudonym_tree_store</property>
- <property name="hadjustment">adjustment7</property>
- <property name="vadjustment">adjustment8</property>
+ <property name="hadjustment">adjustment1</property>
+ <property name="vadjustment">adjustment2</property>
<property name="headers_clickable">False</property>
<property name="reorderable">True</property>
<property name="search_column">0</property>
@@ -326,11 +325,14 @@
</child>
<child>
<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">Current identifier</property>
<property name="clickable">True</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer"/>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer">
+ <signal name="edited"
handler="GNUNET_GTK_master_publish_dialog_pseudonym_identifier_renderer_edited_cb"
swapped="no"/>
+ </object>
<attributes>
<attribute name="editable">8</attribute>
<attribute name="text">2</attribute>
@@ -340,11 +342,13 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_column">
+ <property name="resizable">True</property>
<property name="sizing">autosize</property>
- <property name="fixed_width">5</property>
<property name="title">Update identifier</property>
<child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer"/>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer">
+ <signal name="edited"
handler="GNUNET_GTK_master_publish_dialog_pseudonym_updates_renderer_edited_cb"
swapped="no"/>
+ </object>
<attributes>
<attribute name="editable">7</attribute>
<attribute name="text">5</attribute>
@@ -354,6 +358,7 @@
</child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_column">
+ <property name="resizable">True</property>
<property name="title">Description (of existing
content)</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_master_publish_dialog_pseudonym_description_renderer">
@@ -445,6 +450,16 @@
<column type="gboolean"/>
</columns>
</object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="adjustment5">
<property name="upper">100</property>
<property name="step_increment">1</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2012-01-05 10:37:57 UTC (rev 18993)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2012-01-05 10:53:25 UTC (rev 18994)
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
@@ -8,84 +8,51 @@
<property name="page_increment">10</property>
</object>
<object class="GtkAdjustment" id="priority_adjustment">
- <property name="value">1000</property>
- <property name="upper">100000000</property>
+ <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore"
id="GNUNET_GTK_publish_directory_dialog_expiration_list_store">
- <columns>
- <!-- column-name human_readable_time -->
- <column type="gchararray"/>
- <!-- column-name time_in_ms -->
- <column type="guint64"/>
- </columns>
+ <object class="GtkAdjustment" id="replication_adjustment">
+ <property name="upper">999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
+ <object class="GtkFileFilter" id="gnunet_directory_filter"/>
<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="type_hint">normal</property>
- <property name="has_separator">False</property>
+ <property name="modal">True</property>
+ <property name="window_position">center-on-parent</property>
+ <property name="default_width">800</property>
+ <property name="default_height">600</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="action">select-folder</property>
+ <property name="create_folders">False</property>
+ <property name="filter">gnunet_directory_filter</property>
<property name="select_multiple">True</property>
- <property name="create_folders">False</property>
- <property name="action">select-folder</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox2">
+ <object class="GtkVBox" id="dialog-vbox8">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
<property name="spacing">2</property>
- <child>
- <object class="GtkVBox" id="vbox1">
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area9">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
<child>
- <object class="GtkHBox" id="hbox1">
+ <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>
- <child>
- <object class="GtkCheckButton"
id="GNUNET_GTK_publish_directory_dialog_do_index_checkbutton">
- <property name="label" translatable="yes">Index
files</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="active">True</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_priority_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Priority:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">13</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <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="adjustment">priority_adjustment</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">20</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <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>
@@ -94,149 +61,216 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <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>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Expiration
year:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <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="adjustment">expiration_year_adjustment</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">Anonymity:</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">5</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_anonymity_spin_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="adjustment">anonymity_adjustment</property>
- <property name="numeric">True</property>
- <signal name="value_changed"
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">20</property>
- <property name="position">3</property>
- </packing>
- </child>
+ <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>
<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">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <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="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <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_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>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <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>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <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_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>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <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="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_replication_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">_Replication:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</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">replication_adjustment</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <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="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_replication_label">
+ <object class="GtkComboBox"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Replication:</property>
- <property name="use_underline">True</property>
+ <property name="can_focus">False</property>
+ <property name="active">1</property>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
+ <attributes>
+ <attribute name="foreground">2</attribute>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renerer_level"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">20</property>
- <property name="position">0</property>
- </packing>
</child>
- <child>
- <object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property
name="adjustment">replication_adjustment</property>
- <property name="numeric">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="padding">1</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
</object>
<packing>
- <property name="expand">False</property>
- <property name="position">2</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
</object>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">2</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area3">
+ <child>
+ <object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_dialog_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>
+ <placeholder/>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_directory_dialog_ok_button">
- <property name="label">gtk-ok</property>
+ <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="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="active">True</property>
+ <property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="fill">True</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>
+ <property name="fill">False</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
@@ -246,15 +280,4 @@
<action-widget
response="-5">GNUNET_GTK_publish_directory_dialog_ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="anonymity_adjustment">
- <property name="value">1</property>
- <property name="upper">10000000</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="replication_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
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-05
10:37:57 UTC (rev 18993)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-05
10:53:25 UTC (rev 18994)
@@ -50,6 +50,7 @@
GtkWindow *master_pubdialog;
gulong open_directory_handler_id;
+ GtkBuilder *open_directory_builder;
gulong open_file_handler_id;
};
@@ -1294,40 +1295,38 @@
GtkSpinButton *sb;
struct GNUNET_FS_BlockOptions bo;
GtkWidget *ad;
- GtkBuilder *builder;
if (g_signal_handler_is_connected (G_OBJECT (dialog),
ctx->open_directory_handler_id))
g_signal_handler_disconnect (G_OBJECT (dialog),
ctx->open_directory_handler_id);
ctx->open_directory_handler_id = 0;
- builder = ctx->main_window_builder;
ad = GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_publish_directory_dialog"));
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog"));
if (response_id == -5)
{
filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(ad));
sb = GTK_SPIN_BUTTON (gtk_builder_get_object
- (builder,
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button"));
if (!GNUNET_GTK_get_selected_anonymity_level
- (builder, "GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog_anonymity_combobox",
&bo.anonymity_level))
bo.anonymity_level = 1;
bo.content_priority =
gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object
- (builder,
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog_priority_spin_button")));
bo.replication_level =
gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object
- (builder,
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog_replication_spin_button")));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
do_index =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
- (builder,
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog_do_index_checkbutton")));
/* FIXME: open progress dialog here... */
@@ -1335,7 +1334,8 @@
g_free (filename);
update_selectivity (ctx);
}
- gtk_widget_hide (ad);
+ gtk_widget_destroy (ad);
+ g_object_unref (G_OBJECT (ctx->open_directory_builder));
}
@@ -1344,15 +1344,23 @@
struct
MainPublishingDialogContext *ctx)
{
GtkWidget *ad;
- GtkBuilder *builder;
- builder = ctx->main_window_builder;
- GNUNET_FS_GTK_setup_expiration_year_adjustment (builder);
+ GtkComboBox *combo;
+ GtkTreeModel *anon_treemodel;
+
+ ctx->open_directory_builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_directory_dialog.glade", ctx);
+ GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_directory_builder);
ad = GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_publish_directory_dialog"));
+ (ctx->open_directory_builder,
"GNUNET_GTK_publish_directory_dialog"));
ctx->open_directory_handler_id = g_signal_connect (G_OBJECT (ad),
"response", G_CALLBACK (GNUNET_GTK_publish_directory_dialog_response_cb), ctx);
+ anon_treemodel = GTK_TREE_MODEL (gtk_builder_get_object
(ctx->main_window_builder,
+ "main_window_search_anonymity_liststore"));
+ combo = GTK_COMBO_BOX (gtk_builder_get_object (ctx->open_directory_builder,
+ "GNUNET_GTK_publish_directory_dialog_anonymity_combobox"));
+ gtk_combo_box_set_model (combo, anon_treemodel);
+
gtk_window_set_transient_for (GTK_WINDOW (ad), ctx->master_pubdialog);
gtk_window_present (GTK_WINDOW (ad));
@@ -1659,7 +1667,7 @@
while (TRUE == gtk_tree_model_iter_next (ctx->file_info_treemodel, &iter));
gtk_tree_store_clear (GTK_TREE_STORE (ctx->file_info_treemodel));
gtk_widget_destroy (GTK_WIDGET (ctx->master_pubdialog));
- gtk_object_unref (GTK_OBJECT (ctx->builder));
+ g_object_unref (G_OBJECT (ctx->builder));
GNUNET_free (ctx);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r18994 - in gnunet-gtk: contrib src/fs,
gnunet <=