diff options
author | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-11 22:14:50 +0200 |
---|---|---|
committer | Vivien Kraus <vivien@planete-kraus.eu> | 2021-10-12 22:44:19 +0200 |
commit | 291be6e44a989278d6ced6f6a30f58eb07397618 (patch) | |
tree | 789a54f663e70ffdb8778c3fb907c0850e114cb1 | |
parent | 0a4ea68ff7f3111b7ceafad858e87ab65caccfa0 (diff) |
gui: display a loaded page
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | po/disfluid.pot | 6 | ||||
-rw-r--r-- | po/fr.po | 8 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/Makefile.am | 6 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/application.scm | 1 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/link-widget.scm | 7 | ||||
-rw-r--r-- | src/scm/webid-oidc/client/gui/loaded-page.scm | 109 |
7 files changed, 131 insertions, 7 deletions
diff --git a/po/POTFILES.in b/po/POTFILES.in index 37fbbf3..08fdea9 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -49,6 +49,7 @@ src/scm/webid-oidc/client/gui/client-widget.scm src/scm/webid-oidc/client/gui/clock.scm src/scm/webid-oidc/client/gui/error-page.scm src/scm/webid-oidc/client/gui/link-widget.scm +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 diff --git a/po/disfluid.pot b/po/disfluid.pot index 4676cfa..a24236a 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:99 +#: src/scm/webid-oidc/client/gui/application.scm:100 msgid "Coming soon!" msgstr "" @@ -699,6 +699,10 @@ msgstr "" msgid "Your authorization is required: ~a" msgstr "" +#: src/scm/webid-oidc/client/gui/loaded-page.scm:94 +msgid "Binary data..." +msgstr "" + #: src/scm/webid-oidc/client/gui/settings.scm:202 msgid "can only store 10 accounts" msgstr "" @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: webid-oidc 0.0.0\n" "Report-Msgid-Bugs-To: vivien@planete-kraus.eu\n" "POT-Creation-Date: 2021-10-12 22:41+0200\n" -"PO-Revision-Date: 2021-10-12 22:42+0200\n" +"PO-Revision-Date: 2021-10-12 22:43+0200\n" "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n" "Language-Team: French <vivien@planete-kraus.eu>\n" "Language: fr\n" @@ -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:99 +#: src/scm/webid-oidc/client/gui/application.scm:100 msgid "Coming soon!" msgstr "C’est pour bientôt !" @@ -764,6 +764,10 @@ msgstr "C’est pour bientôt !" msgid "Your authorization is required: ~a" msgstr "Votre autorisation est requise : ~a" +#: src/scm/webid-oidc/client/gui/loaded-page.scm:94 +msgid "Binary data..." +msgstr "Données binaires…" + #: src/scm/webid-oidc/client/gui/settings.scm:202 msgid "can only store 10 accounts" msgstr "on ne peut stocker que 10 comptes" diff --git a/src/scm/webid-oidc/client/gui/Makefile.am b/src/scm/webid-oidc/client/gui/Makefile.am index 7286b92..40cd28f 100644 --- a/src/scm/webid-oidc/client/gui/Makefile.am +++ b/src/scm/webid-oidc/client/gui/Makefile.am @@ -28,7 +28,8 @@ dist_guiclientwebidoidcmod_DATA += \ %reldir%/new-page.scm \ %reldir%/loading-page.scm \ %reldir%/error-page.scm \ - %reldir%/link-widget.scm + %reldir%/link-widget.scm \ + %reldir%/loaded-page.scm guiclientwebidoidcgo_DATA += \ %reldir%/settings.go \ @@ -44,4 +45,5 @@ guiclientwebidoidcgo_DATA += \ %reldir%/new-page.go \ %reldir%/loading-page.go \ %reldir%/error-page.go \ - %reldir%/link-widget.go + %reldir%/link-widget.go \ + %reldir%/loaded-page.go diff --git a/src/scm/webid-oidc/client/gui/application.scm b/src/scm/webid-oidc/client/gui/application.scm index df7f080..86334ad 100644 --- a/src/scm/webid-oidc/client/gui/application.scm +++ b/src/scm/webid-oidc/client/gui/application.scm @@ -42,6 +42,7 @@ #:use-module ((webid-oidc client gui new-page) #:prefix page:) #: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 application-hooks) #:use-module (webid-oidc client application) #:use-module (web uri) diff --git a/src/scm/webid-oidc/client/gui/link-widget.scm b/src/scm/webid-oidc/client/gui/link-widget.scm index 530cf48..e24a539 100644 --- a/src/scm/webid-oidc/client/gui/link-widget.scm +++ b/src/scm/webid-oidc/client/gui/link-widget.scm @@ -34,6 +34,7 @@ #:use-module (webid-oidc client client) #:use-module (webid-oidc client accounts) #:use-module (webid-oidc client application) + #:use-module (webid-oidc http-link) #:use-module ((webid-oidc client gui settings) #:prefix settings:) #:use-module (webid-oidc jwk) #:use-module (webid-oidc oidc-id-token) @@ -75,10 +76,12 @@ (builder:get-object builder "link_widget")) (target-iri-link (builder:get-object builder "target_iri")) + (target-iri-label + (builder:get-object builder "target_label")) (relation-type-label (builder:get-object builder "relation_type"))) - (link-button:set-text target-iri-link (uri->string (target-iri link))) - (link-button:set-tooltip target-iri-link (uri->string (target-iri link))) + (label:set-text target-iri-label (uri->string (target-iri link))) + (widget:set-tooltip-text target-iri-link (uri->string (target-iri link))) (link-button:set-uri target-iri-link (uri->string (target-iri link))) (label:set-text relation-type-label (relation-type link)) (set! builder `(,builder)) diff --git a/src/scm/webid-oidc/client/gui/loaded-page.scm b/src/scm/webid-oidc/client/gui/loaded-page.scm new file mode 100644 index 0000000..78dbd3b --- /dev/null +++ b/src/scm/webid-oidc/client/gui/loaded-page.scm @@ -0,0 +1,109 @@ +;; 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 loaded-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 <loaded-page>)) + (let ((builder + (builder:new-from-file + (string-append config:uidir "/loaded-page.glade")))) + (let ((main-widget + (builder:get-object builder "loaded_page")) + (uri-entry + (builder:get-object builder "uri_entry")) + (links-list + (builder:get-object builder "links_list")) + (content-type-label + (builder:get-object builder "content_type")) + (content-label + (builder:get-object builder "content")) + (delete-button + (builder:get-object builder "button_delete")) + (update-button + (builder:get-object builder "button_update"))) + (set! builder `(,builder)) + (for-each + (lambda (link) + (receive (link-builder link-widget) + (link-widget:->widget link) + (set! builder `(,link-builder ,@builder)) + (box:pack-start links-list link-widget #t #t 0))) + (links page)) + (label:set-text content-type-label (symbol->string (content-type page))) + (label:set-text content-label + (let ((c (content page))) + (false-if-exception + (set! c (utf8->string c))) + (if (string? c) + c + (G_ "Binary data...")))) + (entry:set-text uri-entry (uri->string (uri page))) + (connect uri-entry activate + (lambda _ + (settings:application-state + (set-page-uri (settings:application-state) + (entry:get-text uri-entry))))) + (connect delete-button clicked + (lambda _ + (settings:application-state + (delete-page (settings:application-state))))) + (connect update-button clicked + (lambda _ + (settings:application-state + (edit-page (settings:application-state))))) + (values builder main-widget)))) |