summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVivien Kraus <vivien@planete-kraus.eu>2021-10-12 10:16:00 +0200
committerVivien Kraus <vivien@planete-kraus.eu>2021-10-12 22:44:20 +0200
commita3ef80dfde87c7368ddca483fb5c20868c4d300b (patch)
treeb092bbe2e4b793b55132cb0f9357ad70158222bd
parent291be6e44a989278d6ced6f6a30f58eb07397618 (diff)
gui: display the updated page
-rw-r--r--po/POTFILES.in1
-rw-r--r--po/disfluid.pot2
-rw-r--r--po/fr.po2
-rw-r--r--src/scm/webid-oidc/client/gui/Makefile.am6
-rw-r--r--src/scm/webid-oidc/client/gui/application.scm1
-rw-r--r--src/scm/webid-oidc/client/gui/updated-page.scm116
6 files changed, 124 insertions, 4 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 08fdea9..dd6cd27 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -53,6 +53,7 @@ src/scm/webid-oidc/client/gui/loaded-page.scm
src/scm/webid-oidc/client/gui/loading-page.scm
src/scm/webid-oidc/client/gui/new-page.scm
src/scm/webid-oidc/client/gui/settings.scm
+src/scm/webid-oidc/client/gui/updated-page.scm
src/scm/webid-oidc/dpop-proof.scm
src/scm/webid-oidc/errors.scm
src/scm/webid-oidc/example-app.scm
diff --git a/po/disfluid.pot b/po/disfluid.pot
index a24236a..54b5150 100644
--- a/po/disfluid.pot
+++ b/po/disfluid.pot
@@ -690,7 +690,7 @@ msgstr ""
msgid "Please add an account."
msgstr ""
-#: src/scm/webid-oidc/client/gui/application.scm:100
+#: src/scm/webid-oidc/client/gui/application.scm:101
msgid "Coming soon!"
msgstr ""
diff --git a/po/fr.po b/po/fr.po
index f966136..a220264 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -755,7 +755,7 @@ msgstr "Bouchon : veuillez entrer une URI ou un nom d’hôte…\n"
msgid "Please add an account."
msgstr "Veuillez ajouter un compte."
-#: src/scm/webid-oidc/client/gui/application.scm:100
+#: src/scm/webid-oidc/client/gui/application.scm:101
msgid "Coming soon!"
msgstr "C’est pour bientôt !"
diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am
index 40cd28f..c188b71 100644
--- a/src/scm/webid-oidc/client/gui/Makefile.am
+++ b/src/scm/webid-oidc/client/gui/Makefile.am
@@ -29,7 +29,8 @@ dist_guiclientwebidoidcmod_DATA += \
%reldir%/loading-page.scm \
%reldir%/error-page.scm \
%reldir%/link-widget.scm \
- %reldir%/loaded-page.scm
+ %reldir%/loaded-page.scm \
+ %reldir%/updated-page.scm
guiclientwebidoidcgo_DATA += \
%reldir%/settings.go \
@@ -46,4 +47,5 @@ guiclientwebidoidcgo_DATA += \
%reldir%/loading-page.go \
%reldir%/error-page.go \
%reldir%/link-widget.go \
- %reldir%/loaded-page.go
+ %reldir%/loaded-page.go \
+ %reldir%/updated-page.go
diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm
index 86334ad..58fd9f9 100644
--- a/src/scm/webid-oidc/client/gui/application.scm
+++ b/src/scm/webid-oidc/client/gui/application.scm
@@ -43,6 +43,7 @@
#:use-module ((webid-oidc client gui loading-page) #:prefix page:)
#:use-module ((webid-oidc client gui error-page) #:prefix page:)
#:use-module ((webid-oidc client gui loaded-page) #:prefix page:)
+ #:use-module ((webid-oidc client gui updated-page) #:prefix page:)
#:use-module (webid-oidc client gui application-hooks)
#:use-module (webid-oidc client application)
#:use-module (web uri)
diff --git a/src/scm/webid-oidc/client/gui/updated-page.scm b/src/scm/webid-oidc/client/gui/updated-page.scm
new file mode 100644
index 0000000..d586351
--- /dev/null
+++ b/src/scm/webid-oidc/client/gui/updated-page.scm
@@ -0,0 +1,116 @@
+;; 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 updated-page)
+ #: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 (ice-9 atomic)
+ #: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 settings) #:prefix settings:)
+ #:use-module ((webid-oidc client gui clock) #:prefix clock:)
+ #:use-module ((webid-oidc client gui link-widget) #:prefix link-widget:)
+ #:use-module (webid-oidc client gui application-hooks)
+ #:use-module (webid-oidc client application)
+ #: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
+ (
+ ->widget
+ ))
+
+(push-duplicate-handler! 'merge-generics)
+
+;; This avoids a crash when compiling the module
+(use-typelibs ("GdkPixbuf" "2.0")
+ ("Gtk" "3.0"))
+
+(define-method (->widget (page <updated-page>))
+ (let ((builder
+ (builder:new-from-file
+ (string-append config:uidir "/updated-page.glade"))))
+ (let ((main-widget
+ (builder:get-object builder "updated_page"))
+ (content-type-entry
+ (builder:get-object builder "content_type_entry"))
+ (discard-button
+ (builder:get-object builder "discard_button"))
+ (update-button
+ (builder:get-object builder "update_button"))
+ (content-buffer
+ (builder:get-object builder "content_buffer")))
+ (entry:set-text content-type-entry
+ (symbol->string (desired-content-type page)))
+ (set-text content-buffer
+ (if (string? (desired-content page))
+ (desired-content page)
+ "")
+ -1)
+ (let ((sensitive?
+ (or (not (eq? (desired-content-type page)
+ (content-type page)))
+ (not (equal? (desired-content page)
+ (content page))))))
+ (set-object-property! update-button sensitive sensitive?)
+ (set-object-property! discard-button sensitive sensitive?))
+ (connect update-button clicked
+ (lambda _
+ (let ((state (settings:application-state)))
+ (set! state
+ (change-content-type
+ state
+ (string->symbol
+ (entry:get-text content-type-entry))))
+ (set! state
+ (change-content
+ state
+ (text content-buffer)))
+ (set! state (commit-updates state))
+ (settings:application-state state))))
+ (connect discard-button clicked
+ (lambda _
+ (settings:application-state
+ (discard-updates (settings:application-state)))))
+ (connect content-type-entry activate
+ (lambda _
+ (let ((state (settings:application-state)))
+ (set! state
+ (change-content-type
+ state
+ (string->symbol
+ (entry:get-text content-type-entry))))
+ (settings:application-state state))))
+ (values builder main-widget))))