Commit f412d959 authored by Morten Welinder's avatar Morten Welinder

Icons: part II.

parent c55f147a
...@@ -1099,6 +1099,7 @@ icons/24x24/apps/Makefile ...@@ -1099,6 +1099,7 @@ icons/24x24/apps/Makefile
icons/32x32/Makefile icons/32x32/Makefile
icons/32x32/apps/Makefile icons/32x32/apps/Makefile
icons/48x48/Makefile icons/48x48/Makefile
icons/48x48/actions/Makefile
icons/48x48/apps/Makefile icons/48x48/apps/Makefile
icons/256x256/Makefile icons/256x256/Makefile
icons/256x256/apps/Makefile icons/256x256/apps/Makefile
......
SUBDIRS = apps SUBDIRS = actions apps
internalicons =
EXTRA_DIST = $(internalicons)
...@@ -437,19 +437,7 @@ gnumeric_app_libs = \ ...@@ -437,19 +437,7 @@ gnumeric_app_libs = \
embedded_imgs = \ embedded_imgs = \
gnumeric.css \ gnumeric.css \
pixmaps/border_all.xpm \ pixmaps/bottom_border.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/cursor_cross.xpm \ pixmaps/cursor_cross.xpm \
pixmaps/diag_border.xpm \ pixmaps/diag_border.xpm \
pixmaps/down-right.png \ pixmaps/down-right.png \
...@@ -478,12 +466,6 @@ embedded_imgs = \ ...@@ -478,12 +466,6 @@ embedded_imgs = \
pixmaps/gp_thin_rev_diag.xpm \ pixmaps/gp_thin_rev_diag.xpm \
pixmaps/gp_thin_vert.xpm \ pixmaps/gp_thin_vert.xpm \
pixmaps/gp_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_border.xpm \
pixmaps/inside_horiz_border.xpm \ pixmaps/inside_horiz_border.xpm \
pixmaps/inside_vert_border.xpm \ pixmaps/inside_vert_border.xpm \
...@@ -503,7 +485,6 @@ embedded_imgs = \ ...@@ -503,7 +485,6 @@ embedded_imgs = \
pixmaps/line_pattern_thin.xpm \ pixmaps/line_pattern_thin.xpm \
pixmaps/no_border.xpm \ pixmaps/no_border.xpm \
pixmaps/outline_border.xpm \ pixmaps/outline_border.xpm \
pixmaps/protection_yes_48.png \
pixmaps/rev_diag_border.xpm \ pixmaps/rev_diag_border.xpm \
pixmaps/right-down.png \ pixmaps/right-down.png \
pixmaps/right_border.xpm \ pixmaps/right_border.xpm \
......
...@@ -744,54 +744,6 @@ gnumeric_application_get_property (GObject *obj, guint param_id, ...@@ -744,54 +744,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 static void
install_icons (GnmApp *app) install_icons (GnmApp *app)
{ {
...@@ -854,108 +806,6 @@ install_icons (GnmApp *app) ...@@ -854,108 +806,6 @@ install_icons (GnmApp *app)
"right_border.xpm", "right_border.xpm",
"top_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 (); GtkIconFactory *factory = gtk_icon_factory_new ();
unsigned int ui; unsigned int ui;
...@@ -982,11 +832,6 @@ install_icons (GnmApp *app) ...@@ -982,11 +832,6 @@ install_icons (GnmApp *app)
g_free (res); 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); gtk_icon_factory_add_default (factory);
g_object_set_data_full (G_OBJECT (app), g_object_set_data_full (G_OBJECT (app),
"icon-factory", factory, "icon-factory", factory,
......
...@@ -44,7 +44,7 @@ dialog_get_password (GtkWindow *parent, const char *filename) ...@@ -44,7 +44,7 @@ dialog_get_password (GtkWindow *parent, const char *filename)
hb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); hb = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), hb, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (d))), hb,
TRUE, TRUE, 8); 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_ICON_SIZE_DIALOG);
gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0); gtk_misc_set_alignment (GTK_MISC (image), 0.5, 0.0);
gtk_box_pack_start (GTK_BOX (hb), image, FALSE, FALSE, 0); gtk_box_pack_start (GTK_BOX (hb), image, FALSE, FALSE, 0);
......
...@@ -1112,22 +1112,22 @@ hf_insert_hf_stock_tag (HFCustomizeState *hf_state, GtkTextBuffer *buffer, ...@@ -1112,22 +1112,22 @@ hf_insert_hf_stock_tag (HFCustomizeState *hf_state, GtkTextBuffer *buffer,
stock_id = GTK_STOCK_DIRECTORY; stock_id = GTK_STOCK_DIRECTORY;
break; break;
case HF_FIELD_PAGE: case HF_FIELD_PAGE:
stock_id = "Gnumeric_Pagesetup_HF_Page"; stock_id = "gnumeric-pagesetup-hf-page";
break; break;
case HF_FIELD_PAGES: case HF_FIELD_PAGES:
stock_id = "Gnumeric_Pagesetup_HF_Pages"; stock_id = "gnumeric-pagesetup-hf-pages";
break; break;
case HF_FIELD_DATE: case HF_FIELD_DATE:
stock_id = "Gnumeric_Pagesetup_HF_Date"; stock_id = "gnumeric-pagesetup-hf-date";
break; break;
case HF_FIELD_TIME: case HF_FIELD_TIME:
stock_id = "Gnumeric_Pagesetup_HF_Time"; stock_id = "gnumeric-pagesetup-hf-time";
break; break;
case HF_FIELD_SHEET: case HF_FIELD_SHEET:
stock_id = "Gnumeric_Pagesetup_HF_Sheet"; stock_id = "gnumeric-pagesetup-hf-sheet";
break; break;
case HF_FIELD_CELL: case HF_FIELD_CELL:
stock_id = "Gnumeric_Pagesetup_HF_Cell"; stock_id = "gnumeric-pagesetup-hf-cell";
break; break;
default: default:
return; return;
...@@ -1796,29 +1796,29 @@ do_hf_customize (gboolean header, PrinterSetupState *state) ...@@ -1796,29 +1796,29 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
"clicked", G_CALLBACK (hf_delete_tag_cb), hf_state); "clicked", G_CALLBACK (hf_delete_tag_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-date-button")); 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); 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")); 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_signal_connect_swapped
(G_OBJECT (button), (G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_page_cb), hf_state); "clicked", G_CALLBACK (hf_insert_page_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-pages-button")); 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_signal_connect_swapped
(G_OBJECT (button), (G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_pages_cb), hf_state); "clicked", G_CALLBACK (hf_insert_pages_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-sheet-button")); 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_signal_connect_swapped
(G_OBJECT (button), (G_OBJECT (button),
"clicked", G_CALLBACK (hf_insert_sheet_cb), hf_state); "clicked", G_CALLBACK (hf_insert_sheet_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-time-button")); 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); hf_attach_insert_time_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
g_signal_connect_swapped g_signal_connect_swapped
...@@ -1830,7 +1830,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state) ...@@ -1830,7 +1830,7 @@ do_hf_customize (gboolean header, PrinterSetupState *state)
"clicked", G_CALLBACK (hf_insert_path_cb), hf_state); "clicked", G_CALLBACK (hf_insert_path_cb), hf_state);
button = GTK_TOOL_BUTTON (go_gtk_builder_get_widget (gui, "insert-cell-button")); 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); hf_attach_insert_cell_menu (GTK_MENU_TOOL_BUTTON (button), hf_state);
......
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gresources> <gresources>
<gresource prefix='/org/gnumeric/gnumeric'> <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/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/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/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/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/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/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/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/16x16/actions/gnumeric-row-unhide.xpm</file>
<file>icons/24x24/actions/gnumeric-group.xpm</file> <file>icons/16x16/actions/gnumeric-subscript.png</file>
<file>icons/16x16/actions/gnumeric-group.xpm</file> <file>icons/16x16/actions/gnumeric-superscript.png</file>
<file>icons/24x24/actions/gnumeric-ungroup.xpm</file>
<file>icons/16x16/actions/gnumeric-ungroup.xpm</file> <file>icons/16x16/actions/gnumeric-ungroup.xpm</file>
<file>icons/24x24/actions/gnumeric-detail-show.xpm</file> <file>icons/16x16/actions/gnumeric-visible.png</file>
<file>icons/16x16/actions/gnumeric-detail-show.xpm</file> <file>icons/22x22/actions/gnumeric-brush.png</file>
<file>icons/24x24/actions/gnumeric-detail-hide.xpm</file> <file>icons/24x24/actions/gnumeric-autofilter-delete.png</file>
<file>icons/16x16/actions/gnumeric-detail-hide.xpm</file> <file>icons/24x24/actions/gnumeric-autofilter.png</file>
<file>icons/24x24/actions/gnumeric-graphguru.xpm</file> <file>icons/24x24/actions/gnumeric-autosum.xpm</file>
<file>icons/16x16/actions/gnumeric-graphguru.xpm</file> <file>icons/24x24/actions/gnumeric-bucket.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/24x24/actions/gnumeric-cells-merge.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/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-fill.png</file>
<file>icons/24x24/actions/gnumeric-format-halign-general.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-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-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/24x24/actions/gnumeric-formulaguru.png</file>
<file>icons/16x16/actions/gnumeric-formulaguru.png</file> <file>icons/24x24/actions/gnumeric-graphguru.xpm</file>
<file>icons/24x24/actions/gnumeric-bucket.xpm</file> <file>icons/24x24/actions/gnumeric-group.xpm</file>
<file>icons/24x24/actions/gnumeric-font.xpm</file> <file>icons/24x24/actions/gnumeric-link-add.png</file>
<file>icons/16x16/actions/gnumeric-exprentry.png</file> <file>icons/24x24/actions/gnumeric-link-email.png</file>
<file>icons/22x22/actions/gnumeric-brush.png</file> <file>icons/24x24/actions/gnumeric-link-external.png</file>
<file>icons/16x16/actions/gnumeric-brush.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-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-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-frame.png</file>
<file>icons/24x24/actions/gnumeric-object-label.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-line.png</file>
<file>icons/24x24/actions/gnumeric-object-checkbox.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-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-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-slider.png</file>
<file>icons/24x24/actions/gnumeric-object-combo.png</file> <file>icons/24x24/actions/gnumeric-object-spinbutton.png</file>
<file>icons/24x24/actions/gnumeric-object-list.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/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/24x24/actions/gnumeric-protection-no.png</file>
<file>icons/16x16/actions/gnumeric-visible.png</file> <file>icons/24x24/actions/gnumeric-protection-yes.png</file>
<file>icons/24x24/actions/gnumeric-link-add.png</file> <file>icons/24x24/actions/gnumeric-row-add.xpm</file>
<file>icons/16x16/actions/gnumeric-link-add.png</file> <file>icons/24x24/actions/gnumeric-row-delete.xpm</file>
<file>icons/16x16/actions/gnumeric-link-delete.png</file> <file>icons/24x24/actions/gnumeric-row-hide.xpm</file>
<file>icons/16x16/actions/gnumeric-link-edit.png</file> <file>icons/24x24/actions/gnumeric-row-size.xpm</file>
<file>icons/24x24/actions/gnumeric-link-external.png</file> <file>icons/24x24/actions/gnumeric-row-unhide.xpm</file>
<file>icons/16x16/actions/gnumeric-link-external.png</file> <file>icons/24x24/actions/gnumeric-subscript.png</file>
<file>icons/24x24/actions/gnumeric-link-internal.png</file> <file>icons/24x24/actions/gnumeric-superscript.png</file>
<file>icons/16x16/actions/gnumeric-link-internal.png</file> <file>icons/24x24/actions/gnumeric-ungroup.xpm</file>
<file>icons/24x24/actions/gnumeric-link-email.png</file> <file>icons/48x48/actions/gnumeric-protection-yes-dialog.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>
</gresource> </gresource>
</gresources> </gresources>
...@@ -3136,21 +3136,21 @@ wbc_gtk_init_zoom (WBCGtk *wbcg) ...@@ -3136,21 +3136,21 @@ wbc_gtk_init_zoom (WBCGtk *wbcg)
/****************************************************************************/ /****************************************************************************/
static GOActionComboPixmapsElement const border_combo_info[] = { static GOActionComboPixmapsElement const border_combo_info[] = {
{ N_("Left"), "Gnumeric_BorderLeft", 11 }, { N_("Left"), "gnumeric-format-border-left", 11 },
{ N_("Clear Borders"), "Gnumeric_BorderNone", 12 }, { N_("Clear Borders"), "gnumeric-format-border-none", 12 },
{ N_("Right"), "Gnumeric_BorderRight", 13 }, { N_("Right"), "gnumeric-format-border-right", 13 },
{ N_("All Borders"), "Gnumeric_BorderAll", 21 }, { N_("All Borders"), "gnumeric-format-border-all", 21 },
{ N_("Outside Borders"), "Gnumeric_BorderOutside", 22 }, { N_("Outside Borders"), "gnumeric-format-border-outside", 22 },
{ N_("Thick Outside Borders"), "Gnumeric_BorderThickOutside", 23 }, { N_("Thick Outside Borders"), "gnumeric-format-border-thick-outside", 23 },
{ N_("Bottom"), "Gnumeric_BorderBottom", 31 }, { N_("Bottom"), "gnumeric-format-border-bottom", 31 },
{ N_("Double Bottom"), "Gnumeric_BorderDoubleBottom", 32 }, { N_("Double Bottom"), "gnumeric-format-border-double-bottom", 32 },
{ N_("Thick Bottom"), "Gnumeric_BorderThickBottom", 33 }, { N_("Thick Bottom"), "gnumeric-format-border-thick-bottom", 33 },
{ N_("Top and Bottom"), "Gnumeric_BorderTop_n_Bottom", 41 }, { N_("Top and Bottom"), "gnumeric-format-border-top-n-bottom", 41 },
{ N_("Top and Double Bottom"), "Gnumeric_BorderTop_n_DoubleBottom", 42 }, { N_("Top and Double Bottom"), "gnumeric-format-border-top-n-double-bottom", 42 },
{ N_("Top and Thick Bottom"), "Gnumeric_BorderTop_n_ThickBottom", 43 }, { N_("Top and Thick Bottom"), "gnumeric-format-border-top-n-thick-bottom", 43 },
{ NULL, NULL} { NULL, NULL}
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment