[gnumeric] Icons: part II.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Icons: part II.
- Date: Sat, 27 Dec 2014 00:50:40 +0000 (UTC)
commit f412d9591fa16852a1fae7320c38c682705767b1
Author: Morten Welinder <terra gnome org>
Date: Fri Dec 26 19:50:19 2014 -0500
Icons: part II.
configure.ac | 1 +
.../16x16/actions/gnumeric-pagesetup-hf-date.png | Bin 322 -> 322 bytes
.../16x16/actions/gnumeric-pagesetup-hf-page.png | Bin 309 -> 309 bytes
.../16x16/actions/gnumeric-pagesetup-hf-pages.png | Bin 326 -> 326 bytes
.../24x24/actions/gnumeric-format-border-all.xpm | 0
.../actions/gnumeric-format-border-bottom.xpm | 0
.../gnumeric-format-border-double-bottom.xpm | 0
.../24x24/actions/gnumeric-format-border-left.xpm | 0
.../24x24/actions/gnumeric-format-border-none.xpm | 0
.../actions/gnumeric-format-border-outside.xpm | 0
.../24x24/actions/gnumeric-format-border-right.xpm | 0
.../gnumeric-format-border-thick-bottom.xpm | 0
.../gnumeric-format-border-thick-outside.xpm | 0
.../gnumeric-format-border-top-n-bottom.xpm | 0
.../gnumeric-format-border-top-n-double-bottom.xpm | 0
.../gnumeric-format-border-top-n-thick-bottom.xpm | 0
.../24x24/actions/gnumeric-pagesetup-hf-cell.png | Bin 552 -> 552 bytes
.../24x24/actions/gnumeric-pagesetup-hf-sheet.png | Bin 237 -> 237 bytes
.../24x24/actions/gnumeric-pagesetup-hf-time.png | Bin 373 -> 373 bytes
icons/48x48/Makefile.am | 2 +-
icons/48x48/actions/Makefile.am | 3 +
.../actions/gnumeric-protection-yes-dialog.png | Bin 2836 -> 2836 bytes
src/Makefile.am | 21 +---
src/application.c | 155 ------------------
src/dialogs/dialog-password.c | 2 +-
src/dialogs/dialog-printer-setup.c | 24 ++--
src/gnm.gresource.xml | 165 +++++++++++---------
src/wbc-gtk.c | 24 ++--
28 files changed, 123 insertions(+), 274 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 49760e5..900339b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1099,6 +1099,7 @@ icons/24x24/apps/Makefile
icons/32x32/Makefile
icons/32x32/apps/Makefile
icons/48x48/Makefile
+icons/48x48/actions/Makefile
icons/48x48/apps/Makefile
icons/256x256/Makefile
icons/256x256/apps/Makefile
diff --git a/src/pixmaps/border_all.xpm b/icons/24x24/actions/gnumeric-format-border-all.xpm
similarity index 100%
rename from src/pixmaps/border_all.xpm
rename to icons/24x24/actions/gnumeric-format-border-all.xpm
diff --git a/src/pixmaps/border_bottom.xpm b/icons/24x24/actions/gnumeric-format-border-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-bottom.xpm
diff --git a/src/pixmaps/border_double_bottom.xpm
b/icons/24x24/actions/gnumeric-format-border-double-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_double_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-double-bottom.xpm
diff --git a/src/pixmaps/border_left.xpm b/icons/24x24/actions/gnumeric-format-border-left.xpm
similarity index 100%
rename from src/pixmaps/border_left.xpm
rename to icons/24x24/actions/gnumeric-format-border-left.xpm
diff --git a/src/pixmaps/border_none.xpm b/icons/24x24/actions/gnumeric-format-border-none.xpm
similarity index 100%
rename from src/pixmaps/border_none.xpm
rename to icons/24x24/actions/gnumeric-format-border-none.xpm
diff --git a/src/pixmaps/border_outside.xpm b/icons/24x24/actions/gnumeric-format-border-outside.xpm
similarity index 100%
rename from src/pixmaps/border_outside.xpm
rename to icons/24x24/actions/gnumeric-format-border-outside.xpm
diff --git a/src/pixmaps/border_right.xpm b/icons/24x24/actions/gnumeric-format-border-right.xpm
similarity index 100%
rename from src/pixmaps/border_right.xpm
rename to icons/24x24/actions/gnumeric-format-border-right.xpm
diff --git a/src/pixmaps/border_thick_bottom.xpm b/icons/24x24/actions/gnumeric-format-border-thick-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_thick_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-thick-bottom.xpm
diff --git a/src/pixmaps/border_thick_outside.xpm
b/icons/24x24/actions/gnumeric-format-border-thick-outside.xpm
similarity index 100%
rename from src/pixmaps/border_thick_outside.xpm
rename to icons/24x24/actions/gnumeric-format-border-thick-outside.xpm
diff --git a/src/pixmaps/border_top_n_bottom.xpm b/icons/24x24/actions/gnumeric-format-border-top-n-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_top_n_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-top-n-bottom.xpm
diff --git a/src/pixmaps/border_top_n_double_bottom.xpm
b/icons/24x24/actions/gnumeric-format-border-top-n-double-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_top_n_double_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-top-n-double-bottom.xpm
diff --git a/src/pixmaps/border_top_n_thick_bottom.xpm
b/icons/24x24/actions/gnumeric-format-border-top-n-thick-bottom.xpm
similarity index 100%
rename from src/pixmaps/border_top_n_thick_bottom.xpm
rename to icons/24x24/actions/gnumeric-format-border-top-n-thick-bottom.xpm
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index ebbd145..063f693 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1 +1 @@
-SUBDIRS = apps
+SUBDIRS = actions apps
diff --git a/icons/48x48/actions/Makefile.am b/icons/48x48/actions/Makefile.am
new file mode 100644
index 0000000..1caa90f
--- /dev/null
+++ b/icons/48x48/actions/Makefile.am
@@ -0,0 +1,3 @@
+internalicons =
+
+EXTRA_DIST = $(internalicons)
diff --git a/src/Makefile.am b/src/Makefile.am
index 739f16a..6182511 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -437,19 +437,7 @@ gnumeric_app_libs = \
embedded_imgs = \
gnumeric.css \
- pixmaps/border_all.xpm \
- pixmaps/border_bottom.xpm \
- pixmaps/border_double_bottom.xpm \
- pixmaps/border_left.xpm \
- pixmaps/border_none.xpm \
- pixmaps/border_outside.xpm \
- pixmaps/border_right.xpm \
- pixmaps/border_thick_bottom.xpm \
- pixmaps/border_thick_outside.xpm \
- pixmaps/border_top_n_bottom.xpm \
- pixmaps/border_top_n_double_bottom.xpm \
- pixmaps/border_top_n_thick_bottom.xpm \
- pixmaps/bottom_border.xpm \
+ pixmaps/bottom_border.xpm \
pixmaps/cursor_cross.xpm \
pixmaps/diag_border.xpm \
pixmaps/down-right.png \
@@ -478,12 +466,6 @@ embedded_imgs = \
pixmaps/gp_thin_rev_diag.xpm \
pixmaps/gp_thin_vert.xpm \
pixmaps/gp_vert.xpm \
- pixmaps/hf_cell.png \
- pixmaps/hf_date.png \
- pixmaps/hf_page.png \
- pixmaps/hf_pages.png \
- pixmaps/hf_sheet.png \
- pixmaps/hf_time.png \
pixmaps/inside_border.xpm \
pixmaps/inside_horiz_border.xpm \
pixmaps/inside_vert_border.xpm \
@@ -503,7 +485,6 @@ embedded_imgs = \
pixmaps/line_pattern_thin.xpm \
pixmaps/no_border.xpm \
pixmaps/outline_border.xpm \
- pixmaps/protection_yes_48.png \
pixmaps/rev_diag_border.xpm \
pixmaps/right-down.png \
pixmaps/right_border.xpm \
diff --git a/src/application.c b/src/application.c
index a5aac16..f7657b1 100644
--- a/src/application.c
+++ b/src/application.c
@@ -745,54 +745,6 @@ gnumeric_application_get_property (GObject *obj, guint param_id,
}
static void
-add_icon (GtkIconFactory *factory,
- const char *scalable_filename,
- const char *sized_filename,
- const char *stock_id)
-{
- GtkIconSet *set = gtk_icon_set_new ();
- GtkIconSource *src = gtk_icon_source_new ();
-
- if (scalable_filename) {
- char *res = g_strconcat ("res:gnm:pixmaps/",
- scalable_filename,
- NULL);
- GdkPixbuf *pix = go_gdk_pixbuf_load_from_file (res);
- if (pix) {
- gtk_icon_source_set_size_wildcarded (src, TRUE);
- gtk_icon_source_set_pixbuf (src, pix);
- gtk_icon_set_add_source (set, src);
- g_object_unref (pix);
- } else {
- g_warning ("Missing resource %s\n", res);
- }
- g_free (res);
- }
-
- /*
- * For now, don't register a fixed-sized icon as doing so without
- * catching style changes kills things like bug 302902.
- */
- if (sized_filename && !scalable_filename) {
- char *res = g_strconcat ("res:gnm:pixmaps/",
- sized_filename,
- NULL);
- GdkPixbuf *pix = go_gdk_pixbuf_load_from_file (res);
- gtk_icon_source_set_size (src, GTK_ICON_SIZE_MENU);
- gtk_icon_source_set_size_wildcarded (src, FALSE);
- gtk_icon_source_set_pixbuf (src, pix);
- gtk_icon_set_add_source (set, src);
- g_object_unref (pix);
- g_free (res);
- }
-
- gtk_icon_factory_add (factory, stock_id, set);
- gtk_icon_set_unref (set);
- gtk_icon_source_free (src);
-}
-
-
-static void
install_icons (GnmApp *app)
{
static const char *icons[] = {
@@ -854,108 +806,6 @@ install_icons (GnmApp *app)
"right_border.xpm",
"top_border.xpm"
};
- static struct {
- const char *scalable_filename;
- const char *sized_filename;
- const char *stock_id;
- } const icons2[] = {
- {
- "protection_yes_48.png",
- NULL,
- "Gnumeric_Protection_Yes_Dialog"
- },
- {
- "border_left.xpm",
- NULL,
- "Gnumeric_BorderLeft"
- },
- {
- "border_none.xpm",
- NULL,
- "Gnumeric_BorderNone"
- },
- {
- "border_right.xpm",
- NULL,
- "Gnumeric_BorderRight"
- },
- {
- "border_all.xpm",
- NULL,
- "Gnumeric_BorderAll"
- },
- {
- "border_outside.xpm",
- NULL,
- "Gnumeric_BorderOutside"
- },
- {
- "border_thick_outside.xpm",
- NULL,
- "Gnumeric_BorderThickOutside"
- },
- {
- "border_bottom.xpm",
- NULL,
- "Gnumeric_BorderBottom"
- },
- {
- "border_double_bottom.xpm",
- NULL,
- "Gnumeric_BorderDoubleBottom"
- },
- {
- "border_thick_bottom.xpm",
- NULL,
- "Gnumeric_BorderThickBottom"
- },
- {
- "border_top_n_bottom.xpm",
- NULL,
- "Gnumeric_BorderTop_n_Bottom"
- },
- {
- "border_top_n_double_bottom.xpm",
- NULL,
- "Gnumeric_BorderTop_n_DoubleBottom"
- },
- {
- "border_top_n_thick_bottom.xpm",
- NULL,
- "Gnumeric_BorderTop_n_ThickBottom"
- },
-
- {
- "hf_page.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Page"
- },
- {
- "hf_pages.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Pages"
- },
- {
- "hf_time.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Time"
- },
- {
- "hf_date.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Date"
- },
- {
- "hf_sheet.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Sheet"
- },
- {
- "hf_cell.png",
- NULL,
- "Gnumeric_Pagesetup_HF_Cell"
- },
- };
GtkIconFactory *factory = gtk_icon_factory_new ();
unsigned int ui;
@@ -982,11 +832,6 @@ install_icons (GnmApp *app)
g_free (res);
}
- for (ui = 0; ui < G_N_ELEMENTS (icons2) ; ui++)
- add_icon (factory,
- icons2[ui].scalable_filename,
- icons2[ui].sized_filename,
- icons2[ui].stock_id);
gtk_icon_factory_add_default (factory);
g_object_set_data_full (G_OBJECT (app),
"icon-factory", factory,
diff --git a/src/dialogs/dialog-password.c b/src/dialogs/dialog-password.c
index 391e6e8..e4a4f52 100644
--- a/src/dialogs/dialog-password.c
+++ b/src/dialogs/dialog-password.c
@@ -44,7 +44,7 @@ dialog_get_password (GtkWindow *parent, const char *filename)
hb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), hb,
TRUE, TRUE, 8);
- image = gtk_image_new_from_stock ("Gnumeric_Protection_Yes_Dialog",
+ image = gtk_image_new_from_stock ("gnumeric-protection-yes-dialog",
GTK_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hb), image, FALSE, FALSE, 0);
diff --git a/src/dialogs/dialog-printer-setup.c b/src/dialogs/dialog-printer-setup.c
index f44d65c..91928a1 100644
--- a/src/dialogs/dialog-printer-setup.c
+++ b/src/dialogs/dialog-printer-setup.c
@@ -1112,22 +1112,22 @@ hf_insert_hf_stock_tag (HFCustomizeState *hf_state, GtkTextBuffer *buffer,
stock_id = GTK_STOCK_DIRECTORY;
break;
case HF_FIELD_PAGE:
- stock_id = "Gnumeric_Pagesetup_HF_Page";
+ stock_id = "gnumeric-pagesetup-hf-page";
break;
case HF_FIELD_PAGES:
- stock_id = "Gnumeric_Pagesetup_HF_Pages";
+ stock_id = "gnumeric-pagesetup-hf-pages";
break;
case HF_FIELD_DATE:
- stock_id = "Gnumeric_Pagesetup_HF_Date";
+ stock_id = "gnumeric-pagesetup-hf-date";
break;
case HF_FIELD_TIME:
- stock_id = "Gnumeric_Pagesetup_HF_Time";
+ stock_id = "gnumeric-pagesetup-hf-time";
break;
case HF_FIELD_SHEET:
- stock_id = "Gnumeric_Pagesetup_HF_Sheet";
+ stock_id = "gnumeric-pagesetup-hf-sheet";
break;
case HF_FIELD_CELL:
- stock_id = "Gnumeric_Pagesetup_HF_Cell";
+ stock_id = "gnumeric-pagesetup-hf-cell";
break;
default:
return;
@@ -1796,29 +1796,29 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
"clicked", G_CALLBACK (hf_delete_tag_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-date-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Date");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-date");
hf_attach_insert_date_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-page-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Page");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-page");
g_signal_connect_swapped
(G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_page_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-pages-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Pages");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-pages");
g_signal_connect_swapped
(G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_pages_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-sheet-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Sheet");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-sheet");
g_signal_connect_swapped
(G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_sheet_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-time-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Time");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-time");
hf_attach_insert_time_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
g_signal_connect_swapped
@@ -1830,7 +1830,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
"clicked", G_CALLBACK (hf_insert_path_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-cell-button"));
- gtk_tool_button_set_stock_id (button, "Gnumeric_Pagesetup_HF_Cell");
+ gtk_tool_button_set_stock_id (button, "gnumeric-pagesetup-hf-cell");
hf_attach_insert_cell_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
diff --git a/src/gnm.gresource.xml b/src/gnm.gresource.xml
index cec316a..23b5752 100644
--- a/src/gnm.gresource.xml
+++ b/src/gnm.gresource.xml
@@ -1,103 +1,122 @@
<?xml version='1.0' encoding='UTF-8'?>
<gresources>
<gresource prefix='/org/gnumeric/gnumeric'>
+ <file>icons/16x16/actions/gnumeric-autofilter-delete.png</file>
+ <file>icons/16x16/actions/gnumeric-autofilter.png</file>
+ <file>icons/16x16/actions/gnumeric-brush.png</file>
+ <file>icons/16x16/actions/gnumeric-cells-merge.xpm</file>
+ <file>icons/16x16/actions/gnumeric-cells-split.xpm</file>
+ <file>icons/16x16/actions/gnumeric-center-across-selection.xpm</file>
<file>icons/16x16/actions/gnumeric-column-add.xpm</file>
- <file>icons/24x24/actions/gnumeric-column-add.xpm</file>
- <file>icons/24x24/actions/gnumeric-column-delete.xpm</file>
<file>icons/16x16/actions/gnumeric-column-delete.xpm</file>
- <file>icons/24x24/actions/gnumeric-column-size.xpm</file>
- <file>icons/16x16/actions/gnumeric-column-size.xpm</file>
- <file>icons/24x24/actions/gnumeric-column-hide.xpm</file>
<file>icons/16x16/actions/gnumeric-column-hide.xpm</file>
- <file>icons/24x24/actions/gnumeric-column-unhide.xpm</file>
+ <file>icons/16x16/actions/gnumeric-column-size.xpm</file>
<file>icons/16x16/actions/gnumeric-column-unhide.xpm</file>
- <file>icons/24x24/actions/gnumeric-row-add.xpm</file>
+ <file>icons/16x16/actions/gnumeric-comment-add.xpm</file>
+ <file>icons/16x16/actions/gnumeric-comment-delete.xpm</file>
+ <file>icons/16x16/actions/gnumeric-comment-edit.xpm</file>
+ <file>icons/16x16/actions/gnumeric-component-insert-shaped.xpm</file>
+ <file>icons/16x16/actions/gnumeric-component-insert.xpm</file>
+ <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-formulaguru.png</file>
+ <file>icons/16x16/actions/gnumeric-graphguru.xpm</file>
+ <file>icons/16x16/actions/gnumeric-group.xpm</file>
+ <file>icons/16x16/actions/gnumeric-link-add.png</file>
+ <file>icons/16x16/actions/gnumeric-link-delete.png</file>
+ <file>icons/16x16/actions/gnumeric-link-edit.png</file>
+ <file>icons/16x16/actions/gnumeric-link-email.png</file>
+ <file>icons/16x16/actions/gnumeric-link-external.png</file>
+ <file>icons/16x16/actions/gnumeric-link-internal.png</file>
+ <file>icons/16x16/actions/gnumeric-link-url.png</file>
+ <file>icons/16x16/actions/gnumeric-pagesetup-hf-date.png</file>
+ <file>icons/16x16/actions/gnumeric-pagesetup-hf-page.png</file>
+ <file>icons/16x16/actions/gnumeric-pagesetup-hf-pages.png</file>
+ <file>icons/16x16/actions/gnumeric-pivottable.png</file>
<file>icons/16x16/actions/gnumeric-row-add.xpm</file>
- <file>icons/24x24/actions/gnumeric-row-delete.xpm</file>
<file>icons/16x16/actions/gnumeric-row-delete.xpm</file>
- <file>icons/24x24/actions/gnumeric-row-size.xpm</file>
- <file>icons/16x16/actions/gnumeric-row-size.xpm</file>
- <file>icons/24x24/actions/gnumeric-row-hide.xpm</file>
<file>icons/16x16/actions/gnumeric-row-hide.xpm</file>
- <file>icons/24x24/actions/gnumeric-row-unhide.xpm</file>
+ <file>icons/16x16/actions/gnumeric-row-size.xpm</file>
<file>icons/16x16/actions/gnumeric-row-unhide.xpm</file>
- <file>icons/24x24/actions/gnumeric-group.xpm</file>
- <file>icons/16x16/actions/gnumeric-group.xpm</file>
- <file>icons/24x24/actions/gnumeric-ungroup.xpm</file>
+ <file>icons/16x16/actions/gnumeric-subscript.png</file>
+ <file>icons/16x16/actions/gnumeric-superscript.png</file>
<file>icons/16x16/actions/gnumeric-ungroup.xpm</file>
- <file>icons/24x24/actions/gnumeric-detail-show.xpm</file>
- <file>icons/16x16/actions/gnumeric-detail-show.xpm</file>
- <file>icons/24x24/actions/gnumeric-detail-hide.xpm</file>
- <file>icons/16x16/actions/gnumeric-detail-hide.xpm</file>
- <file>icons/24x24/actions/gnumeric-graphguru.xpm</file>
- <file>icons/16x16/actions/gnumeric-graphguru.xpm</file>
- <file>icons/24x24/actions/gnumeric-component-insert.xpm</file>
- <file>icons/16x16/actions/gnumeric-component-insert.xpm</file>
- <file>icons/24x24/actions/gnumeric-component-insert-shaped.xpm</file>
- <file>icons/16x16/actions/gnumeric-component-insert-shaped.xpm</file>
- <file>icons/24x24/actions/gnumeric-center-across-selection.xpm</file>
- <file>icons/16x16/actions/gnumeric-center-across-selection.xpm</file>
+ <file>icons/16x16/actions/gnumeric-visible.png</file>
+ <file>icons/22x22/actions/gnumeric-brush.png</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>
+ <file>icons/24x24/actions/gnumeric-bucket.xpm</file>
<file>icons/24x24/actions/gnumeric-cells-merge.xpm</file>
- <file>icons/16x16/actions/gnumeric-cells-merge.xpm</file>
<file>icons/24x24/actions/gnumeric-cells-split.xpm</file>
- <file>icons/16x16/actions/gnumeric-cells-split.xpm</file>
+ <file>icons/24x24/actions/gnumeric-center-across-selection.xpm</file>
+ <file>icons/24x24/actions/gnumeric-column-add.xpm</file>
+ <file>icons/24x24/actions/gnumeric-column-delete.xpm</file>
+ <file>icons/24x24/actions/gnumeric-column-hide.xpm</file>
+ <file>icons/24x24/actions/gnumeric-column-size.xpm</file>
+ <file>icons/24x24/actions/gnumeric-column-unhide.xpm</file>
+ <file>icons/24x24/actions/gnumeric-component-insert-shaped.xpm</file>
+ <file>icons/24x24/actions/gnumeric-component-insert.xpm</file>
+ <file>icons/24x24/actions/gnumeric-detail-hide.xpm</file>
+ <file>icons/24x24/actions/gnumeric-detail-show.xpm</file>
+ <file>icons/24x24/actions/gnumeric-equal.xpm</file>
+ <file>icons/24x24/actions/gnumeric-font.xpm</file>
+ <file>icons/24x24/actions/gnumeric-format-accounting.png</file>
+ <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-left.xpm</file>
+ <file>icons/24x24/actions/gnumeric-format-border-none.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>
+ <file>icons/24x24/actions/gnumeric-format-border-thick-outside.xpm</file>
+ <file>icons/24x24/actions/gnumeric-format-border-top-n-bottom.xpm</file>
+ <file>icons/24x24/actions/gnumeric-format-border-top-n-double-bottom.xpm</file>
+ <file>icons/24x24/actions/gnumeric-format-border-top-n-thick-bottom.xpm</file>
<file>icons/24x24/actions/gnumeric-format-halign-fill.png</file>
<file>icons/24x24/actions/gnumeric-format-halign-general.png</file>
- <file>icons/16x16/actions/gnumeric-comment-add.xpm</file>
- <file>icons/16x16/actions/gnumeric-comment-delete.xpm</file>
- <file>icons/16x16/actions/gnumeric-comment-edit.xpm</file>
- <file>icons/24x24/actions/gnumeric-format-precision-increase.png</file>
- <file>icons/24x24/actions/gnumeric-format-precision-decrease.png</file>
- <file>icons/24x24/actions/gnumeric-format-accounting.png</file>
<file>icons/24x24/actions/gnumeric-format-percentage.png</file>
+ <file>icons/24x24/actions/gnumeric-format-precision-decrease.png</file>
+ <file>icons/24x24/actions/gnumeric-format-precision-increase.png</file>
<file>icons/24x24/actions/gnumeric-format-thousand-separator.xpm</file>
- <file>icons/24x24/actions/gnumeric-subscript.png</file>
- <file>icons/16x16/actions/gnumeric-subscript.png</file>
- <file>icons/24x24/actions/gnumeric-superscript.png</file>
- <file>icons/16x16/actions/gnumeric-superscript.png</file>
- <file>icons/24x24/actions/gnumeric-autosum.xpm</file>
- <file>icons/24x24/actions/gnumeric-equal.xpm</file>
<file>icons/24x24/actions/gnumeric-formulaguru.png</file>
- <file>icons/16x16/actions/gnumeric-formulaguru.png</file>
- <file>icons/24x24/actions/gnumeric-bucket.xpm</file>
- <file>icons/24x24/actions/gnumeric-font.xpm</file>
- <file>icons/16x16/actions/gnumeric-exprentry.png</file>
- <file>icons/22x22/actions/gnumeric-brush.png</file>
- <file>icons/16x16/actions/gnumeric-brush.png</file>
+ <file>icons/24x24/actions/gnumeric-graphguru.xpm</file>
+ <file>icons/24x24/actions/gnumeric-group.xpm</file>
+ <file>icons/24x24/actions/gnumeric-link-add.png</file>
+ <file>icons/24x24/actions/gnumeric-link-email.png</file>
+ <file>icons/24x24/actions/gnumeric-link-external.png</file>
+ <file>icons/24x24/actions/gnumeric-link-internal.png</file>
+ <file>icons/24x24/actions/gnumeric-link-url.png</file>
<file>icons/24x24/actions/gnumeric-object-arrow.png</file>
+ <file>icons/24x24/actions/gnumeric-object-button.png</file>
+ <file>icons/24x24/actions/gnumeric-object-checkbox.png</file>
+ <file>icons/24x24/actions/gnumeric-object-combo.png</file>
<file>icons/24x24/actions/gnumeric-object-ellipse.png</file>
- <file>icons/24x24/actions/gnumeric-object-line.png</file>
- <file>icons/24x24/actions/gnumeric-object-rectangle.png</file>
<file>icons/24x24/actions/gnumeric-object-frame.png</file>
<file>icons/24x24/actions/gnumeric-object-label.png</file>
- <file>icons/24x24/actions/gnumeric-object-button.png</file>
- <file>icons/24x24/actions/gnumeric-object-checkbox.png</file>
+ <file>icons/24x24/actions/gnumeric-object-line.png</file>
+ <file>icons/24x24/actions/gnumeric-object-list.png</file>
<file>icons/24x24/actions/gnumeric-object-radiobutton.png</file>
+ <file>icons/24x24/actions/gnumeric-object-rectangle.png</file>
<file>icons/24x24/actions/gnumeric-object-scrollbar.png</file>
- <file>icons/24x24/actions/gnumeric-object-spinbutton.png</file>
<file>icons/24x24/actions/gnumeric-object-slider.png</file>
- <file>icons/24x24/actions/gnumeric-object-combo.png</file>
- <file>icons/24x24/actions/gnumeric-object-list.png</file>
+ <file>icons/24x24/actions/gnumeric-object-spinbutton.png</file>
+ <file>icons/24x24/actions/gnumeric-pagesetup-hf-cell.png</file>
+ <file>icons/24x24/actions/gnumeric-pagesetup-hf-sheet.png</file>
+ <file>icons/24x24/actions/gnumeric-pagesetup-hf-time.png</file>
<file>icons/24x24/actions/gnumeric-pivottable.png</file>
- <file>icons/16x16/actions/gnumeric-pivottable.png</file>
- <file>icons/24x24/actions/gnumeric-protection-yes.png</file>
<file>icons/24x24/actions/gnumeric-protection-no.png</file>
- <file>icons/16x16/actions/gnumeric-visible.png</file>
- <file>icons/24x24/actions/gnumeric-link-add.png</file>
- <file>icons/16x16/actions/gnumeric-link-add.png</file>
- <file>icons/16x16/actions/gnumeric-link-delete.png</file>
- <file>icons/16x16/actions/gnumeric-link-edit.png</file>
- <file>icons/24x24/actions/gnumeric-link-external.png</file>
- <file>icons/16x16/actions/gnumeric-link-external.png</file>
- <file>icons/24x24/actions/gnumeric-link-internal.png</file>
- <file>icons/16x16/actions/gnumeric-link-internal.png</file>
- <file>icons/24x24/actions/gnumeric-link-email.png</file>
- <file>icons/16x16/actions/gnumeric-link-email.png</file>
- <file>icons/24x24/actions/gnumeric-link-url.png</file>
- <file>icons/16x16/actions/gnumeric-link-url.png</file>
- <file>icons/24x24/actions/gnumeric-autofilter.png</file>
- <file>icons/16x16/actions/gnumeric-autofilter.png</file>
- <file>icons/24x24/actions/gnumeric-autofilter-delete.png</file>
- <file>icons/16x16/actions/gnumeric-autofilter-delete.png</file>
+ <file>icons/24x24/actions/gnumeric-protection-yes.png</file>
+ <file>icons/24x24/actions/gnumeric-row-add.xpm</file>
+ <file>icons/24x24/actions/gnumeric-row-delete.xpm</file>
+ <file>icons/24x24/actions/gnumeric-row-hide.xpm</file>
+ <file>icons/24x24/actions/gnumeric-row-size.xpm</file>
+ <file>icons/24x24/actions/gnumeric-row-unhide.xpm</file>
+ <file>icons/24x24/actions/gnumeric-subscript.png</file>
+ <file>icons/24x24/actions/gnumeric-superscript.png</file>
+ <file>icons/24x24/actions/gnumeric-ungroup.xpm</file>
+ <file>icons/48x48/actions/gnumeric-protection-yes-dialog.png</file>
</gresource>
</gresources>
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index 1c08d82..df8bbce 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3136,21 +3136,21 @@ wbc_gtk_init_zoom (WBCGtk *wbcg)
/****************************************************************************/
static GOActionComboPixmapsElement const border_combo_info[] = {
- { N_("Left"), "Gnumeric_BorderLeft", 11 },
- { N_("Clear Borders"), "Gnumeric_BorderNone", 12 },
- { N_("Right"), "Gnumeric_BorderRight", 13 },
+ { N_("Left"), "gnumeric-format-border-left", 11 },
+ { N_("Clear Borders"), "gnumeric-format-border-none", 12 },
+ { N_("Right"), "gnumeric-format-border-right", 13 },
- { N_("All Borders"), "Gnumeric_BorderAll", 21 },
- { N_("Outside Borders"), "Gnumeric_BorderOutside", 22 },
- { N_("Thick Outside Borders"), "Gnumeric_BorderThickOutside", 23 },
+ { N_("All Borders"), "gnumeric-format-border-all", 21 },
+ { N_("Outside Borders"), "gnumeric-format-border-outside", 22 },
+ { N_("Thick Outside Borders"), "gnumeric-format-border-thick-outside", 23 },
- { N_("Bottom"), "Gnumeric_BorderBottom", 31 },
- { N_("Double Bottom"), "Gnumeric_BorderDoubleBottom", 32 },
- { N_("Thick Bottom"), "Gnumeric_BorderThickBottom", 33 },
+ { N_("Bottom"), "gnumeric-format-border-bottom", 31 },
+ { N_("Double Bottom"), "gnumeric-format-border-double-bottom", 32 },
+ { N_("Thick Bottom"), "gnumeric-format-border-thick-bottom", 33 },
- { N_("Top and Bottom"), "Gnumeric_BorderTop_n_Bottom", 41 },
- { N_("Top and Double Bottom"), "Gnumeric_BorderTop_n_DoubleBottom", 42 },
- { N_("Top and Thick Bottom"), "Gnumeric_BorderTop_n_ThickBottom", 43 },
+ { N_("Top and Bottom"), "gnumeric-format-border-top-n-bottom", 41 },
+ { N_("Top and Double Bottom"), "gnumeric-format-border-top-n-double-bottom", 42 },
+ { N_("Top and Thick Bottom"), "gnumeric-format-border-top-n-thick-bottom", 43 },
{ NULL, NULL}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
