summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-10-01 17:37:13 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-04 23:11:39 +0200
commitfe03ceb9f63030cb90837bbee57969cd18841153 (patch)
treeab9701f2d0a1b8983641dd85294bd5017bcf36a6
parent4f0dc42f14879c613d9ed4a53ae342ea35fee798 (diff)
gui: make a widget to display an account
-rw-r--r--po/POTFILES.in2
-rw-r--r--po/disfluid.pot22
-rw-r--r--po/fr.po22
-rw-r--r--src/scm/webid-oidc/client/gui/Makefile.am2
-rw-r--r--src/scm/webid-oidc/client/gui/account-widget.scm81
-rw-r--r--src/ui/Makefile.am4
-rw-r--r--src/ui/account-widget.glade126
7 files changed, 256 insertions, 3 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c502f00..a0b72bd 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -40,6 +40,7 @@ src/scm/webid-oidc/client/client.scm
src/scm/webid-oidc/client/gui.scm
src/scm/webid-oidc/client/gui/application.scm
src/scm/webid-oidc/client/gui/application-hooks.scm
+src/scm/webid-oidc/client/gui/account-widget.scm
src/scm/webid-oidc/client/gui/client-widget.scm
src/scm/webid-oidc/client/gui/settings.scm
src/scm/webid-oidc/dpop-proof.scm
@@ -75,4 +76,5 @@ src/scm/webid-oidc/stubs.scm
src/scm/webid-oidc/testing.scm
src/scm/webid-oidc/token-endpoint.scm
src/scm/webid-oidc/web-i18n.scm
+src/ui/account-widget.glade
src/ui/client-widget.glade \ No newline at end of file
diff --git a/po/disfluid.pot b/po/disfluid.pot
index 1abf6d2..a7dfdc2 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: disfluid SNAPSHOT\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-10-04 23:06+0200\n"
+"POT-Creation-Date: 2021-10-04 23:09+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -632,6 +632,10 @@ msgstr ""
msgid "The accounts changed: the main account is ~a, and the others are ~a.\n"
msgstr ""
+#: src/scm/webid-oidc/client/gui/account-widget.scm:81
+msgid "You don’t have set up an account yet."
+msgstr ""
+
#: src/scm/webid-oidc/client/gui/client-widget.scm:86
#, scheme-format
msgid "The client cannot be constructed: ~a\n"
@@ -2206,6 +2210,22 @@ msgid ""
"</p>"
msgstr ""
+#: src/ui/account-widget.glade:19
+msgid "Identity:"
+msgstr ""
+
+#: src/ui/account-widget.glade:58
+msgid "Identity provider:"
+msgstr ""
+
+#: src/ui/account-widget.glade:94
+msgid "Discard"
+msgstr ""
+
+#: src/ui/account-widget.glade:107
+msgid "Use it"
+msgstr ""
+
#: src/ui/client-widget.glade:19
msgid "Client ID:"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index a27fa09..49a644c 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,7 +2,7 @@ msgid ""
msgstr ""
"Project-Id-Version: webid-oidc 0.0.0\n"
"Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n"
-"POT-Creation-Date: 2021-10-04 23:06+0200\n"
+"POT-Creation-Date: 2021-10-04 23:09+0200\n"
"PO-Revision-Date: 2021-10-04 23:06+0200\n"
"Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
"Language-Team: French <vivien@planete-kraus.eu>\n"
@@ -686,6 +686,10 @@ msgid "The accounts changed: the main account is ~a, and the others are ~a.\n"
msgstr ""
"Les comptes ont changé : le compte principal est ~a, et les autres sont ~a.\n"
+#: src/scm/webid-oidc/client/gui/account-widget.scm:81
+msgid "You don’t have set up an account yet."
+msgstr "Vous n’avez pas encore défini de compte."
+
#: src/scm/webid-oidc/client/gui/client-widget.scm:86
#, scheme-format
msgid "The client cannot be constructed: ~a\n"
@@ -2593,6 +2597,22 @@ msgstr ""
"<p>Vous voulez utiliser <pre>~s</pre> comme type d’offre, mais ce n’est pas "
"supporté.</p>"
+#: src/ui/account-widget.glade:19
+msgid "Identity:"
+msgstr "Identité :"
+
+#: src/ui/account-widget.glade:58
+msgid "Identity provider:"
+msgstr "Fournisseur d’identité :"
+
+#: src/ui/account-widget.glade:94
+msgid "Discard"
+msgstr "Rejeter"
+
+#: src/ui/account-widget.glade:107
+msgid "Use it"
+msgstr "L’utiliser"
+
#: src/ui/client-widget.glade:19
msgid "Client ID:"
msgstr "Identifiant client :"
diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am
index 64b1870..5f2467e 100644
--- a/src/scm/webid-oidc/client/gui/Makefile.am
+++ b/src/scm/webid-oidc/client/gui/Makefile.am
@@ -17,11 +17,13 @@
dist_guiclientwebidoidcmod_DATA += \
%reldir%/settings.scm \
%reldir%/client-widget.scm \
+ %reldir%/account-widget.scm \
%reldir%/application-hooks.scm \
%reldir%/application.scm
guiclientwebidoidcgo_DATA += \
%reldir%/settings.go \
%reldir%/client-widget.go \
+ %reldir%/account-widget.go \
%reldir%/application-hooks.go \
%reldir%/application.go
diff --git a/src/scm/webid-oidc/client/gui/account-widget.scm b/src/scm/webid-oidc/client/gui/account-widget.scm
new file mode 100644
index 0000000..f92e271
--- /dev/null
+++ b/src/scm/webid-oidc/client/gui/account-widget.scm
@@ -0,0 +1,81 @@
+;; disfluid, implementation of the Solid specification
+;; Copyright (C) 2021 Vivien Kraus
+
+;; This program is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU Affero General Public License as
+;; published by the Free Software Foundation, either version 3 of the
+;; License, or (at your option) any later version.
+
+;; This program is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+;; GNU Affero General Public License for more details.
+
+;; You should have received a copy of the GNU Affero General Public License
+;; along with this program. If not, see <https://www.gnu.org/licenses/>.
+
+(define-module (webid-oidc client gui account-widget)
+ #:use-module (gi)
+ #:use-module (gi types)
+ #:use-module (gi util)
+ #:use-module (ice-9 match)
+ #:use-module (ice-9 exceptions)
+ #:use-module (ice-9 i18n)
+ #:use-module (ice-9 receive)
+ #:use-module (ice-9 optargs)
+ #:use-module (ice-9 pretty-print)
+ #:use-module (srfi srfi-9)
+ #:use-module (srfi srfi-19)
+ #:use-module (srfi srfi-26)
+ #:use-module (webid-oidc errors)
+ #:use-module ((webid-oidc stubs) #:prefix stubs:)
+ #:use-module (webid-oidc web-i18n)
+ #:use-module (webid-oidc client client)
+ #:use-module (webid-oidc client accounts)
+ #:use-module (webid-oidc jwk)
+ #:use-module (webid-oidc oidc-id-token)
+ #:use-module (web uri)
+ #:use-module (web response)
+ #:use-module (rnrs bytevectors)
+ #:use-module (oop goops)
+ #:declarative? #t
+ #:duplicates (merge-generics)
+ #:export
+ (
+ make-account-widget
+ ))
+
+(push-duplicate-handler! 'merge-generics)
+
+;; This avoids a crash when compiling the module
+(use-typelibs ("GdkPixbuf" "2.0")
+ ("Gtk" "3.0"))
+
+;; The created account does not handle signals.
+
+(define (make-account-widget account)
+ ;; Return many values:
+ ;; - the builder
+ ;; - the whole widget
+ ;; - the discard button
+ ;; - the use button
+ (if account
+ (let ((builder
+ (builder:new-from-file
+ (string-append config:uidir "/account-widget.glade"))))
+ (let ((whole-widget
+ (builder:get-object builder "account_widget"))
+ (webid
+ (builder:get-object builder "webid"))
+ (issuer
+ (builder:get-object builder "issuer"))
+ (discard-button
+ (builder:get-object builder "discard_button"))
+ (use-button
+ (builder:get-object builder "use_button")))
+ (link-button:set-uri webid (uri->string (subject account)))
+ (link-button:set-uri issuer (uri->string (issuer account)))
+ (button:set-label webid (uri->string (subject account)))
+ (button:set-label issuer (uri->string (issuer account)))
+ (values builder whole-widget discard-button use-button)))
+ (values #f (label:new (G_ "You don’t have set up an account yet.")) #f #f)))
diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am
index 4d2ec3d..e31cfa9 100644
--- a/src/ui/Makefile.am
+++ b/src/ui/Makefile.am
@@ -15,4 +15,6 @@
# along with this program. If not, see <https://www.gnu.org/licenses/>.
uipkgdatadir = $(pkgdatadir)/ui
-dist_uipkgdata_DATA = %reldir%/client-widget.glade
+dist_uipkgdata_DATA = \
+ %reldir%/client-widget.glade \
+ %reldir%/account-widget.glade
diff --git a/src/ui/account-widget.glade b/src/ui/account-widget.glade
new file mode 100644
index 0000000..ac030b4
--- /dev/null
+++ b/src/ui/account-widget.glade
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.36.0 -->
+<interface>
+ <requires lib="gtk+" version="3.22"/>
+ <object class="GtkBox" id="account_widget">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Identity:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="webid">
+ <property name="label">button</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="uri">http://glade.gnome.org</property>
+ </object>
+ <packing>
+ <property name="expand">False</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="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes">Identity provider:</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLinkButton" id="issuer">
+ <property name="label">button</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="relief">none</property>
+ <property name="uri">http://glade.gnome.org</property>
+ </object>
+ <packing>
+ <property name="expand">False</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="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkButton" id="discard_button">
+ <property name="label" translatable="yes">Discard</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="use_button">
+ <property name="label" translatable="yes">Use it</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">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">False</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ </object>
+</interface>