[latexila] icons: move stock-icons to data/icons/



commit b178399be4ac909c0cb9665a2b5020e59850943d
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Wed Dec 24 18:09:49 2014 +0100

    icons: move stock-icons to data/icons/
    
    The icons available in several sizes are no longer duplicated with
    suffixes like "-size16" and "-size24", they are just put in the right
    directories.

 data/icons/16x16/Makefile.am                       |    3 +
 .../16x16/actions/list-description.png}            |  Bin 364 -> 364 bytes
 .../16x16/actions/list-enumerate.png}              |  Bin 454 -> 454 bytes
 .../16x16/actions/list-item.png}                   |  Bin 365 -> 365 bytes
 .../16x16/actions/list-itemize.png}                |  Bin 364 -> 364 bytes
 .../16x16/actions/sectioning.png}                  |  Bin 331 -> 331 bytes
 .../16x16/actions}/symbol_arrows.png               |  Bin 288 -> 288 bytes
 .../16x16/actions}/symbol_delimiters.png           |  Bin 171 -> 171 bytes
 .../16x16/actions}/symbol_greek.png                |  Bin 354 -> 354 bytes
 .../16x16/actions}/symbol_misc_math.png            |  Bin 462 -> 462 bytes
 .../16x16/actions}/symbol_misc_text.png            |  Bin 465 -> 465 bytes
 .../16x16/actions}/symbol_operators.png            |  Bin 362 -> 362 bytes
 .../16x16/actions}/symbol_relations.png            |  Bin 305 -> 305 bytes
 .../16x16/actions/table.png}                       |  Bin 311 -> 311 bytes
 .../16x16/actions}/tree_chapter.png                |  Bin 247 -> 247 bytes
 .../16x16/actions}/tree_label.license              |    0
 .../16x16/actions}/tree_label.png                  |  Bin 752 -> 752 bytes
 .../16x16/actions}/tree_paragraph.png              |  Bin 1121 -> 1121 bytes
 .../16x16/actions}/tree_part.png                   |  Bin 116 -> 116 bytes
 .../16x16/actions}/tree_section.png                |  Bin 1121 -> 1121 bytes
 .../16x16/actions}/tree_subsection.png             |  Bin 1121 -> 1121 bytes
 .../16x16/actions}/tree_subsubsection.png          |  Bin 1121 -> 1121 bytes
 .../16x16/actions}/tree_todo.png                   |  Bin 380 -> 380 bytes
 .../16x16/actions}/view_log.png                    |  Bin 762 -> 762 bytes
 data/icons/24x24/Makefile.am                       |    3 +
 .../24x24/actions}/accent0.png                     |  Bin 465 -> 465 bytes
 .../24x24/actions}/accent1.png                     |  Bin 471 -> 471 bytes
 .../24x24/actions}/accent10.png                    |  Bin 418 -> 418 bytes
 .../24x24/actions}/accent11.png                    |  Bin 430 -> 430 bytes
 .../24x24/actions}/accent12.png                    |  Bin 404 -> 404 bytes
 .../24x24/actions}/accent13.png                    |  Bin 398 -> 398 bytes
 .../24x24/actions}/accent14.png                    |  Bin 425 -> 425 bytes
 .../24x24/actions}/accent15.png                    |  Bin 402 -> 402 bytes
 .../24x24/actions}/accent2.png                     |  Bin 477 -> 477 bytes
 .../24x24/actions}/accent3.png                     |  Bin 475 -> 475 bytes
 .../24x24/actions}/accent4.png                     |  Bin 481 -> 481 bytes
 .../24x24/actions}/accent5.png                     |  Bin 453 -> 453 bytes
 .../24x24/actions}/accent6.png                     |  Bin 459 -> 459 bytes
 .../24x24/actions}/accent7.png                     |  Bin 487 -> 487 bytes
 .../24x24/actions}/accent8.png                     |  Bin 480 -> 480 bytes
 .../24x24/actions}/accent9.png                     |  Bin 487 -> 487 bytes
 .../stock-icons => icons/24x24/actions}/bold.png   |  Bin 387 -> 387 bytes
 .../24x24/actions}/character-size.png              |  Bin 514 -> 514 bytes
 .../24x24/actions}/compile_dvi.png                 |  Bin 1338 -> 1338 bytes
 .../24x24/actions}/compile_pdf.png                 |  Bin 1287 -> 1287 bytes
 .../24x24/actions}/compile_ps.png                  |  Bin 1408 -> 1408 bytes
 .../24x24/actions}/completion_cmd.png              |  Bin 327 -> 327 bytes
 .../24x24/actions}/delimiters-left.png             |  Bin 286 -> 286 bytes
 .../24x24/actions}/delimiters-right.png            |  Bin 281 -> 281 bytes
 .../24x24/actions}/gray-square.png                 |  Bin 212 -> 212 bytes
 .../stock-icons => icons/24x24/actions}/italic.png |  Bin 288 -> 288 bytes
 .../24x24/actions/list-description.png}            |  Bin 439 -> 439 bytes
 .../24x24/actions/list-enumerate.png}              |  Bin 496 -> 496 bytes
 .../24x24/actions/list-item.png}                   |  Bin 590 -> 590 bytes
 .../24x24/actions/list-itemize.png}                |  Bin 469 -> 469 bytes
 .../24x24/actions}/math-frac.png                   |  Bin 391 -> 391 bytes
 .../24x24/actions}/math-nth-root.png               |  Bin 527 -> 527 bytes
 .../24x24/actions}/math-square-root.png            |  Bin 477 -> 477 bytes
 .../24x24/actions}/math-subscript.png              |  Bin 443 -> 443 bytes
 .../24x24/actions}/math-superscript.png            |  Bin 463 -> 463 bytes
 .../stock-icons => icons/24x24/actions}/math.png   |  Bin 973 -> 973 bytes
 .../24x24/actions}/mathaccent0.png                 |  Bin 417 -> 417 bytes
 .../24x24/actions}/mathaccent1.png                 |  Bin 418 -> 418 bytes
 .../24x24/actions}/mathaccent10.png                |  Bin 443 -> 443 bytes
 .../24x24/actions}/mathaccent2.png                 |  Bin 409 -> 409 bytes
 .../24x24/actions}/mathaccent3.png                 |  Bin 397 -> 397 bytes
 .../24x24/actions}/mathaccent4.png                 |  Bin 422 -> 422 bytes
 .../24x24/actions}/mathaccent5.png                 |  Bin 413 -> 413 bytes
 .../24x24/actions}/mathaccent6.png                 |  Bin 423 -> 423 bytes
 .../24x24/actions}/mathaccent7.png                 |  Bin 431 -> 431 bytes
 .../24x24/actions}/mathaccent8.png                 |  Bin 406 -> 406 bytes
 .../24x24/actions}/mathaccent9.png                 |  Bin 417 -> 417 bytes
 .../24x24/actions}/mathcal.png                     |  Bin 424 -> 424 bytes
 .../24x24/actions}/mathfrak.png                    |  Bin 491 -> 491 bytes
 .../24x24/actions}/references.png                  |  Bin 337 -> 337 bytes
 .../stock-icons => icons/24x24/actions}/roman.png  |  Bin 401 -> 401 bytes
 .../24x24/actions}/sans_serif.png                  |  Bin 464 -> 464 bytes
 .../24x24/actions/sectioning.png}                  |  Bin 478 -> 478 bytes
 .../24x24/actions}/slanted.png                     |  Bin 424 -> 424 bytes
 .../24x24/actions}/small_caps.png                  |  Bin 427 -> 427 bytes
 .../24x24/actions/table.png}                       |  Bin 438 -> 438 bytes
 .../24x24/actions}/typewriter.png                  |  Bin 290 -> 290 bytes
 .../24x24/actions}/underline.png                   |  Bin 335 -> 335 bytes
 .../24x24/mimetypes}/view_dvi.png                  |  Bin 942 -> 942 bytes
 .../24x24/mimetypes}/view_pdf.png                  |  Bin 924 -> 924 bytes
 .../24x24/mimetypes}/view_ps.png                   |  Bin 1008 -> 1008 bytes
 data/icons/Makefile.am                             |    3 +
 .../stock-icons => icons/others}/badbox.png        |  Bin 841 -> 841 bytes
 .../stock-icons => icons/others}/blackboard.png    |  Bin 382 -> 382 bytes
 data/images/Makefile.am                            |    3 +-
 src/latex_menu.vala                                |   26 +--
 src/latexila.gresource.xml                         |  184 ++++++++++----------
 src/liblatexila/latexila-utils.c                   |    4 +-
 src/stock_icons.vala                               |   17 +--
 src/structure.vala                                 |    2 +-
 src/ui/ui.xml                                      |    8 +-
 96 files changed, 126 insertions(+), 127 deletions(-)
---
diff --git a/data/icons/16x16/Makefile.am b/data/icons/16x16/Makefile.am
index 906a50e..be15cbe 100644
--- a/data/icons/16x16/Makefile.am
+++ b/data/icons/16x16/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = apps
 
+# Included in a GResource.
+EXTRA_DIST = actions
+
 -include $(top_srcdir)/git.mk
diff --git a/data/images/stock-icons/tree_label.license b/data/icons/16x16/actions/tree_label.license
similarity index 100%
rename from data/images/stock-icons/tree_label.license
rename to data/icons/16x16/actions/tree_label.license
diff --git a/data/icons/24x24/Makefile.am b/data/icons/24x24/Makefile.am
index 906a50e..f96b761 100644
--- a/data/icons/24x24/Makefile.am
+++ b/data/icons/24x24/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = apps
 
+# Included in a GResource.
+EXTRA_DIST = actions mimetypes
+
 -include $(top_srcdir)/git.mk
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index 2ef7883..36f3607 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -1,3 +1,6 @@
 SUBDIRS = 16x16 22x22 24x24 32x32 48x48 128x128 256x256 scalable
 
+# Included in a GResource.
+EXTRA_DIST = others
+
 -include $(top_srcdir)/git.mk
diff --git a/data/images/Makefile.am b/data/images/Makefile.am
index 78b64be..800b49d 100644
--- a/data/images/Makefile.am
+++ b/data/images/Makefile.am
@@ -7,7 +7,6 @@ EXTRA_DIST =            \
        misc-math       \
        misc-text       \
        operators       \
-       relations       \
-       stock-icons
+       relations
 
 -include $(top_srcdir)/git.mk
diff --git a/src/latex_menu.vala b/src/latex_menu.vala
index aa24097..df6c550 100644
--- a/src/latex_menu.vala
+++ b/src/latex_menu.vala
@@ -29,7 +29,7 @@ public class LatexMenu : Gtk.ActionGroup
 
         // LaTeX: Sectioning
 
-        { "Sectioning", "sectioning-size16", N_("_Sectioning") },
+        { "Sectioning", "sectioning", N_("_Sectioning") },
         { "SectioningPart", null, "\\_part", null,
             N_("Part"), on_sectioning_part },
         { "SectioningChapter", null, "\\_chapter", null,
@@ -72,9 +72,7 @@ public class LatexMenu : Gtk.ActionGroup
             N_("Align Right - \\begin{flushright}"), on_env_right },
         { "EnvFigure", "image-x-generic", "\\begin{_figure}", null,
             N_("Figure - \\begin{figure}"), on_env_figure },
-        { "EnvTable", "table-size16", "\\begin{_table}", null,
-            N_("Table - \\begin{table}"), on_env_table },
-        { "EnvTableToolitem", "table-size24", "\\begin{_table}", null,
+        { "EnvTable", "table", "\\begin{_table}", null,
             N_("Table - \\begin{table}"), on_env_table },
         { "EnvQuote", null, "\\begin{_quote}", null,
             N_("Quote - \\begin{quote}"), on_env_quote },
@@ -91,22 +89,16 @@ public class LatexMenu : Gtk.ActionGroup
 
         // LaTeX: list environments
 
-        { "ListEnvironments", "list-itemize-size16", N_("_List Environments") },
-        { "ListEnvItemize", "list-itemize-size16", "\\begin{_itemize}", null,
-            N_("Bulleted List - \\begin{itemize}"), on_list_env_itemize },
-        { "ListEnvItemizeToolitem", "list-itemize-size24", "\\begin{_itemize}", null,
+        { "ListEnvironments", "list-itemize", N_("_List Environments") },
+        { "ListEnvItemize", "list-itemize", "\\begin{_itemize}", null,
             N_("Bulleted List - \\begin{itemize}"), on_list_env_itemize },
-        { "ListEnvEnumerate", "list-enumerate-size16", "\\begin{_enumerate}", null,
+        { "ListEnvEnumerate", "list-enumerate", "\\begin{_enumerate}", null,
             N_("Enumeration - \\begin{enumerate}"), on_list_env_enumerate },
-        { "ListEnvEnumerateToolitem", "list-enumerate-size24", "\\begin{_enumerate}",
-            null, N_("Enumeration - \\begin{enumerate}"), on_list_env_enumerate },
-        { "ListEnvDescription", "list-description-size16", "\\begin{_description}", null,
-            N_("Description - \\begin{description}"), on_list_env_description },
-        { "ListEnvDescriptionToolitem", "list-description-size24", "\\begin{_description}", null,
+        { "ListEnvDescription", "list-description", "\\begin{_description}", null,
             N_("Description - \\begin{description}"), on_list_env_description },
         { "ListEnvList", null, "\\begin{_list}", null,
             N_("Custom list - \\begin{list}"), on_list_env_list },
-        { "ListEnvItem", "list-item-size16", "\\i_tem", "<Alt><Shift>H",
+        { "ListEnvItem", "list-item", "\\i_tem", "<Alt><Shift>H",
             N_("List item - \\item"), on_list_env_item },
 
         // LaTeX: character sizes
@@ -179,7 +171,7 @@ public class LatexMenu : Gtk.ActionGroup
 
         // LaTeX: Tabular
 
-        { "Tabular", "table-size16", N_("_Tabular") },
+        { "Tabular", "table", N_("_Tabular") },
         { "TabularTabbing", null, "\\begin{ta_bbing}", null,
             N_("Tabbing - \\begin{tabbing}"), on_tabular_tabbing },
         { "TabularTabular", null, "\\begin{_tabular}", null,
@@ -448,7 +440,7 @@ public class LatexMenu : Gtk.ActionGroup
 
         // menus under toolitems
         Gtk.Action sectioning = get_menu_tool_action ("SectioningToolItem",
-            _("Sectioning"), "sectioning-size24");
+            _("Sectioning"), "sectioning");
 
         Gtk.Action sizes = get_menu_tool_action ("CharacterSizeToolItem",
             _("Characters Sizes"), "character-size");
diff --git a/src/latexila.gresource.xml b/src/latexila.gresource.xml
index 1491956..cc0a7b4 100644
--- a/src/latexila.gresource.xml
+++ b/src/latexila.gresource.xml
@@ -5,95 +5,101 @@
     <file>ui/latexila.adwaita.css</file>
   </gresource>
 
-  <gresource prefix="/org/gnome/latexila/stock-icons">
-    <!--
-    List of icons that are registered as new stock icons, so it can be used
-    in menus for example.
-    -->
-    <file alias="accent0.png" preprocess="to-pixdata">../data/images/stock-icons/accent0.png</file>
-    <file alias="accent1.png" preprocess="to-pixdata">../data/images/stock-icons/accent1.png</file>
-    <file alias="accent2.png" preprocess="to-pixdata">../data/images/stock-icons/accent2.png</file>
-    <file alias="accent3.png" preprocess="to-pixdata">../data/images/stock-icons/accent3.png</file>
-    <file alias="accent4.png" preprocess="to-pixdata">../data/images/stock-icons/accent4.png</file>
-    <file alias="accent5.png" preprocess="to-pixdata">../data/images/stock-icons/accent5.png</file>
-    <file alias="accent6.png" preprocess="to-pixdata">../data/images/stock-icons/accent6.png</file>
-    <file alias="accent7.png" preprocess="to-pixdata">../data/images/stock-icons/accent7.png</file>
-    <file alias="accent8.png" preprocess="to-pixdata">../data/images/stock-icons/accent8.png</file>
-    <file alias="accent9.png" preprocess="to-pixdata">../data/images/stock-icons/accent9.png</file>
-    <file alias="accent10.png" preprocess="to-pixdata">../data/images/stock-icons/accent10.png</file>
-    <file alias="accent11.png" preprocess="to-pixdata">../data/images/stock-icons/accent11.png</file>
-    <file alias="accent12.png" preprocess="to-pixdata">../data/images/stock-icons/accent12.png</file>
-    <file alias="accent13.png" preprocess="to-pixdata">../data/images/stock-icons/accent13.png</file>
-    <file alias="accent14.png" preprocess="to-pixdata">../data/images/stock-icons/accent14.png</file>
-    <file alias="accent15.png" preprocess="to-pixdata">../data/images/stock-icons/accent15.png</file>
-    <file alias="badbox.png" preprocess="to-pixdata">../data/images/stock-icons/badbox.png</file>
-    <file alias="blackboard.png" preprocess="to-pixdata">../data/images/stock-icons/blackboard.png</file>
-    <file alias="bold.png" preprocess="to-pixdata">../data/images/stock-icons/bold.png</file>
-    <file alias="character-size.png" 
preprocess="to-pixdata">../data/images/stock-icons/character-size.png</file>
-    <file alias="compile_dvi.png" preprocess="to-pixdata">../data/images/stock-icons/compile_dvi.png</file>
-    <file alias="compile_pdf.png" preprocess="to-pixdata">../data/images/stock-icons/compile_pdf.png</file>
-    <file alias="compile_ps.png" preprocess="to-pixdata">../data/images/stock-icons/compile_ps.png</file>
-    <file alias="completion_cmd.png" 
preprocess="to-pixdata">../data/images/stock-icons/completion_cmd.png</file>
-    <file alias="delimiters-left.png" 
preprocess="to-pixdata">../data/images/stock-icons/delimiters-left.png</file>
-    <file alias="delimiters-right.png" 
preprocess="to-pixdata">../data/images/stock-icons/delimiters-right.png</file>
-    <file alias="gray-square.png" preprocess="to-pixdata">../data/images/stock-icons/gray-square.png</file>
-    <file alias="italic.png" preprocess="to-pixdata">../data/images/stock-icons/italic.png</file>
-    <file alias="list-description-size16.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-description-size16.png</file>
-    <file alias="list-description-size24.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-description-size24.png</file>
-    <file alias="list-enumerate-size16.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-enumerate-size16.png</file>
-    <file alias="list-enumerate-size24.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-enumerate-size24.png</file>
-    <file alias="list-item-size16.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-item-size16.png</file>
-    <file alias="list-itemize-size16.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-itemize-size16.png</file>
-    <file alias="list-itemize-size24.png" 
preprocess="to-pixdata">../data/images/stock-icons/list-itemize-size24.png</file>
-    <file alias="math-frac.png" preprocess="to-pixdata">../data/images/stock-icons/math-frac.png</file>
-    <file alias="math-nth-root.png" 
preprocess="to-pixdata">../data/images/stock-icons/math-nth-root.png</file>
-    <file alias="math-square-root.png" 
preprocess="to-pixdata">../data/images/stock-icons/math-square-root.png</file>
-    <file alias="math-subscript.png" 
preprocess="to-pixdata">../data/images/stock-icons/math-subscript.png</file>
-    <file alias="math-superscript.png" 
preprocess="to-pixdata">../data/images/stock-icons/math-superscript.png</file>
-    <file alias="math.png" preprocess="to-pixdata">../data/images/stock-icons/math.png</file>
-    <file alias="mathaccent0.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent0.png</file>
-    <file alias="mathaccent1.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent1.png</file>
-    <file alias="mathaccent2.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent2.png</file>
-    <file alias="mathaccent3.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent3.png</file>
-    <file alias="mathaccent4.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent4.png</file>
-    <file alias="mathaccent5.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent5.png</file>
-    <file alias="mathaccent6.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent6.png</file>
-    <file alias="mathaccent7.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent7.png</file>
-    <file alias="mathaccent8.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent8.png</file>
-    <file alias="mathaccent9.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent9.png</file>
-    <file alias="mathaccent10.png" preprocess="to-pixdata">../data/images/stock-icons/mathaccent10.png</file>
-    <file alias="mathcal.png" preprocess="to-pixdata">../data/images/stock-icons/mathcal.png</file>
-    <file alias="mathfrak.png" preprocess="to-pixdata">../data/images/stock-icons/mathfrak.png</file>
-    <file alias="references.png" preprocess="to-pixdata">../data/images/stock-icons/references.png</file>
-    <file alias="roman.png" preprocess="to-pixdata">../data/images/stock-icons/roman.png</file>
-    <file alias="sans_serif.png" preprocess="to-pixdata">../data/images/stock-icons/sans_serif.png</file>
-    <file alias="sectioning-size16.png" 
preprocess="to-pixdata">../data/images/stock-icons/sectioning-size16.png</file>
-    <file alias="sectioning-size24.png" 
preprocess="to-pixdata">../data/images/stock-icons/sectioning-size24.png</file>
-    <file alias="slanted.png" preprocess="to-pixdata">../data/images/stock-icons/slanted.png</file>
-    <file alias="small_caps.png" preprocess="to-pixdata">../data/images/stock-icons/small_caps.png</file>
-    <file alias="symbol_arrows.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_arrows.png</file>
-    <file alias="symbol_delimiters.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_delimiters.png</file>
-    <file alias="symbol_greek.png" preprocess="to-pixdata">../data/images/stock-icons/symbol_greek.png</file>
-    <file alias="symbol_misc_math.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_misc_math.png</file>
-    <file alias="symbol_misc_text.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_misc_text.png</file>
-    <file alias="symbol_operators.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_operators.png</file>
-    <file alias="symbol_relations.png" 
preprocess="to-pixdata">../data/images/stock-icons/symbol_relations.png</file>
-    <file alias="table-size16.png" preprocess="to-pixdata">../data/images/stock-icons/table-size16.png</file>
-    <file alias="table-size24.png" preprocess="to-pixdata">../data/images/stock-icons/table-size24.png</file>
-    <file alias="tree_chapter.png" preprocess="to-pixdata">../data/images/stock-icons/tree_chapter.png</file>
-    <file alias="tree_label.png" preprocess="to-pixdata">../data/images/stock-icons/tree_label.png</file>
-    <file alias="tree_paragraph.png" 
preprocess="to-pixdata">../data/images/stock-icons/tree_paragraph.png</file>
-    <file alias="tree_part.png" preprocess="to-pixdata">../data/images/stock-icons/tree_part.png</file>
-    <file alias="tree_section.png" preprocess="to-pixdata">../data/images/stock-icons/tree_section.png</file>
-    <file alias="tree_subsection.png" 
preprocess="to-pixdata">../data/images/stock-icons/tree_subsection.png</file>
-    <file alias="tree_subsubsection.png" 
preprocess="to-pixdata">../data/images/stock-icons/tree_subsubsection.png</file>
-    <file alias="tree_todo.png" preprocess="to-pixdata">../data/images/stock-icons/tree_todo.png</file>
-    <file alias="typewriter.png" preprocess="to-pixdata">../data/images/stock-icons/typewriter.png</file>
-    <file alias="underline.png" preprocess="to-pixdata">../data/images/stock-icons/underline.png</file>
-    <file alias="view_dvi.png" preprocess="to-pixdata">../data/images/stock-icons/view_dvi.png</file>
-    <file alias="view_log.png" preprocess="to-pixdata">../data/images/stock-icons/view_log.png</file>
-    <file alias="view_pdf.png" preprocess="to-pixdata">../data/images/stock-icons/view_pdf.png</file>
-    <file alias="view_ps.png" preprocess="to-pixdata">../data/images/stock-icons/view_ps.png</file>
+  <gresource prefix="/org/gnome/latexila/icons/16x16/actions">
+    <file alias="list-description.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/list-description.png</file>
+    <file alias="list-enumerate.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/list-enumerate.png</file>
+    <file alias="list-itemize.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/list-itemize.png</file>
+    <file alias="list-item.png" preprocess="to-pixdata">../data/icons/16x16/actions/list-item.png</file>
+    <file alias="sectioning.png" preprocess="to-pixdata">../data/icons/16x16/actions/sectioning.png</file>
+    <file alias="symbol_arrows.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_arrows.png</file>
+    <file alias="symbol_delimiters.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_delimiters.png</file>
+    <file alias="symbol_greek.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_greek.png</file>
+    <file alias="symbol_misc_math.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_misc_math.png</file>
+    <file alias="symbol_misc_text.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_misc_text.png</file>
+    <file alias="symbol_operators.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_operators.png</file>
+    <file alias="symbol_relations.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/symbol_relations.png</file>
+    <file alias="table.png" preprocess="to-pixdata">../data/icons/16x16/actions/table.png</file>
+    <file alias="tree_chapter.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/tree_chapter.png</file>
+    <file alias="tree_label.png" preprocess="to-pixdata">../data/icons/16x16/actions/tree_label.png</file>
+    <file alias="tree_paragraph.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/tree_paragraph.png</file>
+    <file alias="tree_part.png" preprocess="to-pixdata">../data/icons/16x16/actions/tree_part.png</file>
+    <file alias="tree_section.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/tree_section.png</file>
+    <file alias="tree_subsection.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/tree_subsection.png</file>
+    <file alias="tree_subsubsection.png" 
preprocess="to-pixdata">../data/icons/16x16/actions/tree_subsubsection.png</file>
+    <file alias="tree_todo.png" preprocess="to-pixdata">../data/icons/16x16/actions/tree_todo.png</file>
+    <file alias="view_log.png" preprocess="to-pixdata">../data/icons/16x16/actions/view_log.png</file>
+  </gresource>
+
+  <gresource prefix="/org/gnome/latexila/icons/24x24/actions">
+    <file alias="accent0.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent0.png</file>
+    <file alias="accent10.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent10.png</file>
+    <file alias="accent11.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent11.png</file>
+    <file alias="accent12.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent12.png</file>
+    <file alias="accent13.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent13.png</file>
+    <file alias="accent14.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent14.png</file>
+    <file alias="accent15.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent15.png</file>
+    <file alias="accent1.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent1.png</file>
+    <file alias="accent2.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent2.png</file>
+    <file alias="accent3.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent3.png</file>
+    <file alias="accent4.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent4.png</file>
+    <file alias="accent5.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent5.png</file>
+    <file alias="accent6.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent6.png</file>
+    <file alias="accent7.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent7.png</file>
+    <file alias="accent8.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent8.png</file>
+    <file alias="accent9.png" preprocess="to-pixdata">../data/icons/24x24/actions/accent9.png</file>
+    <file alias="bold.png" preprocess="to-pixdata">../data/icons/24x24/actions/bold.png</file>
+    <file alias="character-size.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/character-size.png</file>
+    <file alias="compile_dvi.png" preprocess="to-pixdata">../data/icons/24x24/actions/compile_dvi.png</file>
+    <file alias="compile_pdf.png" preprocess="to-pixdata">../data/icons/24x24/actions/compile_pdf.png</file>
+    <file alias="compile_ps.png" preprocess="to-pixdata">../data/icons/24x24/actions/compile_ps.png</file>
+    <file alias="completion_cmd.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/completion_cmd.png</file>
+    <file alias="delimiters-left.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/delimiters-left.png</file>
+    <file alias="delimiters-right.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/delimiters-right.png</file>
+    <file alias="gray-square.png" preprocess="to-pixdata">../data/icons/24x24/actions/gray-square.png</file>
+    <file alias="italic.png" preprocess="to-pixdata">../data/icons/24x24/actions/italic.png</file>
+    <file alias="list-description.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/list-description.png</file>
+    <file alias="list-enumerate.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/list-enumerate.png</file>
+    <file alias="list-itemize.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/list-itemize.png</file>
+    <file alias="list-item.png" preprocess="to-pixdata">../data/icons/24x24/actions/list-item.png</file>
+    <file alias="mathaccent0.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent0.png</file>
+    <file alias="mathaccent10.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent10.png</file>
+    <file alias="mathaccent1.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent1.png</file>
+    <file alias="mathaccent2.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent2.png</file>
+    <file alias="mathaccent3.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent3.png</file>
+    <file alias="mathaccent4.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent4.png</file>
+    <file alias="mathaccent5.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent5.png</file>
+    <file alias="mathaccent6.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent6.png</file>
+    <file alias="mathaccent7.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent7.png</file>
+    <file alias="mathaccent8.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent8.png</file>
+    <file alias="mathaccent9.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathaccent9.png</file>
+    <file alias="mathcal.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathcal.png</file>
+    <file alias="math-frac.png" preprocess="to-pixdata">../data/icons/24x24/actions/math-frac.png</file>
+    <file alias="mathfrak.png" preprocess="to-pixdata">../data/icons/24x24/actions/mathfrak.png</file>
+    <file alias="math-nth-root.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/math-nth-root.png</file>
+    <file alias="math.png" preprocess="to-pixdata">../data/icons/24x24/actions/math.png</file>
+    <file alias="math-square-root.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/math-square-root.png</file>
+    <file alias="math-subscript.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/math-subscript.png</file>
+    <file alias="math-superscript.png" 
preprocess="to-pixdata">../data/icons/24x24/actions/math-superscript.png</file>
+    <file alias="references.png" preprocess="to-pixdata">../data/icons/24x24/actions/references.png</file>
+    <file alias="roman.png" preprocess="to-pixdata">../data/icons/24x24/actions/roman.png</file>
+    <file alias="sans_serif.png" preprocess="to-pixdata">../data/icons/24x24/actions/sans_serif.png</file>
+    <file alias="sectioning.png" preprocess="to-pixdata">../data/icons/24x24/actions/sectioning.png</file>
+    <file alias="slanted.png" preprocess="to-pixdata">../data/icons/24x24/actions/slanted.png</file>
+    <file alias="small_caps.png" preprocess="to-pixdata">../data/icons/24x24/actions/small_caps.png</file>
+    <file alias="table.png" preprocess="to-pixdata">../data/icons/24x24/actions/table.png</file>
+    <file alias="typewriter.png" preprocess="to-pixdata">../data/icons/24x24/actions/typewriter.png</file>
+    <file alias="underline.png" preprocess="to-pixdata">../data/icons/24x24/actions/underline.png</file>
+  </gresource>
+
+  <gresource prefix="/org/gnome/latexila/icons/24x24/mimetypes">
+    <file alias="view_dvi.png" preprocess="to-pixdata">../data/icons/24x24/mimetypes/view_dvi.png</file>
+    <file alias="view_pdf.png" preprocess="to-pixdata">../data/icons/24x24/mimetypes/view_pdf.png</file>
+    <file alias="view_ps.png" preprocess="to-pixdata">../data/icons/24x24/mimetypes/view_ps.png</file>
+  </gresource>
+
+  <gresource prefix="/org/gnome/latexila/icons">
+    <file alias="badbox.png" preprocess="to-pixdata">../data/icons/others/badbox.png</file>
+    <file alias="blackboard.png" preprocess="to-pixdata">../data/icons/others/blackboard.png</file>
   </gresource>
 
   <gresource prefix="/org/gnome/latexila/symbols/arrows">
diff --git a/src/liblatexila/latexila-utils.c b/src/liblatexila/latexila-utils.c
index c6df9c6..2f5de66 100644
--- a/src/liblatexila/latexila-utils.c
+++ b/src/liblatexila/latexila-utils.c
@@ -147,9 +147,7 @@ latexila_utils_replace_home_dir_with_tilde (const gchar *filename)
  * when stock icons are no longer used in LaTeXila.
  *
  * TODO: prefix icon names with "latexila-", so the badbox.png would be
- * "latexila-badbox". Also, put icons in subdirectories for each size, so it is
- * better for icons available in several sizes. As an example there is currently
- * table-size16.png and table-size24.png.
+ * "latexila-badbox".
  */
 void
 latexila_utils_register_icons (void)
diff --git a/src/stock_icons.vala b/src/stock_icons.vala
index 08be709..fb87954 100644
--- a/src/stock_icons.vala
+++ b/src/stock_icons.vala
@@ -59,13 +59,10 @@ namespace StockIcons
         add_theme_icon_to_stock ("delimiters-right");
         add_theme_icon_to_stock ("gray-square");
         add_theme_icon_to_stock ("italic");
-        add_theme_icon_to_stock ("list-description-size16");
-        add_theme_icon_to_stock ("list-description-size24");
-        add_theme_icon_to_stock ("list-enumerate-size16");
-        add_theme_icon_to_stock ("list-enumerate-size24");
-        add_theme_icon_to_stock ("list-item-size16");
-        add_theme_icon_to_stock ("list-itemize-size16");
-        add_theme_icon_to_stock ("list-itemize-size24");
+        add_theme_icon_to_stock ("list-description");
+        add_theme_icon_to_stock ("list-enumerate");
+        add_theme_icon_to_stock ("list-item");
+        add_theme_icon_to_stock ("list-itemize");
         add_theme_icon_to_stock ("math-frac");
         add_theme_icon_to_stock ("math-nth-root");
         add_theme_icon_to_stock ("math-square-root");
@@ -88,8 +85,7 @@ namespace StockIcons
         add_theme_icon_to_stock ("references");
         add_theme_icon_to_stock ("roman");
         add_theme_icon_to_stock ("sans_serif");
-        add_theme_icon_to_stock ("sectioning-size16");
-        add_theme_icon_to_stock ("sectioning-size24");
+        add_theme_icon_to_stock ("sectioning");
         add_theme_icon_to_stock ("slanted");
         add_theme_icon_to_stock ("small_caps");
         add_theme_icon_to_stock ("symbol_arrows");
@@ -99,8 +95,7 @@ namespace StockIcons
         add_theme_icon_to_stock ("symbol_misc_text");
         add_theme_icon_to_stock ("symbol_operators");
         add_theme_icon_to_stock ("symbol_relations");
-        add_theme_icon_to_stock ("table-size16");
-        add_theme_icon_to_stock ("table-size24");
+        add_theme_icon_to_stock ("table");
         add_theme_icon_to_stock ("tree_chapter");
         add_theme_icon_to_stock ("tree_label");
         add_theme_icon_to_stock ("tree_paragraph");
diff --git a/src/structure.vala b/src/structure.vala
index 0b89789..10dd489 100644
--- a/src/structure.vala
+++ b/src/structure.vala
@@ -759,7 +759,7 @@ public class Structure : Grid
             _icons[StructType.LABEL]        = "tree_label";
             _icons[StructType.TODO]         = "tree_todo";
             _icons[StructType.FIXME]        = "tree_todo";
-            _icons[StructType.TABLE]        = "table-size16";
+            _icons[StructType.TABLE]        = "table";
             _icons[StructType.FIGURE]       = "image-x-generic";
             _icons[StructType.IMAGE]        = "image-x-generic";
             _icons[StructType.INCLUDE]      = "text-x-generic";
diff --git a/src/ui/ui.xml b/src/ui/ui.xml
index c5d9464..88f7b7b 100644
--- a/src/ui/ui.xml
+++ b/src/ui/ui.xml
@@ -463,14 +463,14 @@ along with LaTeXila.  If not, see <http://www.gnu.org/licenses/>.
 
     <separator />
 
-    <toolitem action="ListEnvItemizeToolitem" />
-    <toolitem action="ListEnvEnumerateToolitem" />
-    <toolitem action="ListEnvDescriptionToolitem" />
+    <toolitem action="ListEnvItemize" />
+    <toolitem action="ListEnvEnumerate" />
+    <toolitem action="ListEnvDescription" />
 
     <separator />
 
     <toolitem action="EnvFigure" />
-    <toolitem action="EnvTableToolitem" />
+    <toolitem action="EnvTable" />
 
     <separator />
 


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