From 1339816ded9932d6bd256bd88ca5b87afc4eb4c6 Mon Sep 17 00:00:00 2001
From: lainsce <paulogalardi@outlook.com>
Date: Sat, 10 Feb 2024 13:21:34 -0300
Subject: [PATCH] Impl better main menu

---
 data/io.github.lainsce.Notejot.gresource.xml |  1 +
 data/meson.build                             |  1 +
 data/ui/main_menu.blp                        | 60 ++++++++++++++++++
 data/ui/main_window.ui                       | 64 +-------------------
 data/ui/note_theme.blp                       |  7 ++-
 meson.build                                  |  3 +-
 src/MainWindow.vala                          | 10 ++-
 src/Widgets/MainMenu.vala                    | 25 ++++++++
 8 files changed, 104 insertions(+), 67 deletions(-)
 create mode 100644 data/ui/main_menu.blp
 create mode 100644 src/Widgets/MainMenu.vala

diff --git a/data/io.github.lainsce.Notejot.gresource.xml b/data/io.github.lainsce.Notejot.gresource.xml
index e81abab..56fd3b1 100644
--- a/data/io.github.lainsce.Notejot.gresource.xml
+++ b/data/io.github.lainsce.Notejot.gresource.xml
@@ -6,6 +6,7 @@
       <file alias="edit_notebooks.ui">ui/edit_notebooks.ui</file>
       <file alias="move_to_dialog.ui">ui/move_to_dialog.ui</file>
       <file alias="main_window.ui">ui/main_window.ui</file>
+      <file alias="main_menu.ui">ui/main_menu.ui</file>
       <file alias="note_theme.ui">ui/note_theme.ui</file>
       <file alias="notecontentview.ui">ui/notecontentview.ui</file>
       <file alias="notelistview.ui">ui/notelistview.ui</file>
diff --git a/data/meson.build b/data/meson.build
index 79acc7d..af001a4 100644
--- a/data/meson.build
+++ b/data/meson.build
@@ -60,6 +60,7 @@ blueprints = custom_target(
   'blueprints',
   input: files(
     'ui/edit_notebooks.blp',
+    'ui/main_menu.blp',
     'ui/move_to_dialog.blp',
     'ui/note_theme.blp',
     'ui/notebooklistview.blp',
diff --git a/data/ui/main_menu.blp b/data/ui/main_menu.blp
new file mode 100644
index 0000000..d28729e
--- /dev/null
+++ b/data/ui/main_menu.blp
@@ -0,0 +1,60 @@
+using Gtk 4.0;
+using He 1;
+
+template $NotejotWidgetsMainMenu : Box {
+  orientation: vertical;
+  styles [
+    "notejot-theme",
+  ]
+
+  Box {
+    orientation: vertical;
+    spacing: 6;
+    margin-start: 6;
+    margin-end: 10;
+
+    Label {
+      label: _('Font Size');
+      halign: start;
+      styles [
+        "caption",
+        "dim-label",
+      ]
+    }
+
+    He.SegmentedButton {
+      ToggleButton s {
+        label: 'Small';
+        action-name: 'app.font-size';
+        action-target: '"\'small\'"';
+      }
+
+      ToggleButton {
+        label: 'Medium';
+        action-name: 'app.font-size';
+        action-target: '"\'medium\'"';
+        group: s;
+      }
+
+      ToggleButton {
+        label: 'Large';
+        action-name: 'app.font-size';
+        action-target: '"\'large\'"';
+        group: s;
+      }
+    }
+  }
+
+  He.Divider {
+  }
+
+  He.TextButton about_button {
+    hexpand: true;
+    action-name: 'win.action_about';
+    child: 
+    He.ButtonContent {
+      icon: "dialog-information-symbolic";
+      label: _("About Notejot");
+    };
+  }
+}
\ No newline at end of file
diff --git a/data/ui/main_window.ui b/data/ui/main_window.ui
index f599320..102310a 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>
@@ -51,59 +43,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/note_theme.blp b/data/ui/note_theme.blp
index 06ad59f..fdd476f 100644
--- a/data/ui/note_theme.blp
+++ b/data/ui/note_theme.blp
@@ -9,12 +9,13 @@ template $NotejotWidgetsNoteTheme : Box {
   ]
 
   Label {
-    margin-start: 8;
-    margin-bottom: 6;
+    margin-start: 6;
+    margin-end: 10;
     halign: start;
     label: _("Note Color");
 
     styles [
+      "caption",
       "dim-label",
     ]
   }
@@ -23,7 +24,7 @@ template $NotejotWidgetsNoteTheme : Box {
     column-spacing: 6;
     row-spacing: 6;
     margin-start: 6;
-    margin-end: 6;
+    margin-end: 10;
     hexpand: true;
 
     CheckButton color_button_red {
diff --git a/meson.build b/meson.build
index 33e59db..30e1603 100644
--- a/meson.build
+++ b/meson.build
@@ -67,7 +67,8 @@ sources = [
   'src/Views/TrashContentView.vala',
   'src/Views/TrashListView.vala',
   'src/Views/View.vala',
-  'src/Widgets/EditNotebookDialog.vala',\
+  'src/Widgets/EditNotebookDialog.vala',
+  'src/Widgets/MainMenu.vala',
   'src/Widgets/NotebookMainRowContent.vala',
   'src/Widgets/NoteRowContent.vala',
   'src/Widgets/MoveToDialog.vala',
diff --git a/src/MainWindow.vala b/src/MainWindow.vala
index 63fd293..fba2405 100644
--- a/src/MainWindow.vala
+++ b/src/MainWindow.vala
@@ -149,7 +149,15 @@ namespace Notejot {
             this.mw = (MainWindow) app.get_active_window ();
             this.album = albumt;
 
-            menu_button.get_popover ().has_arrow = false;
+            // Main Menu
+            var nmp = new Widgets.MainMenu ();
+            var pop = (Gtk.PopoverMenu)menu_button.get_popover ();
+            pop.add_child (nmp, "zoom");
+            pop.has_arrow = false;
+
+            nmp.about_button.clicked.connect (() => {
+                pop.closed ();
+            });
         }
 
         protected override bool close_request () {
diff --git a/src/Widgets/MainMenu.vala b/src/Widgets/MainMenu.vala
new file mode 100644
index 0000000..31cbeb0
--- /dev/null
+++ b/src/Widgets/MainMenu.vala
@@ -0,0 +1,25 @@
+/*
+ * Copyright (C) 2017-2022 Lains
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 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
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA 02110-1301 USA
+ */
+ namespace Notejot {
+    [GtkTemplate (ui = "/io/github/lainsce/Notejot/main_menu.ui")]
+    public class Widgets.MainMenu : Gtk.Box {
+        [GtkChild]
+        public unowned He.TextButton about_button;
+    }
+}