[latexila] Use "x-office-presentation" icon name



commit af32a9bdeda7b75587f032c2f22d5c28c0fc201a
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Dec 24 18:28:15 2014 +0100

    Use "x-office-presentation" icon name
    
    And use the icon-name property in MenuToolAction instead of stock-id.

 src/latex_menu.vala      |    8 ++++----
 src/menu_in_toolbar.vala |    4 ++--
 src/stock_icons.vala     |    1 -
 3 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/src/latex_menu.vala b/src/latex_menu.vala
index 1ea95c8..70e0b5c 100644
--- a/src/latex_menu.vala
+++ b/src/latex_menu.vala
@@ -195,7 +195,7 @@ public class LatexMenu : Gtk.ActionGroup
 
         // LaTeX: Presentation
 
-        { "Presentation", "presentation", "_Presentation" },
+        { "Presentation", "x-office-presentation", "_Presentation" },
         { "PresentationFrame", null, "\\begin{frame}", null,
             N_("Frame - \\begin{frame}"), on_present_frame },
         { "PresentationBlock", null, "\\begin{block}", null,
@@ -457,7 +457,7 @@ public class LatexMenu : Gtk.ActionGroup
             _("References"), "references");
 
         Gtk.Action presentation_env = get_menu_tool_action ("PresentationToolItem",
-            _("Presentation Environments"), "presentation");
+            _("Presentation Environments"), "x-office-presentation");
 
         Gtk.Action math_env = get_menu_tool_action ("MathEnvironmentsToolItem",
             _("Math Environments"), "math");
@@ -478,9 +478,9 @@ public class LatexMenu : Gtk.ActionGroup
         add_action (math_right_del);
     }
 
-    private Gtk.Action get_menu_tool_action (string name, string? label, string? stock_id)
+    private Gtk.Action get_menu_tool_action (string name, string? label, string? icon_name)
     {
-        Gtk.Action action = new MenuToolAction (name, label, label, stock_id);
+        Gtk.Action action = new MenuToolAction (name, label, label, icon_name);
         Activatable menu_tool_button = (Activatable) new MenuToolButton (null, null);
         menu_tool_button.set_related_action (action);
         return action;
diff --git a/src/menu_in_toolbar.vala b/src/menu_in_toolbar.vala
index 3f7afe8..f2a095c 100644
--- a/src/menu_in_toolbar.vala
+++ b/src/menu_in_toolbar.vala
@@ -21,9 +21,9 @@ using Gtk;
 
 public class MenuToolAction : Gtk.Action
 {
-    public MenuToolAction (string name, string? label, string? tooltip, string? stock_id)
+    public MenuToolAction (string name, string? label, string? tooltip, string? icon_name)
     {
-        GLib.Object (name: name, label: label, tooltip: tooltip, stock_id: stock_id);
+        GLib.Object (name: name, label: label, tooltip: tooltip, icon_name: icon_name);
         unowned GtkActionClass ac = (GtkActionClass) get_class ();
         ac.toolbar_item_type = typeof (MenuToolButton);
     }
diff --git a/src/stock_icons.vala b/src/stock_icons.vala
index fbf8915..5ebe5ce 100644
--- a/src/stock_icons.vala
+++ b/src/stock_icons.vala
@@ -31,7 +31,6 @@ public class StockIcons
         register_new_stock_icons ();
 
         add_theme_icon_to_stock ("image-x-generic", "image");
-        add_theme_icon_to_stock ("x-office-presentation", "presentation");
     }
 
     private void add_theme_icon_to_stock (string icon_name, string stock_id)


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]