[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r19643 - in gnunet-gtk: contrib src/fs
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r19643 - in gnunet-gtk: contrib src/fs |
|
Date: |
Thu, 2 Feb 2012 18:22:53 +0100 |
Author: grothoff
Date: 2012-02-02 18:22:53 +0100 (Thu, 02 Feb 2012)
New Revision: 19643
Added:
gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
Removed:
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
Modified:
gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
gnunet-gtk/src/fs/Makefile.am
Log:
-separating pseudonym/namespace glade files from master dialog
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
2012-02-02 17:04:50 UTC (rev 19642)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_advertise_pseudonym_dialog.glade
2012-02-02 17:22:53 UTC (rev 19643)
@@ -1,17 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
- <object class="GtkAdjustment" id="expiration_year_adjustment">
- <property name="upper">9999</property>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="upper">100</property>
<property name="step_increment">1</property>
- <property name="page_increment">5</property>
- </object>
- <object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">10000000</property>
- <property name="value">1000</property>
- <property name="step_increment">1</property>
<property name="page_increment">10</property>
+ <property name="page_size">10</property>
</object>
<object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
<property name="upper">100000</property>
@@ -25,30 +19,127 @@
<column type="gchararray"/>
</columns>
</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_metatype_list_store">
+ <columns>
+ <!-- column-name description -->
+ <column type="gchararray"/>
+ <!-- column-name guint1 -->
+ <column type="guint"/>
+ <!-- column-name helptext -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ </object>
<object class="GtkDialog" id="GNUNET_GTK_advertise_pseudonym_dialog">
+ <property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="title" translatable="yes">Advertise namespace</property>
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
- <property name="has_separator">False</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_advertise_pseudonym_master_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
+ <child internal-child="action_area">
+ <object class="GtkButtonBox" id="dialog-action_area13">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_advertise_pseudonym_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_action_appearance">False</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_advertise_pseudonym_confirm_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="receives_default">True</property>
+ <property name="use_action_appearance">False</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="GNUNET_GTK_advertise_pseudonym_metadata_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkVBox"
id="GNUNET_GTK_advertise_pseudonym_metadata_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="spacing">5</property>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_advertise_pseudonym_metadata_edit_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_metadata_type_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">Type:</property>
</object>
<packing>
@@ -63,7 +154,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view">
<property name="visible">True</property>
@@ -74,6 +164,9 @@
<property name="reorderable">True</property>
<property name="enable_search">False</property>
<property name="tooltip_column">2</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_advertise_pseudonym_metadata_type_tree_view_column">
<property name="title"
translatable="yes">Value</property>
@@ -90,12 +183,15 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_metadata_value_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">Value:</property>
</object>
<packing>
@@ -113,6 +209,8 @@
<signal name="changed"
handler="GNUNET_GTK_advertise_pseudonym_metadata_value_entry_changed_cb"
swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
@@ -131,16 +229,17 @@
<property name="can_focus">False</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
+ <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<property name="enable_search">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_advertise_pseudonym_metadata_tree_view_type_column">
<property name="sizing">fixed</property>
@@ -174,20 +273,26 @@
</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_advertise_pseudonym_metadata_button_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_advertise_pseudonym_metadata_add_button">
<property name="label">gtk-add</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -205,6 +310,7 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_advertise_pseudonym_metadata_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>
@@ -223,6 +329,7 @@
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">Preview:</property>
</object>
<packing>
@@ -235,14 +342,18 @@
<child>
<object class="GtkImage"
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_image">
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="stock">gtk-missing-image</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">3</property>
</packing>
</child>
<child>
<object class="GtkFileChooserButton"
id="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button">
+ <property name="can_focus">False</property>
<property name="create_folders">False</property>
<property name="title" translatable="yes">Select
file</property>
<signal name="file-set"
handler="GNUNET_GTK_advertise_pseudonym_metadata_preview_file_chooser_button_file_set_cb"
swapped="no"/>
@@ -255,27 +366,35 @@
</child>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</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="GNUNET_GTK_advertise_pseudonym_secondary_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkVBox"
id="GNUNET_GTK_advertise_pseudonym_keyword_entry_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkHBox"
id="GNUNET_GTK_advertise_pseudonym_keyword_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_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_advertise_pseudonym_keyword_entry</property>
@@ -296,6 +415,8 @@
<signal name="activate"
handler="GNUNET_GTK_advertise_pseudonym_keyword_entry_activate_cb"
swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -310,6 +431,7 @@
<child>
<object class="GtkHBox"
id="GNUNET_GTK_advertise_pseudonym_keyword_list_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkScrolledWindow"
id="GNUNET_GTK_advertise_pseudonym_keyword_scrolled_window">
<property name="width_request">400</property>
@@ -319,15 +441,17 @@
<property name="hadjustment">adjustment3</property>
<property name="vadjustment">adjustment4</property>
<property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_keyword_list_store</property>
<property name="hadjustment">adjustment3</property>
<property name="vadjustment">adjustment4</property>
+ <property
name="model">GNUNET_GTK_keyword_list_store</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection3"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_advertise_pseudonym_keyword_list_tree_view_column">
<property name="title"
translatable="yes">Keywords</property>
@@ -345,15 +469,19 @@
</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_advertise_pseudonym_keyword_list_button_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkButton"
id="GNUNET_GTK_advertise_pseudonym_keyword_list_add_button">
<property name="label">gtk-add</property>
+ <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
@@ -371,6 +499,7 @@
<child>
<object class="GtkButton"
id="GNUNET_GTK_advertise_pseudonym_keyword_list_del_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>
@@ -396,11 +525,15 @@
</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>
@@ -408,9 +541,11 @@
<child>
<object class="GtkVBox"
id="GNUNET_GTK_advertise_pseudonym_misc_vbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_options_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">Options</property>
<property name="justify">center</property>
</object>
@@ -424,9 +559,11 @@
<child>
<object class="GtkHSeparator" id="hseparator3">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">1</property>
</packing>
@@ -434,9 +571,11 @@
<child>
<object class="GtkHBox"
id="GNUNET_GTK_advertise_pseudonym_anonymity_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_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>
</object>
@@ -457,6 +596,8 @@
<signal name="value-changed"
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes"
swapped="no"/>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -470,6 +611,7 @@
<child>
<object class="GtkHSeparator" id="hseparator1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
@@ -480,14 +622,17 @@
<child>
<object class="GtkHBox"
id="GNUNET_GTK_advertise_pseudonym_priority_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_priority_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_Priority:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -502,6 +647,8 @@
<property name="numeric">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -515,23 +662,29 @@
<child>
<object class="GtkHSeparator" id="hseparator2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">5</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox1">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_root_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_Root:</property>
<property name="use_underline">True</property>
<property name="selectable">True</property>
</object>
<packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -544,34 +697,43 @@
<property name="text"
translatable="yes">root</property>
</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">6</property>
</packing>
</child>
<child>
<object class="GtkHSeparator" id="hseparator4">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">7</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="hbox2">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_advertise_pseudonym_expiration_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">_Expiration
year:</property>
<property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="padding">5</property>
<property name="position">0</property>
</packing>
@@ -587,11 +749,15 @@
<property name="numeric">True</property>
</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">8</property>
</packing>
</child>
@@ -605,52 +771,12 @@
</child>
</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 internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area13">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_advertise_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_action_appearance">False</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_advertise_pseudonym_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="receives_default">True</property>
- <property name="use_action_appearance">False</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>
@@ -658,50 +784,10 @@
<action-widget
response="-5">GNUNET_GTK_advertise_pseudonym_confirm_button</action-widget>
</action-widgets>
</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_metatype_list_store">
- <columns>
- <!-- column-name description -->
- <column type="gchararray"/>
- <!-- column-name guint1 -->
- <column type="guint"/>
- <!-- column-name helptext -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkAdjustment" id="adjustment1">
- <property name="upper">100</property>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">10000000</property>
+ <property name="value">1000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
- <property name="page_size">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>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">10</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-02-02 17:04:50 UTC
(rev 19642)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2012-02-02 17:22:53 UTC
(rev 19643)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
- <!-- 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>
@@ -44,490 +43,12 @@
<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"/>
- </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>
- <property name="default_height">240</property>
- <property name="destroy_with_parent">True</property>
- <property name="skip_taskbar_hint">True</property>
- <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"/>
- <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>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">4</property>
- <property name="position">0</property>
- </packing>
- </child>
- <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>
- <property name="can_focus">True</property>
- <property name="events">GDK_KEY_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
- <property name="wrap_mode">char</property>
- <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"/>
- </object>
- </child>
- </object>
- </child>
- <child type="label_item">
- <placeholder/>
- </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">
- <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>
- <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="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>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renderer"/>
- <attributes>
- <attribute name="foreground">2</attribute>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_open_url_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="pack_type">end</property>
- <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>
- <property name="fill">False</property>
- <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="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">
- <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">
- <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_select_pseudonym_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="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="GtkScrolledWindow"
id="GNUNET_GTK_select_pseudonym_scrolledwindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hadjustment">adjustment3</property>
- <property name="vadjustment">adjustment4</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView"
id="GNUNET_GTK_select_pseudonym_tree_view">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
- <property name="hadjustment">adjustment3</property>
- <property name="vadjustment">adjustment4</property>
- <property name="search_column">0</property>
- <child>
- <object class="GtkTreeViewColumn"
id="GNUNET_GTK_select_pseudonym_tree_view_column">
- <property name="title">Name</property>
- <property name="expand">True</property>
- <property name="clickable">True</property>
- <property name="reorderable">True</property>
- <property name="sort_indicator">True</property>
- <property name="sort_column_id">0</property>
- <child>
- <object class="GtkCellRendererText"
id="GNUNET_GTK_select_pseudonym_name_renderer"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- </child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GTK_select_pseudonym_cancel_button</action-widget>
- <action-widget
response="-5">GNUNET_GTK_select_pseudonym_ok_button</action-widget>
- </action-widgets>
- </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">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- <property name="page_size">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>
<property name="page_size">10</property>
</object>
- <object class="GtkAdjustment" id="adjustment3">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment4">
- <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>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment6">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment7">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="adjustment8">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</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="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="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="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="GtkWindow" id="GNUNET_GTK_main_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">gnunet-fs-gtk</property>
@@ -827,6 +348,7 @@
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="events">GDK_ENTER_NOTIFY_MASK |
GDK_LEAVE_NOTIFY_MASK | GDK_STRUCTURE_MASK</property>
+ <property name="use_action_appearance">False</property>
<property name="image_position">right</property>
<signal name="toggled"
handler="main_window_search_namespace_dropdown_button_toggled_cb" swapped="no"/>
<signal name="leave-notify-event"
handler="namespace_selector_window_leave_notify_event_cb" swapped="no"/>
@@ -862,6 +384,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="image">find_stock_image</property>
<signal name="clicked"
handler="main_window_search_button_clicked_cb" swapped="no"/>
</object>
@@ -882,8 +405,6 @@
<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"/>
</object>
<packing>
@@ -1021,9 +542,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="scrollable">True</property>
- <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"/>
</object>
<packing>
@@ -1057,21 +575,22 @@
<property name="can_focus">True</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>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_main_window_metadata_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
+ <property
name="model">GNUNET_GTK_meta_data_list_store</property>
<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"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_main_window_metadata_type_column">
<property name="sizing">autosize</property>
@@ -1130,6 +649,163 @@
</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="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="GtkAdjustment" id="adjustment1">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ <property name="page_size">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment3">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment4">
+ <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>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment6">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment7">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment8">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </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="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="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="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"/>
+ </widgets>
+ </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="GtkTreeStore" id="main_window_search_namespace_treestore">
<columns>
<!-- column-name Name -->
@@ -1184,6 +860,9 @@
<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"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="name_column">
<property name="sizing">autosize</property>
@@ -1232,24 +911,11 @@
<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="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"/>
- </widgets>
- </object>
<object class="GtkSizeGroup" id="sizegroup4"/>
<object class="GtkSizeGroup" id="sizegroup5"/>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2012-02-02
17:04:50 UTC (rev 19642)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2012-02-02
17:22:53 UTC (rev 19643)
@@ -1,156 +1,203 @@
-<?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="GtkImage" id="execute_stock_image">
- <property name="visible">True</property>
- <property name="stock">gtk-execute</property>
- </object>
- <object class="GtkAdjustment" id="GNUNET_GTK_open_url_anonymity_adjustment">
- <property name="value">1</property>
- <property name="upper">100000</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkDialog" id="GNUNET_GTK_open_url_dialog">
- <property name="border_width">5</property>
- <property name="title" translatable="yes">Download from URI</property>
- <property name="resizable">False</property>
+ <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>
+ <property name="default_height">240</property>
<property name="destroy_with_parent">True</property>
- <property name="icon_name">dialog-password</property>
- <property name="type_hint">dialog</property>
<property name="skip_taskbar_hint">True</property>
<property name="skip_pager_hint">True</property>
- <property name="has_separator">False</property>
- <child internal-child="vbox">
+ <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"/>
+ <child>
<object class="GtkVBox" id="GNUNET_GTK_open_url_dialog_main_vbox">
<property name="visible">True</property>
- <property name="orientation">vertical</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="sensitive">False</property>
- <property name="double_buffered">False</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_entry</property>
- <property name="single_line_mode">True</property>
- <property name="track_visited_links">False</property>
+ <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_url_textview</property>
</object>
<packing>
<property name="expand">False</property>
<property name="fill">False</property>
- <property name="padding">5</property>
+ <property name="padding">4</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry"
id="GNUNET_GTK_open_url_dialog_url_entry">
+ <object class="GtkFrame" id="frame1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="max_length">250</property>
- <property name="invisible_char">●</property>
- <property name="activates_default">True</property>
- <property name="width_chars">50</property>
- <property name="caps_lock_warning">False</property>
- <signal name="changed"
handler="GNUNET_GTK_open_url_dialog_url_entry_changed_cb"/>
- <signal name="activate"
handler="GNUNET_GTK_search_dialog_search_button_clicked_cb"/>
+ <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>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_KEY_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
+ <property name="wrap_mode">char</property>
+ <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"/>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label_item">
+ <placeholder/>
+ </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">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkLabel"
id="GNUNET_GTK_open_url_dialog_anonymity_label">
+ <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
+ <property name="label">_Execute</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
- <property name="label"
translatable="yes">_Anonymity:</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
+ <property name="image">execute_stock_image</property>
<property name="use_underline">True</property>
- <property
name="mnemonic_widget">GNUNET_GTK_open_url_dialog_anonymity_spin_button</property>
- <property name="track_visited_links">False</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="padding">5</property>
- <property name="position">2</property>
+ <property name="padding">4</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkSpinButton"
id="GNUNET_GTK_open_url_dialog_anonymity_spin_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="invisible_char">●</property>
- <property name="caps_lock_warning">False</property>
- <property
name="adjustment">GNUNET_GTK_open_url_anonymity_adjustment</property>
- <property name="climb_rate">1</property>
- <property name="numeric">True</property>
- <signal name="value_changed"
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb"/>
+ <property name="receives_default">True</property>
+ <property name="use_action_appearance">False</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="position">3</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">5</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 internal-child="action_area">
- <object class="GtkHButtonBox"
id="GNUNET_GTK_open_url_dialog_action_area">
+ <child>
+ <object class="GtkHBox" id="hbox8">
<property name="visible">True</property>
- <property name="layout_style">end</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_cancel_button">
- <property name="label">gtk-cancel</property>
+ <object class="GtkAlignment"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_alignment">
<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="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>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_open_url_dialog_anonymity_combobox_renderer"/>
+ <attributes>
+ <attribute name="foreground">2</attribute>
+ <attribute name="text">0</attribute>
+ </attributes>
+ </child>
+ <child>
+ <object class="GtkCellRendererText"
id="GNUNET_GTK_open_url_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="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="GNUNET_GTK_open_url_dialog_execute_button">
- <property name="label">_Execute</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="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>
- <property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
</child>
- <action-widgets>
- <action-widget
response="-6">GNUNET_GTK_open_url_dialog_cancel_button</action-widget>
- <action-widget
response="-5">GNUNET_GTK_open_url_dialog_execute_button</action-widget>
- </action-widgets>
</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"/>
+ </object>
+
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
2012-02-02 17:04:50 UTC (rev 19642)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_select_pseudonym_dialog.glade
2012-02-02 17:22:53 UTC (rev 19643)
@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<interface>
<requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
<object class="GtkListStore" id="GNUNET_GTK_select_pseudonym_liststore">
<columns>
<!-- column-name namespace_name -->
@@ -29,12 +28,13 @@
<property name="modal">True</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_select_pseudonym_dialog_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
- <object class="GtkHButtonBox"
id="GNUNET_GTK_select_pseudonym_dialog_action_area">
+ <object class="GtkButtonBox"
id="GNUNET_GTK_select_pseudonym_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -45,6 +45,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -61,6 +62,7 @@
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
+ <property name="use_action_appearance">False</property>
<property name="use_stock">True</property>
</object>
<packing>
@@ -73,7 +75,6 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="pack_type">end</property>
<property name="position">0</property>
</packing>
</child>
@@ -83,15 +84,16 @@
<property name="can_focus">True</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_select_pseudonym_tree_view">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
<property name="hadjustment">adjustment1</property>
<property name="vadjustment">adjustment2</property>
+ <property
name="model">GNUNET_GTK_select_pseudonym_liststore</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_select_pseudonym_tree_view_column">
<property name="title" translatable="yes">Name</property>
@@ -117,9 +119,6 @@
<property name="position">1</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<action-widgets>
Modified: gnunet-gtk/src/fs/Makefile.am
===================================================================
--- gnunet-gtk/src/fs/Makefile.am 2012-02-02 17:04:50 UTC (rev 19642)
+++ gnunet-gtk/src/fs/Makefile.am 2012-02-02 17:22:53 UTC (rev 19643)
@@ -14,6 +14,7 @@
gnunet-fs-gtk_about.c \
gnunet-fs-gtk_anonymity-widgets.c gnunet-fs-gtk_anonymity-widgets.h \
gnunet-fs-gtk_common.c gnunet-fs-gtk_common.h \
+ gnunet-fs-gtk_advertise-pseudonym.c \
gnunet-fs-gtk_create-pseudonym.c \
gnunet-fs-gtk_download-save-as.c gnunet-fs-gtk_download-save-as.h \
gnunet-fs-gtk_event-handler.c gnunet-fs-gtk_event-handler.h \
@@ -22,7 +23,6 @@
gnunet-fs-gtk_publish-dialog.c \
gnunet-fs-gtk_publish-edit-dialog.c gnunet-fs-gtk_publish-edit-dialog.h \
gnunet-fs-gtk-main_window_meta_data_context_menu.c \
- gnunet-fs-gtk-main_window_adv_pseudonym.c \
gnunet-fs-gtk-main_window_file_download.c \
gnunet-fs-gtk-main_window_namespace.c \
gnunet-fs-gtk-main_window_open_directory.c
Deleted: 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-02-02
17:04:50 UTC (rev 19642)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c 2012-02-02
17:22:53 UTC (rev 19643)
@@ -1,258 +0,0 @@
-/*
- This file is part of GNUnet
- (C) 2005, 2006, 2010 Christian Grothoff (and other contributing authors)
-
- GNUnet is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published
- by the Free Software Foundation; either version 2, or (at your
- option) any later version.
-
- GNUnet is distributed in the hope that it will be useful, but
- WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with GNUnet; see the file COPYING. If not, write to the
- Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- Boston, MA 02111-1307, USA.
-*/
-
-/**
- * @file src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c
- * @author Christian Grothoff
- */
-#include "gnunet-fs-gtk_common.h"
-#include "gnunet-fs-gtk.h"
-#include "gnunet-fs-gtk_publish-edit-dialog.h"
-
-
-
-gboolean
-GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget * widget,
- GdkEvent * event,
- gpointer user_Data)
-{
- gtk_widget_hide (widget);
- return TRUE;
-}
-
-
-/**
- * Callback with information about local (!) namespaces.
- * Contains the names of the local namespace and the global
- * ID. Adds the to the list store.
- *
- * @param cls closure, the list store.
- * @param name human-readable identifier of the namespace
- * @param id hash identifier for the namespace
- */
-static void
-add_to_list (void *cls, const char *name, const GNUNET_HashCode * id)
-{
- GtkListStore *ls = cls;
- GtkTreeIter iter;
- gtk_list_store_insert_with_values (ls, &iter, -1, 0, name, 1,
- GNUNET_FS_namespace_create
- (GNUNET_FS_GTK_get_fs_handle (), name),
- -1);
-}
-
-
-static void
-selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
-{
- GtkTreeIter iter;
- GtkWidget *ok_button;
- GtkBuilder *builder;
-
- builder = GTK_BUILDER (user_data);
-
- ok_button =
- GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
- if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
- gtk_widget_set_sensitive (ok_button, TRUE);
- else
- gtk_widget_set_sensitive (ok_button, FALSE);
-}
-
-
-struct NamespaceAdvertisementContext
-{
- struct GNUNET_FS_Namespace *ns;
- const char *root;
- struct GNUNET_FS_FileInformation *fip;
-};
-
-
-/**
- * Function called on entries in a GNUNET_FS_FileInformation publish-structure.
- *
- * @param cls closure, a 'struct NamespaceAdvertisementContext *'
- * @param fi the entry in the publish-structure
- * @param length length of the file or directory
- * @param meta metadata for the file or directory (can be modified)
- * @param uri pointer to the keywords that will be used for this entry (can be
modified)
- * @param bo block options (can be modified)
- * @param do_index should we index (can be modified)
- * @param client_info pointer to client context set upon creation (can be
modified)
- * @return GNUNET_OK to continue, GNUNET_NO to remove
- * this entry from the directory, GNUNET_SYSERR
- * to abort the iteration
- */
-static int
-advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
- uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
- struct GNUNET_FS_Uri **uri,
- struct GNUNET_FS_BlockOptions *bo, int *do_index,
- void **client_info)
-{
- struct NamespaceAdvertisementContext *nds = cls;
-
- GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), *uri, nds->ns,
- meta, bo, nds->root, NULL, NULL);
- return GNUNET_SYSERR;
-}
-
-
-static void
-adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
- gint ret,
- const char *root)
-{
- struct NamespaceAdvertisementContext *nds = cls;
-
- if (ret == GTK_RESPONSE_OK)
- {
- nds->root = root;
- GNUNET_FS_file_information_inspect (nds->fip, &advertise_namespace, nds);
- nds->root = NULL;
- }
- GNUNET_FS_namespace_delete (nds->ns, GNUNET_NO);
- GNUNET_FS_file_information_destroy (nds->fip, NULL, NULL);
- GNUNET_free (nds);
-}
-
-
-void
-GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
- gint response_id,
- gpointer user_data)
-{
- GtkBuilder *builder;
- GtkWidget *ad;
- GtkTreeView *tv;
- GtkTreeSelection *sel;
- GtkTreeModel *tm;
- GtkTreeIter iter;
- struct GNUNET_FS_Namespace *ns;
- struct GNUNET_FS_Namespace *nso;
- GtkWindow *transient;
- GtkListStore *anon_liststore;
- 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
- (builder, "GNUNET_GTK_select_pseudonym_dialog"));
-
- anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (builder,
"main_window_search_anonymity_liststore"));
-
- if (response_id != -5)
- {
- gtk_widget_hide (ad);
- return;
- }
- tv = GTK_TREE_VIEW (gtk_builder_get_object
- (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
- sel = gtk_tree_view_get_selection (tv);
-
- GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, &tm, &iter));
- gtk_tree_model_get (tm, &iter, 1, &ns, -1);
- /* free all namespaces from list store except "ns" */
- if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
- {
- do
- {
- gtk_tree_model_get (tm, &iter, 1, &nso, -1);
- if (ns != nso)
- GNUNET_FS_namespace_delete (nso, GNUNET_NO);
- }
- while (TRUE == gtk_tree_model_iter_next (tm, &iter));
- }
- transient = gtk_window_get_transient_for (GTK_WINDOW (ad));
- gtk_widget_hide (ad);
-
- meta = GNUNET_CONTAINER_meta_data_create ();
-
- nds = GNUNET_malloc (sizeof (struct NamespaceAdvertisementContext));
- nds->ns = ns;
- /* 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 (struct GNUNET_FS_BlockOptions));
- bo.expiration_time =
- GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
- bo.anonymity_level = 1;
- bo.content_priority = 1000;
- nds->fip =
- GNUNET_FS_file_information_create_empty_directory (NULL, NULL, NULL,
meta,
- &bo, NULL);
- GNUNET_CONTAINER_meta_data_destroy (meta);
- GNUNET_FS_GTK_edit_publish_dialog (transient,
- nds->fip,
- GNUNET_NO,
- anon_liststore,
- &adv_pseudonym_edit_publish_dialog_cb,
- nds);
-}
-
-
-void
-GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
- gpointer user_data)
-{
- GtkTreeView *tv;
- GtkTreeSelection *sel;
- GtkBuilder *builder;
-
- builder = GTK_BUILDER (user_data);
-
- tv = GTK_TREE_VIEW (gtk_builder_get_object
- (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
- sel = gtk_tree_view_get_selection (tv);
- g_signal_connect (G_OBJECT (sel), "changed",
- G_CALLBACK (selection_changed_cb), user_data);
-}
-
-
-/**
- * Advertise pseudonym selected.
- */
-void
-GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
- gpointer data)
-{
- GtkWidget *ad;
- GtkListStore *ls;
- GtkWidget *toplevel;
- GtkBuilder *builder;
-
- builder = GTK_BUILDER (data);
-
- ad = GTK_WIDGET (gtk_builder_get_object
- (builder, "GNUNET_GTK_select_pseudonym_dialog"));
- ls = GTK_LIST_STORE (gtk_builder_get_object
- (builder, "GNUNET_GTK_select_pseudonym_liststore"));
- gtk_list_store_clear (ls);
- GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (), &add_to_list, ls);
- toplevel = gtk_widget_get_toplevel (dummy);
- if (GTK_IS_WINDOW (toplevel))
- gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
- gtk_window_present (GTK_WINDOW (ad));
-}
-
-
-/* end of gnunet-fs-gtk-main_window_adv_pseudonym.c */
Copied: gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c (from rev 19630,
gnunet-gtk/src/fs/gnunet-fs-gtk-main_window_adv_pseudonym.c)
===================================================================
--- gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c
(rev 0)
+++ gnunet-gtk/src/fs/gnunet-fs-gtk_advertise-pseudonym.c 2012-02-02
17:22:53 UTC (rev 19643)
@@ -0,0 +1,286 @@
+/*
+ This file is part of GNUnet
+ (C) 2005, 2006, 2010, 2012 Christian Grothoff (and other contributing
authors)
+
+ GNUnet is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published
+ by the Free Software Foundation; either version 2, or (at your
+ option) any later version.
+
+ GNUnet is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with GNUnet; see the file COPYING. If not, write to the
+ Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ Boston, MA 02111-1307, USA.
+*/
+
+/**
+ * @file src/fs/gnunet-fs-gtk_advertise-pseudonym.c
+ * @author Christian Grothoff
+ */
+#include "gnunet-fs-gtk_common.h"
+#include "gnunet-fs-gtk.h"
+#include "gnunet-fs-gtk_publish-edit-dialog.h"
+
+
+
+gboolean
+GNUNET_GTK_select_pseudonym_dialog_delete_event_cb (GtkWidget * widget,
+ GdkEvent * event,
+ gpointer user_Data)
+{
+ /* FIXME-LEAK: this doesn't destroy the dialog properly... */
+ gtk_widget_hide (widget);
+ return TRUE;
+}
+
+
+/**
+ * Callback with information about local (!) namespaces.
+ * Contains the names of the local namespace and the global
+ * ID. Adds the to the list store.
+ *
+ * @param cls closure, the list store.
+ * @param name human-readable identifier of the namespace
+ * @param id hash identifier for the namespace
+ */
+static void
+add_to_list (void *cls, const char *name, const GNUNET_HashCode * id)
+{
+ GtkListStore *ls = cls;
+ GtkTreeIter iter;
+
+ gtk_list_store_insert_with_values (ls, &iter, -1,
+ 0, name,
+ 1, GNUNET_FS_namespace_create
(GNUNET_FS_GTK_get_fs_handle (),
+ name),
+ -1);
+}
+
+
+/**
+ *
+ */
+struct NamespaceAdvertisementContext
+{
+ /**
+ *
+ */
+ struct GNUNET_FS_Namespace *ns;
+
+ /**
+ *
+ */
+ const char *root;
+
+ /**
+ *
+ */
+ struct GNUNET_FS_FileInformation *fip;
+};
+
+
+/**
+ * Function called on entries in a GNUNET_FS_FileInformation publish-structure.
+ *
+ * @param cls closure, a 'struct NamespaceAdvertisementContext *'
+ * @param fi the entry in the publish-structure
+ * @param length length of the file or directory
+ * @param meta metadata for the file or directory (can be modified)
+ * @param uri pointer to the keywords that will be used for this entry (can be
modified)
+ * @param bo block options (can be modified)
+ * @param do_index should we index (can be modified)
+ * @param client_info pointer to client context set upon creation (can be
modified)
+ * @return GNUNET_OK to continue, GNUNET_NO to remove
+ * this entry from the directory, GNUNET_SYSERR
+ * to abort the iteration
+ */
+static int
+advertise_namespace (void *cls, struct GNUNET_FS_FileInformation *fi,
+ uint64_t length, struct GNUNET_CONTAINER_MetaData *meta,
+ struct GNUNET_FS_Uri **uri,
+ struct GNUNET_FS_BlockOptions *bo, int *do_index,
+ void **client_info)
+{
+ struct NamespaceAdvertisementContext *nds = cls;
+
+ GNUNET_FS_namespace_advertise (GNUNET_FS_GTK_get_fs_handle (), *uri, nds->ns,
+ meta, bo, nds->root, NULL, NULL);
+ return GNUNET_SYSERR;
+}
+
+
+/**
+ *
+ */
+static void
+adv_pseudonym_edit_publish_dialog_cb (gpointer cls,
+ gint ret,
+ const char *root)
+{
+ struct NamespaceAdvertisementContext *nds = cls;
+
+ if (ret == GTK_RESPONSE_OK)
+ {
+ nds->root = root;
+ GNUNET_FS_file_information_inspect (nds->fip, &advertise_namespace, nds);
+ nds->root = NULL;
+ }
+ GNUNET_FS_namespace_delete (nds->ns, GNUNET_NO);
+ GNUNET_FS_file_information_destroy (nds->fip, NULL, NULL);
+ GNUNET_free (nds);
+}
+
+
+/**
+ *
+ */
+void
+GNUNET_GTK_select_pseudonym_dialog_response_cb (GtkDialog * dialog,
+ gint response_id,
+ gpointer user_data)
+{
+ GtkBuilder *builder;
+ GtkWidget *ad;
+ GtkTreeView *tv;
+ GtkTreeSelection *sel;
+ GtkTreeModel *tm;
+ GtkTreeIter iter;
+ struct GNUNET_FS_Namespace *ns;
+ struct GNUNET_FS_Namespace *nso;
+ GtkWindow *transient;
+ GtkListStore *anon_liststore;
+ 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
+ (builder, "GNUNET_GTK_select_pseudonym_dialog"));
+
+ anon_liststore = GTK_LIST_STORE (gtk_builder_get_object (builder,
"main_window_search_anonymity_liststore"));
+
+ if (response_id != -5)
+ {
+ gtk_widget_hide (ad);
+ return;
+ }
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
+ sel = gtk_tree_view_get_selection (tv);
+
+ GNUNET_assert (TRUE == gtk_tree_selection_get_selected (sel, &tm, &iter));
+ gtk_tree_model_get (tm, &iter, 1, &ns, -1);
+ /* free all namespaces from list store except "ns" */
+ if (TRUE == gtk_tree_model_get_iter_first (tm, &iter))
+ {
+ do
+ {
+ gtk_tree_model_get (tm, &iter, 1, &nso, -1);
+ if (ns != nso)
+ GNUNET_FS_namespace_delete (nso, GNUNET_NO);
+ }
+ while (TRUE == gtk_tree_model_iter_next (tm, &iter));
+ }
+ transient = gtk_window_get_transient_for (GTK_WINDOW (ad));
+ gtk_widget_hide (ad);
+
+ meta = GNUNET_CONTAINER_meta_data_create ();
+
+ nds = GNUNET_malloc (sizeof (struct NamespaceAdvertisementContext));
+ nds->ns = ns;
+ /* 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 (struct GNUNET_FS_BlockOptions));
+ bo.expiration_time =
+ GNUNET_FS_year_to_time (GNUNET_FS_get_current_year () + 2);
+ bo.anonymity_level = 1;
+ bo.content_priority = 1000;
+ nds->fip =
+ GNUNET_FS_file_information_create_empty_directory (NULL, NULL, NULL,
meta,
+ &bo, NULL);
+ GNUNET_CONTAINER_meta_data_destroy (meta);
+ GNUNET_FS_GTK_edit_publish_dialog (transient,
+ nds->fip,
+ GNUNET_NO,
+ anon_liststore,
+ &adv_pseudonym_edit_publish_dialog_cb,
+ nds);
+}
+
+
+
+
+/**
+ * Advertise pseudonym selected.
+ */
+void
+GNUNET_GTK_main_menu_file_advertise_pseudonym_activate_cb (GtkWidget * dummy,
+ gpointer data)
+{
+ GtkWidget *ad;
+ GtkListStore *ls;
+ GtkWidget *toplevel;
+ GtkBuilder *builder;
+
+ builder = GTK_BUILDER (data);
+ ad = GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_dialog"));
+ ls = GTK_LIST_STORE (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_liststore"));
+ gtk_list_store_clear (ls);
+ GNUNET_FS_namespace_list (GNUNET_FS_GTK_get_fs_handle (), &add_to_list, ls);
+ toplevel = gtk_widget_get_toplevel (dummy);
+ if (GTK_IS_WINDOW (toplevel))
+ gtk_window_set_transient_for (GTK_WINDOW (ad), GTK_WINDOW (toplevel));
+ gtk_window_present (GTK_WINDOW (ad));
+}
+
+
+/**
+ *
+ */
+static void
+selection_changed_cb (GtkTreeSelection * ts, gpointer user_data)
+{
+ GtkBuilder *builder = GTK_BUILDER (user_data);
+ GtkTreeIter iter;
+ GtkWidget *ok_button;
+
+ ok_button =
+ GTK_WIDGET (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_ok_button"));
+ if (TRUE == gtk_tree_selection_get_selected (ts, NULL, &iter))
+ gtk_widget_set_sensitive (ok_button, TRUE);
+ else
+ gtk_widget_set_sensitive (ok_button, FALSE);
+}
+
+
+/**
+ *
+ */
+void
+GNUNET_GTK_select_pseudonym_dialog_realize_cb (GtkWidget * widget,
+ gpointer user_data)
+{
+ GtkTreeView *tv;
+ GtkTreeSelection *sel;
+ GtkBuilder *builder;
+
+ builder = GTK_BUILDER (user_data);
+
+ tv = GTK_TREE_VIEW (gtk_builder_get_object
+ (builder, "GNUNET_GTK_select_pseudonym_tree_view"));
+ sel = gtk_tree_view_get_selection (tv);
+ g_signal_connect (G_OBJECT (sel), "changed",
+ G_CALLBACK (selection_changed_cb), user_data);
+}
+
+
+/* end of gnunet-fs-gtk_advertise-pseudonym.c */
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r19643 - in gnunet-gtk: contrib src/fs,
gnunet <=