[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: more work on policy editor
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: more work on policy editor |
|
Date: |
Sun, 04 Jul 2021 22:51:40 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 18139aa more work on policy editor
18139aa is described below
commit 18139aaffc29799ff9ddf9e2cc9fdb987d3e669c
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sun Jul 4 22:51:37 2021 +0200
more work on policy editor
---
contrib/anastasis_gtk_edit_policy.glade | 211 ++++++++++++++-------------
src/anastasis/anastasis-gtk_pe-edit-policy.c | 8 +-
2 files changed, 119 insertions(+), 100 deletions(-)
diff --git a/contrib/anastasis_gtk_edit_policy.glade
b/contrib/anastasis_gtk_edit_policy.glade
index 93e5561..58194b4 100644
--- a/contrib/anastasis_gtk_edit_policy.glade
+++ b/contrib/anastasis_gtk_edit_policy.glade
@@ -2,118 +2,35 @@
<!-- Generated with glade 3.22.2 -->
<interface>
<requires lib="gtk+" version="3.24"/>
+ <object class="GtkAdjustment" id="adjustment_h">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment_v">
+ <property name="upper">100</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">10</property>
+ </object>
<object class="GtkDialog" id="anastasis_gtk_policy_edit_dialog">
+ <property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="title" translatable="yes">Edit policy</property>
+ <property name="modal">True</property>
+ <property name="window_position">center</property>
<property name="type_hint">dialog</property>
+ <property name="gravity">center</property>
<signal name="response"
handler="anastasis_gtk_policy_edit_dialog_response_cb" swapped="no"/>
<child type="titlebar">
- <object class="GtkBox" id="edit_dialog_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="orientation">vertical</property>
- <child>
- <object class="GtkLabel" id="edit_frame_label">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Map challenges to
providers to select them!</property>
- <property name="justify">center</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="padding">15</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkScrolledWindow">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkViewport">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <child>
- <object class="GtkGrid" id="policy_grid">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- <property name="margin_top">5</property>
- <property name="margin_bottom">5</property>
- <property name="hexpand">True</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">10</property>
- <property name="column_spacing">5</property>
- <property name="row_homogeneous">True</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- <property name="label"
translatable="yes">Authentication method</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="margin_left">5</property>
- <property name="margin_right">5</property>
- <property name="label" translatable="yes">Anastasis
provider</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- </object>
+ <placeholder/>
</child>
- <action-widgets>
- <action-widget response="-6">cancel_button</action-widget>
- <action-widget response="-5">ok_button</action-widget>
- </action-widgets>
<child internal-child="vbox">
<object class="GtkBox">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child internal-child="action_area">
<object class="GtkButtonBox">
- <property name="visible">True</property>
<property name="can_focus">False</property>
<property name="layout_style">end</property>
<child>
@@ -154,6 +71,102 @@
<property name="position">0</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="edit_dialog_vbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel" id="edit_frame_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Map challenges to
providers to select them!</property>
+ <property name="justify">center</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="padding">15</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrolledWindow" id="policy_scrolled_window">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hadjustment">adjustment_h</property>
+ <property name="vadjustment">adjustment_v</property>
+ <property name="shadow_type">in</property>
+ <property name="propagate_natural_width">True</property>
+ <property name="propagate_natural_height">True</property>
+ <child>
+ <object class="GtkViewport" id="grid_viewport">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hadjustment">adjustment_h</property>
+ <property name="vadjustment">adjustment_v</property>
+ <child>
+ <object class="GtkGrid" id="policy_grid">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_top">5</property>
+ <property name="margin_bottom">5</property>
+ <property name="row_spacing">10</property>
+ <property name="column_spacing">5</property>
+ <property name="row_homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="methods_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="margin_left">5</property>
+ <property name="margin_right">5</property>
+ <property name="label"
translatable="yes">Authentication method</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="provider_label">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Anastasis provider</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
</object>
</child>
<action-widgets>
diff --git a/src/anastasis/anastasis-gtk_pe-edit-policy.c
b/src/anastasis/anastasis-gtk_pe-edit-policy.c
index d4cb064..358a959 100644
--- a/src/anastasis/anastasis-gtk_pe-edit-policy.c
+++ b/src/anastasis/anastasis-gtk_pe-edit-policy.c
@@ -322,14 +322,20 @@ make_model (const char *type)
-1);
aps = json_object_get (AG_redux_state,
"authentication_providers");
+ GNUNET_break (NULL != aps);
json_object_foreach (aps, url, ap) {
if (ap_matches (type,
ap))
+ {
+ fprintf (stderr,
+ "adding %s to model\n",
+ url);
gtk_list_store_insert_with_values (ls,
NULL,
-1,
0, url,
-1);
+ }
}
return GTK_TREE_MODEL (ls);
@@ -443,7 +449,7 @@ AG_edit_policy (guint pindex)
"authentication_methods");
json_t *am;
size_t index;
- gint row = 0;
+ gint row = 1;
json_array_foreach (ams, index, am) {
const char *type;
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-gtk] branch master updated: more work on policy editor,
gnunet <=