From c305c6e272ae26414b21f256c0a3c5e84dae5219 Mon Sep 17 00:00:00 2001
From: lainsce <paulogalardi@outlook.com>
Date: Tue, 25 Jun 2024 09:53:10 -0300
Subject: [PATCH] *

---
 data/ui/edit_notebooks.ui         |  1 -
 data/ui/main_menu.ui              | 70 +++++++++++++++++++++++++++
 data/ui/main_window.ui            | 64 +------------------------
 data/ui/move_to_dialog.ui         |  1 -
 data/ui/note_theme.ui             | 80 +++++++++++--------------------
 data/ui/notebookmainrowcontent.ui |  3 ++
 data/ui/notecontentview.ui        |  5 +-
 data/ui/noterowcontent.ui         | 80 ++++++++++++++++---------------
 data/ui/trashcontentview.ui       |  8 ++--
 9 files changed, 148 insertions(+), 164 deletions(-)
 create mode 100644 data/ui/main_menu.ui

diff --git a/data/ui/edit_notebooks.ui b/data/ui/edit_notebooks.ui
index ceec1ce..1c18fca 100644
--- a/data/ui/edit_notebooks.ui
+++ b/data/ui/edit_notebooks.ui
@@ -28,7 +28,6 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="HeAppBar">
-            <property name="show-buttons">1</property>
             <property name="show-back">0</property>
             <property name="scroller">sw</property>
             <property name="viewtitle-widget">
diff --git a/data/ui/main_menu.ui b/data/ui/main_menu.ui
new file mode 100644
index 0000000..f9a4321
--- /dev/null
+++ b/data/ui/main_menu.ui
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <template class="NotejotWidgetsMainMenu" parent="GtkBox">
+    <property name="orientation">1</property>
+    <style>
+      <class name="notejot-theme"/>
+    </style>
+    <child>
+      <object class="GtkBox">
+        <property name="orientation">1</property>
+        <property name="spacing">6</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">10</property>
+        <child>
+          <object class="GtkLabel">
+            <property name="label" translatable="true">Font Size</property>
+            <property name="halign">1</property>
+            <style>
+              <class name="caption"/>
+              <class name="dim-label"/>
+            </style>
+          </object>
+        </child>
+        <child>
+          <object class="HeSegmentedButton">
+            <child>
+              <object class="GtkToggleButton" id="s">
+                <property name="label">Small</property>
+                <property name="action-name">app.font-size</property>
+                <property name="action-target">"'small'"</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton">
+                <property name="label">Medium</property>
+                <property name="action-name">app.font-size</property>
+                <property name="action-target">"'medium'"</property>
+                <property name="group">s</property>
+              </object>
+            </child>
+            <child>
+              <object class="GtkToggleButton">
+                <property name="label">Large</property>
+                <property name="action-name">app.font-size</property>
+                <property name="action-target">"'large'"</property>
+                <property name="group">s</property>
+              </object>
+            </child>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child>
+      <object class="HeDivider"></object>
+    </child>
+    <child>
+      <object class="HeTextButton" id="about_button">
+        <property name="hexpand">true</property>
+        <property name="action-name">win.action_about</property>
+        <property name="child">
+          <object class="HeButtonContent">
+            <property name="icon">dialog-information-symbolic</property>
+            <property name="label" translatable="true">About Notejot</property>
+          </object>
+        </property>
+      </object>
+    </child>
+  </template>
+</interface>
\ No newline at end of file
diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui
index cf20080..c473668 100644
--- a/data/ui/main_window.ui
+++ b/data/ui/main_window.ui
@@ -2,16 +2,8 @@
 <interface>
   <menu id="menu">
     <item>
-      <attribute name="label" translatable="yes">Text size</attribute>
-      <attribute name="display-hint">inline-buttons</attribute>
-      <attribute name="custom">zoom-grid</attribute>
+      <attribute name="custom">zoom</attribute>
     </item>
-    <section>
-      <item>
-        <attribute name="label" translatable="yes">About Notejot</attribute>
-        <attribute name="action">win.action_about</attribute>
-      </item>
-    </section>
   </menu>
   <template class="NotejotMainWindow" parent="HeApplicationWindow">
     <property name="visible">1</property>
@@ -50,59 +42,7 @@
                     <child type="titlebar-button">
                       <object class="GtkMenuButton" id="menu_button">
                         <property name="icon-name">open-menu-symbolic</property>
-                        <property name="popover">
-                          <object class="GtkPopoverMenu">
-                              <property name="menu-model">menu</property>
-                              <child type="zoom-grid">
-                                  <object class="GtkBox">
-                                      <property name="hexpand">1</property>
-                                      <property name="orientation">vertical</property>
-                                      <property name="spacing">6</property>
-                                      <property name="margin-top">6</property>
-                                      <property name="margin-bottom">6</property>
-                                      <property name="margin-start">10</property>
-                                      <property name="margin-end">6</property>
-                                      <child>
-                                        <object class="GtkBox">
-                                          <child>
-                                            <object class="GtkLabel">
-                                              <property name="label" translatable="true">Font Size</property>
-                                              <property name="sensitive">0</property>
-                                            </object>
-                                          </child>
-                                        </object>
-                                      </child>
-                                      <child>
-                                        <object class="HeSegmentedButton">
-                                          <child>
-                                              <object class="GtkToggleButton" id="s">
-                                                  <property name="label">Small</property>
-                                                  <property name="action-name">app.font-size</property>
-                                                  <property name="action-target">"'small'"</property>
-                                              </object>
-                                          </child>
-                                          <child>
-                                              <object class="GtkToggleButton">
-                                                  <property name="label">Medium</property>
-                                                  <property name="action-name">app.font-size</property>
-                                                  <property name="action-target">"'medium'"</property>
-                                                  <property name="group">s</property>
-                                              </object>
-                                          </child>
-                                          <child>
-                                              <object class="GtkToggleButton">
-                                                  <property name="label">Large</property>
-                                                  <property name="action-name">app.font-size</property>
-                                                  <property name="action-target">"'large'"</property>
-                                                  <property name="group">s</property>
-                                              </object>
-                                          </child>
-                                        </object>
-                                      </child>
-                                  </object>
-                              </child>
-                          </object>
-                      </property>
+                        <property name="menu-model">menu</property>
                       </object>
                     </child>
                     <child>
diff --git a/data/ui/move_to_dialog.ui b/data/ui/move_to_dialog.ui
index ec7f725..99c097e 100644
--- a/data/ui/move_to_dialog.ui
+++ b/data/ui/move_to_dialog.ui
@@ -30,7 +30,6 @@
         <property name="orientation">vertical</property>
         <child>
           <object class="HeAppBar">
-            <property name="show-buttons">1</property>
             <property name="show-back">0</property>
             <property name="scroller">sw</property>
             <property name="viewtitle-widget">
diff --git a/data/ui/note_theme.ui b/data/ui/note_theme.ui
index 3ecc6a8..7260c77 100644
--- a/data/ui/note_theme.ui
+++ b/data/ui/note_theme.ui
@@ -1,31 +1,33 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
+  <requires lib="gtk" version="4.0"/>
   <template class="NotejotWidgetsNoteTheme" parent="GtkBox">
-    <property name="orientation">vertical</property>
+    <property name="orientation">1</property>
     <style>
-      <class name="notejot-theme" />
+      <class name="notejot-theme"/>
     </style>
     <child>
       <object class="GtkLabel">
-        <property name="margin-start">8</property>
-        <property name="margin-bottom">6</property>
-        <property name="halign">start</property>
-        <property name="label" translatable="yes">Note Color</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">10</property>
+        <property name="halign">1</property>
+        <property name="label" translatable="true">Note Color</property>
         <style>
+          <class name="caption"/>
           <class name="dim-label"/>
         </style>
       </object>
     </child>
     <child>
       <object class="GtkGrid">
-        <property name="column_spacing">6</property>
-        <property name="row_spacing">6</property>
-        <property name="margin_start">6</property>
-        <property name="margin_end">6</property>
-        <property name="hexpand">1</property>
+        <property name="column-spacing">6</property>
+        <property name="row-spacing">6</property>
+        <property name="margin-start">6</property>
+        <property name="margin-end">10</property>
+        <property name="hexpand">true</property>
         <child>
           <object class="GtkCheckButton" id="color_button_red">
-            <property name="tooltip-text" translatable="yes">Red</property>
+            <property name="tooltip-text" translatable="true">Red</property>
             <style>
               <class name="circular"/>
               <class name="color-red"/>
@@ -36,37 +38,23 @@
             </layout>
           </object>
         </child>
-        <child>
-          <object class="GtkCheckButton" id="color_button_orange">
-            <property name="tooltip-text" translatable="yes">Orange</property>
-            <property name="group">color_button_red</property>
-            <style>
-              <class name="circular"/>
-              <class name="color-orange"/>
-            </style>
-            <layout>
-              <property name="column">1</property>
-              <property name="row">0</property>
-            </layout>
-          </object>
-        </child>
         <child>
           <object class="GtkCheckButton" id="color_button_yellow">
-            <property name="tooltip-text" translatable="yes">Yellow</property>
+            <property name="tooltip-text" translatable="true">Yellow</property>
             <property name="group">color_button_red</property>
             <style>
               <class name="circular"/>
               <class name="color-yellow"/>
             </style>
             <layout>
-              <property name="column">2</property>
+              <property name="column">1</property>
               <property name="row">0</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkCheckButton" id="color_button_blue">
-            <property name="tooltip-text" translatable="yes">Blue</property>
+            <property name="tooltip-text" translatable="true">Blue</property>
             <property name="group">color_button_red</property>
             <style>
               <class name="circular"/>
@@ -80,7 +68,7 @@
         </child>
         <child>
           <object class="GtkCheckButton" id="color_button_purple">
-            <property name="tooltip-text" translatable="yes">Purple</property>
+            <property name="tooltip-text" translatable="true">Purple</property>
             <property name="group">color_button_red</property>
             <style>
               <class name="circular"/>
@@ -92,44 +80,30 @@
             </layout>
           </object>
         </child>
-        <child>
-          <object class="GtkCheckButton" id="color_button_brown">
-            <property name="tooltip-text" translatable="yes">Brown</property>
-            <property name="group">color_button_red</property>
-            <style>
-              <class name="circular"/>
-              <class name="color-brown"/>
-            </style>
-            <layout>
-              <property name="column">2</property>
-              <property name="row">1</property>
-            </layout>
-          </object>
-        </child>
         <child>
           <object class="GtkCheckButton" id="color_button_green">
-            <property name="tooltip-text" translatable="yes">Green</property>
+            <property name="tooltip-text" translatable="true">Green</property>
             <property name="group">color_button_red</property>
             <style>
               <class name="circular"/>
               <class name="color-green"/>
             </style>
             <layout>
-              <property name="column">3</property>
+              <property name="column">2</property>
               <property name="row">0</property>
             </layout>
           </object>
         </child>
         <child>
           <object class="GtkCheckButton" id="color_button_reset">
-            <property name="tooltip-text" translatable="yes">No Color</property>
+            <property name="tooltip-text" translatable="true">No Color</property>
             <property name="group">color_button_red</property>
             <style>
               <class name="circular"/>
               <class name="color-reset"/>
             </style>
             <layout>
-              <property name="column">3</property>
+              <property name="column">2</property>
               <property name="row">1</property>
             </layout>
           </object>
@@ -144,25 +118,25 @@
     </child>
     <child>
       <object class="HeTextButton" id="note_pin_button">
-        <property name="hexpand">1</property>
+        <property name="hexpand">true</property>
         <property name="child">
           <object class="HeButtonContent">
             <property name="icon">view-pin-symbolic</property>
-            <property name="label" translatable="yes">Pin/Unpin Note</property>
+            <property name="label" translatable="true">Pin/Unpin Note</property>
           </object>
         </property>
       </object>
     </child>
     <child>
       <object class="HeTextButton" id="export_button">
-        <property name="hexpand">1</property>
+        <property name="hexpand">true</property>
         <property name="child">
           <object class="HeButtonContent">
             <property name="icon">document-export-symbolic</property>
-            <property name="label" translatable="yes">Export Note…</property>
+            <property name="label" translatable="true">Export Note…</property>
           </object>
         </property>
       </object>
     </child>
   </template>
-</interface>
+</interface>
\ No newline at end of file
diff --git a/data/ui/notebookmainrowcontent.ui b/data/ui/notebookmainrowcontent.ui
index 290d94b..88814ec 100644
--- a/data/ui/notebookmainrowcontent.ui
+++ b/data/ui/notebookmainrowcontent.ui
@@ -6,6 +6,9 @@
       <property name="orientation">horizontal</property>
       <property name="valign">center</property>
       <property name="spacing">12</property>
+      <style>
+        <class name="mini-content-block"/>
+      </style>
       <child>
         <object class="GtkImage">
           <property name="halign">start</property>
diff --git a/data/ui/notecontentview.ui b/data/ui/notecontentview.ui
index 91e3595..a74730a 100644
--- a/data/ui/notecontentview.ui
+++ b/data/ui/notecontentview.ui
@@ -25,6 +25,7 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="HeAppBar" id="ftitlebar">
+                    <property name="show-left-title-buttons">0</property>
                     <property name="show-back">0</property>
                     <property name="width-request">360</property>
                   </object>
@@ -52,9 +53,7 @@
                       <object class="GtkOverlay">
                         <child>
                           <object class="HeContentBlockImage" id="image">
-                            <property name="height-request">182</property>
-                            <property name="width-request">450</property>
-                            <property name="rounded">0</property>
+                            <property name="requested-height">160</property>
                           </object>
                         </child>
                         <child type="overlay">
diff --git a/data/ui/noterowcontent.ui b/data/ui/noterowcontent.ui
index 3ebc4cb..5508db1 100644
--- a/data/ui/noterowcontent.ui
+++ b/data/ui/noterowcontent.ui
@@ -9,6 +9,12 @@
       <style>
         <class name="mini-content-block"/>
       </style>
+      <child type="prefix">
+        <object class="HeContentBlockImage" id="image">
+          <property name="requested-height">48</property>
+          <property name="requested-width">48</property>
+        </object>
+      </child>
       <child>
         <object class="GtkBox">
           <property name="orientation">vertical</property>
@@ -34,14 +40,10 @@
               <property name="halign">start</property>
               <property name="hexpand">1</property>
               <property name="ellipsize">end</property>
-              <property name="single-line-mode">yes</property>
               <property name="max-width-chars">25</property>
               <property name="use-markup">1</property>
               <binding name="label">
-                <closure type="gchararray" function="get_subtitle_line">
-                  <lookup name="subtitle" type="NotejotNote">
-                    <lookup name="note">NotejotNoteRowContent</lookup>
-                  </lookup>
+                <closure type="gchararray" function="get_text_line">
                   <lookup name="text" type="NotejotNote">
                     <lookup name="note">NotejotNoteRowContent</lookup>
                   </lookup>
@@ -52,20 +54,25 @@
               </style>
             </object>
           </child>
+        </object>
+      </child>
+      <child>
+        <object class="GtkBox">
+          <property name="halign">end</property>
+          <property name="valign">start</property>
+          <property name="spacing">6</property>
           <child>
             <object class="GtkLabel">
               <property name="halign">start</property>
+              <property name="valign">start</property>
               <property name="hexpand">1</property>
               <property name="ellipsize">end</property>
               <property name="single-line-mode">yes</property>
               <property name="max-width-chars">25</property>
               <property name="use-markup">1</property>
               <binding name="label">
-                <closure type="gchararray" function="get_text_line">
-                  <lookup name="content" type="NotejotNote">
-                    <lookup name="note">NotejotNoteRowContent</lookup>
-                  </lookup>
-                  <lookup name="text" type="NotejotNote">
+                <closure type="gchararray" function="get_subtitle_line">
+                  <lookup name="subtitle" type="NotejotNote">
                     <lookup name="note">NotejotNoteRowContent</lookup>
                   </lookup>
                 </closure>
@@ -75,37 +82,32 @@
               </style>
             </object>
           </child>
+          <child>
+            <object class="GtkImage" id="pin">
+              <property name="valign">start</property>
+              <property name="halign">end</property>
+              <property name="hexpand">1</property>
+              <property name="icon-name">view-pin-symbolic</property>
+              <binding name="visible">
+                <lookup name="pinned" type="NotejotNote">
+                  <lookup name="note">NotejotNoteRowContent</lookup>
+                </lookup>
+              </binding>
+            </object>
+          </child>
+          <child>
+            <object class="GtkBox" id="box">
+              <property name="width-request">16</property>
+              <property name="height-request">16</property>
+              <property name="halign">1</property>
+              <property name="valign">1</property>
+              <style>
+                <class name="notejot-sidebar-box"/>
+              </style>
+            </object>
+          </child>
         </object>
       </child>
-      <child>
-        <object class="GtkImage" id="pin">
-          <property name="valign">start</property>
-          <property name="halign">end</property>
-          <property name="hexpand">1</property>
-          <property name="icon-name">view-pin-symbolic</property>
-          <binding name="visible">
-            <lookup name="pinned" type="NotejotNote">
-              <lookup name="note">NotejotNoteRowContent</lookup>
-            </lookup>
-          </binding>
-        </object>
-      </child>
-      <child type="prefix">
-        <object class="HeContentBlockImage" id="image">
-          <property name="height-request">44</property>
-          <property name="width-request">44</property>
-          <property name="rounded">1</property>
-        </object>
-      </child>
-      <object class="GtkBox" id="box">
-        <property name="width-request">16</property>
-        <property name="height-request">16</property>
-        <property name="halign">1</property>
-        <property name="valign">1</property>
-        <style>
-          <class name="notejot-sidebar-box"/>
-        </style>
-      </object>
     </object>
   </child>
 </template>
diff --git a/data/ui/trashcontentview.ui b/data/ui/trashcontentview.ui
index 0fabb18..cb3ad4a 100644
--- a/data/ui/trashcontentview.ui
+++ b/data/ui/trashcontentview.ui
@@ -18,7 +18,7 @@
                 <property name="orientation">vertical</property>
                 <child>
                   <object class="HeAppBar" id="ftitlebar">
-                    <property name="show-buttons">1</property>
+                    <property name="show-left-title-buttons">0</property>
                     <property name="show-back">0</property>
                     <property name="width-request">420</property>
                   </object>
@@ -50,9 +50,7 @@
                       <object class="GtkOverlay">
                         <child>
                           <object class="HeContentBlockImage" id="image">
-                            <property name="height-request">182</property>
-                            <property name="width-request">450</property>
-                            <property name="rounded">0</property>
+                            <property name="requested-height">160</property>
                           </object>
                         </child>
                         <child type="overlay">
@@ -60,8 +58,8 @@
                             <property name="orientation">vertical</property>
                             <child>
                               <object class="HeAppBar" id="titlebar">
-                                <property name="show-buttons">1</property>
                                 <property name="width-request">420</property>
+                                <property name="height-request">182</property>
                                 <property name="viewtitle-widget">
                                   <object class="GtkLabel" id="trash_title">
                                     <property name="hexpand">1</property>