GNOME.org
 

[gnome-latex] Edit toolbar: start over

commit 8e640cd1e2fd41273059db1e4f5dde48a4941b19
Author: SĂŠbastien Wilmet <swilmet gnome org>
Date:   Mon Apr 27 13:45:00 2020 +0200

    Edit toolbar: start over
    
    The toolbar will be created with Amtk instead in a following commit.
    
    It's really great to get rid of menu_in_toolbar.vala, because it was
    tricky to implement. I remember implementing it first in C for the
    <= 0.2 versions, it was the first GObject subclass that I created
    in C :-) then I struggled to re-implement it in Vala, and now it's
    finnaly gone!! \o/

 docs/reference/gnome-latex-sections.txt   |  1 +
 po/POTFILES.in                            |  1 -
 po/POTFILES.skip                          |  1 -
 src/Makefile.am                           |  1 -
 src/latex_menu.vala                       | 29 ----------
 src/liblatexila/latexila-latex-commands.c | 17 ++++++
 src/liblatexila/latexila-latex-commands.h |  6 +-
 src/main_window.vala                      |  8 +--
 src/menu_in_toolbar.vala                  | 30 ----------
 src/ui/gnome-latex.adwaita.css            |  2 +-
 src/ui/ui.xml                             | 91 -------------------------------
 11 files changed, 24 insertions(+), 163 deletions(-)
---
diff --git a/docs/reference/gnome-latex-sections.txt b/docs/reference/gnome-latex-sections.txt
index 6fe2bcf..bf3634e 100644
--- a/docs/reference/gnome-latex-sections.txt
+++ b/docs/reference/gnome-latex-sections.txt
@@ -149,6 +149,7 @@ latexila_factory_get_type
 <FILE>latex-commands</FILE>
 latexila_latex_commands_add_action_infos
 latexila_latex_commands_add_actions
+latexila_latex_commands_get_edit_toolbar
 </SECTION>
 
 <SECTION>
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 68f09cc..ba1ab40 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -52,7 +52,6 @@ src/main_window_file.vala
 src/main_window_structure.vala
 src/main_window_tools.vala
 src/main_window.vala
-src/menu_in_toolbar.vala
 src/most_used_symbols.vala
 src/preferences_dialog.vala
 src/project_dialogs.vala
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 185c9b4..45dc23b 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -25,7 +25,6 @@ src/main_window_edit.c
 src/main_window_file.c
 src/main_window_structure.c
 src/main_window_tools.c
-src/menu_in_toolbar.c
 src/most_used_symbols.c
 src/post_processors.c
 src/preferences_dialog.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 65c8590..8a2abd5 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -47,7 +47,6 @@ vala_files =                          \
        main_window_structure.vala      \
        main_window_tools.vala          \
        main_window.vala                \
-       menu_in_toolbar.vala            \
        most_used_symbols.vala          \
        preferences_dialog.vala         \
        project_dialogs.vala            \
diff --git a/src/latex_menu.vala b/src/latex_menu.vala
index 4480dc8..33da685 100644
--- a/src/latex_menu.vala
+++ b/src/latex_menu.vala
@@ -62,28 +62,7 @@ public class LatexMenu : Gtk.ActionGroup
 
         this.main_window = main_window;
 
-        // menus under toolitems
-        Gtk.Action sectioning = get_menu_tool_action ("SectioningToolItem",
-            _("Sectioning"), "sectioning");
-
-        Gtk.Action sizes = get_menu_tool_action ("CharacterSizeToolItem",
-            _("Characters Sizes"), "character-size");
-
-        Gtk.Action references = get_menu_tool_action ("ReferencesToolItem",
-            _("References"), "references");
-
-        Gtk.Action presentation_env = get_menu_tool_action ("PresentationToolItem",
-            _("Presentation Environments"), "x-office-presentation");
-
-        Gtk.Action math_env = get_menu_tool_action ("MathEnvironmentsToolItem",
-            _("Math Environments"), "math");
-
         add_actions (latex_action_entries, this);
-        add_action (sectioning);
-        add_action (sizes);
-        add_action (references);
-        add_action (presentation_env);
-        add_action (math_env);
 
         /* GActions */
 
@@ -496,12 +475,4 @@ public class LatexMenu : Gtk.ActionGroup
         Amtk.utils_create_gtk_action (main_window, "win.math-command-delimiter-right9",
             this, "MathRightDelimiter9");
     }
-
-    private Gtk.Action get_menu_tool_action (string name, string? label, string? icon_name)
-    {
-        Gtk.Action action = new MenuToolAction (name, label, label, icon_name);
-        MenuToolButton menu_tool_button = new MenuToolButton (null, null);
-        menu_tool_button.set_related_action (action);
-        return action;
-    }
 }
diff --git a/src/liblatexila/latexila-latex-commands.c b/src/liblatexila/latexila-latex-commands.c
index 339c4dc..6b250ce 100644
--- a/src/liblatexila/latexila-latex-commands.c
+++ b/src/liblatexila/latexila-latex-commands.c
@@ -1312,3 +1312,20 @@ latexila_latex_commands_add_actions (GtkApplicationWindow *gtk_window)
                                                       G_N_ELEMENTS (entries),
                                                       tepl_window);
 }
+
+/**
+ * latexila_latex_commands_get_edit_toolbar:
+ *
+ * Returns: (transfer floating): a new #GtkToolbar with the most common LaTeX
+ * actions.
+ */
+GtkToolbar *
+latexila_latex_commands_get_edit_toolbar (void)
+{
+       GtkToolbar *toolbar;
+
+       toolbar = GTK_TOOLBAR (gtk_toolbar_new ());
+       gtk_widget_show_all (GTK_WIDGET (toolbar));
+
+       return toolbar;
+}
diff --git a/src/liblatexila/latexila-latex-commands.h b/src/liblatexila/latexila-latex-commands.h
index a68188d..e9a1e1b 100644
--- a/src/liblatexila/latexila-latex-commands.h
+++ b/src/liblatexila/latexila-latex-commands.h
@@ -24,9 +24,11 @@
 
 G_BEGIN_DECLS
 
-void   latexila_latex_commands_add_action_infos        (GtkApplication *gtk_app);
+void           latexila_latex_commands_add_action_infos        (GtkApplication *gtk_app);
 
-void   latexila_latex_commands_add_actions             (GtkApplicationWindow *gtk_window);
+void           latexila_latex_commands_add_actions             (GtkApplicationWindow *gtk_window);
+
+GtkToolbar *   latexila_latex_commands_get_edit_toolbar        (void);
 
 G_END_DECLS
 
diff --git a/src/main_window.vala b/src/main_window.vala
index 34f75a7..dd3b8e3 100644
--- a/src/main_window.vala
+++ b/src/main_window.vala
@@ -407,13 +407,7 @@ public class MainWindow : ApplicationWindow
 
     private Toolbar get_edit_toolbar ()
     {
-        Toolbar edit_toolbar = _ui_manager.get_widget ("/EditToolbar") as Toolbar;
-        edit_toolbar.set_style (ToolbarStyle.ICONS);
-
-        StyleContext context = edit_toolbar.get_style_context ();
-        context.add_class ("gnome-latex-edit-toolbar");
-
-        edit_toolbar.show_all ();
+        Toolbar edit_toolbar = Latexila.latex_commands_get_edit_toolbar ();
 
         ToggleAction action =
             _action_group.get_action ("ViewEditToolbar") as ToggleAction;
diff --git a/src/ui/gnome-latex.adwaita.css b/src/ui/gnome-latex.adwaita.css
index 5ef9471..44f3898 100644
--- a/src/ui/gnome-latex.adwaita.css
+++ b/src/ui/gnome-latex.adwaita.css
@@ -1,3 +1,3 @@
-.primary-toolbar button, .gnome-latex-edit-toolbar button {
+.primary-toolbar button {
     padding: 2px;
 }
diff --git a/src/ui/ui.xml b/src/ui/ui.xml
index 1bd0167..8375719 100644
--- a/src/ui/ui.xml
+++ b/src/ui/ui.xml
@@ -416,97 +416,6 @@ along with GNOME LaTeX.  If not, see <http://www.gnu.org/licenses/>.
     <placeholder name="BuildToolsPlaceholderToolbar" />
   </toolbar>
 
-  <toolbar name="EditToolbar">
-    <toolitem action="SectioningToolItem">
-      <menu action="Sectioning">
-        <menuitem action="SectioningPart" />
-        <menuitem action="SectioningChapter" />
-        <separator />
-        <menuitem action="SectioningSection" />
-        <menuitem action="SectioningSubsection" />
-        <menuitem action="SectioningSubsubsection" />
-        <menuitem action="SectioningParagraph" />
-        <menuitem action="SectioningSubparagraph" />
-      </menu>
-    </toolitem>
-
-    <toolitem action="ReferencesToolItem">
-      <menu action="References">
-        <menuitem action="ReferencesLabel" />
-        <menuitem action="ReferencesRef" />
-        <menuitem action="ReferencesPageref" />
-        <menuitem action="ReferencesIndex" />
-        <menuitem action="ReferencesFootnote" />
-        <menuitem action="ReferencesCite" />
-      </menu>
-    </toolitem>
-
-    <toolitem action="CharacterSizeToolItem">
-      <menu action="CharacterSize">
-        <menuitem action="CharacterSizeTiny" />
-        <menuitem action="CharacterSizeScriptsize" />
-        <menuitem action="CharacterSizeFootnotesize" />
-        <menuitem action="CharacterSizeSmall" />
-        <menuitem action="CharacterSizeNormalsize" />
-        <menuitem action="CharacterSizelarge" />
-        <menuitem action="CharacterSizeLarge" />
-        <menuitem action="CharacterSizeLARGE" />
-        <menuitem action="CharacterSizehuge" />
-        <menuitem action="CharacterSizeHuge" />
-      </menu>
-    </toolitem>
-
-    <separator />
-
-    <toolitem action="Bold" />
-    <toolitem action="Italic" />
-    <toolitem action="Typewriter" />
-    <toolitem action="Underline" />
-
-    <separator />
-
-    <toolitem action="EnvCenter" />
-
-    <separator />
-
-    <toolitem action="ListEnvItemize" />
-    <toolitem action="ListEnvEnumerate" />
-    <toolitem action="ListEnvDescription" />
-
-    <separator />
-
-    <toolitem action="EnvFigure" />
-    <toolitem action="EnvTable" />
-
-    <separator />
-
-    <toolitem action="PresentationToolItem">
-      <menu action="Presentation">
-        <menuitem action="PresentationFrame" />
-        <menuitem action="PresentationBlock" />
-        <menuitem action="PresentationColumns" />
-      </menu>
-    </toolitem>
-
-    <separator />
-
-    <toolitem action="MathEnvironmentsToolItem">
-      <menu action="MathEnvironments">
-        <menuitem action="MathEnvNormal" />
-        <menuitem action="MathEnvCentered" />
-        <menuitem action="MathEnvNumbered" />
-        <menuitem action="MathEnvArray" />
-        <menuitem action="MathEnvNumberedArray" />
-      </menu>
-    </toolitem>
-    <separator />
-    <toolitem action="MathSuperscript" />
-    <toolitem action="MathSubscript" />
-    <separator />
-    <toolitem action="MathFrac" />
-    <toolitem action="MathSquareRoot" />
-  </toolbar>
-
   <toolbar name="BuildToolbar">
     <toolitem action="BuildStopExecution" />
     <toolitem action="BuildViewLog" />
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]