diff options
author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-01 21:37:46 +0200 |
---|---|---|
committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-04 23:13:06 +0200 |
commit | 20a1d5236ded1738c6007bd9617a913e2c798a8c (patch) | |
tree | 1c41bebf0e9029d8b38d3a40025bae847b9d6e90 | |
parent | fe03ceb9f63030cb90837bbee57969cd18841153 (diff) |
gui: make a widget to display all accounts
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | po/disfluid.pot | 11 | ||||
-rw-r--r-- | po/fr.po | 14 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/Makefile.am | 2 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/accounts-widget.scm | 146 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/application.scm | 9 | ||||
-rw-r--r-- | src/ui/Makefile.am | 3 | ||||
-rw-r--r-- | src/ui/accounts-widget.glade | 141 |
8 files changed, 319 insertions, 8 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index a0b72bd..00169b5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -41,6 +41,7 @@ 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/accounts-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 diff --git a/po/disfluid.pot b/po/disfluid.pot index a7dfdc2..8155a56 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:09+0200\n" +"POT-Creation-Date: 2021-10-04 23:12+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" @@ -636,6 +636,15 @@ msgstr "" msgid "You don’t have set up an account yet." msgstr "" +#: src/scm/webid-oidc/client/gui/accounts-widget.scm:135 +#, scheme-format +msgid "Stub: adding an account with identity provider ~s...\n" +msgstr "" + +#: src/scm/webid-oidc/client/gui/accounts-widget.scm:139 +msgid "Stub: please enter an URI or a host name...\n" +msgstr "" + #: src/scm/webid-oidc/client/gui/client-widget.scm:86 #, scheme-format msgid "The client cannot be constructed: ~a\n" @@ -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:09+0200\n" +"POT-Creation-Date: 2021-10-04 23:12+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" @@ -690,6 +690,15 @@ msgstr "" 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/accounts-widget.scm:135 +#, scheme-format +msgid "Stub: adding an account with identity provider ~s...\n" +msgstr "Bouchon : ajout d’un compte avec le fournisseur d’identité ~s…\n" + +#: src/scm/webid-oidc/client/gui/accounts-widget.scm:139 +msgid "Stub: please enter an URI or a host name...\n" +msgstr "Bouchon : veuillez entrer une URI ou un nom d’hôte…\n" + #: src/scm/webid-oidc/client/gui/client-widget.scm:86 #, scheme-format msgid "The client cannot be constructed: ~a\n" @@ -3033,9 +3042,6 @@ msgstr "Mettre à jour" #~ "Le jeton de rafraîchissement a expiré, il n’est pas possible d’utiliser " #~ "ce compte hors ligne.\n" -#~ msgid "Please enter an URI to GET:\n" -#~ msgstr "Veuillez entrer un URI à requêter avec GET :\n" - #~ msgid "status|not initialized yet" #~ msgstr "pas encore initialisé" diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am index 5f2467e..d72f45c 100644 --- a/src/scm/webid-oidc/client/gui/Makefile.am +++ b/src/scm/webid-oidc/client/gui/Makefile.am @@ -18,6 +18,7 @@ dist_guiclientwebidoidcmod_DATA += \ %reldir%/settings.scm \ %reldir%/client-widget.scm \ %reldir%/account-widget.scm \ + %reldir%/accounts-widget.scm \ %reldir%/application-hooks.scm \ %reldir%/application.scm @@ -25,5 +26,6 @@ guiclientwebidoidcgo_DATA += \ %reldir%/settings.go \ %reldir%/client-widget.go \ %reldir%/account-widget.go \ + %reldir%/accounts-widget.go \ %reldir%/application-hooks.go \ %reldir%/application.go diff --git a/src/scm/webid-oidc/client/gui/accounts-widget.scm b/src/scm/webid-oidc/client/gui/accounts-widget.scm new file mode 100644 index 0000000..3064e9a --- /dev/null +++ b/src/scm/webid-oidc/client/gui/accounts-widget.scm @@ -0,0 +1,146 @@ +;; 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 accounts-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 config) #:prefix config:) + #:use-module (webid-oidc web-i18n) + #:use-module (webid-oidc client client) + #:use-module (webid-oidc client accounts) + #:use-module (webid-oidc client gui account-widget) + #:use-module ((webid-oidc client gui settings) #:prefix settings:) + #:use-module (webid-oidc client gui application-hooks) + #: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 + ( + accounts-widget + )) + +(push-duplicate-handler! 'merge-generics) + +;; This avoids a crash when compiling the module +(use-typelibs ("GdkPixbuf" "2.0") + ("Gtk" "3.0")) + +(define builder #f) +(define accounts-widget #f) + +(define current-main-child '()) +(define current-other-children '()) + +(define (build-accounts-widget app) + (unless accounts-widget + (set! builder + (builder:new-from-file (string-append config:uidir "/accounts-widget.glade"))) + (set! accounts-widget + (builder:get-object builder "accounts_widget")) + (let ((main-account-box + (builder:get-object builder "main_account_box")) + (other-accounts-box + (builder:get-object builder "other_accounts_box")) + (identity-provider-entry + (builder:get-object builder "identity_provider_entry")) + (add-account-button + (builder:get-object builder "add_account_button"))) + (define (set-accounts main other) + (for-each + (match-lambda + ((_ widget) + (container:remove main-account-box widget))) + current-main-child) + (set! current-main-child '()) + (for-each + (match-lambda + ((_ widget) + (container:remove other-accounts-box widget))) + current-other-children) + (set! current-other-children '()) + (receive (main-builder main-widget discard-button use-button) + (make-account-widget main) + (set! current-main-child + `((,main-builder ,main-widget))) + (when discard-button + ((@ (gi) connect) discard-button clicked + (lambda _ + (match other + ((new-main new-other ...) + (settings:main-account new-main) + (settings:other-accounts new-other)) + (() + (settings:main-account #f)))))) + (when use-button + (widget:set-sensitive use-button #f)) + (box:pack-end main-account-box main-widget #t #t 0)) + (for-each + (lambda (other-account) + (let ((not-represented (filter (lambda (a) (not (eq? a other-account))) + other))) + ;; We’re packing a widget for other-account, and if the + ;; discard button is clicked, replace the list of other + ;; accounts with not-represented. + (receive (builder widget discard-button use-button) + (make-account-widget other-account) + (set! current-other-children + `((,builder ,widget) ,@current-other-children)) + ((@ (gi) connect) discard-button clicked + (lambda _ + (settings:other-accounts not-represented))) + ((@ (gi) connect) use-button clicked + (lambda _ + (settings:main-account other-account) + (settings:other-accounts `(,main ,@not-represented)))) + (box:pack-end main-account-box widget #t #t 0)))) + other) + ((@ (gi) connect) add-account-button clicked + (lambda _ + (define (as-host-name host) + (false-if-exception + (build-uri 'https #:host host))) + (match (entry:get-text identity-provider-entry) + ((or (? string? (= string->uri (? uri? uri))) + (? string? (= as-host-name (? uri? uri)))) + ((@ (ice-9 format) format) (current-error-port) (G_ "Stub: adding an account with identity provider ~s...\n") + (uri->string uri)) + (entry:set-text identity-provider-entry "")) + (else + ((@ (ice-9 format) format) (current-error-port) (G_ "Stub: please enter an URI or a host name...\n")))))) + ((@ (gi) connect) identity-provider-entry activate + (lambda _ + (button:clicked add-account-button)))) + (set-accounts (settings:main-account) (settings:other-accounts)) + (add-hook! settings:accounts-changed-hook set-accounts)))) + +(add-hook! application-activated-hook build-accounts-widget) diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm index 361e12d..25708b8 100644 --- a/src/scm/webid-oidc/client/gui/application.scm +++ b/src/scm/webid-oidc/client/gui/application.scm @@ -37,6 +37,7 @@ #:use-module (webid-oidc client accounts) #:use-module ((webid-oidc client gui settings) #:prefix settings:) #:use-module ((webid-oidc client gui client-widget) #:prefix client:) + #:use-module ((webid-oidc client gui accounts-widget) #:prefix accounts:) #:use-module (webid-oidc client gui application-hooks) #:use-module (web uri) #:use-module (web response) @@ -65,8 +66,12 @@ (run-hook application-activated-hook application) (let ((window (make <GtkApplicationWindow> #:application application)) - (widget client:client-widget)) - (add window widget) + (client client:client-widget) + (accounts accounts:accounts-widget) + (content (box:new (symbol->orientation 'horizontal) 12))) + (box:pack-end content client #t #t 0) + (box:pack-end content accounts #t #t 0) + (add window content) (show-all window))) (connect application activate on-activate) diff --git a/src/ui/Makefile.am b/src/ui/Makefile.am index e31cfa9..67f1143 100644 --- a/src/ui/Makefile.am +++ b/src/ui/Makefile.am @@ -17,4 +17,5 @@ uipkgdatadir = $(pkgdatadir)/ui dist_uipkgdata_DATA = \ %reldir%/client-widget.glade \ - %reldir%/account-widget.glade + %reldir%/account-widget.glade \ + %reldir%/accounts-widget.glade diff --git a/src/ui/accounts-widget.glade b/src/ui/accounts-widget.glade new file mode 100644 index 0000000..d177e34 --- /dev/null +++ b/src/ui/accounts-widget.glade @@ -0,0 +1,141 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.36.0 --> +<interface> + <requires lib="gtk+" version="3.22"/> + <object class="GtkBox" id="accounts_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">Main account:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="main_account_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">8</property> + <child> + <placeholder/> + </child> + </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">Other accounts:</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="other_accounts_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">8</property> + <child> + <placeholder/> + </child> + </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> + <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">To add an account, +please enter your identity provider:</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="identity_provider_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="add_account_button"> + <property name="label" translatable="yes">Add an account</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">3</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> +</interface> |