[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19034 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19034 - in gnunet-gtk: contrib src/fs |
|
Date: |
Fri, 6 Jan 2012 09:57:20 +0100 |
Author: grothoff
Date: 2012-01-06 09:57:20 +0100 (Fri, 06 Jan 2012)
New Revision: 19034
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c
Log:
-LRN: unbuildering publish-file-dialog
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-06 08:56:56 UTC
(rev 19033)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-01-06 08:57:20 UTC
(rev 19034)
@@ -254,302 +254,6 @@
<column type="guint64"/>
</columns>
</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"/>
- <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">
- <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">
- <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="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>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <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="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="vbox1">
- <property name="visible">True</property>
- <property name="can_focus">False</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>
- <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_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>
- </child>
- <child>
- <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_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="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>
- <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_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_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>
- <property name="numeric">True</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_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>
- </child>
- <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>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_file_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_file_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">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox11">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_file_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_file_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="adjustment">replication_adjustment</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_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 -->
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2012-01-06
08:56:56 UTC (rev 19033)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2012-01-06
08:57:20 UTC (rev 19034)
@@ -1,72 +1,35 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
<!-- interface-naming-policy project-wide -->
<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="has_separator">False</property>
+ <property name="create_folders">False</property>
<property name="select_multiple">True</property>
- <property name="create_folders">False</property>
<child internal-child="vbox">
<object class="GtkVBox" id="dialog-vbox1">
<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_area2">
<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_file_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_file_dialog_do_index_checkbutton">
- <property name="label" translatable="yes">Index
file</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_file_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_file_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>
@@ -75,150 +38,219 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox2">
+ <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>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_file_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_file_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>
- <property name="numeric">True</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_file_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_file_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="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkHBox" id="hbox3">
+ <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>
- <child>
- <object class="GtkLabel"
id="GNUNET_GTK_publish_file_dialog_replication_label">
- <property name="visible">True</property>
- <property name="label"
translatable="yes">_Replication:</property>
- <property name="use_underline">True</property>
- </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_file_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>
+ <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="position">2</property>
+ <property name="fill">False</property>
+ <property name="padding">20</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">1</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area2">
+ <child>
+ <object class="GtkTable" id="table1">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">4</property>
+ <property name="column_spacing">4</property>
+ <property name="row_spacing">3</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_cancel_button">
- <property name="label">gtk-cancel</property>
+ <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="active">1</property>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_publish_file_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_file_dialog_anonymity_combobox_renerer_level"/>
+ <attributes>
+ <attribute name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </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>
+ </packing>
+ </child>
+ <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="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="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="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_file_dialog_priority_spin_button">
+ <property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">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">False</property>
- <property name="position">0</property>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_file_dialog_ok_button">
- <property name="label">gtk-ok</property>
+ <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>
+ <property name="x_options"></property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <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="can_default">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">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>
+ <property name="numeric">True</property>
</object>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
</packing>
</child>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_GTK_publish_file_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="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_file_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">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
</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">2</property>
</packing>
</child>
</object>
@@ -228,12 +260,6 @@
<action-widget
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment" id="priority_adjustment">
- <property name="value">1000</property>
- <property name="upper">100000000</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkListStore"
id="GNUNET_GTK_publish_file_dialog_expiration_list_store">
<columns>
<!-- column-name human_readable_time -->
@@ -243,8 +269,8 @@
</columns>
</object>
<object class="GtkAdjustment" id="anonymity_adjustment">
+ <property name="upper">10000000</property>
<property name="value">1</property>
- <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
@@ -253,6 +279,12 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">100000000</property>
+ <property name="value">1000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkAdjustment" id="replication_adjustment">
<property name="upper">99999</property>
<property name="step_increment">1</property>
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-06
08:56:56 UTC (rev 19033)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_file_publish.c 2012-01-06
08:57:20 UTC (rev 19034)
@@ -51,6 +51,7 @@
gulong open_directory_handler_id;
GtkBuilder *open_directory_builder;
+ GtkBuilder *open_file_builder;
gulong open_file_handler_id;
};
@@ -1150,12 +1151,22 @@
{
GtkWidget *ad;
+ GtkComboBox *combo;
+ GtkTreeModel *anon_treemodel;
+
+ ctx->open_file_builder = GNUNET_GTK_get_new_builder
("gnunet_fs_gtk_publish_file_dialog.glade", ctx);
+ GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->open_file_builder);
ad = GTK_WIDGET (gtk_builder_get_object
- (ctx->main_window_builder,
"GNUNET_GTK_publish_file_dialog"));
- GNUNET_FS_GTK_setup_expiration_year_adjustment (ctx->main_window_builder);
+ (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
ctx->open_file_handler_id = g_signal_connect (G_OBJECT (ad), "response",
G_CALLBACK (GNUNET_GTK_publish_file_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_file_builder,
+ "GNUNET_GTK_publish_file_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));
@@ -1709,41 +1720,39 @@
GtkSpinButton *sb;
GtkWidget *ad;
- GtkBuilder *builder = ctx->main_window_builder;
-
if (g_signal_handler_is_connected (G_OBJECT (dialog),
ctx->open_file_handler_id))
g_signal_handler_disconnect (G_OBJECT (dialog), ctx->open_file_handler_id);
ctx->open_file_handler_id = 0;
ad = GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_publish_file_dialog"));
+ (ctx->open_file_builder, "GNUNET_GTK_publish_file_dialog"));
if (response_id == -5)
{
/* OK */
sb = GTK_SPIN_BUTTON (gtk_builder_get_object
- (builder,
+ (ctx->open_file_builder,
"GNUNET_GTK_publish_file_dialog_expiration_year_spin_button"));
if (!GNUNET_GTK_get_selected_anonymity_level
- (builder, "GNUNET_GTK_publish_file_dialog_anonymity_combobox",
+ (ctx->open_file_builder,
"GNUNET_GTK_publish_file_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_file_builder,
"GNUNET_GTK_publish_file_dialog_priority_spin_button")));
bo.expiration_time = GNUNET_FS_GTK_get_expiration_time (sb);
bo.replication_level =
gtk_spin_button_get_value (GTK_SPIN_BUTTON
(gtk_builder_get_object
- (builder,
+ (ctx->open_file_builder,
"GNUNET_GTK_publish_file_dialog_replication_spin_button")));
do_index =
gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object
- (builder,
+ (ctx->open_file_builder,
"GNUNET_GTK_publish_file_dialog_do_index_checkbutton")));
filename = GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER
(ad));
@@ -1755,7 +1764,7 @@
{
/* Cancel/Escape/close/etc */
}
- gtk_widget_hide (ad);
+ gtk_widget_destroy (ad);
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19034 - in gnunet-gtk: contrib src/fs,
gnunet <=