[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33112 - in gnunet-gtk: contrib src/include src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33112 - in gnunet-gtk: contrib src/include src/namestore |
|
Date: |
Fri, 18 Apr 2014 14:20:36 +0200 |
Author: grothoff
Date: 2014-04-18 14:20:36 +0200 (Fri, 18 Apr 2014)
New Revision: 33112
Modified:
gnunet-gtk/contrib/gnunet_namestore_edit_a.glade
gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade
gnunet-gtk/contrib/gnunet_namestore_edit_cname.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_txt.glade
gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade
gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
gnunet-gtk/contrib/gnunet_setup_main_window.glade
gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
Log:
enable editing pending flag in gnunet-namestore-gtk
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_a.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_a.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_a.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -17,23 +17,6 @@
<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>
@@ -54,7 +37,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +51,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +65,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -125,8 +105,8 @@
<child>
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="can_focus">False</property>
- <property name="sensitive">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -267,7 +247,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -283,7 +262,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -296,6 +274,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -340,7 +332,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -358,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -377,7 +367,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -569,4 +558,21 @@
<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-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_aaaa.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -37,7 +37,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -52,7 +51,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -67,7 +65,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -109,6 +106,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -249,7 +247,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -265,7 +262,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -278,6 +274,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -322,7 +332,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -340,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -359,7 +367,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_cname.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_cname.glade 2014-04-18
12:20:18 UTC (rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_cname.glade 2014-04-18
12:20:36 UTC (rev 33112)
@@ -37,7 +37,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -52,7 +51,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -67,7 +65,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -109,6 +106,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -249,7 +247,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -265,7 +262,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -278,6 +274,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -322,7 +332,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -340,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -359,7 +367,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade 2014-04-18
12:20:18 UTC (rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_gns2dns.glade 2014-04-18
12:20:36 UTC (rev 33112)
@@ -292,6 +292,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_leho.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -54,7 +54,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +68,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +82,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -126,6 +123,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -266,7 +264,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -282,7 +279,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,6 +291,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -339,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +366,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -376,7 +384,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_mx.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -59,7 +59,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -74,7 +73,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -89,7 +87,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -131,6 +128,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -302,7 +300,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -318,7 +315,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -331,6 +327,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -375,7 +385,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -393,7 +402,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -412,7 +420,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade 2014-04-18
12:20:18 UTC (rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_phone.glade 2014-04-18
12:20:36 UTC (rev 33112)
@@ -60,7 +60,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -75,7 +74,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -90,7 +88,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -318,7 +315,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -334,7 +330,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -347,6 +342,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -391,7 +400,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -409,7 +417,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -428,7 +435,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_pkey.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -54,7 +54,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +68,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +82,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -126,6 +123,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -266,7 +264,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -282,7 +279,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,6 +291,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -339,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +366,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -376,7 +384,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_ptr.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -54,7 +54,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +68,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +82,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -126,6 +123,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -266,7 +264,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -282,7 +279,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,6 +291,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -339,7 +349,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +366,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -376,7 +384,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_soa.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -83,7 +83,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -98,7 +97,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -113,7 +111,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -155,6 +152,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -246,8 +244,8 @@
<property name="label" translatable="yes">Source
host:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -259,8 +257,8 @@
<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>
@@ -272,8 +270,8 @@
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -285,8 +283,8 @@
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -298,8 +296,8 @@
<packing>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -311,8 +309,8 @@
<packing>
<property name="top_attach">5</property>
<property name="bottom_attach">6</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -324,8 +322,8 @@
<packing>
<property name="top_attach">6</property>
<property name="bottom_attach">7</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -503,7 +501,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -519,7 +516,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -532,6 +528,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -576,7 +586,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -594,7 +603,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -613,7 +621,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -69,7 +69,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +83,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -99,7 +97,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -141,6 +138,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -232,8 +230,8 @@
<property name="label"
translatable="yes">Priority:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -245,8 +243,8 @@
<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>
@@ -258,8 +256,8 @@
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -271,8 +269,8 @@
<packing>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -390,7 +388,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -406,7 +403,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -419,6 +415,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -463,7 +473,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -481,7 +490,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -500,7 +508,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_txt.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -54,7 +54,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +68,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +82,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -126,6 +123,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -214,7 +212,6 @@
<property name="can_focus">True</property>
<property name="has_focus">True</property>
<property name="tooltip_text" translatable="yes">Enter
the IPv4 address for the A record here. The format is the usual dotted-decimal
format (i.e. 127.0.0.1).</property>
- <property name="max_length">0</property>
<property name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
@@ -266,7 +263,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -282,7 +278,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -295,6 +290,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -339,7 +348,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -357,7 +365,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -376,7 +383,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_vpn.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -54,7 +54,6 @@
<child>
<object class="GtkButton" id="edit_dialog_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -69,7 +68,6 @@
<child>
<object class="GtkButton" id="edit_dialog_delete_button">
<property name="label">gtk-delete</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -84,7 +82,6 @@
<child>
<object class="GtkButton" id="edit_dialog_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="can_default">True</property>
@@ -126,6 +123,7 @@
<object class="GtkEntry" id="edit_dialog_name_entry">
<property name="visible">True</property>
<property name="sensitive">False</property>
+ <property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Name
of the record in the zone.</property>
<property name="max_length">63</property>
<property name="invisible_char">●</property>
@@ -217,8 +215,8 @@
<property name="label"
translatable="yes">Protocol:</property>
</object>
<packing>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -230,8 +228,8 @@
<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>
@@ -243,8 +241,8 @@
<packing>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
+ <property name="x_options"/>
+ <property name="y_options"/>
</packing>
</child>
<child>
@@ -254,7 +252,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_vpn_protocol_tcp_radiobutton">
<property name="label"
translatable="yes">TCP</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -271,7 +268,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_vpn_protocol_udp_radiobutton">
<property name="label"
translatable="yes">UDP</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -368,7 +364,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_public_checkbutton">
<property name="label" translatable="yes">Record is
public (visible to other users)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -384,7 +379,6 @@
<child>
<object class="GtkCheckButton"
id="edit_dialog_options_shadow_checkbutton">
<property name="label" translatable="yes">Record is a
shadow record (valid after other records expire)</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -397,6 +391,20 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkCheckButton"
id="edit_dialog_options_pending_checkbutton">
+ <property name="label" translatable="yes">Record is
pending approval (not currently usable for anyone)</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
</child>
</object>
@@ -441,7 +449,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_relative_radiobutton">
<property name="label"
translatable="yes">Relative</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -459,7 +466,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_absolute_radiobutton">
<property name="label"
translatable="yes">Absolute</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -478,7 +484,6 @@
<child>
<object class="GtkRadioButton"
id="edit_dialog_expiration_never_radiobutton">
<property name="label"
translatable="yes">Never</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2014-04-18
12:20:18 UTC (rev 33111)
+++ gnunet-gtk/contrib/gnunet_namestore_gtk_main_window.glade 2014-04-18
12:20:36 UTC (rev 33112)
@@ -50,7 +50,6 @@
<child>
<object class="GtkButton"
id="gnunet_namestore_gtk_public_key_copy_button">
<property name="label">gtk-copy</property>
- <property
name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -174,7 +173,6 @@
<child>
<object class="GtkButton"
id="gnunet_namestore_gtk_qr_saveas_button">
<property name="label">gtk-save-as</property>
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
@@ -318,6 +316,16 @@
</child>
</object>
</child>
+ <child>
+ <object class="GtkTreeViewColumn"
id="gnunet_namestore_gtk_ispending_treeviewcolumn">
+ <property name="sizing">fixed</property>
+ <property name="fixed_width">58</property>
+ <property name="title"
translatable="yes">Pending</property>
+ <child>
+ <object class="GtkCellRendererToggle"
id="gnunet_namestore_gtk_ispending_cellrenderertoggle"/>
+ </child>
+ </object>
+ </child>
</object>
</child>
</object>
@@ -341,7 +349,6 @@
<child>
<object class="GtkButton"
id="gnunet_namestore_gtk_cancel_button">
<property name="label">gtk-cancel</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
@@ -355,7 +362,6 @@
<child>
<object class="GtkButton"
id="gnunet_namestore_gtk_save_as_button">
<property name="label">gtk-save-as</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
@@ -369,7 +375,6 @@
<child>
<object class="GtkButton" id="gnunet_namestore_gtk_save_button">
<property name="label">gtk-save</property>
- <property name="use_action_appearance">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_stock">True</property>
@@ -401,7 +406,6 @@
<property name="can_focus">False</property>
<child>
<object class="GtkMenuItem" id="gnunet_namestore_gtk_popup_edit_button">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Edit GNS
entry</property>
@@ -444,10 +448,12 @@
<column type="gboolean"/>
<!-- column-name is_shadow -->
<column type="gboolean"/>
- <!-- column-name name_is_editable1 -->
+ <!-- column-name name_is_editable -->
<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">
@@ -467,14 +473,6 @@
<col id="1">CNAME</col>
</row>
<row>
- <col id="0">6</col>
- <col id="1">SOA</col>
- </row>
- <row>
- <col id="0">12</col>
- <col id="1">PTR</col>
- </row>
- <row>
<col id="0">15</col>
<col id="1">MX</col>
</row>
Modified: gnunet-gtk/contrib/gnunet_setup_main_window.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_setup_main_window.glade 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/contrib/gnunet_setup_main_window.glade 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -16,6 +16,13 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment"
id="GNUNET_setup_exit_interface_mask_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">127</property>
+ <property name="value">48</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="GNUNET_setup_dialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>
@@ -369,8 +376,25 @@
<property name="position">1</property>
</packing>
</child>
+ </object>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel" id="GNUNET_setup_general_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">_General</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="GNUNET_setup_hostlist_frame">
+ <object class="GtkFrame"
id="GNUNET_setup_hostlist_general_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label_xalign">0</property>
@@ -612,20 +636,322 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">5</property>
- <property name="position">2</property>
+ <property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkFrame"
id="GNUNET_setup_hostlist_proxy_frame">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment"
id="GNUNET_setup_hostlist_proxy_alignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
+ <child>
+ <object class="GtkVBox"
id="GNUNET_setup_hostlist_proxy_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_hostlist_proxy_type_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_hostlist_proxy_type_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">_Proxy type:</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox"
id="GNUNET_setup_hostlist_proxy_type_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_none_radiobutton">
+ <property name="label"
translatable="yes">no proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_http_radiobutton">
+ <property name="label"
translatable="yes">HTTP proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_http_10_radiobutton">
+ <property name="label"
translatable="yes">HTTP 1.0 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_socks4_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_socks4a_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4a proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_socks5_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_hostlist_proxy_type_socks5_hostname_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy with hostname</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_hostlist_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_hostlist_proxy_hostname_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_hostlist_proxy_hostname_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy hostname:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_hostlist_proxy_hostname_entry">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_hostlist_proxy_username_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_hostlist_proxy_username_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy username:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_hostlist_proxy_username_entry">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_hostlist_proxy_password_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_hostlist_proxy_password_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy password:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_hostlist_proxy_password_entry">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel"
id="GNUNET_setup_hostlist_proxy_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes"><b>Proxy configuration</b></property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="GNUNET_setup_general_label">
+ <object class="GtkLabel" id="GNUNET_setup_hostlist_labe">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">_General</property>
+ <property name="label" translatable="yes">_Hostlist</property>
<property name="use_underline">True</property>
</object>
<packing>
+ <property name="position">1</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -1029,7 +1355,7 @@
</child>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
<child type="tab">
@@ -1040,7 +1366,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">1</property>
+ <property name="position">2</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -1649,7 +1975,7 @@
</packing>
</child>
<child>
- <object class="GtkVBox"
id="GNUNET_setup_transport_http_vbox">
+ <object class="GtkVBox"
id="GNUNET_setup_transport_http_server_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@@ -1844,10 +2170,10 @@
</packing>
</child>
<child type="tab">
- <object class="GtkLabel"
id="GNUNET_setup_transport_http_label">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_server_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">HTTP</property>
+ <property name="label"
translatable="yes">HTTP-Server</property>
</object>
<packing>
<property name="position">2</property>
@@ -1855,6 +2181,296 @@
</packing>
</child>
<child>
+ <object class="GtkVBox"
id="GNUNET_setup_transport_http_client_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_type_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_type_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">_Proxy type:</property>
+ <property
name="use_underline">True</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox"
id="GNUNET_setup_transport_http_client_proxy_type_vbox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_none_radiobutton">
+ <property name="label"
translatable="yes">no proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_radiobutton2">
+ <property name="label"
translatable="yes">HTTP proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_http_10_radiobutton">
+ <property name="label"
translatable="yes">HTTP 1.0 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks4_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks4a_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v4a proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks5_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">5</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkRadioButton"
id="GNUNET_setup_transport_http_client_proxy_type_socks5_hostname_radiobutton">
+ <property name="label"
translatable="yes">SOCKS v5 proxy with hostname</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">False</property>
+ <property
name="active">True</property>
+ <property
name="draw_indicator">True</property>
+ <property
name="group">GNUNET_setup_transport_http_client_proxy_type_none_radiobutton</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">6</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_hostname_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_hostname_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy hostname:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_hostname_entry">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_username_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_username_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy username:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_username_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="invisible_char">●</property>
+ <property
name="primary_icon_activatable">False</property>
+ <property
name="secondary_icon_activatable">False</property>
+ <property
name="primary_icon_sensitive">True</property>
+ <property
name="secondary_icon_sensitive">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox"
id="GNUNET_setup_transport_http_client_proxy_password_hbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_proxy_password_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Proxy password:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">5</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="GNUNET_setup_transport_http_client_proxy_password_entry">
+ <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>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child type="tab">
+ <object class="GtkLabel"
id="GNUNET_setup_transport_http_client_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">HTTP-Client</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ <property name="tab_fill">False</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox"
id="GNUNET_setup_transport_https_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -2046,17 +2662,17 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child type="tab">
<object class="GtkLabel"
id="GNUNET_setup_transport_https_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label"
translatable="yes">HTTPS</property>
+ <property name="label"
translatable="yes">HTTPS-Server</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2069,7 +2685,7 @@
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child type="tab">
@@ -2079,7 +2695,7 @@
<property name="label"
translatable="yes">DV</property>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2134,7 +2750,7 @@
</child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child type="tab">
@@ -2144,7 +2760,7 @@
<property name="label"
translatable="yes">WLAN</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -2169,7 +2785,7 @@
</child>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
</packing>
</child>
<child type="tab">
@@ -2180,7 +2796,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">2</property>
+ <property name="position">3</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -3168,7 +3784,7 @@
</child>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child type="tab">
@@ -3179,7 +3795,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">3</property>
+ <property name="position">4</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -3497,7 +4113,7 @@
</child>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
<child type="tab">
@@ -3509,7 +4125,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">4</property>
+ <property name="position">5</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -4058,7 +4674,7 @@
</child>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
</packing>
</child>
<child type="tab">
@@ -4069,7 +4685,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">5</property>
+ <property name="position">6</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -4335,7 +4951,7 @@
</child>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
</packing>
</child>
<child type="tab">
@@ -4346,7 +4962,7 @@
<property name="use_underline">True</property>
</object>
<packing>
- <property name="position">6</property>
+ <property name="position">7</property>
<property name="tab_fill">False</property>
</packing>
</child>
@@ -4381,13 +4997,6 @@
<action-widget response="-3">GNUNET_setup_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkAdjustment"
id="GNUNET_setup_exit_interface_mask_adjustment">
- <property name="lower">1</property>
- <property name="upper">127</property>
- <property name="value">48</property>
- <property name="step_increment">1</property>
- <property name="page_increment">10</property>
- </object>
<object class="GtkAdjustment"
id="GNUNET_setup_fs_datacache_mysql_port_adjustment">
<property name="lower">1</property>
<property name="upper">65535</property>
Modified: gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h
===================================================================
--- gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h 2014-04-18
12:20:18 UTC (rev 33111)
+++ gnunet-gtk/src/include/gnunet_gtk_namestore_plugin.h 2014-04-18
12:20:36 UTC (rev 33112)
@@ -130,6 +130,11 @@
*/
gboolean n_is_shadow;
+ /**
+ * Is this record pending?
+ */
+ gboolean n_is_pending;
+
};
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-04-18 12:20:18 UTC
(rev 33111)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-04-18 12:20:36 UTC
(rev 33112)
@@ -160,7 +160,13 @@
/**
* A guint; offset of this record in the array.
*/
- GNS_TREESTORE_COL_RECORD_OFFSET
+ GNS_TREESTORE_COL_RECORD_OFFSET,
+
+ /**
+ * A gboolean; TRUE if the record is pending approval
+ * and thus not usable for anyone right now.
+ */
+ GNS_TREESTORE_COL_IS_PENDING
};
@@ -203,7 +209,7 @@
/**
- * Closure for 'operation_done_cont'.
+ * Closure for #operation_done_cont().
*/
struct OperationContext
{
@@ -227,7 +233,7 @@
/**
- * Closure for 'merge_with_existing_records'.
+ * Closure for #merge_with_existing_records().
*/
struct MoveOperationContext
{
@@ -258,6 +264,8 @@
struct GNUNET_CRYPTO_EcdsaPrivateKey pk;
/**
+
+
* Data to free.
*/
void *data;
@@ -614,6 +622,9 @@
/**
* User clicked on 'save as' to extract the QR code. Open 'save as'
* dialog to get the desired filename and file type.
+ *
+ * @param button the 'save as' button
+ * @param user_data unused
*/
void
gnunet_namestore_gtk_qr_saveas_button_clicked_cb (GtkButton *button,
@@ -975,6 +986,8 @@
rd.flags = GNUNET_GNSRECORD_RF_PRIVATE;
if (edc->n_is_shadow)
rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ if (edc->n_is_pending)
+ rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
rd.record_type = edc->record_type;
rd.expiration_time = edc->n_exp_time;
if (edc->n_is_relative)
@@ -1224,6 +1237,10 @@
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
"edit_dialog_options_shadow_checkbutton")),
edc->n_is_shadow);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
+
"edit_dialog_options_pending_checkbutton")),
+ edc->n_is_pending);
+
if (GNUNET_TIME_UNIT_FOREVER_REL.rel_value_us == edc->n_exp_time)
{
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
@@ -1322,6 +1339,9 @@
/* is shadow flag */
edc->n_is_shadow = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (edc->builder,
"edit_dialog_options_shadow_checkbutton")));
+ /* is pending flag */
+ edc->n_is_pending = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON
(gtk_builder_get_object (edc->builder,
+
"edit_dialog_options_pending_checkbutton")));
/* 'forever' expiration time */
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (gtk_builder_get_object
(edc->builder,
@@ -1568,6 +1588,7 @@
edc->n_public = (0 == (rd_old[off].flags & GNUNET_GNSRECORD_RF_PRIVATE));
edc->n_is_relative = (0 != (rd_old[off].flags &
GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
edc->n_is_shadow = (0 != (rd_old[off].flags &
GNUNET_GNSRECORD_RF_SHADOW_RECORD));
+ edc->n_is_pending = (0 != (rd_old[off].flags &
GNUNET_GNSRECORD_RF_PENDING));
edc->n_exp_time = rd_old[off].expiration_time;
edc->old_record_in_namestore = GNUNET_YES;
}
@@ -1943,8 +1964,8 @@
*/
gboolean
gnunet_namestore_gtk_treeview_key_press_event_cb (GtkWidget *widget,
- GdkEventKey *event,
- gpointer user_data)
+ GdkEventKey *event,
+ gpointer user_data)
{
GtkTreeIter iter;
GtkTreeSelection *sel;
@@ -1988,6 +2009,7 @@
guint64 n_exp_time;
gboolean n_is_relative;
gboolean n_is_shadow;
+ gboolean n_is_pending;
char *n_value;
/* Removing a single record */
@@ -2005,6 +2027,7 @@
GNS_TREESTORE_COL_EXP_TIME, &n_exp_time,
GNS_TREESTORE_COL_EXP_TIME_IS_REL, &n_is_relative,
GNS_TREESTORE_COL_IS_SHADOW, &n_is_shadow,
+ GNS_TREESTORE_COL_IS_PENDING, &n_is_pending,
GNS_TREESTORE_COL_VAL_AS_STR, &n_value,
-1);
/* valid name */
@@ -2016,6 +2039,8 @@
rd.flags |= GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION;
if (n_is_shadow)
rd.flags |= GNUNET_GNSRECORD_RF_SHADOW_RECORD;
+ if (n_is_pending)
+ rd.flags |= GNUNET_GNSRECORD_RF_PENDING;
rd.record_type = n_type;
rd.expiration_time = n_exp_time;
if (GNUNET_OK !=
@@ -2235,7 +2260,9 @@
char *val;
char *type_str;
gboolean time_is_relative;
- gboolean public;
+ gboolean is_public;
+ gboolean is_pending;
+ gboolean is_shadow;
guint64 exp_t;
GtkEntry *pseu_entry;
struct GNUNET_HashCode name_hash;
@@ -2345,7 +2372,11 @@
rd[c].data_size);
/* Set public toggle */
- public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) !=
GNUNET_GNSRECORD_RF_PRIVATE);
+ is_public = ((rd[c].flags & GNUNET_GNSRECORD_RF_PRIVATE) !=
GNUNET_GNSRECORD_RF_PRIVATE);
+ /* Set shadow toggle */
+ is_shadow = ((rd[c].flags & GNUNET_GNSRECORD_RF_SHADOW_RECORD) ==
GNUNET_GNSRECORD_RF_SHADOW_RECORD);
+ /* Set pending toggle */
+ is_pending = ((rd[c].flags & GNUNET_GNSRECORD_RF_PENDING) ==
GNUNET_GNSRECORD_RF_PENDING);
/* Expiration time */
time_is_relative = (0 != (rd[c].flags &
GNUNET_GNSRECORD_RF_RELATIVE_EXPIRATION));
@@ -2392,7 +2423,9 @@
GNS_TREESTORE_COL_NAME_IS_VISIBLE, FALSE,
GNS_TREESTORE_COL_RECORD_TYPE,
rd[c].record_type,
GNS_TREESTORE_COL_RECORD_TYPE_AS_STR,
type_str,
- GNS_TREESTORE_COL_IS_PUBLIC, public,
+ GNS_TREESTORE_COL_IS_PUBLIC, is_public,
+ GNS_TREESTORE_COL_IS_SHADOW, is_shadow,
+ GNS_TREESTORE_COL_IS_PENDING, is_pending,
GNS_TREESTORE_COL_EXP_TIME, exp_t,
GNS_TREESTORE_COL_EXP_TIME_AS_STR, exp,
GNS_TREESTORE_COL_EXP_TIME_IS_REL,
time_is_relative,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33112 - in gnunet-gtk: contrib src/include src/namestore,
gnunet <=