[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r33587 - in gnunet-gtk: contrib src/namestore
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r33587 - in gnunet-gtk: contrib src/namestore |
|
Date: |
Sat, 7 Jun 2014 16:55:00 +0200 |
Author: grothoff
Date: 2014-06-07 16:55:00 +0200 (Sat, 07 Jun 2014)
New Revision: 33587
Modified:
gnunet-gtk/contrib/gnunet_namestore_edit_box.glade
gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
gnunet-gtk/src/namestore/plugin_gtk_namestore_box.c
gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c
gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c
Log:
more editing signals in TLSA dialog
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_box.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_box.glade 2014-06-07 14:26:04 UTC
(rev 33586)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_box.glade 2014-06-07 14:55:00 UTC
(rev 33587)
@@ -67,6 +67,11 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="horizontal_value_adjustment">
+ <property name="upper">100</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>
@@ -82,6 +87,14 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkTextBuffer" id="tlsa_value_textbuffer">
+ <signal name="changed" handler="tlsa_value_textbuffer_changed_cb"
swapped="no"/>
+ </object>
+ <object class="GtkAdjustment" id="vertical_value_adjustment">
+ <property name="upper">100</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">800</property>
<property name="height_request">700</property>
@@ -525,6 +538,7 @@
<property
name="xalign">0</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -543,6 +557,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -560,6 +575,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -577,6 +593,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">True</property>
@@ -618,6 +635,7 @@
<property
name="xalign">0</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_selector_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -635,6 +653,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_selector_full_cert_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_selector_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -676,6 +695,7 @@
<property
name="xalign">0</property>
<property
name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -693,6 +713,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -710,6 +731,7 @@
<property
name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -743,15 +765,28 @@
</packing>
</child>
<child>
- <object class="GtkTextView"
id="edit_dialog_tlsa_value_textview">
- <property
name="height_request">100</property>
+ <object class="GtkScrolledWindow"
id="edit_dialog_tlsa_value_scrolledwindow">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
+ <property
name="hadjustment">horizontal_value_adjustment</property>
+ <property
name="vadjustment">vertical_value_adjustment</property>
+ <property
name="shadow_type">in</property>
+ <property
name="min_content_width">400</property>
+ <property
name="min_content_height">100</property>
+ <child>
+ <object class="GtkTextView"
id="edit_dialog_tlsa_value_textview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hadjustment">horizontal_value_adjustment</property>
+ <property
name="vadjustment">vertical_value_adjustment</property>
+ <property
name="wrap_mode">char</property>
+ <property
name="buffer">tlsa_value_textbuffer</property>
+ </object>
+ </child>
</object>
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="padding">5</property>
<property
name="position">1</property>
</packing>
</child>
@@ -791,6 +826,7 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
+ <signal name="changed"
handler="edit_dialog_tlsa_import_entry_changed_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">True</property>
Modified: gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade
===================================================================
--- gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-07 14:26:04 UTC
(rev 33586)
+++ gnunet-gtk/contrib/gnunet_namestore_edit_tlsa.glade 2014-06-07 14:55:00 UTC
(rev 33587)
@@ -67,6 +67,19 @@
<property name="step_increment">1</property>
<property name="page_increment">10</property>
</object>
+ <object class="GtkAdjustment" id="horizontal_value_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkTextBuffer" id="tlsa_value_textbuffer">
+ <signal name="changed" handler="tlsa_value_textbuffer_changed_cb"
swapped="no"/>
+ </object>
+ <object class="GtkAdjustment" id="vertical_value_adjustment">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="edit_tlsa_dialog">
<property name="width_request">800</property>
<property name="height_request">700</property>
@@ -305,6 +318,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -323,6 +337,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -340,6 +355,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -357,6 +373,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_usage_ca_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_usage_toggled_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
@@ -398,6 +415,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_selector_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -415,6 +433,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_selector_full_cert_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_selector_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -456,6 +475,7 @@
<property name="xalign">0</property>
<property name="active">True</property>
<property
name="draw_indicator">True</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -473,6 +493,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -490,6 +511,7 @@
<property name="xalign">0</property>
<property
name="draw_indicator">True</property>
<property
name="group">edit_dialog_tlsa_matching_type_full_contents_radiobutton</property>
+ <signal name="toggled"
handler="edit_dialog_tlsa_matching_type_radiobutton_toggled_cb" swapped="no"/>
</object>
<packing>
<property
name="expand">False</property>
@@ -523,16 +545,28 @@
</packing>
</child>
<child>
- <object class="GtkTextView"
id="edit_dialog_tlsa_value_textview">
- <property
name="height_request">100</property>
+ <object class="GtkScrolledWindow"
id="edit_dialog_tlsa_value_scrolledwindow">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <signal name="preedit-changed"
handler="edit_dialog_tlsa_value_textview_preedit_changed_cb" swapped="no"/>
+ <property
name="hadjustment">horizontal_value_adjustment</property>
+ <property
name="vadjustment">vertical_value_adjustment</property>
+ <property
name="shadow_type">in</property>
+ <property
name="min_content_width">400</property>
+ <property
name="min_content_height">100</property>
+ <child>
+ <object class="GtkTextView"
id="edit_dialog_tlsa_value_textview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hadjustment">horizontal_value_adjustment</property>
+ <property
name="vadjustment">vertical_value_adjustment</property>
+ <property
name="wrap_mode">char</property>
+ <property
name="buffer">tlsa_value_textbuffer</property>
+ </object>
+ </child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="padding">5</property>
<property name="position">1</property>
</packing>
</child>
@@ -572,7 +606,7 @@
<property
name="invisible_char">●</property>
<property
name="primary_icon_activatable">False</property>
<property
name="secondary_icon_activatable">False</property>
- <signal name="changed"
handler="GNS_edit_dialog_tlsa_entry_changed_cb" swapped="no"/>
+ <signal name="changed"
handler="edit_dialog_tlsa_import_entry_changed_cb" swapped="no"/>
</object>
<packing>
<property name="expand">True</property>
Modified: gnunet-gtk/src/namestore/plugin_gtk_namestore_box.c
===================================================================
--- gnunet-gtk/src/namestore/plugin_gtk_namestore_box.c 2014-06-07 14:26:04 UTC
(rev 33586)
+++ gnunet-gtk/src/namestore/plugin_gtk_namestore_box.c 2014-06-07 14:55:00 UTC
(rev 33587)
@@ -213,11 +213,25 @@
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
+ /* SRV plugin */
{ "GNS_edit_dialog_srv_target_entry_changed_cb",
G_CALLBACK (GNS_edit_dialog_srv_target_entry_changed_cb) },
+ /* TLSA plugin */
+ { "tlsa_value_textbuffer_changed_cb",
+ G_CALLBACK (tlsa_value_textbuffer_changed_cb) },
+ { "edit_dialog_tlsa_selector_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_selector_radiobutton_toggled_cb) },
+ { "edit_dialog_tlsa_usage_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_usage_radiobutton_toggled_cb) },
+ { "edit_dialog_tlsa_matching_type_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_matching_type_radiobutton_toggled_cb) },
+ { "tlsa_import_button_clicked_cb",
+ G_CALLBACK (tlsa_import_button_clicked_cb) },
+ { "edit_dialog_tlsa_import_entry_changed_cb",
+ G_CALLBACK (edit_dialog_tlsa_import_entry_changed_cb) },
+ /* generic CBs */
{ "edit_dialog_protocol_combobox_changed_cb",
G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
- /* FIXME: add TLSA symbols! */
/* need to include symbols from all boxed types here */
{ NULL, NULL }
};
Modified: gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c
===================================================================
--- gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c 2014-06-07 14:26:04 UTC
(rev 33586)
+++ gnunet-gtk/src/namestore/plugin_gtk_namestore_srv.c 2014-06-07 14:55:00 UTC
(rev 33587)
@@ -274,6 +274,7 @@
static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
{ "GNS_edit_dialog_srv_target_entry_changed_cb",
G_CALLBACK (GNS_edit_dialog_srv_target_entry_changed_cb) },
+ /* generic CBs */
{ "edit_dialog_protocol_combobox_changed_cb",
G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
{ NULL, NULL }
Modified: gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c
===================================================================
--- gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c 2014-06-07
14:26:04 UTC (rev 33586)
+++ gnunet-gtk/src/namestore/plugin_gtk_namestore_tlsa.c 2014-06-07
14:55:00 UTC (rev 33587)
@@ -42,9 +42,9 @@
* @param user_data the plugin environment
*/
static void
-edit_dialog_tlsa_value_textview_preedit_changed_cb (GtkTextView *textview,
- gchar *preedit,
- gpointer user_data)
+tlsa_value_textbuffer_changed_cb (GtkTextView *textview,
+ gchar *preedit,
+ gpointer user_data)
{
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
@@ -52,6 +52,57 @@
}
+/**
+ * The user has changed the selector. Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_selector_radiobutton_toggled_cb (GtkToggleButton
*togglebutton,
+ gpointer user_data)
+{
+ struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+ edc->check_validity (edc);
+}
+
+
+/**
+ * The user has changed the usage. Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_usage_radiobutton_toggled_cb (GtkToggleButton *togglebutton,
+ gpointer user_data)
+{
+ struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+ edc->check_validity (edc);
+}
+
+
+/**
+ * The user has changed the matching type. Enable/disable 'save'
+ * button depending on the validity of the value.
+ *
+ * @param togglebutton button that changed editing widget
+ * @param user_data the plugin environment
+ */
+static void
+edit_dialog_tlsa_matching_type_radiobutton_toggled_cb (GtkToggleButton
*togglebutton,
+ gpointer user_data)
+{
+ struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
+
+ edc->check_validity (edc);
+}
+
+
#ifndef EDP_CBC_DEF
#define EDP_CBC_DEF
/**
@@ -389,8 +440,6 @@
tlsa_validate (void *cls,
GtkBuilder *builder)
{
- GtkEditable *entry;
- const gchar *preedit;
GtkComboBox *cb;
GtkTreeIter iter;
gchar *value;
@@ -402,17 +451,17 @@
int ret;
unsigned int matching_type;
- entry = GTK_EDITABLE (gtk_builder_get_object (builder,
-
"edit_dialog_tlsa_target_entry"));
- preedit = gtk_editable_get_chars (entry, 0, -1);
- if ( (NULL == preedit) ||
- (GNUNET_OK != GNUNET_DNSPARSER_check_name (preedit)) )
- return GNUNET_SYSERR;
+ fprintf (stderr,
+ "Validating...\n");
cb = GTK_COMBO_BOX (gtk_builder_get_object (builder,
"edit_dialog_protocol_combobox"));
if (! gtk_combo_box_get_active_iter (cb,
&iter))
+ {
+ fprintf (stderr,
+ "No protocol selected...\n");
return GNUNET_SYSERR;
+ }
tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW
(gtk_builder_get_object (builder,
@@ -432,6 +481,8 @@
bin))
{
/* not hex */
+ fprintf (stderr,
+ "Certificate value is not in hex...\n");
return GNUNET_SYSERR;
}
matching_type = get_selected_radio_value (builder,
@@ -447,7 +498,11 @@
gnutls_pkcs7_import (pkcs7,
&datum,
GNUTLS_X509_FMT_DER))
+ {
+ fprintf (stderr,
+ "Certificate value is not PKCS7...\n");
ret = GNUNET_SYSERR;
+ }
else
ret = GNUNET_OK;
gnutls_pkcs7_deinit (pkcs7);
@@ -489,8 +544,8 @@
* Update the import button's sensitivity.
*/
static void
-GNS_edit_dialog_tlsa_entry_changed_cb (GtkEditable *entry,
- gpointer user_data)
+edit_dialog_tlsa_import_entry_changed_cb (GtkEditable *entry,
+ gpointer user_data)
{
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *edc = user_data;
GtkWidget *button;
@@ -522,14 +577,21 @@
struct GNUNET_GTK_NAMESTORE_PluginEnvironment *env = cls;
struct GNUNET_GTK_NAMESTORE_PluginFunctions *plugin;
static struct GNUNET_GTK_NAMESTORE_Symbol symbols[] = {
- { "edit_dialog_tlsa_value_textview_preedit_changed_cb",
- G_CALLBACK (edit_dialog_tlsa_value_textview_preedit_changed_cb) },
+ { "tlsa_value_textbuffer_changed_cb",
+ G_CALLBACK (tlsa_value_textbuffer_changed_cb) },
+ { "edit_dialog_tlsa_selector_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_selector_radiobutton_toggled_cb) },
+ { "edit_dialog_tlsa_usage_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_usage_radiobutton_toggled_cb) },
+ { "edit_dialog_tlsa_matching_type_radiobutton_toggled_cb",
+ G_CALLBACK (edit_dialog_tlsa_matching_type_radiobutton_toggled_cb) },
+ { "tlsa_import_button_clicked_cb",
+ G_CALLBACK (tlsa_import_button_clicked_cb) },
+ { "edit_dialog_tlsa_import_entry_changed_cb",
+ G_CALLBACK (edit_dialog_tlsa_import_entry_changed_cb) },
+ /* generic CBs */
{ "edit_dialog_protocol_combobox_changed_cb",
G_CALLBACK (edit_dialog_protocol_combobox_changed_cb) },
- { "tlsa_import_button_clicked_cb",
- G_CALLBACK (tlsa_import_button_clicked_cb) },
- { "GNS_edit_dialog_tlsa_entry_changed_cb",
- G_CALLBACK (GNS_edit_dialog_tlsa_entry_changed_cb) },
{ NULL, NULL }
};
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r33587 - in gnunet-gtk: contrib src/namestore,
gnunet <=