gui: let the account widget shrink

4 files changed, 58 insertions, 30 deletions

diff --git a/po/disfluid.pot b/po/disfluid.pot
index 44a0a99..539b72d 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-05 16:51+0200\n"
+"POT-Creation-Date: 2021-10-05 22:57+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"
@@ -2228,15 +2228,19 @@ msgstr ""
 msgid "Identity:"
 msgstr ""
 
-#: src/ui/account-widget.glade:58
+#: src/ui/account-widget.glade:38 src/ui/account-widget.glade:84
+msgid "label"
+msgstr ""
+
+#: src/ui/account-widget.glade:65
 msgid "Identity provider:"
 msgstr ""
 
-#: src/ui/account-widget.glade:94
+#: src/ui/account-widget.glade:108
 msgid "Discard"
 msgstr ""
 
-#: src/ui/account-widget.glade:107
+#: src/ui/account-widget.glade:121
 msgid "Use it"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 4aaae18..f6d000d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -2,8 +2,8 @@ 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-05 16:51+0200\n"
-"PO-Revision-Date: 2021-10-05 12:06+0200\n"
+"POT-Creation-Date: 2021-10-05 22:57+0200\n"
+"PO-Revision-Date: 2021-10-05 22:56+0200\n"
 "Last-Translator: Vivien Kraus <vivien@planete-kraus.eu>\n"
 "Language-Team: French <vivien@planete-kraus.eu>\n"
 "Language: fr\n"
@@ -2614,15 +2614,19 @@ msgstr ""
 msgid "Identity:"
 msgstr "Identité :"
 
-#: src/ui/account-widget.glade:58
+#: src/ui/account-widget.glade:38 src/ui/account-widget.glade:84
+msgid "label"
+msgstr "étiquette"
+
+#: src/ui/account-widget.glade:65
 msgid "Identity provider:"
 msgstr "Fournisseur d’identité :"
 
-#: src/ui/account-widget.glade:94
+#: src/ui/account-widget.glade:108
 msgid "Discard"
 msgstr "Rejeter"
 
-#: src/ui/account-widget.glade:107
+#: src/ui/account-widget.glade:121
 msgid "Use it"
 msgstr "L’utiliser"
 
diff --git a/src/scm/webid-oidc/client/gui/account-widget.scm b/src/scm/webid-oidc/client/gui/account-widget.scm
index 4449049..cef6a9d 100644
--- a/src/scm/webid-oidc/client/gui/account-widget.scm
+++ b/src/scm/webid-oidc/client/gui/account-widget.scm
@@ -62,18 +62,24 @@
           (string-append config:uidir "/account-widget.glade"))))
     (let ((whole-widget
            (builder:get-object builder "account_widget"))
-          (webid
+          (webid-link
            (builder:get-object builder "webid"))
+          (webid-label
+           (builder:get-object builder "webid_label"))
           (issuer-link
            (builder:get-object builder "issuer"))
+          (issuer-label
+           (builder:get-object builder "issuer_label"))
           (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 webid-link (uri->string (subject account)))
       (link-button:set-uri issuer-link (uri->string (issuer account)))
-      (button:set-label webid (uri->string (subject account)))
-      (button:set-label issuer-link (uri->string (issuer account)))
+      (label:set-text webid-label (uri->string (subject account)))
+      (label:set-text issuer-label (uri->string (issuer account)))
+      (widget:set-tooltip-text webid-link (uri->string (subject account)))
+      (widget:set-tooltip-text issuer-link (uri->string (issuer account)))
       (unless can-use?
         (widget:set-sensitive use-button #f))
       (connect discard-button clicked
diff --git a/src/ui/account-widget.glade b/src/ui/account-widget.glade
index ac030b4..07b2968 100644
--- a/src/ui/account-widget.glade
+++ b/src/ui/account-widget.glade
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.36.0 -->
+<!-- Generated with glade 3.38.2 -->
 <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="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="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="can-focus">False</property>
             <property name="label" translatable="yes">Identity:</property>
           </object>
           <packing>
@@ -26,12 +26,19 @@
         </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="can-focus">True</property>
+            <property name="receives-default">True</property>
             <property name="relief">none</property>
             <property name="uri">http://glade.gnome.org</property>
+            <child>
+              <object class="GtkLabel" id="webid_label">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -49,12 +56,12 @@
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</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="can-focus">False</property>
             <property name="label" translatable="yes">Identity provider:</property>
           </object>
           <packing>
@@ -65,12 +72,19 @@
         </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="can-focus">True</property>
+            <property name="receives-default">True</property>
             <property name="relief">none</property>
             <property name="uri">http://glade.gnome.org</property>
+            <child>
+              <object class="GtkLabel" id="issuer_label">
+                <property name="visible">True</property>
+                <property name="can-focus">False</property>
+                <property name="label" translatable="yes">label</property>
+                <property name="ellipsize">end</property>
+              </object>
+            </child>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -88,13 +102,13 @@
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
-        <property name="can_focus">False</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>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
           </object>
           <packing>
             <property name="expand">False</property>
@@ -106,8 +120,8 @@
           <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>
+            <property name="can-focus">True</property>
+            <property name="receives-default">True</property>
           </object>
           <packing>
             <property name="expand">True</property>