From 89811997421b815d4d985e28da4540359c3a3047 Mon Sep 17 00:00:00 2001
From: Romain Gallet <gr211@users.noreply.github.com>
Date: Sun, 31 Mar 2024 22:51:14 +0200
Subject: [PATCH] Group icons moved to eventbox (#149)

* Account title borders
* Group title borders
* Moved account icons to EventBox
---
 data/resources/gtk/ui/account_group.ui |  58 +++++---
 data/resources/gtk/ui/main.ui          | 189 +++++++++++++++----------
 2 files changed, 149 insertions(+), 98 deletions(-)

diff --git a/data/resources/gtk/ui/account_group.ui b/data/resources/gtk/ui/account_group.ui
index 55afca11..66d01c51 100644
--- a/data/resources/gtk/ui/account_group.ui
+++ b/data/resources/gtk/ui/account_group.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.38.2 -->
+<!-- Generated with glade 3.40.0 -->
 <interface>
   <requires lib="gtk+" version="3.24"/>
   <object class="GtkBox" id="buttons_container">
@@ -278,13 +278,42 @@
             <property name="visible">True</property>
             <property name="can-focus">False</property>
             <child>
-              <object class="GtkLabel" id="group_label">
-                <property name="name">group_label</property>
+              <!-- n-columns=2 n-rows=1 -->
+              <object class="GtkGrid">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
-                <style>
-                  <class name="group_label_button"/>
-                </style>
+                <child>
+                  <object class="GtkLabel" id="group_label">
+                    <property name="name">group_label</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <style>
+                      <class name="group_label_button"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">1</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkImage" id="group_image">
+                    <property name="name">group_image</property>
+                    <property name="width-request">0</property>
+                    <property name="height-request">0</property>
+                    <property name="visible">True</property>
+                    <property name="can-focus">False</property>
+                    <property name="margin-end">10</property>
+                    <property name="icon_size">0</property>
+                    <style>
+                      <class name="group_image"/>
+                    </style>
+                  </object>
+                  <packing>
+                    <property name="left-attach">0</property>
+                    <property name="top-attach">0</property>
+                  </packing>
+                </child>
               </object>
             </child>
           </object>
@@ -294,22 +323,7 @@
           </packing>
         </child>
         <child>
-          <object class="GtkImage" id="group_image">
-            <property name="name">group_image</property>
-            <property name="width-request">0</property>
-            <property name="height-request">0</property>
-            <property name="visible">True</property>
-            <property name="can-focus">False</property>
-            <property name="margin-end">10</property>
-            <property name="icon_size">0</property>
-            <style>
-              <class name="group_image"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">0</property>
-          </packing>
+          <placeholder/>
         </child>
         <child>
           <placeholder/>
diff --git a/data/resources/gtk/ui/main.ui b/data/resources/gtk/ui/main.ui
index 750f2f6b..65b99225 100644
--- a/data/resources/gtk/ui/main.ui
+++ b/data/resources/gtk/ui/main.ui
@@ -180,65 +180,81 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">20</property>
+                <property name="spacing">3</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkFrame">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-start">10</property>
-                    <property name="margin-top">25</property>
+                    <property name="valign">center</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">15</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
-                      <object class="GtkLabel" id="add_accounts_container_edit">
-                        <property name="name">add_accounts_container_edit</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">Edit account</property>
-                        <style>
-                          <class name="section_title"/>
-                          <class name="account_group_label"/>
-                        </style>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <child>
+                          <object class="GtkLabel" id="add_accounts_container_edit">
+                            <property name="name">add_accounts_container_edit</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Edit account</property>
+                            <style>
+                              <class name="section_title"/>
+                              <class name="account_group_label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="add_accounts_container_add">
+                            <property name="name">add_accounts_container_add</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">New account</property>
+                            <style>
+                              <class name="section_title"/>
+                              <class name="account_group_label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
                       </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">0</property>
-                      </packing>
                     </child>
-                    <child>
-                      <object class="GtkLabel" id="add_accounts_container_add">
-                        <property name="name">add_accounts_container_add</property>
-                        <property name="can-focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">New account</property>
-                        <style>
-                          <class name="section_title"/>
-                          <class name="account_group_label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">False</property>
-                        <property name="position">1</property>
-                      </packing>
+                    <child type="label_item">
+                      <placeholder/>
                     </child>
+                    <style>
+                      <class name="form_container"/>
+                    </style>
                   </object>
                   <packing>
-                    <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
-                <child>
-                  <placeholder/>
-                </child>
                 <child>
                   <object class="GtkFrame">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
                     <property name="margin-start">5</property>
                     <property name="margin-end">5</property>
-                    <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
                     <property name="label-xalign">0</property>
                     <property name="shadow-type">in</property>
@@ -511,7 +527,7 @@
                   <packing>
                     <property name="expand">True</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">1</property>
                   </packing>
                 </child>
               </object>
@@ -543,53 +559,72 @@
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
                 <property name="orientation">vertical</property>
-                <property name="spacing">20</property>
+                <property name="spacing">2</property>
                 <child>
-                  <object class="GtkBox">
+                  <object class="GtkFrame">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="margin-start">10</property>
-                    <property name="margin-top">25</property>
+                    <property name="margin-start">5</property>
+                    <property name="margin-end">5</property>
+                    <property name="margin-top">15</property>
+                    <property name="label-xalign">0</property>
+                    <property name="shadow-type">in</property>
                     <child>
-                      <object class="GtkLabel" id="add_group_container_add">
-                        <property name="name">add_group_container_add</property>
+                      <object class="GtkBox">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">New group</property>
-                        <style>
-                          <class name="section_title"/>
-                          <class name="add_group_label"/>
-                        </style>
+                        <property name="margin-start">5</property>
+                        <property name="margin-end">5</property>
+                        <property name="margin-top">5</property>
+                        <property name="margin-bottom">5</property>
+                        <child>
+                          <object class="GtkLabel" id="add_group_container_add">
+                            <property name="name">add_group_container_add</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">New group</property>
+                            <style>
+                              <class name="section_title"/>
+                              <class name="add_group_label"/>
+                            </style>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="add_group_container_edit">
+                            <property name="name">add_group_container_edit</property>
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Edit group</property>
+                            <style>
+                              <class name="section_title"/>
+                              <class name="add_group_label"/>
+                            </style>
+                          </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="GtkLabel" id="add_group_container_edit">
-                        <property name="name">add_group_container_edit</property>
-                        <property name="visible">True</property>
-                        <property name="can-focus">False</property>
-                        <property name="halign">start</property>
-                        <property name="label" translatable="yes">Edit group</property>
-                        <style>
-                          <class name="section_title"/>
-                          <class name="add_group_label"/>
-                        </style>
-                      </object>
-                      <packing>
-                        <property name="expand">False</property>
-                        <property name="fill">True</property>
-                        <property name="position">1</property>
-                      </packing>
+                    <child type="label_item">
+                      <placeholder/>
                     </child>
+                    <style>
+                      <class name="form_container"/>
+                    </style>
                   </object>
                   <packing>
                     <property name="expand">False</property>
-                    <property name="fill">False</property>
+                    <property name="fill">True</property>
                     <property name="position">0</property>
                   </packing>
                 </child>
@@ -599,7 +634,6 @@
                     <property name="can-focus">False</property>
                     <property name="margin-start">5</property>
                     <property name="margin-end">5</property>
-                    <property name="margin-top">5</property>
                     <property name="margin-bottom">5</property>
                     <property name="label-xalign">0</property>
                     <property name="shadow-type">in</property>
@@ -857,6 +891,9 @@
                     <property name="position">1</property>
                   </packing>
                 </child>
+                <child>
+                  <placeholder/>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>