From 0ea4ac7e20674e3e6a8d1b3d4b53702dace72907 Mon Sep 17 00:00:00 2001
From: Marvin W <git@larma.de>
Date: Sat, 11 Mar 2017 22:48:35 +0100
Subject: Plug-In API: allow adding custom entries to account settings

Also make OpenPGP code use this API
---
 libdino/data/manage_accounts/dialog.ui    | 60 +++----------------------------
 libdino/data/manage_accounts/pgp_stack.ui | 31 ++++++++++++++++
 2 files changed, 36 insertions(+), 55 deletions(-)
 create mode 100644 libdino/data/manage_accounts/pgp_stack.ui

(limited to 'libdino/data')

diff --git a/libdino/data/manage_accounts/dialog.ui b/libdino/data/manage_accounts/dialog.ui
index d44cae71..e431bfff 100644
--- a/libdino/data/manage_accounts/dialog.ui
+++ b/libdino/data/manage_accounts/dialog.ui
@@ -77,10 +77,10 @@
                                     </object>
                                 </child>
                                 <child>
-                                    <object class="GtkGrid">
+                                    <object class="GtkGrid" id="settings_list">
                                         <property name="expand">True</property>
                                         <property name="column-spacing">10</property>
-                                        <property name="row-spacing">10</property>
+                                        <property name="row-spacing">5</property>
                                         <property name="visible">True</property>
                                         <child>
                                             <object class="GtkBox">
@@ -133,12 +133,14 @@
                                         <child>
                                             <object class="GtkSwitch" id="active_switch">
                                                 <property name="visible">True</property>
+                                                <property name="halign">end</property>
+                                                <property name="valign">center</property>
                                             </object>
                                             <packing>
                                                 <property name="left_attach">2</property>
                                                 <property name="top_attach">0</property>
                                                 <property name="width">1</property>
-                                                <property name="height">1</property>
+                                                <property name="height">2</property>
                                             </packing>
                                         </child>
                                         <child>
@@ -247,58 +249,6 @@
                                                 <property name="height">1</property>
                                             </packing>
                                         </child>
-                                        <child>
-                                            <object class="GtkLabel">
-                                                <property name="label">OpenPGP</property>
-                                                <property name="xalign">1</property>
-                                                <property name="visible">True</property>
-                                                <style>
-                                                    <class name="dim-label"/>
-                                                </style>
-                                            </object>
-                                            <packing>
-                                                <property name="left_attach">0</property>
-                                                <property name="top_attach">4</property>
-                                                <property name="width">1</property>
-                                                <property name="height">1</property>
-                                            </packing>
-                                        </child>
-                                        <child>
-                                            <object class="GtkStack" id="pgp_stack">
-                                                <property name="visible">True</property>
-                                                <child>
-                                                    <object class="GtkButton" id="pgp_button">
-                                                        <property name="relief">none</property>
-                                                        <property name="visible">True</property>
-                                                        <child>
-                                                            <object class="GtkLabel" id="pgp_label">
-                                                                <property name="xalign">0</property>
-                                                                <property name="visible">True</property>
-                                                            </object>
-                                                        </child>
-                                                    </object>
-                                                    <packing>
-                                                        <property name="name">label</property>
-                                                    </packing>
-                                                </child>
-                                                <child>
-                                                    <object class="GtkComboBox" id="pgp_combobox">
-                                                        <property name="hexpand">True</property>
-                                                        <property name="width_request">200</property>
-                                                        <property name="visible">True</property>
-                                                    </object>
-                                                    <packing>
-                                                        <property name="name">entry</property>
-                                                    </packing>
-                                                </child>
-                                            </object>
-                                            <packing>
-                                                <property name="left_attach">1</property>
-                                                <property name="top_attach">4</property>
-                                                <property name="width">2</property>
-                                                <property name="height">1</property>
-                                            </packing>
-                                        </child>
                                     </object>
                                 </child>
                             </object>
diff --git a/libdino/data/manage_accounts/pgp_stack.ui b/libdino/data/manage_accounts/pgp_stack.ui
new file mode 100644
index 00000000..4df9f0b8
--- /dev/null
+++ b/libdino/data/manage_accounts/pgp_stack.ui
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <template class="DinoPgpManagerAccountSettingsWidget">
+        <property name="visible">True</property>
+        <child>
+            <object class="GtkButton" id="pgp_button">
+                <property name="relief">none</property>
+                <property name="visible">True</property>
+                <child>
+                    <object class="GtkLabel" id="pgp_label">
+                        <property name="xalign">0</property>
+                        <property name="visible">True</property>
+                    </object>
+                </child>
+            </object>
+            <packing>
+                <property name="name">label</property>
+            </packing>
+        </child>
+        <child>
+            <object class="GtkComboBox" id="pgp_combobox">
+                <property name="hexpand">True</property>
+                <property name="width_request">200</property>
+                <property name="visible">True</property>
+            </object>
+            <packing>
+                <property name="name">entry</property>
+            </packing>
+        </child>
+    </template>
+</interface>
\ No newline at end of file
-- 
cgit v1.2.3-70-g09d2