GNOME.org
 

[gnumeric] Icons: Part III.

commit 86622841e941308da056232f84c32b823b7373bc
Author: Morten Welinder <terra gnome org>
Date:   Fri Dec 26 20:57:03 2014 -0500

    Icons: Part III.
    
    Note: many of these icons doesn't have regular sizes.

 .../actions/gnumeric-format-border-bottom.xpm      |    0
 .../16x16/actions/gnumeric-format-border-diag.xpm  |    0
 .../16x16/actions/gnumeric-format-border-left.xpm  |    0
 .../actions/gnumeric-format-border-rev-diag.xpm    |    0
 .../16x16/actions/gnumeric-format-border-right.xpm |    0
 .../16x16/actions/gnumeric-format-border-top.xpm   |    0
 .../gnumeric-format-border-inside-horiz.xpm        |    0
 .../22x22/actions/gnumeric-pattern-125grey.xpm     |    0
 .../22x22/actions/gnumeric-pattern-25grey.xpm      |    0
 .../22x22/actions/gnumeric-pattern-50grey.xpm      |    0
 .../22x22/actions/gnumeric-pattern-625grey.xpm     |    0
 .../22x22/actions/gnumeric-pattern-75grey.xpm      |    0
 .../22x22/actions/gnumeric-pattern-bricks.xpm      |    0
 .../22x22/actions/gnumeric-pattern-diag-cross.xpm  |    0
 .../22x22/actions/gnumeric-pattern-diag.xpm        |    0
 .../actions/gnumeric-pattern-foreground-solid.xpm  |    0
 .../22x22/actions/gnumeric-pattern-horiz.xpm       |    0
 .../actions/gnumeric-pattern-large-circles.xpm     |    0
 .../22x22/actions/gnumeric-pattern-rev-diag.xpm    |    0
 .../22x22/actions/gnumeric-pattern-semi-circle.xpm |    0
 .../actions/gnumeric-pattern-small-circle.xpm      |    0
 .../22x22/actions/gnumeric-pattern-solid.xpm       |    0
 .../22x22/actions/gnumeric-pattern-thatch.xpm      |    0
 .../actions/gnumeric-pattern-thick-diag-cross.xpm  |    0
 .../actions/gnumeric-pattern-thin-diag-cross.xpm   |    0
 .../22x22/actions/gnumeric-pattern-thin-diag.xpm   |    0
 .../actions/gnumeric-pattern-thin-horiz-cross.xpm  |    0
 .../22x22/actions/gnumeric-pattern-thin-horiz.xpm  |    0
 .../actions/gnumeric-pattern-thin-rev-diag.xpm     |    0
 .../22x22/actions/gnumeric-pattern-thin-vert.xpm   |    0
 .../22x22/actions/gnumeric-pattern-vert.xpm        |    0
 .../actions/gnumeric-format-border-inside-vert.xpm |    0
 .../actions/gnumeric-format-border-inside.xpm      |    0
 .../24x24/actions/gnumeric-format-border-no.xpm    |    0
 .../actions/gnumeric-format-border-outline.xpm     |    0
 src/Makefile.am                                    |   35 --------
 src/application.c                                  |   38 --------
 src/dialogs/cell-format.ui                         |   92 ++++++++++----------
 src/dialogs/dialog-cell-format.c                   |   58 ++++++------
 src/gnm.gresource.xml                              |   35 ++++++++
 40 files changed, 110 insertions(+), 148 deletions(-)
---
diff --git a/src/pixmaps/bottom_border.xpm b/icons/16x16/actions/gnumeric-format-border-bottom.xpm
similarity index 100%
rename from src/pixmaps/bottom_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-bottom.xpm
diff --git a/src/pixmaps/diag_border.xpm b/icons/16x16/actions/gnumeric-format-border-diag.xpm
similarity index 100%
rename from src/pixmaps/diag_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-diag.xpm
diff --git a/src/pixmaps/left_border.xpm b/icons/16x16/actions/gnumeric-format-border-left.xpm
similarity index 100%
rename from src/pixmaps/left_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-left.xpm
diff --git a/src/pixmaps/rev_diag_border.xpm b/icons/16x16/actions/gnumeric-format-border-rev-diag.xpm
similarity index 100%
rename from src/pixmaps/rev_diag_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-rev-diag.xpm
diff --git a/src/pixmaps/right_border.xpm b/icons/16x16/actions/gnumeric-format-border-right.xpm
similarity index 100%
rename from src/pixmaps/right_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-right.xpm
diff --git a/src/pixmaps/top_border.xpm b/icons/16x16/actions/gnumeric-format-border-top.xpm
similarity index 100%
rename from src/pixmaps/top_border.xpm
rename to icons/16x16/actions/gnumeric-format-border-top.xpm
diff --git a/src/pixmaps/inside_horiz_border.xpm b/icons/22x22/actions/gnumeric-format-border-inside-horiz.xpm
similarity index 100%
rename from src/pixmaps/inside_horiz_border.xpm
rename to icons/22x22/actions/gnumeric-format-border-inside-horiz.xpm
diff --git a/src/pixmaps/gp_125grey.xpm b/icons/22x22/actions/gnumeric-pattern-125grey.xpm
similarity index 100%
rename from src/pixmaps/gp_125grey.xpm
rename to icons/22x22/actions/gnumeric-pattern-125grey.xpm
diff --git a/src/pixmaps/gp_25grey.xpm b/icons/22x22/actions/gnumeric-pattern-25grey.xpm
similarity index 100%
rename from src/pixmaps/gp_25grey.xpm
rename to icons/22x22/actions/gnumeric-pattern-25grey.xpm
diff --git a/src/pixmaps/gp_50grey.xpm b/icons/22x22/actions/gnumeric-pattern-50grey.xpm
similarity index 100%
rename from src/pixmaps/gp_50grey.xpm
rename to icons/22x22/actions/gnumeric-pattern-50grey.xpm
diff --git a/src/pixmaps/gp_625grey.xpm b/icons/22x22/actions/gnumeric-pattern-625grey.xpm
similarity index 100%
rename from src/pixmaps/gp_625grey.xpm
rename to icons/22x22/actions/gnumeric-pattern-625grey.xpm
diff --git a/src/pixmaps/gp_75grey.xpm b/icons/22x22/actions/gnumeric-pattern-75grey.xpm
similarity index 100%
rename from src/pixmaps/gp_75grey.xpm
rename to icons/22x22/actions/gnumeric-pattern-75grey.xpm
diff --git a/src/pixmaps/gp_bricks.xpm b/icons/22x22/actions/gnumeric-pattern-bricks.xpm
similarity index 100%
rename from src/pixmaps/gp_bricks.xpm
rename to icons/22x22/actions/gnumeric-pattern-bricks.xpm
diff --git a/src/pixmaps/gp_diag_cross.xpm b/icons/22x22/actions/gnumeric-pattern-diag-cross.xpm
similarity index 100%
rename from src/pixmaps/gp_diag_cross.xpm
rename to icons/22x22/actions/gnumeric-pattern-diag-cross.xpm
diff --git a/src/pixmaps/gp_diag.xpm b/icons/22x22/actions/gnumeric-pattern-diag.xpm
similarity index 100%
rename from src/pixmaps/gp_diag.xpm
rename to icons/22x22/actions/gnumeric-pattern-diag.xpm
diff --git a/src/pixmaps/gp_foreground_solid.xpm b/icons/22x22/actions/gnumeric-pattern-foreground-solid.xpm
similarity index 100%
rename from src/pixmaps/gp_foreground_solid.xpm
rename to icons/22x22/actions/gnumeric-pattern-foreground-solid.xpm
diff --git a/src/pixmaps/gp_horiz.xpm b/icons/22x22/actions/gnumeric-pattern-horiz.xpm
similarity index 100%
rename from src/pixmaps/gp_horiz.xpm
rename to icons/22x22/actions/gnumeric-pattern-horiz.xpm
diff --git a/src/pixmaps/gp_large_circles.xpm b/icons/22x22/actions/gnumeric-pattern-large-circles.xpm
similarity index 100%
rename from src/pixmaps/gp_large_circles.xpm
rename to icons/22x22/actions/gnumeric-pattern-large-circles.xpm
diff --git a/src/pixmaps/gp_rev_diag.xpm b/icons/22x22/actions/gnumeric-pattern-rev-diag.xpm
similarity index 100%
rename from src/pixmaps/gp_rev_diag.xpm
rename to icons/22x22/actions/gnumeric-pattern-rev-diag.xpm
diff --git a/src/pixmaps/gp_semi_circle.xpm b/icons/22x22/actions/gnumeric-pattern-semi-circle.xpm
similarity index 100%
rename from src/pixmaps/gp_semi_circle.xpm
rename to icons/22x22/actions/gnumeric-pattern-semi-circle.xpm
diff --git a/src/pixmaps/gp_small_circle.xpm b/icons/22x22/actions/gnumeric-pattern-small-circle.xpm
similarity index 100%
rename from src/pixmaps/gp_small_circle.xpm
rename to icons/22x22/actions/gnumeric-pattern-small-circle.xpm
diff --git a/src/pixmaps/gp_solid.xpm b/icons/22x22/actions/gnumeric-pattern-solid.xpm
similarity index 100%
rename from src/pixmaps/gp_solid.xpm
rename to icons/22x22/actions/gnumeric-pattern-solid.xpm
diff --git a/src/pixmaps/gp_thatch.xpm b/icons/22x22/actions/gnumeric-pattern-thatch.xpm
similarity index 100%
rename from src/pixmaps/gp_thatch.xpm
rename to icons/22x22/actions/gnumeric-pattern-thatch.xpm
diff --git a/src/pixmaps/gp_thick_diag_cross.xpm b/icons/22x22/actions/gnumeric-pattern-thick-diag-cross.xpm
similarity index 100%
rename from src/pixmaps/gp_thick_diag_cross.xpm
rename to icons/22x22/actions/gnumeric-pattern-thick-diag-cross.xpm
diff --git a/src/pixmaps/gp_thin_diag_cross.xpm b/icons/22x22/actions/gnumeric-pattern-thin-diag-cross.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_diag_cross.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-diag-cross.xpm
diff --git a/src/pixmaps/gp_thin_diag.xpm b/icons/22x22/actions/gnumeric-pattern-thin-diag.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_diag.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-diag.xpm
diff --git a/src/pixmaps/gp_thin_horiz_cross.xpm b/icons/22x22/actions/gnumeric-pattern-thin-horiz-cross.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_horiz_cross.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-horiz-cross.xpm
diff --git a/src/pixmaps/gp_thin_horiz.xpm b/icons/22x22/actions/gnumeric-pattern-thin-horiz.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_horiz.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-horiz.xpm
diff --git a/src/pixmaps/gp_thin_rev_diag.xpm b/icons/22x22/actions/gnumeric-pattern-thin-rev-diag.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_rev_diag.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-rev-diag.xpm
diff --git a/src/pixmaps/gp_thin_vert.xpm b/icons/22x22/actions/gnumeric-pattern-thin-vert.xpm
similarity index 100%
rename from src/pixmaps/gp_thin_vert.xpm
rename to icons/22x22/actions/gnumeric-pattern-thin-vert.xpm
diff --git a/src/pixmaps/gp_vert.xpm b/icons/22x22/actions/gnumeric-pattern-vert.xpm
similarity index 100%
rename from src/pixmaps/gp_vert.xpm
rename to icons/22x22/actions/gnumeric-pattern-vert.xpm
diff --git a/src/pixmaps/inside_vert_border.xpm b/icons/24x24/actions/gnumeric-format-border-inside-vert.xpm
similarity index 100%
rename from src/pixmaps/inside_vert_border.xpm
rename to icons/24x24/actions/gnumeric-format-border-inside-vert.xpm
diff --git a/src/pixmaps/inside_border.xpm b/icons/24x24/actions/gnumeric-format-border-inside.xpm
similarity index 100%
rename from src/pixmaps/inside_border.xpm
rename to icons/24x24/actions/gnumeric-format-border-inside.xpm
diff --git a/src/pixmaps/no_border.xpm b/icons/24x24/actions/gnumeric-format-border-no.xpm
similarity index 100%
rename from src/pixmaps/no_border.xpm
rename to icons/24x24/actions/gnumeric-format-border-no.xpm
diff --git a/src/pixmaps/outline_border.xpm b/icons/24x24/actions/gnumeric-format-border-outline.xpm
similarity index 100%
rename from src/pixmaps/outline_border.xpm
rename to icons/24x24/actions/gnumeric-format-border-outline.xpm
diff --git a/src/Makefile.am b/src/Makefile.am
index 6182511..6e8f1dc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,39 +437,9 @@ gnumeric_app_libs =                                \
 
 embedded_imgs =                                                \
        gnumeric.css                                    \
-       pixmaps/bottom_border.xpm                       \
        pixmaps/cursor_cross.xpm                        \
-       pixmaps/diag_border.xpm                         \
        pixmaps/down-right.png                          \
        pixmaps/gnumeric_splash_1.4.png                 \
-       pixmaps/gp_125grey.xpm                          \
-       pixmaps/gp_25grey.xpm                           \
-       pixmaps/gp_50grey.xpm                           \
-       pixmaps/gp_625grey.xpm                          \
-       pixmaps/gp_75grey.xpm                           \
-       pixmaps/gp_bricks.xpm                           \
-       pixmaps/gp_diag.xpm                             \
-       pixmaps/gp_diag_cross.xpm                       \
-       pixmaps/gp_foreground_solid.xpm                 \
-       pixmaps/gp_horiz.xpm                            \
-       pixmaps/gp_large_circles.xpm                    \
-       pixmaps/gp_rev_diag.xpm                         \
-       pixmaps/gp_semi_circle.xpm                      \
-       pixmaps/gp_small_circle.xpm                     \
-       pixmaps/gp_solid.xpm                            \
-       pixmaps/gp_thatch.xpm                           \
-       pixmaps/gp_thick_diag_cross.xpm                 \
-       pixmaps/gp_thin_diag.xpm                        \
-       pixmaps/gp_thin_diag_cross.xpm                  \
-       pixmaps/gp_thin_horiz.xpm                       \
-       pixmaps/gp_thin_horiz_cross.xpm                 \
-       pixmaps/gp_thin_rev_diag.xpm                    \
-       pixmaps/gp_thin_vert.xpm                        \
-       pixmaps/gp_vert.xpm                             \
-       pixmaps/inside_border.xpm                       \
-       pixmaps/inside_horiz_border.xpm                 \
-       pixmaps/inside_vert_border.xpm                  \
-       pixmaps/left_border.xpm                         \
        pixmaps/line_pattern_dash_dot.xpm               \
        pixmaps/line_pattern_dash_dot_dot.xpm           \
        pixmaps/line_pattern_dashed.xpm                 \
@@ -483,13 +453,8 @@ embedded_imgs =                                            \
        pixmaps/line_pattern_slant.xpm                  \
        pixmaps/line_pattern_thick.xpm                  \
        pixmaps/line_pattern_thin.xpm                   \
-       pixmaps/no_border.xpm                           \
-       pixmaps/outline_border.xpm                      \
-       pixmaps/rev_diag_border.xpm                     \
        pixmaps/right-down.png                          \
-       pixmaps/right_border.xpm                        \
        pixmaps/sheet_move_marker.xpm                   \
-       pixmaps/top_border.xpm                          \
        pixmaps/unknown_image.png
 
 embedded-imgs.c: $(top_srcdir)/tools/embedder $(embedded_imgs) Makefile
diff --git a/src/application.c b/src/application.c
index f7657b1..4537ecc 100644
--- a/src/application.c
+++ b/src/application.c
@@ -754,31 +754,6 @@ install_icons (GnmApp *app)
                //"font.xpm",
                "sheet_move_marker.xpm",
 
-               /* Patterns */
-               "gp_125grey.xpm",
-               "gp_25grey.xpm",
-               "gp_50grey.xpm",
-               "gp_625grey.xpm",
-               "gp_75grey.xpm",
-               "gp_bricks.xpm",
-               "gp_diag.xpm",
-               "gp_diag_cross.xpm",
-               "gp_foreground_solid.xpm",
-               "gp_horiz.xpm",
-               "gp_large_circles.xpm",
-               "gp_rev_diag.xpm",
-               "gp_semi_circle.xpm",
-               "gp_small_circle.xpm",
-               "gp_solid.xpm",
-               "gp_thatch.xpm",
-               "gp_thick_diag_cross.xpm",
-               "gp_thin_diag.xpm",
-               "gp_thin_diag_cross.xpm",
-               "gp_thin_horiz.xpm",
-               "gp_thin_horiz_cross.xpm",
-               "gp_thin_rev_diag.xpm",
-               "gp_thin_vert.xpm",
-               "gp_vert.xpm",
                "line_pattern_dash_dot.xpm",
                "line_pattern_dash_dot_dot.xpm",
                "line_pattern_dashed.xpm",
@@ -792,19 +767,6 @@ install_icons (GnmApp *app)
                "line_pattern_slant.xpm",
                "line_pattern_thick.xpm",
                "line_pattern_thin.xpm",
-
-               /* Borders */
-               "bottom_border.xpm",
-               "diag_border.xpm",
-               "inside_border.xpm",
-               "inside_horiz_border.xpm",
-               "inside_vert_border.xpm",
-               "left_border.xpm",
-               "no_border.xpm",
-               "outline_border.xpm",
-               "rev_diag_border.xpm",
-               "right_border.xpm",
-               "top_border.xpm"
        };
 
        GtkIconFactory *factory = gtk_icon_factory_new ();
diff --git a/src/dialogs/cell-format.ui b/src/dialogs/cell-format.ui
index 4db2e5f..ecb76e8 100644
--- a/src/dialogs/cell-format.ui
+++ b/src/dialogs/cell-format.ui
@@ -10,57 +10,57 @@
   <object class="GtkImage" id="image1">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">top_border</property>
+    <property name="icon_name">gnumeric-format-border-top</property>
   </object>
   <object class="GtkImage" id="image10">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">outline_border</property>
+    <property name="icon_name">gnumeric-format-border-outline</property>
   </object>
   <object class="GtkImage" id="image11">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">no_border</property>
+    <property name="icon_name">gnumeric-format-border-no</property>
   </object>
   <object class="GtkImage" id="image2">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">rev_diag_border</property>
+    <property name="icon_name">gnumeric-format-border-rev-diag</property>
   </object>
   <object class="GtkImage" id="image3">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">diag_border</property>
+    <property name="icon_name">gnumeric-format-border-diag</property>
   </object>
   <object class="GtkImage" id="image4">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">left_border</property>
+    <property name="icon_name">gnumeric-format-border-left</property>
   </object>
   <object class="GtkImage" id="image5">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">right_border</property>
+    <property name="icon_name">gnumeric-format-border-right</property>
   </object>
   <object class="GtkImage" id="image6">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">bottom_border</property>
+    <property name="icon_name">gnumeric-format-border-bottom</property>
   </object>
   <object class="GtkImage" id="image7">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">inside_vert_border</property>
+    <property name="icon_name">gnumeric-format-border-inside_vert</property>
   </object>
   <object class="GtkImage" id="image8">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">inside_horiz_border</property>
+    <property name="icon_name">gnumeric-format-border-inside_horiz</property>
   </object>
   <object class="GtkImage" id="image9">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
-    <property name="icon_name">inside_border</property>
+    <property name="icon_name">gnumeric-format-border-inside</property>
   </object>
   <object class="GtkListStore" id="model1">
     <columns>
@@ -680,7 +680,7 @@
                     <property name="column_spacing">6</property>
                     <property name="column_homogeneous">True</property>
                     <child>
-                      <object class="GtkToggleButton" id="rev_diag_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-rev-diag">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -700,7 +700,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="top_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-top">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -720,7 +720,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="diag_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-diag">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -740,7 +740,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="left_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-left">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -760,7 +760,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="right_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-right">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -780,7 +780,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="bottom_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-bottom">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -800,7 +800,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="no_border">
+                      <object class="GtkButton" id="gnumeric-format-border-no">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -821,7 +821,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="outline_border">
+                      <object class="GtkButton" id="gnumeric-format-border-outline">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -842,7 +842,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="inside_vert_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-inside-vert">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -863,7 +863,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkButton" id="inside_border">
+                      <object class="GtkButton" id="gnumeric-format-border-inside">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -884,7 +884,7 @@
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkToggleButton" id="inside_horiz_border">
+                      <object class="GtkToggleButton" id="gnumeric-format-border-inside-horiz">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
@@ -1373,7 +1373,7 @@
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
-                          <object class="GtkToggleButton" id="gp_solid">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-solid">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1390,7 +1390,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_75grey">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-75grey">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1407,7 +1407,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_50grey">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-50grey">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1424,7 +1424,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_25grey">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-25grey">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1441,7 +1441,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_125grey">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-125grey">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1458,7 +1458,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_625grey">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-625grey">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1475,7 +1475,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_horiz">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-horiz">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1492,7 +1492,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_vert">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-vert">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1509,7 +1509,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_rev_diag">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-rev-diag">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1526,7 +1526,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_diag">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-diag">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1543,7 +1543,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_diag_cross">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-diag-cross">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1560,7 +1560,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thick_diag_cross">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thick-diag-cross">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1577,7 +1577,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_horiz">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-horiz">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1594,7 +1594,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_vert">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-vert">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1611,7 +1611,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_rev_diag">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-rev-diag">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1628,7 +1628,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_diag">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-diag">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1645,7 +1645,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_horiz_cross">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-horiz-cross">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1662,7 +1662,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thin_diag_cross">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thin-diag-cross">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1679,7 +1679,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_foreground_solid">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-foreground-solid">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1696,7 +1696,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_small_circle">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-small-circle">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1713,7 +1713,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_semi_circle">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-semi-circle">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1730,7 +1730,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_thatch">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-thatch">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1747,7 +1747,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_large_circles">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-large-circles">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
@@ -1764,7 +1764,7 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkToggleButton" id="gp_bricks">
+                          <object class="GtkToggleButton" id="gnumeric-pattern-bricks">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
diff --git a/src/dialogs/dialog-cell-format.c b/src/dialogs/dialog-cell-format.c
index 60e1f1d..15fef05 100644
--- a/src/dialogs/dialog-cell-format.c
+++ b/src/dialogs/dialog-cell-format.c
@@ -2188,7 +2188,7 @@ set_initial_focus (FormatState *s)
        else if (strcmp (name, "font_box") == 0)
              focus_widget = GTK_WIDGET (s->font.selector);
        else if (strcmp (name, "border_box") == 0)
-             focus_widget = go_gtk_builder_get_widget (s->gui, "outline_border");
+             focus_widget = go_gtk_builder_get_widget (s->gui, "gnumeric-format-border-outline");
        else if (strcmp (name, "background_box") == 0)
              focus_widget = go_gtk_builder_get_widget (s->gui, "back_color_auto");
        else if (strcmp (name, "protection_box") == 0)
@@ -2233,45 +2233,45 @@ fmt_dialog_impl (FormatState *state, FormatDialogPosition_t pageno, gint pages)
                { NULL, 0}
        };
        static char const *const pattern_buttons[] = {
-               "gp_solid", "gp_75grey", "gp_50grey",
-               "gp_25grey", "gp_125grey", "gp_625grey",
-
-               "gp_horiz",
-               "gp_vert",
-               "gp_diag",
-               "gp_rev_diag",
-               "gp_diag_cross",
-               "gp_thick_diag_cross",
-
-               "gp_thin_horiz",
-               "gp_thin_vert",
-               "gp_thin_rev_diag",
-               "gp_thin_diag",
-               "gp_thin_horiz_cross",
-               "gp_thin_diag_cross",
-
-               "gp_small_circle",
-               "gp_semi_circle",
-               "gp_thatch",
-               "gp_large_circles",
-               "gp_bricks",
-               "gp_foreground_solid",
+               "gnumeric-pattern-solid", "gnumeric-pattern-75grey", "gnumeric-pattern-50grey",
+               "gnumeric-pattern-25grey", "gnumeric-pattern-125grey", "gnumeric-pattern-625grey",
+
+               "gnumeric-pattern-horiz",
+               "gnumeric-pattern-vert",
+               "gnumeric-pattern-diag",
+               "gnumeric-pattern-rev-diag",
+               "gnumeric-pattern-diag-cross",
+               "gnumeric-pattern-thick-diag-cross",
+
+               "gnumeric-pattern-thin-horiz",
+               "gnumeric-pattern-thin-vert",
+               "gnumeric-pattern-thin-rev-diag",
+               "gnumeric-pattern-thin-diag",
+               "gnumeric-pattern-thin-horiz-cross",
+               "gnumeric-pattern-thin-diag-cross",
+
+               "gnumeric-pattern-small-circle",
+               "gnumeric-pattern-semi-circle",
+               "gnumeric-pattern-thatch",
+               "gnumeric-pattern-large-circles",
+               "gnumeric-pattern-bricks",
+               "gnumeric-pattern-foreground-solid",
 
                NULL
        };
 
        /* The order corresponds to the BorderLocation enum */
        static char const *const border_buttons[] = {
-               "top_border",   "bottom_border",
-               "left_border",  "right_border",
-               "rev_diag_border",      "diag_border",
-               "inside_horiz_border", "inside_vert_border",
+               "gnumeric-format-border-top",   "gnumeric-format-border-bottom",
+               "gnumeric-format-border-left",  "gnumeric-format-border-right",
+               "gnumeric-format-border-rev-diag",      "gnumeric-format-border-diag",
+               "gnumeric-format-border-inside-horiz", "gnumeric-format-border-inside-vert",
                NULL
        };
 
        /* The order corresponds to BorderPresets */
        static char const *const border_preset_buttons[] = {
-               "no_border", "outline_border", "inside_border",
+               "gnumeric-format-border-no", "gnumeric-format-border-outline", 
"gnumeric-format-border-inside",
                NULL
        };
 
diff --git a/src/gnm.gresource.xml b/src/gnm.gresource.xml
index 23b5752..10a0ea6 100644
--- a/src/gnm.gresource.xml
+++ b/src/gnm.gresource.xml
@@ -20,6 +20,12 @@
     <file>icons/16x16/actions/gnumeric-detail-hide.xpm</file>
     <file>icons/16x16/actions/gnumeric-detail-show.xpm</file>
     <file>icons/16x16/actions/gnumeric-exprentry.png</file>
+    <file>icons/16x16/actions/gnumeric-format-border-bottom.xpm</file>
+    <file>icons/16x16/actions/gnumeric-format-border-diag.xpm</file>
+    <file>icons/16x16/actions/gnumeric-format-border-left.xpm</file>
+    <file>icons/16x16/actions/gnumeric-format-border-rev-diag.xpm</file>
+    <file>icons/16x16/actions/gnumeric-format-border-right.xpm</file>
+    <file>icons/16x16/actions/gnumeric-format-border-top.xpm</file>
     <file>icons/16x16/actions/gnumeric-formulaguru.png</file>
     <file>icons/16x16/actions/gnumeric-graphguru.xpm</file>
     <file>icons/16x16/actions/gnumeric-group.xpm</file>
@@ -44,6 +50,31 @@
     <file>icons/16x16/actions/gnumeric-ungroup.xpm</file>
     <file>icons/16x16/actions/gnumeric-visible.png</file>
     <file>icons/22x22/actions/gnumeric-brush.png</file>
+    <file>icons/22x22/actions/gnumeric-format-border-inside-horiz.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-125grey.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-25grey.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-50grey.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-625grey.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-75grey.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-bricks.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-diag-cross.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-diag.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-foreground-solid.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-horiz.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-large-circles.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-rev-diag.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-semi-circle.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-small-circle.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-solid.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thatch.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thick-diag-cross.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-diag-cross.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-diag.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-horiz-cross.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-horiz.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-rev-diag.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-thin-vert.xpm</file>
+    <file>icons/22x22/actions/gnumeric-pattern-vert.xpm</file>
     <file>icons/24x24/actions/gnumeric-autofilter-delete.png</file>
     <file>icons/24x24/actions/gnumeric-autofilter.png</file>
     <file>icons/24x24/actions/gnumeric-autosum.xpm</file>
@@ -66,8 +97,12 @@
     <file>icons/24x24/actions/gnumeric-format-border-all.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-bottom.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-double-bottom.xpm</file>
+    <file>icons/24x24/actions/gnumeric-format-border-inside-vert.xpm</file>
+    <file>icons/24x24/actions/gnumeric-format-border-inside.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-left.xpm</file>
+    <file>icons/24x24/actions/gnumeric-format-border-no.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-none.xpm</file>
+    <file>icons/24x24/actions/gnumeric-format-border-outline.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-outside.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-right.xpm</file>
     <file>icons/24x24/actions/gnumeric-format-border-thick-bottom.xpm</file>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]