[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33585 - in gnunet-gtk: contrib src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33585 - in gnunet-gtk: contrib src/namestore |
|
Date: |
Sat, 7 Jun 2014 16:20:33 +0200 |
Author: grothoff
Date: 2014-06-07 16:20:33 +0200 (Sat, 07 Jun 2014)
New Revision: 33585
Modified:
gnunet-gtk/contrib/gnunet_namestore_edit_box.glade
gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade
gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c
Log:
fix glade files
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_box.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_box.glade 2014-06-07 14:08:58 UTC
(rev 33584)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_box.glade 2014-06-07 14:20:33 UTC
(rev 33585)
@@ -2,9 +2,92 @@
<!-- Generated with glade 3.18.3 -->
<interface>
<requires lib="gtk+" version="3.0"/>
+ <object class="GtkAdjustment" id="absolute_expiration_hours_adjustment">
+ <property name="upper">23</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">12</property>
+ </object>
+ <object class="GtkAdjustment" id="absolute_expiration_minutes_adjustment">
+ <property name="upper">59</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="absolute_expiration_seconds_adjustment">
+ <property name="upper">100</property>
+ <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="GtkListStore" id="edit_dialog_protocol_liststore">
+ <columns>
+ <!-- column-name protocol_name -->
+ <column type="gchararray"/>
+ <!-- column-name protocol_number -->
+ <column type="guint"/>
+ </columns>
+ <data>
+ <row>
+ <col id="0" translatable="yes">tcp</col>
+ <col id="1">6</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">udp</col>
+ <col id="1">17</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">sctp</col>
+ <col id="1">132</col>
+ </row>
+ <row>
+ <col id="0" translatable="yes">dccp</col>
+ <col id="1">33</col>
+ </row>
+ </data>
+ </object>
+ <object class="GtkAdjustment" id="edit_dialog_srv_port_adjustment">
+ <property name="lower">1</property>
+ <property name="upper">65535</property>
+ <property name="value">80</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="srv_port_adjustment">
+ <property name="upper">65535</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="srv_priority_adjustment">
+ <property name="upper">9999999</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="srv_weight_adjustment">
+ <property name="upper">65535</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="edit_box_dialog">
+ <property name="width_request">600</property>
+ <property name="height_request">700</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
+ <property name="type">popup</property>
<property name="modal">True</property>
<property name="window_position">center-on-parent</property>
<property name="destroy_with_parent">True</property>
@@ -156,7 +239,7 @@
<property
name="model">edit_dialog_protocol_liststore</property>
<property name="active">0</property>
<child>
- <object class="GtkCellRendererText"
id="edit_dialog_srv_protocol_name_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="edit_dialog_protocol_name_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -880,6 +963,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="group-changed"
handler="edit_dialog_expiration_relative_radiobutton_group_changed_cb"
swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -897,6 +981,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_expiration_relative_radiobutton</property>
+ <signal name="group-changed"
handler="edit_dialog_expiration_absolute_radiobutton_group_changed_cb"
swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -1106,21 +1191,4 @@
<action-widget response="-5">edit_dialog_save_button</action-widget>
</action-widgets>
</object>
- <object class="GtkListStore" id="edit_dialog_expiration_relative_liststore">
- <columns>
- <!-- column-name relativetime -->
- <column type="gchararray"/>
- </columns>
- <data>
- <row>
- <col id="0">7 days</col>
- </row>
- <row>
- <col id="0">1 day</col>
- </row>
- <row>
- <col id="0">1 h</col>
- </row>
- </data>
- </object>
</interface>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-06-07 14:08:58 UTC
(rev 33584)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_srv.glade 2014-06-07 14:20:33 UTC
(rev 33585)
@@ -162,9 +162,9 @@
<property name="can_focus">False</property>
<property
name="model">edit_dialog_protocol_liststore</property>
<property name="active">0</property>
- <signal name="changed"
handler="edit_dialog_srv_protocol_combobox_changed_cb" swapped="no"/>
+ <signal name="changed"
handler="edit_dialog_protocol_combobox_changed_cb" swapped="no"/>
<child>
- <object class="GtkCellRendererText"
id="edit_dialog_srv_protocol_name_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="edit_dialog_protocol_name_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-07 14:08:58 UTC
(rev 33584)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-07 14:20:33 UTC
(rev 33585)
@@ -67,7 +67,9 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
- <object class="GtkDialog" id="edit_a_dialog">
+ <object class="GtkDialog" id="edit_tlsa_dialog">
+ <property name="width_request">600</property>
+ <property name="height_request">700</property>
<property name="can_focus">False</property>
<property name="border_width">5</property>
<property name="modal">True</property>
@@ -164,7 +166,7 @@
<property name="active">0</property>
<signal name="changed"
handler="edit_dialog_protocol_combobox_changed_cb" swapped="no"/>
<child>
- <object class="GtkCellRendererText"
id="edit_dialog_tlsa_protocol_name_cellrenderertext"/>
+ <object class="GtkCellRendererText"
id="edit_dialog_protocol_name_cellrenderertext"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -549,7 +551,7 @@
<object class="GtkLabel"
id="edit_dialog_tlsa_import_label">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Import ID:</property>
+ <property name="label"
translatable="yes">Import from:</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -601,6 +603,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
+ <property name="padding">5</property>
<property name="position">4</property>
</packing>
</child>
Modified: gnunet-gtk/src/namestore/gnunet-namestore-gtk.c
===================================================================
--- gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-06-07 14:08:58 UTC
(rev 33584)
+++ gnunet-gtk/src/namestore/gnunet-namestore-gtk.c 2014-06-07 14:20:33 UTC
(rev 33585)
@@ -1610,10 +1610,6 @@
GNUNET_STRINGS_utf8_tolower (edc->liblow,
edc->liblow);
edc->plugin = GNUNET_PLUGIN_load (edc->liblow, edc);
- if (0 != edc->plugin->record_type)
- edc->record_type = edc->plugin->record_type;
- else
- edc->record_type = n_type;
if (NULL == edc->plugin)
{
GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
@@ -1623,6 +1619,10 @@
GTK_RESPONSE_CANCEL);
return;
}
+ if (0 != edc->plugin->record_type)
+ edc->record_type = edc->plugin->record_type;
+ else
+ edc->record_type = n_type;
edc->builder = GNUNET_GTK_get_new_builder2
(edc->plugin->dialog_glade_filename,
edc,
&add_symbols);
Modified: gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c
===================================================================
--- gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c 2014-06-07 14:08:58 UTC
(rev 33584)
+++ gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c 2014-06-07 14:20:33 UTC
(rev 33585)
@@ -212,7 +212,6 @@
entry = GTK_ENTRY (gtk_builder_get_object (builder,
"edit_dialog_srv_target_entry"));
target = gtk_entry_get_text (entry);
-
GNUNET_asprintf (&result,
"%u %u %u %u %u %u %s",
protocol,
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33585 - in gnunet-gtk: contrib src/namestore,
gnunet <=