[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33393 - in gnunet-gtk: contrib src/conversation
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33393 - in gnunet-gtk: contrib src/conversation |
|
Date: |
Mon, 26 May 2014 16:14:05 +0200 |
Author: grothoff
Date: 2014-05-26 16:14:05 +0200 (Mon, 26 May 2014)
New Revision: 33393
Modified:
gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade
gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade
gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade
gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
gnunet-gtk/contrib/gnunet_namestore_edit_a.glade
gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade
gnunet-gtk/contrib/gnunet_namestore_edit_cert.glade
gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade
gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade
gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade
gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade
gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade
gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade
gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade
gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade
gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade
gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade
gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
gnunet-gtk/contrib/gnunet_statistics_gtk_main_window.glade
gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
Log:
-updating misc. glade files to Gtk3
Modified: gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_conversation_gtk_main_window.glade
2014-05-26 14:14:05 UTC (rev 33393)
@@ -490,7 +490,7 @@
<property
name="receives_default">True</property>
<property
name="use_action_appearance">False</property>
<property
name="xalign">0.4699999988079071</property>
- <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_on_current_clicked" swapped="no"/>
+ <signal name="clicked"
handler="GNUNET_CONVERSATION_GTK_use_current_button_clicked" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_download_as_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="GNUNET_GTK_anonymity_adjustment">
<property name="upper">100000</property>
<property name="value">1</property>
@@ -25,12 +25,13 @@
<signal name="delete-event"
handler="GNUNET_GTK_save_as_dialog_delete_event_cb" swapped="no"/>
<signal name="response" handler="GNUNET_GTK_save_as_dialog_response_cb"
swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox4">
+ <object class="GtkBox" id="dialog-vbox4">
<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="dialog-action_area5">
+ <object class="GtkButtonBox" id="dialog-action_area5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -101,8 +102,6 @@
<property name="caps_lock_warning">False</property>
<property name="primary_icon_activatable">False</property>
<property name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
<property
name="adjustment">GNUNET_GTK_anonymity_adjustment</property>
<property name="numeric">True</property>
<signal name="value-changed"
handler="GNUNET_GTK_anonymity_spin_button_value_changed_cb" after="yes"
swapped="no"/>
@@ -122,6 +121,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_edit_publication.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
+ <columns>
+ <!-- column-name Keyword -->
+ <column type="gchararray"/>
+ <!-- column-name Added -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
<object class="GtkListStore" id="GNUNET_GTK_publication_metadata_liststore">
<columns>
<!-- column-name Type -->
@@ -66,23 +84,40 @@
</row>
</data>
</object>
- <object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
- <property name="upper">100</property>
+ <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="GtkImage" id="add_stock_image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-add</property>
+ </object>
+ <object class="GtkImage" id="del_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </object>
+ <object class="GtkImage" id="del_stock_image1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-delete</property>
+ </object>
+ <object class="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment">
- <property name="upper">100</property>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">10000000</property>
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkListStore" id="GNUNET_GTK_publication_keywords_liststore">
- <columns>
- <!-- column-name Keyword -->
- <column type="gchararray"/>
- <!-- column-name Added -->
- <column type="gboolean"/>
- </columns>
+ <object class="GtkAdjustment" id="replication_adjustment">
+ <property name="upper">999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
</object>
<object class="GtkWindow" id="GNUNET_GTK_edit_publication_window">
<property name="can_focus">False</property>
@@ -195,8 +230,6 @@
<property name="height_request">120</property>
<property name="visible">True</property>
<property name="can_focus">True</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_edit_publication_metadata_tree_view">
@@ -206,6 +239,9 @@
<property name="enable_search">False</property>
<property name="search_column">0</property>
<property name="tooltip_column">4</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_metadata_tree_view_type_column">
<property name="resizable">True</property>
@@ -294,8 +330,6 @@
<property name="can_focus">True</property>
<property
name="hadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment</property>
<property
name="vadjustment">GNUNET_GTK_edit_publication_metadata_preview_image_verticall_adjustment</property>
- <property
name="hscrollbar_policy">automatic</property>
- <property
name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkViewport"
id="GNUNET_GTK_edit_publication_metadata_preview_image_viewport">
<property name="visible">True</property>
@@ -376,12 +410,9 @@
<property name="can_focus">True</property>
<property name="events">GDK_KEY_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property name="caps_lock_warning">False</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">True</property>
@@ -422,7 +453,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">never</property>
- <property name="vscrollbar_policy">automatic</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view">
@@ -430,6 +460,9 @@
<property name="can_focus">True</property>
<property
name="model">GNUNET_GTK_publication_keywords_liststore</property>
<property name="search_column">0</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_edit_publication_keyword_list_tree_view_column">
<property name="title">Keywords</property>
@@ -524,6 +557,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="draw_indicator">True</property>
</object>
<packing>
@@ -564,11 +598,8 @@
<property name="can_focus">True</property>
<property
name="invisible_char">•</property>
<property name="text">root</property>
- <property
name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -665,11 +696,8 @@
<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>
@@ -711,11 +739,8 @@
<property name="can_focus">True</property>
<property name="max_length">4</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="climb_rate">1</property>
<property name="numeric">True</property>
@@ -756,11 +781,8 @@
<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>
</object>
<packing>
@@ -863,41 +885,6 @@
</object>
</child>
</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="GtkImage" id="add_stock_image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-add</property>
- </object>
- <object class="GtkImage" id="del_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
- </object>
- <object class="GtkImage" id="del_stock_image1">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-delete</property>
- </object>
- <object class="GtkAdjustment" id="expiration_year_adjustment">
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="replication_adjustment">
- <property name="upper">999999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">10000000</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkSizeGroup" id="sizegroup1">
<widgets>
<widget name="GNUNET_GTK_edit_publication_root_entry"/>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_enter_nick_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="GNUNET_GTK_enter_nick_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Enter the desired nickname for
the namespace</property>
@@ -44,8 +44,6 @@
<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>
<signal name="changed"
handler="GNUNET_GTK_enter_nick_window_nick_entry_changed_cb" swapped="no"/>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_main_window.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment"
id="GNUNET_GTK_edit_publication_metadata_preview_image_horizontal_adjustment">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -88,6 +88,329 @@
<column type="gchararray"/>
</columns>
</object>
+ <object class="GtkListStore" id="GNUNET_GTK_peer_info_list_store">
+ <columns>
+ <!-- column-name peer_identity -->
+ <column type="gchararray"/>
+ <!-- column-name number_of_known_addresses -->
+ <column type="guint"/>
+ <!-- column-name country_name -->
+ <column type="gchararray"/>
+ <!-- column-name country_flag -->
+ <column type="GdkPixbuf"/>
+ <!-- column-name bandwidth -->
+ <column type="guint64"/>
+ </columns>
+ </object>
+ <object class="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="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="GtkListStore" id="anonymity_level_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="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="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
+ <property name="mode">vertical</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_and_replace_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-find-and-replace</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_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">mimetype:text</col>
+ <col id="1" translatable="yes">Text</col>
+ <col id="2">txt, html</col>
+ <col id="3" translatable="yes">N/A</col>
+ <col id="4" translatable="yes">N/A</col>
+ </row>
+ <row>
+ <col id="0">mimetype:image</col>
+ <col id="1" translatable="yes">Image</col>
+ <col id="2">png, jpeg, gif, ...</col>
+ <col id="3" translatable="yes">N/A</col>
+ <col id="4" translatable="yes">N/A</col>
+ </row>
+ <row>
+ <col id="0">application/pdf</col>
+ <col id="1" translatable="yes">PDF documents</col>
+ <col id="2">pdf</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">image/jpeg</col>
+ <col id="1" translatable="yes">JPEG image</col>
+ <col id="2">jpg, jpeg</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ <row>
+ <col id="0">image/png</col>
+ <col id="1" translatable="yes">PNG image</col>
+ <col id="2">png</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">mimetype:audio</col>
+ <col id="1" translatable="yes">Audio</col>
+ <col id="2">wav, mp3, ogg, ...</col>
+ <col id="3" translatable="yes"> </col>
+ <col id="4" translatable="yes"> </col>
+ </row>
+ <row>
+ <col id="0">audio/ogg</col>
+ <col id="1" translatable="yes">OGG Vorbis audio</col>
+ <col id="2">ogg</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-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>
+ <row>
+ <col id="0">mimetype:video</col>
+ <col id="1" translatable="yes">Vorbis</col>
+ <col id="2">ogv, mpeg, mp4, flv, ...</col>
+ <col id="3" translatable="yes"> </col>
+ <col id="4" translatable="yes"> </col>
+ </row>
+ <row>
+ <col id="0">video/ogg</col>
+ <col id="1" translatable="yes">OGG Vorbis video</col>
+ <col id="2">ogv</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ <row>
+ <col id="0">video/mpeg</col>
+ <col id="1" translatable="yes">MPEG video (v2)</col>
+ <col id="2">mpg, mpeg</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">video/mp4</col>
+ <col id="1" translatable="yes">MPEG video (v4)</col>
+ <col id="2">mp4</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">video/x-msvideo</col>
+ <col id="1" translatable="yes">AVI video</col>
+ <col id="2">avi</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">video/x-ms-asf</col>
+ <col id="1" translatable="yes">ASF video</col>
+ <col id="2">asf</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">video/x-flv</col>
+ <col id="1" translatable="yes">Flash video</col>
+ <col id="2">flv</col>
+ <col id="3" translatable="yes">lossy</col>
+ <col id="4" translatable="yes">non-free</col>
+ </row>
+ <row>
+ <col id="0">application/x-tar</col>
+ <col id="1" translatable="yes">Tar archive</col>
+ <col id="2">tar, tgz</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ <row>
+ <col id="0">application/zip</col>
+ <col id="1" translatable="yes">Zip archive</col>
+ <col id="2">zip</col>
+ <col id="3" translatable="yes">lossless</col>
+ <col id="4" translatable="yes">free</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ <!-- column-name Key -->
+ <column type="gpointer"/>
+ <!-- column-name Root -->
+ <column type="gchararray"/>
+ <!-- column-name Tooltip -->
+ <column type="gchararray"/>
+ </columns>
+ </object>
+ <object class="GtkMenu" id="metadata_popup_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="Copy selection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Copy selection</property>
+ <property name="use_underline">True</property>
+ <signal name="activate"
handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <object class="GtkListStore" id="namespace_label_liststore">
+ <columns>
+ <!-- column-name Name -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes"><none></col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkImage" id="new_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-new</property>
+ </object>
+ <object class="GtkImage" id="open_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-open</property>
+ </object>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">10000000</property>
+ <property name="value">1000</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="replication_adjustment">
+ <property name="upper">999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="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="GtkWindow" id="GNUNET_GTK_main_window">
<property name="can_focus">False</property>
<property name="events">GDK_BUTTON_PRESS_MASK |
GDK_STRUCTURE_MASK</property>
@@ -164,8 +487,8 @@
<property name="use_underline">True</property>
<property name="image">up_stock_image</property>
<property name="use_stock">False</property>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
<accelerator key="a" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_publish_activate_cb" swapped="no"/>
</object>
</child>
<child>
@@ -193,8 +516,8 @@
<property name="use_underline">True</property>
<property name="image">down_stock_image</property>
<property name="use_stock">False</property>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
<accelerator key="d" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_download_uri_activate_cb" swapped="no"/>
</object>
</child>
<child>
@@ -207,8 +530,8 @@
<property name="use_underline">True</property>
<property name="image">open_stock_image</property>
<property name="use_stock">False</property>
+ <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"
swapped="no"/>
<accelerator key="F3" signal="activate"/>
- <signal name="activate"
handler="GNUNET_GTK_main_menu_file_open_gnunet_directory_activate_cb"
swapped="no"/>
</object>
</child>
<child>
@@ -226,8 +549,8 @@
<property
name="accel_path"><gnunet-fs-gtk>/Quit</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
+ <signal name="activate"
handler="GNUNET_FS_GTK_menu_quit_activate_cb" swapped="no"/>
<accelerator key="q" signal="activate"
modifiers="GDK_CONTROL_MASK"/>
- <signal name="activate"
handler="GNUNET_FS_GTK_menu_quit_activate_cb" swapped="no"/>
</object>
</child>
</object>
@@ -372,6 +695,11 @@
<attribute name="text">0</attribute>
</attributes>
</child>
+ <child internal-child="entry">
+ <object class="GtkEntry" id="combobox-entry1">
+ <property name="can_focus">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -425,11 +753,8 @@
<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>
<signal name="key-press-event"
handler="main_window_search_entry_key_press_event_cb" swapped="no"/>
</object>
<packing>
@@ -635,9 +960,12 @@
<property name="search_column">6</property>
<property
name="enable_grid_lines">horizontal</property>
<property name="enable_tree_lines">True</property>
+ <signal name="button-press-event"
handler="GNUNET_GTK_download_frame_button_press_event_cb" swapped="no"/>
<signal name="cursor-changed"
handler="GNUNET_FS_GTK_download_frame_treeview_cursor_changed_cb" swapped="no"/>
- <signal name="button-press-event"
handler="GNUNET_GTK_download_frame_button_press_event_cb" swapped="no"/>
<signal name="popup-menu"
handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_download_description_column">
<property name="title">Description</property>
@@ -808,7 +1136,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-clear</property>
- <property name="icon-size">2</property>
+ <property name="icon_size">2</property>
</object>
</child>
</object>
@@ -899,11 +1227,8 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -992,6 +1317,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -1077,14 +1403,17 @@
<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>
@@ -1143,320 +1472,6 @@
</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="GtkSizeGroup"
id="GNUNET_GTK_download_frame_labels_size_group">
- <widgets>
- <widget name="GNUNET_GTK_search_frame_download_location_label"/>
- <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
- <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
- </widgets>
- </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="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="GtkListStore" id="anonymity_level_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="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="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_and_replace_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-find-and-replace</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="GtkSizeGroup" id="enties_and_comboboxes_sizegroup">
- <property name="mode">vertical</property>
- </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">mimetype:text</col>
- <col id="1" translatable="yes">Text</col>
- <col id="2">txt, html</col>
- <col id="3" translatable="yes">N/A</col>
- <col id="4" translatable="yes">N/A</col>
- </row>
- <row>
- <col id="0">mimetype:image</col>
- <col id="1" translatable="yes">Image</col>
- <col id="2">png, jpeg, gif, ...</col>
- <col id="3" translatable="yes">N/A</col>
- <col id="4" translatable="yes">N/A</col>
- </row>
- <row>
- <col id="0">application/pdf</col>
- <col id="1" translatable="yes">PDF documents</col>
- <col id="2">pdf</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">image/jpeg</col>
- <col id="1" translatable="yes">JPEG image</col>
- <col id="2">jpg, jpeg</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">free</col>
- </row>
- <row>
- <col id="0">image/png</col>
- <col id="1" translatable="yes">PNG image</col>
- <col id="2">png</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">mimetype:audio</col>
- <col id="1" translatable="yes">Audio</col>
- <col id="2">wav, mp3, ogg, ...</col>
- <col id="3" translatable="yes"> </col>
- <col id="4" translatable="yes"> </col>
- </row>
- <row>
- <col id="0">audio/ogg</col>
- <col id="1" translatable="yes">OGG Vorbis audio</col>
- <col id="2">ogg</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-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>
- <row>
- <col id="0">mimetype:video</col>
- <col id="1" translatable="yes">Vorbis</col>
- <col id="2">ogv, mpeg, mp4, flv, ...</col>
- <col id="3" translatable="yes"> </col>
- <col id="4" translatable="yes"> </col>
- </row>
- <row>
- <col id="0">video/ogg</col>
- <col id="1" translatable="yes">OGG Vorbis video</col>
- <col id="2">ogv</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">free</col>
- </row>
- <row>
- <col id="0">video/mpeg</col>
- <col id="1" translatable="yes">MPEG video (v2)</col>
- <col id="2">mpg, mpeg</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">video/mp4</col>
- <col id="1" translatable="yes">MPEG video (v4)</col>
- <col id="2">mp4</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">video/x-msvideo</col>
- <col id="1" translatable="yes">AVI video</col>
- <col id="2">avi</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">video/x-ms-asf</col>
- <col id="1" translatable="yes">ASF video</col>
- <col id="2">asf</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">video/x-flv</col>
- <col id="1" translatable="yes">Flash video</col>
- <col id="2">flv</col>
- <col id="3" translatable="yes">lossy</col>
- <col id="4" translatable="yes">non-free</col>
- </row>
- <row>
- <col id="0">application/x-tar</col>
- <col id="1" translatable="yes">Tar archive</col>
- <col id="2">tar, tgz</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">free</col>
- </row>
- <row>
- <col id="0">application/zip</col>
- <col id="1" translatable="yes">Zip archive</col>
- <col id="2">zip</col>
- <col id="3" translatable="yes">lossless</col>
- <col id="4" translatable="yes">free</col>
- </row>
- </data>
- </object>
- <object class="GtkTreeStore" id="main_window_search_namespace_treestore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- <!-- column-name Key -->
- <column type="gpointer"/>
- <!-- column-name Root -->
- <column type="gchararray"/>
- <!-- column-name Tooltip -->
- <column type="gchararray"/>
- </columns>
- </object>
- <object class="GtkMenu" id="metadata_popup_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="Copy selection">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Copy selection</property>
- <property name="use_underline">True</property>
- <signal name="activate"
handler="GNUNET_GTK_FS_metadata_copy_selection_activated" swapped="no"/>
- </object>
- </child>
- </object>
- <object class="GtkListStore" id="namespace_label_liststore">
- <columns>
- <!-- column-name Name -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0" translatable="yes"><none></col>
- </row>
- </data>
- </object>
- <object class="GtkImage" id="new_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
- </object>
- <object class="GtkImage" id="open_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-open</property>
- </object>
<object class="GtkSizeGroup" id="GNUNET_FS_GTK_download_frame_vsize_group">
<property name="mode">vertical</property>
<property name="ignore_hidden">True</property>
@@ -1471,20 +1486,11 @@
<widget name="GNUNET_GTK_search_frame_download_recursive_checkbox"/>
</widgets>
</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>
+ <object class="GtkSizeGroup"
id="GNUNET_GTK_download_frame_labels_size_group">
+ <widgets>
+ <widget name="GNUNET_GTK_search_frame_download_location_label"/>
+ <widget name="GNUNET_GTK_search_frame_download_anonymity_label"/>
+ <widget name="GNUNET_GTK_search_frame_download_filename_label"/>
+ </widgets>
</object>
- <object class="GtkAdjustment" id="replication_adjustment">
- <property name="upper">999999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkImage" id="up_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-up</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_directory_dialog.glade
2014-05-26 14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkFileFilter" id="gnunet_directory_filter"/>
<object class="GtkFileChooserDialog" id="GNUNET_GTK_open_directory_dialog">
<property name="can_focus">False</property>
@@ -13,12 +13,13 @@
<property name="filter">gnunet_directory_filter</property>
<signal name="response"
handler="GNUNET_GTK_open_directory_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox3">
+ <object class="GtkBox" id="dialog-vbox3">
<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="dialog-action_area4">
+ <object class="GtkButtonBox" id="dialog-action_area4">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_open_url_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<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>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_progress_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,13 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="GNUNET_FS_GTK_progress_bar_adjustment">
<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="GtkTextBuffer" id="GNUNET_FS_GTK_progress_dialog_textbuffer"/>
+ <object class="GtkAdjustment"
id="GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment"
id="GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkWindow" id="GNUNET_FS_GTK_progress_dialog">
<property name="can_focus">False</property>
<property name="border_width">2</property>
@@ -38,8 +49,6 @@
<property name="can_focus">True</property>
<property
name="hadjustment">GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment</property>
<property
name="vadjustment">GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTextView"
id="GNUNET_FS_GTK_progress_dialog_textview">
<property name="visible">True</property>
@@ -74,12 +83,9 @@
<object class="GtkProgressBar"
id="GNUNET_FS_GTK_progress_dialog_progressbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
<property name="pulse_step">0.050000000000000003</property>
<property name="text"
translatable="yes">Preprocessing...</property>
- <property
name="adjustment">GNUNET_FS_GTK_progress_bar_adjustment</property>
- <property name="discrete_blocks">5</property>
+ <property name="show_text">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -122,15 +128,4 @@
</object>
</child>
</object>
- <object class="GtkTextBuffer" id="GNUNET_FS_GTK_progress_dialog_textbuffer"/>
- <object class="GtkAdjustment"
id="GNUNET_FS_GTK_progress_dialog_textview_horizontal_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment"
id="GNUNET_FS_GTK_progress_dialog_textview_vertical_adjustment">
- <property name="upper">100</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_pseu_progress_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment"
id="GNUNET_FS_GTK_pseu_progress_bar_adjustment">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -26,12 +26,9 @@
<object class="GtkProgressBar"
id="GNUNET_FS_GTK_pseu_progress_dialog_progressbar">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="activity_mode">True</property>
- <property name="show_text">True</property>
<property name="pulse_step">0.050000000000000003</property>
<property name="text" translatable="yes">Trying to discover
nickname...</property>
- <property
name="adjustment">GNUNET_FS_GTK_pseu_progress_bar_adjustment</property>
- <property name="discrete_blocks">5</property>
+ <property name="show_text">True</property>
</object>
<packing>
<property name="expand">False</property>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkTreeStore"
id="GNUNET_GTK_file_sharing_publishing_tree_store">
<columns>
<!-- column-name filesize -->
@@ -22,6 +22,43 @@
<column type="guint"/>
</columns>
</object>
+ <object class="GtkListStore"
id="GNUNET_GTK_master_publish_dialog_ego_liststore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name ego -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
+ <object class="GtkTreeStore" id="GNUNET_GTK_update_identifiers_treestore">
+ <columns>
+ <!-- column-name Identifier -->
+ <column type="gchararray"/>
+ <!-- column-name UpdateIdentifier -->
+ <column type="gchararray"/>
+ <!-- column-name Description -->
+ <column type="gchararray"/>
+ <!-- column-name PathToOriginal -->
+ <column type="gchararray"/>
+ <!-- column-name IdentifierMarkedUp -->
+ <column type="gchararray"/>
+ </columns>
+ </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="GtkImage" id="new_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-new</property>
+ </object>
+ <object class="GtkImage" id="right_stock_image">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="stock">gtk-go-forward</property>
+ </object>
<object class="GtkWindow" id="GNUNET_GTK_master_publish_dialog">
<property name="height_request">500</property>
<property name="can_focus">False</property>
@@ -55,8 +92,6 @@
<object class="GtkScrolledWindow"
id="GNUNET_GTK_master_publish_dialog_file_information_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_master_publish_dialog_file_information_tree_view">
<property name="visible">True</property>
@@ -66,6 +101,9 @@
<property
name="expander_column">GNUNET_GTK_master_publish_dialog_file_information_filename_column</property>
<property name="search_column">0</property>
<property name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_file_information_filesize_column">
<property name="sizing">autosize</property>
@@ -370,6 +408,12 @@
<child>
<placeholder/>
</child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="expand">False</property>
@@ -420,6 +464,7 @@
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Make unsigned publication that will be searchable in global
(anonymous) namespace.
Disabling this is equivalent to pressing the "Remove all Keywords" button
before starting the publication.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNUNET_GTK_master_publish_dialog_global_checkbox_toggled_cb"
swapped="no"/>
</object>
@@ -460,6 +505,7 @@
Publishing in both global and private namespaces will not double storage
requirements for published files.
</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNUNET_GTK_master_publish_dialog_own_checkbox_toggled_cb"
swapped="no"/>
</object>
@@ -528,8 +574,6 @@
<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>
<signal name="changed"
handler="GNUNET_GTK_master_publish_dialog_identifier_entry_changed_cb"
swapped="no"/>
</object>
<packing>
@@ -570,8 +614,6 @@
<child>
<object class="GtkScrolledWindow"
id="GNUNET_GTK_master_publish_dialog_previous_identifiers_scrolled">
<property name="can_focus">True</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_master_publish_dialog_previous_identifiers_treeview">
@@ -582,6 +624,9 @@
<property
name="expander_column">GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column</property>
<property name="enable_search">False</property>
<property
name="enable_tree_lines">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_master_publish_dialog_previous_identifiers_treeview_id_column">
<property name="sizing">autosize</property>
@@ -642,6 +687,7 @@
<property name="tooltip_text"
translatable="yes">With the update mechanism, you can publish updates to a file
that will be automatically located when a users searches for the original
identifier.
To enable updates, you must check this box and specify an update
identifier.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNUNET_GTK_master_publish_dialog_updateable_checkbox_toggled_cb"
swapped="no"/>
</object>
@@ -687,11 +733,8 @@
GNUnet clients will use it to try to find updated version of this publication
automatically.
Leaving this field blank makes publication unupdateable.</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>
</object>
<packing>
<property name="expand">True</property>
@@ -800,43 +843,6 @@
</object>
</child>
</object>
- <object class="GtkListStore"
id="GNUNET_GTK_master_publish_dialog_ego_liststore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name ego -->
- <column type="gpointer"/>
- </columns>
- </object>
- <object class="GtkTreeStore" id="GNUNET_GTK_update_identifiers_treestore">
- <columns>
- <!-- column-name Identifier -->
- <column type="gchararray"/>
- <!-- column-name UpdateIdentifier -->
- <column type="gchararray"/>
- <!-- column-name Description -->
- <column type="gchararray"/>
- <!-- column-name PathToOriginal -->
- <column type="gchararray"/>
- <!-- column-name IdentifierMarkedUp -->
- <column type="gchararray"/>
- </columns>
- </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="GtkImage" id="new_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-new</property>
- </object>
- <object class="GtkImage" id="right_stock_image">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- </object>
<object class="GtkSizeGroup"
id="GNUNET_GTK_master_publish_dialog_labels_sizegroup">
<widgets>
<widget name="GNUNET_GTK_master_publish_dialog_identifier_label"/>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_directory_dialog.glade
2014-05-26 14:14:05 UTC (rev 33393)
@@ -1,12 +1,13 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<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="GtkFileFilter" id="gnunet_directory_filter"/>
<object class="GtkAdjustment" id="priority_adjustment">
<property name="upper">10000000</property>
<property name="step_increment">1</property>
@@ -17,8 +18,8 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkFileFilter" id="gnunet_directory_filter"/>
<object class="GtkFileChooserDialog"
id="GNUNET_GTK_publish_directory_dialog">
+ <property name="can_focus">False</property>
<property name="can_default">True</property>
<property name="events">GDK_FOCUS_CHANGE_MASK |
GDK_STRUCTURE_MASK</property>
<property name="border_width">5</property>
@@ -34,87 +35,129 @@
<property name="create_folders">False</property>
<property name="filter">gnunet_directory_filter</property>
<property name="select_multiple">True</property>
- <signal name="response"
handler="GNUNET_GTK_publish_directory_dialog_response_cb"/>
+ <signal name="response"
handler="GNUNET_GTK_publish_directory_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox8">
+ <object class="GtkBox" id="GNUNET_GTK_publish_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="GtkButtonBox" id="dialog-action_area9">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="layout_style">end</property>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_publish_dialog_cancel_button">
+ <property name="label">gtk-cancel</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton"
id="GNUNET_GTK_publish_directory_dialog_ok_button">
+ <property name="label">gtk-ok</property>
+ <property name="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="GtkTable" id="table1">
+ <object class="GtkTable" id="GNUNET_GTK_publish_dialog_action_table">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="n_rows">2</property>
<property name="n_columns">4</property>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_priority_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Priority:</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="right_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_priority_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
+ <property name="invisible_char">•</property>
<property name="adjustment">priority_adjustment</property>
<property name="numeric">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="right_attach">4</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_expiration_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Expiration
year:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_expiration_year_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">•</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
+ <property name="invisible_char">•</property>
<property
name="adjustment">expiration_year_adjustment</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_anonymity_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label" translatable="yes">Anonymity:</property>
</object>
<packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkLabel"
id="GNUNET_GTK_publish_directory_dialog_replication_label">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="label"
translatable="yes">_Replication:</property>
<property name="use_underline">True</property>
</object>
@@ -123,18 +166,15 @@
<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>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkSpinButton"
id="GNUNET_GTK_publish_directory_dialog_replication_spin_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
- <property name="primary_icon_sensitive">True</property>
- <property name="secondary_icon_sensitive">True</property>
+ <property name="invisible_char">●</property>
<property name="adjustment">replication_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -143,16 +183,18 @@
<property name="right_attach">4</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkAlignment"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_alignment">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="yscale">0</property>
<child>
<object class="GtkComboBox"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="active">1</property>
<child>
<object class="GtkCellRendererText"
id="GNUNET_GTK_publish_directory_dialog_anonymity_combobox_renderer"/>
@@ -175,7 +217,7 @@
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
+ <property name="y_options"/>
</packing>
</child>
</object>
@@ -186,8 +228,9 @@
</packing>
</child>
<child>
- <object class="GtkHBox" id="hbox1">
+ <object class="GtkHBox" id="GNUNET_GTK_publish_dialog_index_hbox">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<placeholder/>
</child>
@@ -198,11 +241,13 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
<packing>
<property name="expand">False</property>
+ <property name="fill">True</property>
<property name="position">1</property>
</packing>
</child>
@@ -213,46 +258,6 @@
<property name="position">3</property>
</packing>
</child>
- <child internal-child="action_area">
- <object class="GtkHButtonBox" id="dialog-action_area9">
- <property name="visible">True</property>
- <property name="layout_style">end</property>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_dialog_cancel_button">
- <property name="label">gtk-cancel</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="use_stock">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton"
id="GNUNET_GTK_publish_directory_dialog_ok_button">
- <property name="label">gtk-ok</property>
- <property name="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="pack_type">end</property>
- <property name="position">0</property>
- </packing>
- </child>
</object>
</child>
<action-widgets>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_file_dialog.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,23 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">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>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkFileChooserDialog" id="GNUNET_GTK_publish_file_dialog">
<property name="can_focus">False</property>
<property name="can_default">True</property>
@@ -14,12 +30,13 @@
<property name="select_multiple">True</property>
<signal name="response"
handler="GNUNET_GTK_publish_file_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="dialog-vbox1">
+ <object class="GtkBox" id="dialog-vbox1">
<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="dialog-action_area2">
+ <object class="GtkButtonBox" id="dialog-action_area2">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -74,6 +91,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -170,11 +188,8 @@
<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>
@@ -199,11 +214,8 @@
<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>
@@ -231,11 +243,8 @@
<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>
@@ -261,20 +270,4 @@
<action-widget
response="-5">GNUNET_GTK_publish_file_dialog_ok_button</action-widget>
</action-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="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>
- <property name="page_increment">10</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_publish_tab.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkTreeStore" id="_publish_frame_tree_store">
<columns>
<!-- column-name filename -->
@@ -36,6 +36,9 @@
<property name="enable_tree_lines">True</property>
<signal name="button-press-event"
handler="GNUNET_FS_GTK_publish_treeview_button_press_event" swapped="no"/>
<signal name="popup-menu"
handler="GNUNET_FS_GTK_publish_treeview_popup_menu" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn" id="filename">
<property name="sizing">autosize</property>
@@ -127,7 +130,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-close</property>
- <property name="icon-size">2</property>
+ <property name="icon_size">2</property>
</object>
</child>
</object>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_search_tab.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkTreeStore" id="GNUNET_GTK_file_sharing_result_tree_store">
<columns>
<!-- column-name metadata -->
@@ -59,8 +59,6 @@
<object class="GtkScrolledWindow" id="_search_frame_scrolled_window">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="_search_result_frame">
<property name="visible">True</property>
@@ -69,10 +67,13 @@
<property name="search_column">6</property>
<property name="enable_grid_lines">horizontal</property>
<property name="enable_tree_lines">True</property>
+ <signal name="button-press-event"
handler="GNUNET_FS_GTK_search_treeview_button_press_event" swapped="no"/>
<signal name="cursor-changed"
handler="GNUNET_FS_GTK_search_treeview_cursor_changed" swapped="no"/>
- <signal name="button-press-event"
handler="GNUNET_FS_GTK_search_treeview_button_press_event" swapped="no"/>
+ <signal name="popup-menu"
handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
<signal name="row-activated"
handler="GNUNET_FS_GTK_search_treeview_row_activated" swapped="no"/>
- <signal name="popup-menu"
handler="GNUNET_FS_GTK_search_treeview_popup_menu" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="search_result_description_column">
<property name="title">Description</property>
@@ -216,6 +217,9 @@
</object>
</child>
</object>
+ <object class="GtkSizeGroup" id="_search_result_label_buttons_size_group">
+ <property name="mode">both</property>
+ </object>
<object class="GtkWindow" id="_search_result_label_window">
<property name="can_focus">False</property>
<property name="type">popup</property>
@@ -253,7 +257,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-play</property>
- <property name="icon-size">2</property>
+ <property name="icon_size">2</property>
</object>
</child>
</object>
@@ -274,7 +278,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-media-pause</property>
- <property name="icon-size">2</property>
+ <property name="icon_size">2</property>
</object>
</child>
</object>
@@ -296,7 +300,7 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="stock">gtk-close</property>
- <property name="icon-size">2</property>
+ <property name="icon_size">2</property>
</object>
</child>
</object>
@@ -309,7 +313,4 @@
</object>
</child>
</object>
- <object class="GtkSizeGroup" id="_search_result_label_buttons_size_group">
- <property name="mode">both</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_fs_gtk_unindex.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.18"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkImage" id="GNUNET_FS_GTK_unindex_delete_image">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -37,12 +37,13 @@
<property name="icon_name">folder</property>
<property name="type_hint">normal</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_FS_GTK_unindex_dialog-vbox">
+ <object class="GtkBox" id="GNUNET_FS_GTK_unindex_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_FS_GTK_unindex_dialog-action_area">
+ <object class="GtkButtonBox"
id="GNUNET_FS_GTK_unindex_dialog-action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -93,13 +94,14 @@
<object class="GtkScrolledWindow"
id="GNUNET_FS_GTK_unindex_scrolledwindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView" id="GNUNET_FS_GTK_unindex_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property
name="model">GNUNET_FS_GTK_unindex_liststore</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_FS_GTK_unindex_filesize_treeviewcolumn">
<property name="sizing">autosize</property>
Modified: gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_gtk_status_bar_menu.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,15 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkMenu" id="GNUNET_GTK_status_bar_popup_menu">
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
<object class="GtkImageMenuItem"
id="GNUNET_GTK_status_bar_popup_menu_quit">
<property name="label">gtk-quit</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Quit</property>
- <property name="use_action_appearance">False</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
<property name="always_show_image">True</property>
Modified: gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_identity_gtk_advertise_dialog.glade
2014-05-26 14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment"
id="GNUNET_GTK_identity_advertise_keywords_hadj">
<property name="upper">100</property>
<property name="step_increment">1</property>
@@ -38,6 +38,58 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore"
id="GNUNET_GTK_identity_metadata_types_liststore">
+ <columns>
+ <!-- column-name type_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name type_as_enum -->
+ <column type="guint"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="anonymity_level_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="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="priority_adjustment">
+ <property name="upper">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="value">5</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="GNUNET_GTK_identity_advertise_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -45,9 +97,10 @@
<property name="type_hint">dialog</property>
<signal name="response"
handler="GNUNET_GTK_identity_advertise_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="GNUNET_GTK_identity_advertise_vbox">
+ <object class="GtkBox" id="GNUNET_GTK_identity_advertise_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame"
id="GNUNET_GTK_identity_advertise_root_frame">
@@ -68,8 +121,6 @@
<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>
</object>
</child>
</object>
@@ -157,11 +208,8 @@
<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>
<signal name="changed"
handler="GNUNET_GTK_identity_advertise_metadata_value_entry_changed_cb"
swapped="no"/>
</object>
<packing>
@@ -215,16 +263,14 @@
<property name="can_focus">True</property>
<property
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
<property
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</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_identity_advertise_metadata_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_identity_advertise_metadata_liststore</property>
<property
name="hadjustment">GNUNET_GTK_identity_advertise_metadata_hadj</property>
<property
name="vadjustment">GNUNET_GTK_identity_advertise_metadata_vadj</property>
+ <property
name="model">GNUNET_GTK_identity_advertise_metadata_liststore</property>
<property name="headers_clickable">False</property>
<property name="rules_hint">True</property>
<property name="search_column">0</property>
@@ -232,6 +278,9 @@
<property name="rubber_banding">True</property>
<property name="enable_grid_lines">both</property>
<signal name="key-press-event"
handler="GNUNET_GTK_identity_advertise_metadata_treeview_key_press_event_cb"
swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_identity_advertise_metadata_type_column">
<property name="title"
translatable="yes">Type</property>
@@ -302,20 +351,21 @@
<property name="can_focus">True</property>
<property
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
<property
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="GNUNET_GTK_identity_advertise_keywords_treeview">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
<property
name="hadjustment">GNUNET_GTK_identity_advertise_keywords_hadj</property>
<property
name="vadjustment">GNUNET_GTK_identity_advertise_keywords_vadj</property>
+ <property
name="model">GNUNET_GTK_identity_advertise_keywords_liststore</property>
<property name="reorderable">True</property>
<property name="enable_search">False</property>
<property name="search_column">0</property>
<property name="show_expanders">False</property>
<property name="rubber_banding">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection2"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="GNUNET_GTK_identity_advertise_keywords_name_column">
<property name="title"
translatable="yes">Name</property>
@@ -438,11 +488,8 @@
<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>
@@ -467,11 +514,8 @@
<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>
@@ -499,11 +543,8 @@
<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>
@@ -534,7 +575,7 @@
</packing>
</child>
<child internal-child="action_area">
- <object class="GtkHButtonBox"
id="GNUNET_GTK_identity_advertise_action_area">
+ <object class="GtkButtonBox"
id="GNUNET_GTK_identity_advertise_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -586,56 +627,4 @@
<action-widget
response="-6">GNUNET_GTK_identity_advertise_cancel_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore"
id="GNUNET_GTK_identity_metadata_types_liststore">
- <columns>
- <!-- column-name type_as_string -->
- <column type="gchararray"/>
- <!-- column-name type_as_enum -->
- <column type="guint"/>
- </columns>
- </object>
- <object class="GtkListStore" id="anonymity_level_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="GtkAdjustment" id="expiration_year_adjustment">
- <property name="upper">9999</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
- <object class="GtkAdjustment" id="priority_adjustment">
- <property name="upper">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="value">5</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_a.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_a.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_a.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -17,6 +17,23 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
+ <columns>
+ <!-- column-name relativetime -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">7 days</col>
+ </row>
+ <row>
+ <col id="0">1 day</col>
+ </row>
+ <row>
+ <col id="0">1 h</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="edit_a_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -25,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -112,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -199,8 +215,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_a_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -251,6 +265,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -266,6 +281,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -280,6 +296,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -336,6 +353,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -353,6 +371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -371,6 +390,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -430,8 +450,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -462,8 +480,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -494,8 +510,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
@@ -558,21 +572,4 @@
<action-widget response="-5">edit_dialog_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
- <columns>
- <!-- column-name relativetime -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">7 days</col>
- </row>
- <row>
- <col id="0">1 day</col>
- </row>
- <row>
- <col id="0">1 h</col>
- </row>
- </data>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -17,6 +17,23 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
+ <columns>
+ <!-- column-name relativetime -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">7 days</col>
+ </row>
+ <row>
+ <col id="0">1 day</col>
+ </row>
+ <row>
+ <col id="0">1 h</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="edit_aaaa_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -25,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -112,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -199,8 +215,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_aaaa_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -251,6 +265,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -266,6 +281,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -280,6 +296,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -336,6 +353,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -353,6 +371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -371,6 +390,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -430,8 +450,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -462,8 +480,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -494,8 +510,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
@@ -558,21 +572,4 @@
<action-widget response="-5">edit_dialog_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
- <columns>
- <!-- column-name relativetime -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">7 days</col>
- </row>
- <row>
- <col id="0">1 day</col>
- </row>
- <row>
- <col id="0">1 h</col>
- </row>
- </data>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_cert.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_cert.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_cert.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -17,6 +17,23 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
+ <columns>
+ <!-- column-name relativetime -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">7 days</col>
+ </row>
+ <row>
+ <col id="0">1 day</col>
+ </row>
+ <row>
+ <col id="0">1 h</col>
+ </row>
+ </data>
+ </object>
<object class="GtkDialog" id="edit_a_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -25,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -112,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -213,6 +229,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -230,6 +247,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_cert_type_pkix_radiobutton</property>
@@ -272,8 +290,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -316,11 +332,8 @@
</property>
<property name="max_length">15</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNS_edit_dialog_cert_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -396,6 +409,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -411,6 +425,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -425,6 +440,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -481,6 +497,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -498,6 +515,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -516,6 +534,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -575,8 +594,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -607,8 +624,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -639,8 +654,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
@@ -703,21 +716,4 @@
<action-widget response="-5">edit_dialog_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
- <columns>
- <!-- column-name relativetime -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">7 days</col>
- </row>
- <row>
- <col id="0">1 day</col>
- </row>
- <row>
- <col id="0">1 h</col>
- </row>
- </data>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,9 +42,10 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_dialog_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkFrame" id="edit_dialog_name_frame">
@@ -71,8 +72,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -155,11 +154,8 @@
<property name="tooltip_text" translatable="yes">Enter
the name of the DNS domain that this label delegates to. Resolution will
continue under the given target domain, asking the DNS server specified
below.</property>
<property name="max_length">253</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNS_edit_dialog_gns2dns_ns_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -217,8 +213,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_gns2dns_ip_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -269,6 +263,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -284,6 +279,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -298,6 +294,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -354,6 +351,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -371,6 +369,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -389,6 +388,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -448,8 +448,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -480,8 +478,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -512,8 +508,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
@@ -569,7 +563,7 @@
</packing>
</child>
<child internal-child="action_area">
- <object class="GtkHButtonBox" id="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -216,8 +215,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_leho_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -268,6 +265,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -283,6 +281,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -297,6 +296,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -353,6 +353,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -370,6 +371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -479,8 +480,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -511,8 +510,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -47,12 +47,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -134,8 +135,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -221,8 +220,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_mx_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -251,8 +248,6 @@
<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">mx_distance_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -304,6 +299,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -319,6 +315,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -333,6 +330,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -389,6 +387,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -406,6 +405,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -424,6 +424,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -483,8 +484,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -515,8 +514,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -547,8 +544,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -48,12 +48,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -135,8 +136,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -235,8 +234,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_phone_peer_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -266,8 +263,6 @@
<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">phone_line_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -319,6 +314,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -334,6 +330,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -348,6 +345,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -404,6 +402,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -421,6 +420,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -439,6 +439,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -498,8 +499,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -530,8 +529,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -562,8 +559,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -216,8 +215,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_pkey_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -268,6 +265,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -283,6 +281,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -297,6 +296,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -353,6 +353,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -370,6 +371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -479,8 +480,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -511,8 +510,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -216,8 +215,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_ptr_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -268,6 +265,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -283,6 +281,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -297,6 +296,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -353,6 +353,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -370,6 +371,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -388,6 +390,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -447,8 +450,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -479,8 +480,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -511,8 +510,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -71,12 +71,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -158,8 +159,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -335,8 +334,6 @@
<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">soa_serial_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -355,8 +352,6 @@
<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">soa_refresh_time_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -375,8 +370,6 @@
<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">soa_retry_time_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -395,8 +388,6 @@
<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">soa_expire_time_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -415,8 +406,6 @@
<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">soa_minimum_ttl_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -435,8 +424,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_soa_source_host_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -452,8 +439,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_soa_contact_email_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -505,6 +490,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -520,6 +506,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -534,6 +521,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -590,6 +578,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -607,6 +596,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -625,6 +615,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -684,8 +675,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -716,8 +705,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -748,8 +735,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -57,12 +57,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -144,8 +145,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -281,8 +280,6 @@
<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">srv_priority_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -299,8 +296,6 @@
<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">srv_weight_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -319,8 +314,6 @@
<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">srv_port_adjustment</property>
<property name="numeric">True</property>
</object>
@@ -339,8 +332,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_srv_target_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -392,6 +383,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -407,6 +399,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -421,6 +414,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -477,6 +471,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -494,6 +489,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -512,6 +508,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -571,8 +568,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -603,8 +598,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -635,8 +628,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -230,6 +229,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -247,6 +247,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
@@ -264,6 +265,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property
name="yalign">0.60000002384185791</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
@@ -282,6 +284,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
@@ -323,6 +326,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -339,6 +343,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_selector_full_cert_radiobutton</property>
@@ -380,6 +385,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -396,6 +402,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
@@ -413,6 +420,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
@@ -495,11 +503,8 @@
</property>
<property name="max_length">15</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="GNS_edit_dialog_tlsa_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -575,6 +580,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -590,6 +596,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -604,6 +611,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -660,6 +668,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -677,6 +686,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -695,6 +705,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -754,8 +765,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -786,8 +795,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -818,8 +825,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -215,8 +214,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_txt_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -267,6 +264,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -282,6 +280,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -296,6 +295,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -352,6 +352,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -369,6 +370,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -387,6 +389,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -446,8 +449,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -478,8 +479,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -510,8 +509,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade 2014-05-26 13:46:08 UTC
(rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade 2014-05-26 14:14:05 UTC
(rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
<property name="upper">23</property>
<property name="step_increment">1</property>
@@ -42,12 +42,13 @@
<property name="destroy_with_parent">True</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkVBox" id="edit_dialog_vbox">
+ <object class="GtkBox" id="edit_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="edit_dialog_action_area">
+ <object class="GtkButtonBox" id="edit_dialog_action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
@@ -129,8 +130,6 @@
<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>
</object>
<packing>
<property name="expand">True</property>
@@ -256,6 +255,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Service is available via TCP</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
</object>
@@ -272,6 +272,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Service is available via UDP</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_vpn_protocol_tcp_radiobutton</property>
@@ -297,8 +298,6 @@
<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>
<signal name="changed"
handler="GNS_edit_dialog_vpn_peer_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -316,8 +315,6 @@
<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>
</object>
<packing>
<property name="left_attach">1</property>
@@ -368,6 +365,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">Not
that while it is recommended that 'private' records should be in the 'private
zone', you are allowed to mark records in other zones as private as well.
Please be aware that once a record is made public, you are less free to change
expiration times. Most importantly, if your record is set to never expire, you
will never be able to change the mapping in the future if the record is
public.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -383,6 +381,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text" translatable="yes">A
shadow record is a record which becomes valid in the future. They are not used
as long as a second non-expired record with the same name and type exists. This
is useful if a mapping is to be changed as soon as an existing record expires.
For example, if a users are supposed to switch at midnight from one IP address
to another, two records would be placed into the system: one that is valid
until midnight, and a second "shadow" record that becomes valid at
midnight.</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -397,6 +396,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
</object>
<packing>
@@ -453,6 +453,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with a relative expiration time (such as 1 week) are
always valid for at least that time period into the future. In other words, the
auto-renew their own expiration to the given time period into the future. When
you convert a public record with a relative expiration time to one with an
absolute expiration time, the earliest possible expiration will be the
respective relative time in the future. Use relative expiration times for
entries for which you do not know a specific date when they will
expire.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled"
handler="GNS_edit_dialog_expiration_relative_radiobutton_toggled_cb"
swapped="no"/>
@@ -470,6 +471,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records with an absolute expiration time are valid until the
specified date. You can change that date to an even later date, but you cannot
set it to an earlier time (as other users may have cached the longer expiration
time). Use absolute expiration times if you know that a particular record will
only be valid until a particular day.</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -488,6 +490,7 @@
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="tooltip_text"
translatable="yes">Records can be set to be valid forever. This is great if you
are worried about censorship or certain that the mapping will never change.
Note that if you set a public record to never expire, you cannot later change
it (as other users are free to cache the old value forever).</property>
+ <property name="xalign">0.5</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
@@ -547,8 +550,6 @@
<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">absolute_expiration_hours_adjustment</property>
</object>
<packing>
@@ -579,8 +580,6 @@
<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">absolute_expiration_minutes_adjustment</property>
</object>
<packing>
@@ -611,8 +610,6 @@
<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">absolute_expiration_seconds_adjustment</property>
</object>
<packing>
Modified: gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,7 +1,120 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
- <!-- interface-naming-policy toplevel-contextual -->
+ <requires lib="gtk+" version="3.0"/>
+ <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="tooltip_text" translatable="yes">Edit GNS
entry</property>
+ <property name="label" translatable="yes">Edit</property>
+ <signal name="activate"
handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
+ </object>
+ </child>
+ </object>
+ <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
+ <columns>
+ <!-- column-name name -->
+ <column type="gchararray"/>
+ <!-- column-name is_public -->
+ <column type="gboolean"/>
+ <!-- column-name record_type -->
+ <column type="guint"/>
+ <!-- column-name record_type_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name expiration_time -->
+ <column type="guint64"/>
+ <!-- column-name expiration_time_is_relative -->
+ <column type="gboolean"/>
+ <!-- column-name expiration_time_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_as_string -->
+ <column type="gchararray"/>
+ <!-- column-name value_color -->
+ <column type="gchararray"/>
+ <!-- column-name name_is_editable -->
+ <column type="gboolean"/>
+ <!-- column-name name_is_record_row -->
+ <column type="gboolean"/>
+ <!-- column-name not_dummy_row -->
+ <column type="gboolean"/>
+ <!-- column-name expiration_time_color -->
+ <column type="gchararray"/>
+ <!-- column-name name_color -->
+ <column type="gchararray"/>
+ <!-- column-name type_is_editable -->
+ <column type="gboolean"/>
+ <!-- column-name is_shadow -->
+ <column type="gboolean"/>
+ <!-- column-name name_is_editable1 -->
+ <column type="gboolean"/>
+ <!-- column-name record_offset -->
+ <column type="guint"/>
+ <!-- column-name record_is_pending -->
+ <column type="gboolean"/>
+ </columns>
+ </object>
+ <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
+ <columns>
+ <!-- column-name type -->
+ <column type="guint"/>
+ <!-- column-name typename -->
+ <column type="gchararray"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0">1</col>
+ <col id="1">A</col>
+ </row>
+ <row>
+ <col id="0">5</col>
+ <col id="1">CNAME</col>
+ </row>
+ <row>
+ <col id="0">15</col>
+ <col id="1">MX</col>
+ </row>
+ <row>
+ <col id="0">16</col>
+ <col id="1">TXT</col>
+ </row>
+ <row>
+ <col id="0">28</col>
+ <col id="1">AAAA</col>
+ </row>
+ <row>
+ <col id="0">65536</col>
+ <col id="1">PKEY</col>
+ </row>
+ <row>
+ <col id="0">65538</col>
+ <col id="1">LEHO</col>
+ </row>
+ <row>
+ <col id="0">65539</col>
+ <col id="1">VPN</col>
+ </row>
+ <row>
+ <col id="0">65540</col>
+ <col id="1">GNS2DNS</col>
+ </row>
+ <row>
+ <col id="0">65542</col>
+ <col id="1">PHONE</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkListStore" id="zone_liststore">
+ <columns>
+ <!-- column-name ego_name -->
+ <column type="gchararray"/>
+ <!-- column-name ego -->
+ <column type="gpointer"/>
+ </columns>
+ </object>
<object class="GtkDialog" id="gnunet_namestore_gtk_dialog">
<property name="width_request">800</property>
<property name="height_request">600</property>
@@ -14,9 +127,10 @@
<property name="type_hint">normal</property>
<signal name="destroy" handler="gnunet_namestore_gtk_quit_cb"
swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox" id="gnunet_namestore_gtk_dialog-vbox">
+ <object class="GtkBox" id="gnunet_namestore_gtk_dialog-vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkVBox" id="gnunet_namestore_gtk_vbox">
@@ -94,11 +208,8 @@
<property name="max_length">63</property>
<property name="invisible_char">●</property>
<property name="width_chars">32</property>
- <property name="invisible_char_set">True</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <property
name="primary_icon_sensitive">True</property>
- <property
name="secondary_icon_sensitive">True</property>
<signal name="changed"
handler="gnunet_namestore_gtk_pseu_entry_changed_cb" swapped="no"/>
</object>
<packing>
@@ -209,8 +320,6 @@
<child>
<object class="GtkScrolledWindow"
id="gnunet_namestore_gtk_scrolledwindow">
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">automatic</property>
- <property name="vscrollbar_policy">automatic</property>
<child>
<object class="GtkTreeView"
id="gnunet_namestore_gtk_treeview">
<property name="visible">True</property>
@@ -220,6 +329,9 @@
<signal name="button-press-event"
handler="gnunet_namestore_gtk_treeview_button_press_event_cb" swapped="no"/>
<signal name="key-press-event"
handler="gnunet_namestore_gtk_treeview_key_press_event_cb" swapped="no"/>
<signal name="popup-menu"
handler="gnunet_namestore_gtk_treeview_popup_menu_cb" swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection"
id="treeview-selection1"/>
+ </child>
<child>
<object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_name_treeviewcolumn">
<property name="title">Name</property>
@@ -346,7 +458,7 @@
</packing>
</child>
<child internal-child="action_area">
- <object class="GtkHButtonBox"
id="gnunet_namestore_gtk_dialog-action_area">
+ <object class="GtkButtonBox"
id="gnunet_namestore_gtk_dialog-action_area">
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
@@ -404,117 +516,4 @@
<action-widget
response="-3">gnunet_namestore_gtk_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkMenu" id="gnunet_namestore_gtk_edit_popup_menu">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="tooltip_text" translatable="yes">Edit GNS
entry</property>
- <property name="label" translatable="yes">Edit</property>
- <signal name="activate"
handler="gnunet_namestore_gtk_popup_edit_button_activate_cb" swapped="no"/>
- </object>
- </child>
- </object>
- <object class="GtkTreeStore" id="gnunet_namestore_gtk_treestore">
- <columns>
- <!-- column-name name -->
- <column type="gchararray"/>
- <!-- column-name is_public -->
- <column type="gboolean"/>
- <!-- column-name record_type -->
- <column type="guint"/>
- <!-- column-name record_type_as_string -->
- <column type="gchararray"/>
- <!-- column-name expiration_time -->
- <column type="guint64"/>
- <!-- column-name expiration_time_is_relative -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_as_string -->
- <column type="gchararray"/>
- <!-- column-name value_color -->
- <column type="gchararray"/>
- <!-- column-name name_is_editable -->
- <column type="gboolean"/>
- <!-- column-name name_is_record_row -->
- <column type="gboolean"/>
- <!-- column-name not_dummy_row -->
- <column type="gboolean"/>
- <!-- column-name expiration_time_color -->
- <column type="gchararray"/>
- <!-- column-name name_color -->
- <column type="gchararray"/>
- <!-- column-name type_is_editable -->
- <column type="gboolean"/>
- <!-- column-name is_shadow -->
- <column type="gboolean"/>
- <!-- column-name name_is_editable1 -->
- <column type="gboolean"/>
- <!-- column-name record_offset -->
- <column type="guint"/>
- <!-- column-name record_is_pending -->
- <column type="gboolean"/>
- </columns>
- </object>
- <object class="GtkListStore" id="gnunet_namestore_gtk_type_liststore">
- <columns>
- <!-- column-name type -->
- <column type="guint"/>
- <!-- column-name typename -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">1</col>
- <col id="1">A</col>
- </row>
- <row>
- <col id="0">5</col>
- <col id="1">CNAME</col>
- </row>
- <row>
- <col id="0">15</col>
- <col id="1">MX</col>
- </row>
- <row>
- <col id="0">16</col>
- <col id="1">TXT</col>
- </row>
- <row>
- <col id="0">28</col>
- <col id="1">AAAA</col>
- </row>
- <row>
- <col id="0">65536</col>
- <col id="1">PKEY</col>
- </row>
- <row>
- <col id="0">65538</col>
- <col id="1">LEHO</col>
- </row>
- <row>
- <col id="0">65539</col>
- <col id="1">VPN</col>
- </row>
- <row>
- <col id="0">65540</col>
- <col id="1">GNS2DNS</col>
- </row>
- <row>
- <col id="0">65542</col>
- <col id="1">PHONE</col>
- </row>
- </data>
- </object>
- <object class="GtkListStore" id="zone_liststore">
- <columns>
- <!-- column-name ego_name -->
- <column type="gchararray"/>
- <!-- column-name ego -->
- <column type="gpointer"/>
- </columns>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_namestore_gtk_qr_save_as_dialog.glade
2014-05-26 14:14:05 UTC (rev 33393)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.24"/>
- <!-- interface-naming-policy project-wide -->
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkFileChooserDialog"
id="gnunet_namestore_gtk_qr_save_as_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -14,12 +14,13 @@
<property name="action">save</property>
<signal name="response"
handler="gnunet_namestore_gtk_qr_save_as_dialog_response_cb" swapped="no"/>
<child internal-child="vbox">
- <object class="GtkVBox"
id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-vbox">
+ <object class="GtkBox"
id="gnunet_namestore_gtk_qr_save_as_dialog_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_namestore_gtk_qr_save_as_dialog_dialog-action_area">
+ <object class="GtkButtonBox"
id="gnunet_namestore_gtk_qr_save_as_dialog_dialog-action_area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
Modified: gnunet-gtk/contrib/gnunet_statistics_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_statistics_gtk_main_window.glade 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/contrib/gnunet_statistics_gtk_main_window.glade 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
<interface>
- <requires lib="gtk+" version="2.20"/>
+ <requires lib="gtk+" version="3.0"/>
<object class="GtkWindow" id="GNUNET_STATISTICS_GTK_main_window">
<property name="can_focus">False</property>
<property name="title" translatable="yes">gnunet-statistics-gtk</property>
@@ -19,9 +20,9 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem"
id="GNUNET_STATISTICS_GTK_main_menu_help">
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="use_action_appearance">False</property>
<property name="label" translatable="yes">_Help</property>
<property name="use_underline">True</property>
<child type="submenu">
@@ -31,10 +32,10 @@
<child>
<object class="GtkImageMenuItem"
id="GNUNET_STATISTICS_GTK_main_menu_help_about">
<property name="label">gtk-about</property>
+ <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text"
translatable="yes">Display information about this version of
gnunet-statistics-gtk</property>
- <property name="use_action_appearance">False</property>
<property
name="accel_path"><gnunet-statistics-gtk>/Help/About</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
@@ -60,7 +61,6 @@
<object class="GtkHBox"
id="GNUNET_STATISTICS_GTK_connectivity_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@@ -81,7 +81,6 @@
<object class="GtkHBox" id="GNUNET_STATISTICS_GTK_traffic_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
@@ -106,7 +105,6 @@
<object class="GtkHBox" id="GNUNET_STATISTICS_GTK_storage_box">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
<placeholder/>
</child>
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.c 2014-05-26
14:14:05 UTC (rev 33393)
@@ -1072,9 +1072,15 @@
*
* @param arg arguments given to the command
*/
-extern void
-do_call (const char *arg)
+void
+GSC_do_call (const char *arg)
{
+ GtkEntry *address_entry;
+
+ address_entry = GTK_ENTRY (GCG_get_main_window_object
("GNUNET_GTK_conversation_address"));
+ gtk_entry_set_text (address_entry,
+ address);
+
if (NULL == caller_id)
{
GCG_log (_("Ego `%s' not available\n"), ego_name);
@@ -1556,7 +1562,7 @@
address_entry = GTK_ENTRY (GCG_get_main_window_object
("GNUNET_GTK_conversation_address"));
- do_call (gtk_entry_get_text(address_entry));
+ GSC_do_call (gtk_entry_get_text(address_entry));
//disable_button ("GNUNET_GTK_conversation_accept_button");
do_status ();
// free(to_addr);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk.h
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-05-26
13:46:08 UTC (rev 33392)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk.h 2014-05-26
14:14:05 UTC (rev 33393)
@@ -187,8 +187,13 @@
...);
+/**
+ * Initiate a call to the given address.
+ *
+ * @param address address to call
+ */
extern void
-do_call(const char*);
+GSC_do_call (const char *address);
Modified: gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
===================================================================
--- gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-05-26 13:46:08 UTC (rev 33392)
+++ gnunet-gtk/src/conversation/gnunet-conversation-gtk_contacts.c
2014-05-26 14:14:05 UTC (rev 33393)
@@ -57,22 +57,12 @@
static GtkListStore *contacts_liststore;
/**
- * zone treeview
- */
-static GtkTreeView *zone_treeview;
-
-/**
- * zone tree model
- */
-static GtkTreeModel *zone_treemodel;
-
-/**
* The main tree view for 'gns' that shows the records.
*/
static GtkTreeView *contacts_treeview;
/**
- * Tree model (same object as 'contacts_treestore', just different type).
+ * Tree model of the #contacts_treeview, same objects as #contacts_liststore.
*/
static GtkTreeModel *contacts_treemodel;
@@ -292,54 +282,59 @@
* FIXME: what was clicked where?
*/
void
-GNUNET_CONVERSATION_GTK_on_current_clicked (GtkButton *button,
- gpointer *user_data)
+GNUNET_CONVERSATION_GTK_use_current_button_clicked (GtkButton *button,
+ gpointer *user_data)
{
GtkEntry *addressEntry;
addressEntry = GTK_ENTRY (GCG_get_main_window_object
("GNUNET_GTK_conversation_addressAdd"));
gtk_entry_set_text (addressEntry,
"FIXME");
-
}
/**
* A row was activated in the contacts list. Initiate call.
*
- * @return void
+ * @param tree_view view where the row was activated
+ * @param path path to the activated element
+ * @param column column that was activated
+ * @param user_data builder context (unused)
*/
void
-GNUNET_CONVERSATION_GTK_row_activated ()
+GNUNET_CONVERSATION_GTK_row_activated (GtkTreeView *tree_view,
+ GtkTreePath *path,
+ GtkTreeViewColumn *column,
+ gpointer user_data)
{
char *address;
gchar *type;
- GtkTreeSelection *selection;
- GtkTreeIter iterA;
- GtkEntry *address_entry;
+ GtkTreeIter iter;
- selection = gtk_tree_view_get_selection (contacts_treeview);
- gtk_tree_selection_get_selected (selection, &contacts_treemodel, &iterA);
+ gtk_tree_model_get_iter (contacts_treemodel,
+ path,
+ &iter);
gtk_tree_model_get (contacts_treemodel,
- &iterA,
+ &iter,
CONTACTS_LS_NAME, &name,
CONTACTS_LS_TYPE, &type,
-1);
if (0 == strcmp (type, "PKEY"))
{
- GNUNET_asprintf (&address, "call.%s.gnu", name);
+ GNUNET_asprintf (&address,
+ "call.%s.gnu",
+ name);
}
else
{
GNUNET_assert (0 == strcmp (type, "PHONE"));
- GNUNET_asprintf (&address, "%s.gnu", name);
+ GNUNET_asprintf (&address,
+ "%s.gnu",
+ name);
}
+ g_free (name);
g_free (type);
-
- address_entry = GTK_ENTRY (GCG_get_main_window_object
("GNUNET_GTK_conversation_address"));
- gtk_entry_set_text (address_entry,
- address);
- do_call (address);
+ GSC_do_call (address);
GNUNET_free (address);
}
@@ -395,12 +390,12 @@
/* check if exists, if so, update or remove */
update = FALSE;
- if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (contacts_liststore),
+ if (gtk_tree_model_get_iter_first (contacts_treemodel,
&iter))
{
do
{
- gtk_tree_model_get (GTK_TREE_MODEL(contacts_liststore),
+ gtk_tree_model_get (contacts_treemodel,
&iter,
CONTACTS_LS_NAME, &lname,
-1);
@@ -421,7 +416,7 @@
}
g_free (lname);
}
- while (gtk_tree_model_iter_next (GTK_TREE_MODEL(contacts_liststore),
+ while (gtk_tree_model_iter_next (contacts_treemodel,
&iter));
}
@@ -497,15 +492,11 @@
contacts_liststore
= GTK_LIST_STORE (GCG_get_main_window_object
("gnunet_conversation_gtk_contacts_liststore"));
- contacts_treemodel = GTK_TREE_MODEL (contacts_liststore);
+ contacts_treemodel
+ = GTK_TREE_MODEL (contacts_liststore);
contacts_treeview
= GTK_TREE_VIEW (GCG_get_main_window_object
("gnunet_conversation_gtk_treeview"));
// gtk_tree_view_set_activate_on_single_click (contacts_treeview, TRUE);
-
- zone_treemodel
- = GTK_TREE_MODEL (GCG_get_main_window_object
("gnunet_conversation_gtk_contacts_zone_liststore"));
- zone_treeview
- = GTK_TREE_VIEW (GCG_get_main_window_object
("gnunet_conversation_gtk_zone_treeview"));
ns = GNUNET_NAMESTORE_connect (GCG_get_configuration ());
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33393 - in gnunet-gtk: contrib src/conversation,
gnunet <=