[gnumeric] Icons: bring icon setup partly up to new standards.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] Icons: bring icon setup partly up to new standards.
- Date: Sat, 27 Dec 2014 00:18:13 +0000 (UTC)
commit c55f147a51729e4cf6471cc22862340453b6e6e5
Author: Morten Welinder <terra gnome org>
Date: Fri Dec 26 19:05:03 2014 -0500
Icons: bring icon setup partly up to new standards.
This installs a bunch of icons via gresource. In the process we rename
the icons to something consistent.
Not everything is done yet. And we want to keep installing our application
icons.
configure.ac | 13 +-
icons/16x16/Makefile.am | 5 +-
icons/16x16/actions/Makefile.am | 3 +
.../16x16/actions/gnumeric-autofilter-delete.png | Bin 403 -> 403 bytes
.../16x16/actions/gnumeric-autofilter.png | Bin 322 -> 322 bytes
.../16x16/actions/gnumeric-brush.png | Bin 571 -> 571 bytes
.../16x16/actions/gnumeric-cells-merge.xpm | 0
.../16x16/actions/gnumeric-cells-split.xpm | 0
.../actions/gnumeric-center-across-selection.xpm | 0
.../16x16/actions/gnumeric-column-add.xpm | 0
.../16x16/actions/gnumeric-column-delete.xpm | 0
.../16x16/actions/gnumeric-column-hide.xpm | 0
.../16x16/actions/gnumeric-column-size.xpm | 0
.../16x16/actions/gnumeric-column-unhide.xpm | 0
.../16x16/actions/gnumeric-comment-add.xpm | 0
.../16x16/actions/gnumeric-comment-delete.xpm | 0
.../16x16/actions/gnumeric-comment-edit.xpm | 0
.../actions/gnumeric-component-insert-shaped.xpm | 0
.../16x16/actions/gnumeric-component-insert.xpm | 0
.../16x16/actions/gnumeric-detail-hide.xpm | 0
.../16x16/actions/gnumeric-detail-show.xpm | 0
.../16x16/actions/gnumeric-exprentry.png | Bin 426 -> 426 bytes
.../16x16/actions/gnumeric-formulaguru.png | Bin 390 -> 390 bytes
.../16x16/actions/gnumeric-graphguru.xpm | 0
.../16x16/actions/gnumeric-group.xpm | 0
.../16x16/actions/gnumeric-link-add.png | Bin 729 -> 729 bytes
.../16x16/actions/gnumeric-link-delete.png | Bin 729 -> 729 bytes
.../16x16/actions/gnumeric-link-edit.png | Bin 604 -> 604 bytes
.../16x16/actions/gnumeric-link-email.png | Bin 369 -> 369 bytes
.../16x16/actions/gnumeric-link-external.png | Bin 426 -> 426 bytes
.../16x16/actions/gnumeric-link-internal.png | Bin 461 -> 461 bytes
.../16x16/actions/gnumeric-link-url.png | Bin 519 -> 519 bytes
.../16x16/actions/gnumeric-pivottable.png | Bin 609 -> 609 bytes
.../16x16/actions/gnumeric-row-add.xpm | 0
.../16x16/actions/gnumeric-row-delete.xpm | 0
.../16x16/actions/gnumeric-row-hide.xpm | 0
.../16x16/actions/gnumeric-row-size.xpm | 0
.../16x16/actions/gnumeric-row-unhide.xpm | 0
.../16x16/actions/gnumeric-subscript.png | Bin 549 -> 549 bytes
.../16x16/actions/gnumeric-superscript.png | Bin 557 -> 557 bytes
.../16x16/actions/gnumeric-ungroup.xpm | 0
.../16x16/actions/gnumeric-visible.png | Bin 225 -> 225 bytes
icons/16x16/apps/Makefile.am | 6 +
icons/16x16/{ => apps}/gnumeric.png | Bin 1010 -> 1010 bytes
icons/22x22/Makefile.am | 5 +-
icons/22x22/actions/Makefile.am | 3 +
.../22x22/actions/gnumeric-brush.png | Bin 854 -> 854 bytes
icons/22x22/apps/Makefile.am | 6 +
icons/22x22/{ => apps}/gnumeric.png | Bin 1469 -> 1469 bytes
icons/24x24/Makefile.am | 5 +-
icons/24x24/actions/Makefile.am | 3 +
.../24x24/actions/gnumeric-autofilter-delete.png | Bin 566 -> 566 bytes
.../24x24/actions/gnumeric-autofilter.png | Bin 454 -> 454 bytes
.../24x24/actions/gnumeric-autosum.xpm | 0
.../24x24/actions/gnumeric-bucket.xpm | 0
.../24x24/actions/gnumeric-cells-merge.xpm | 0
.../24x24/actions/gnumeric-cells-split.xpm | 0
.../actions/gnumeric-center-across-selection.xpm | 0
.../24x24/actions/gnumeric-column-add.xpm | 0
.../24x24/actions/gnumeric-column-delete.xpm | 0
.../24x24/actions/gnumeric-column-hide.xpm | 0
.../24x24/actions/gnumeric-column-size.xpm | 0
.../24x24/actions/gnumeric-column-unhide.xpm | 0
.../actions/gnumeric-component-insert-shaped.xpm | 0
.../24x24/actions/gnumeric-component-insert.xpm | 0
.../24x24/actions/gnumeric-detail-hide.xpm | 0
.../24x24/actions/gnumeric-detail-show.xpm | 0
.../24x24/actions/gnumeric-equal.xpm | 0
.../24x24/actions/gnumeric-font.xpm | 0
.../24x24/actions/gnumeric-format-accounting.png | Bin 1301 -> 1301 bytes
.../24x24/actions/gnumeric-format-halign-fill.png | Bin 589 -> 589 bytes
.../actions/gnumeric-format-halign-general.png | Bin 910 -> 910 bytes
.../24x24/actions/gnumeric-format-percentage.png | Bin 841 -> 841 bytes
.../actions/gnumeric-format-precision-decrease.png | Bin 499 -> 499 bytes
.../actions/gnumeric-format-precision-increase.png | Bin 706 -> 706 bytes
.../actions/gnumeric-format-thousand-separator.xpm | 0
.../24x24/actions/gnumeric-formulaguru.png | Bin 520 -> 520 bytes
.../24x24/actions/gnumeric-graphguru.xpm | 0
.../24x24/actions/gnumeric-group.xpm | 0
.../24x24/actions/gnumeric-link-add.png | Bin 1473 -> 1473 bytes
.../24x24/actions/gnumeric-link-email.png | Bin 620 -> 620 bytes
.../24x24/actions/gnumeric-link-external.png | Bin 777 -> 777 bytes
.../24x24/actions/gnumeric-link-internal.png | Bin 781 -> 781 bytes
.../24x24/actions/gnumeric-link-url.png | Bin 1202 -> 1202 bytes
.../24x24/actions/gnumeric-object-arrow.png | Bin 397 -> 397 bytes
.../24x24/actions/gnumeric-object-button.png | Bin 216 -> 216 bytes
.../24x24/actions/gnumeric-object-checkbox.png | Bin 731 -> 731 bytes
.../24x24/actions/gnumeric-object-combo.png | Bin 749 -> 749 bytes
.../24x24/actions/gnumeric-object-ellipse.png | Bin 845 -> 845 bytes
.../24x24/actions/gnumeric-object-frame.png | Bin 314 -> 314 bytes
.../24x24/actions/gnumeric-object-label.png | Bin 532 -> 532 bytes
.../24x24/actions/gnumeric-object-line.png | Bin 274 -> 274 bytes
.../24x24/actions/gnumeric-object-list.png | Bin 790 -> 790 bytes
.../24x24/actions/gnumeric-object-radiobutton.png | Bin 264 -> 264 bytes
.../24x24/actions/gnumeric-object-rectangle.png | Bin 276 -> 276 bytes
.../24x24/actions/gnumeric-object-scrollbar.png | Bin 509 -> 509 bytes
.../24x24/actions/gnumeric-object-slider.png | Bin 197 -> 197 bytes
.../24x24/actions/gnumeric-object-spinbutton.png | Bin 211 -> 211 bytes
.../24x24/actions/gnumeric-pivottable.png | Bin 970 -> 970 bytes
.../24x24/actions/gnumeric-protection-no.png | Bin 792 -> 792 bytes
.../24x24/actions/gnumeric-protection-yes.png | Bin 866 -> 866 bytes
.../24x24/actions/gnumeric-row-add.xpm | 0
.../24x24/actions/gnumeric-row-delete.xpm | 0
.../24x24/actions/gnumeric-row-hide.xpm | 0
.../24x24/actions/gnumeric-row-size.xpm | 0
.../24x24/actions/gnumeric-row-unhide.xpm | 0
.../24x24/actions/gnumeric-subscript.png | Bin 783 -> 783 bytes
.../24x24/actions/gnumeric-superscript.png | Bin 792 -> 792 bytes
.../24x24/actions/gnumeric-ungroup.xpm | 0
icons/24x24/apps/Makefile.am | 6 +
icons/24x24/{ => apps}/gnumeric.png | Bin 1537 -> 1537 bytes
icons/256x256/Makefile.am | 5 +-
icons/256x256/apps/Makefile.am | 6 +
icons/256x256/{ => apps}/gnumeric.png | Bin 39347 -> 39347 bytes
icons/32x32/Makefile.am | 5 +-
icons/32x32/apps/Makefile.am | 6 +
icons/32x32/{ => apps}/gnumeric.png | Bin 2259 -> 2259 bytes
icons/48x48/Makefile.am | 5 +-
icons/48x48/apps/Makefile.am | 6 +
icons/48x48/{ => apps}/gnumeric.png | Bin 3550 -> 3550 bytes
src/.gitignore | 2 +
src/Makefile.am | 120 +------
src/application.c | 361 +-------------------
src/dialogs/dialog-consolidate.c | 2 +-
src/dialogs/dialog-define-names.c | 2 +-
src/dialogs/dialog-doc-metadata.c | 2 +-
src/dialogs/dialog-hyperlink.c | 8 +-
src/dialogs/dialog-preferences.c | 2 +-
src/dialogs/dialog-sheet-order.c | 8 +-
src/dialogs/dialog-workbook-attr.c | 2 +-
src/gnm.gresource.xml | 103 ++++++
src/gui-util.c | 4 +-
src/libgnumeric.c | 65 ++++
src/sheet-control-gui.c | 46 ++--
src/wbc-gtk-actions.c | 124 ++++----
src/wbc-gtk.c | 2 +-
src/widgets/gnumeric-expr-entry.c | 2 +-
137 files changed, 359 insertions(+), 584 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 80e3662..49760e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -249,6 +249,8 @@ dnl ****************************
AC_ARG_VAR(GLIB_GENMARSHAL, [The glib-genmarshal executable.])
AC_CHECK_PROG(GLIB_GENMARSHAL, glib-genmarshal$ac_exeext, glib-genmarshal$ac_exeext)
+GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable=glib_compile_resources gio-2.0`
+AC_SUBST(GLIB_COMPILE_RESOURCES)
AC_ARG_VAR(GDK_PIXBUF_CSOURCE, [The gdk-pixbuf-csource executable.])
AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource$ac_exeext, gdk-pixbuf-csource$ac_exeext)
@@ -580,7 +582,7 @@ CFLAGS="$CFLAGS $GNUMERIC_CFLAGS"
LIBS="$GNUMERIC_LIBS $LIBS"
AC_CHECK_FUNCS(gtk_cell_renderer_text_get_background_set gtk_cell_renderer_text_get_foreground_set
gtk_cell_renderer_text_get_editable)
-AC_CHECK_FUNCS(gtk_entry_set_editing_cancelled)
+AC_CHECK_FUNCS(gtk_entry_set_editing_cancelled gtk_icon_theme_add_resource_path)
AC_MSG_CHECKING([for PANGO_WEIGHT_THIN etc.])
AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <pango/pango.h>]],
@@ -1086,11 +1088,20 @@ Makefile
libspreadsheet.pc
icons/Makefile
icons/16x16/Makefile
+icons/16x16/actions/Makefile
+icons/16x16/apps/Makefile
icons/22x22/Makefile
+icons/22x22/actions/Makefile
+icons/22x22/apps/Makefile
icons/24x24/Makefile
+icons/24x24/actions/Makefile
+icons/24x24/apps/Makefile
icons/32x32/Makefile
+icons/32x32/apps/Makefile
icons/48x48/Makefile
+icons/48x48/apps/Makefile
icons/256x256/Makefile
+icons/256x256/apps/Makefile
src/Makefile
src/dialogs/Makefile
src/widgets/Makefile
diff --git a/icons/16x16/Makefile.am b/icons/16x16/Makefile.am
index 6f0ac02..063f693 100644
--- a/icons/16x16/Makefile.am
+++ b/icons/16x16/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/16x16/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/icons/16x16/actions/Makefile.am b/icons/16x16/actions/Makefile.am
new file mode 100644
index 0000000..6c0cfff
--- /dev/null
+++ b/icons/16x16/actions/Makefile.am
@@ -0,0 +1,3 @@
+internalicons = gnumeric-column-add.xpm
+
+EXTRA_DIST = $(internalicons)
diff --git a/src/pixmaps/merge_cells_16.xpm b/icons/16x16/actions/gnumeric-cells-merge.xpm
similarity index 100%
rename from src/pixmaps/merge_cells_16.xpm
rename to icons/16x16/actions/gnumeric-cells-merge.xpm
diff --git a/src/pixmaps/split_cells_16.xpm b/icons/16x16/actions/gnumeric-cells-split.xpm
similarity index 100%
rename from src/pixmaps/split_cells_16.xpm
rename to icons/16x16/actions/gnumeric-cells-split.xpm
diff --git a/src/pixmaps/center_across_selection_16.xpm
b/icons/16x16/actions/gnumeric-center-across-selection.xpm
similarity index 100%
rename from src/pixmaps/center_across_selection_16.xpm
rename to icons/16x16/actions/gnumeric-center-across-selection.xpm
diff --git a/src/pixmaps/column_add_16.xpm b/icons/16x16/actions/gnumeric-column-add.xpm
similarity index 100%
rename from src/pixmaps/column_add_16.xpm
rename to icons/16x16/actions/gnumeric-column-add.xpm
diff --git a/src/pixmaps/column_delete_16.xpm b/icons/16x16/actions/gnumeric-column-delete.xpm
similarity index 100%
rename from src/pixmaps/column_delete_16.xpm
rename to icons/16x16/actions/gnumeric-column-delete.xpm
diff --git a/src/pixmaps/column_hide_16.xpm b/icons/16x16/actions/gnumeric-column-hide.xpm
similarity index 100%
rename from src/pixmaps/column_hide_16.xpm
rename to icons/16x16/actions/gnumeric-column-hide.xpm
diff --git a/src/pixmaps/column_size_16.xpm b/icons/16x16/actions/gnumeric-column-size.xpm
similarity index 100%
rename from src/pixmaps/column_size_16.xpm
rename to icons/16x16/actions/gnumeric-column-size.xpm
diff --git a/src/pixmaps/column_unhide_16.xpm b/icons/16x16/actions/gnumeric-column-unhide.xpm
similarity index 100%
rename from src/pixmaps/column_unhide_16.xpm
rename to icons/16x16/actions/gnumeric-column-unhide.xpm
diff --git a/src/pixmaps/comment_add_16.xpm b/icons/16x16/actions/gnumeric-comment-add.xpm
similarity index 100%
rename from src/pixmaps/comment_add_16.xpm
rename to icons/16x16/actions/gnumeric-comment-add.xpm
diff --git a/src/pixmaps/comment_delete_16.xpm b/icons/16x16/actions/gnumeric-comment-delete.xpm
similarity index 100%
rename from src/pixmaps/comment_delete_16.xpm
rename to icons/16x16/actions/gnumeric-comment-delete.xpm
diff --git a/src/pixmaps/comment_edit_16.xpm b/icons/16x16/actions/gnumeric-comment-edit.xpm
similarity index 100%
rename from src/pixmaps/comment_edit_16.xpm
rename to icons/16x16/actions/gnumeric-comment-edit.xpm
diff --git a/src/pixmaps/insert_shaped_component_16.xpm
b/icons/16x16/actions/gnumeric-component-insert-shaped.xpm
similarity index 100%
rename from src/pixmaps/insert_shaped_component_16.xpm
rename to icons/16x16/actions/gnumeric-component-insert-shaped.xpm
diff --git a/src/pixmaps/insert_component_16.xpm b/icons/16x16/actions/gnumeric-component-insert.xpm
similarity index 100%
rename from src/pixmaps/insert_component_16.xpm
rename to icons/16x16/actions/gnumeric-component-insert.xpm
diff --git a/src/pixmaps/hide_detail_16.xpm b/icons/16x16/actions/gnumeric-detail-hide.xpm
similarity index 100%
rename from src/pixmaps/hide_detail_16.xpm
rename to icons/16x16/actions/gnumeric-detail-hide.xpm
diff --git a/src/pixmaps/show_detail_16.xpm b/icons/16x16/actions/gnumeric-detail-show.xpm
similarity index 100%
rename from src/pixmaps/show_detail_16.xpm
rename to icons/16x16/actions/gnumeric-detail-show.xpm
diff --git a/src/pixmaps/graph_guru_16.xpm b/icons/16x16/actions/gnumeric-graphguru.xpm
similarity index 100%
rename from src/pixmaps/graph_guru_16.xpm
rename to icons/16x16/actions/gnumeric-graphguru.xpm
diff --git a/src/pixmaps/group_16.xpm b/icons/16x16/actions/gnumeric-group.xpm
similarity index 100%
rename from src/pixmaps/group_16.xpm
rename to icons/16x16/actions/gnumeric-group.xpm
diff --git a/src/pixmaps/row_add_16.xpm b/icons/16x16/actions/gnumeric-row-add.xpm
similarity index 100%
rename from src/pixmaps/row_add_16.xpm
rename to icons/16x16/actions/gnumeric-row-add.xpm
diff --git a/src/pixmaps/row_delete_16.xpm b/icons/16x16/actions/gnumeric-row-delete.xpm
similarity index 100%
rename from src/pixmaps/row_delete_16.xpm
rename to icons/16x16/actions/gnumeric-row-delete.xpm
diff --git a/src/pixmaps/row_hide_16.xpm b/icons/16x16/actions/gnumeric-row-hide.xpm
similarity index 100%
rename from src/pixmaps/row_hide_16.xpm
rename to icons/16x16/actions/gnumeric-row-hide.xpm
diff --git a/src/pixmaps/row_size_16.xpm b/icons/16x16/actions/gnumeric-row-size.xpm
similarity index 100%
rename from src/pixmaps/row_size_16.xpm
rename to icons/16x16/actions/gnumeric-row-size.xpm
diff --git a/src/pixmaps/row_unhide_16.xpm b/icons/16x16/actions/gnumeric-row-unhide.xpm
similarity index 100%
rename from src/pixmaps/row_unhide_16.xpm
rename to icons/16x16/actions/gnumeric-row-unhide.xpm
diff --git a/src/pixmaps/ungroup_16.xpm b/icons/16x16/actions/gnumeric-ungroup.xpm
similarity index 100%
rename from src/pixmaps/ungroup_16.xpm
rename to icons/16x16/actions/gnumeric-ungroup.xpm
diff --git a/icons/16x16/apps/Makefile.am b/icons/16x16/apps/Makefile.am
new file mode 100644
index 0000000..d68f1f3
--- /dev/null
+++ b/icons/16x16/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/16x16/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/icons/22x22/Makefile.am b/icons/22x22/Makefile.am
index 645cbc0..063f693 100644
--- a/icons/22x22/Makefile.am
+++ b/icons/22x22/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/22x22/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/icons/22x22/actions/Makefile.am b/icons/22x22/actions/Makefile.am
new file mode 100644
index 0000000..1caa90f
--- /dev/null
+++ b/icons/22x22/actions/Makefile.am
@@ -0,0 +1,3 @@
+internalicons =
+
+EXTRA_DIST = $(internalicons)
diff --git a/icons/22x22/apps/Makefile.am b/icons/22x22/apps/Makefile.am
new file mode 100644
index 0000000..acfb00d
--- /dev/null
+++ b/icons/22x22/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/22x22/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/icons/24x24/Makefile.am b/icons/24x24/Makefile.am
index e460adc..063f693 100644
--- a/icons/24x24/Makefile.am
+++ b/icons/24x24/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/24x24/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = actions apps
diff --git a/icons/24x24/actions/Makefile.am b/icons/24x24/actions/Makefile.am
new file mode 100644
index 0000000..6c0cfff
--- /dev/null
+++ b/icons/24x24/actions/Makefile.am
@@ -0,0 +1,3 @@
+internalicons = gnumeric-column-add.xpm
+
+EXTRA_DIST = $(internalicons)
diff --git a/src/pixmaps/auto-sum.xpm b/icons/24x24/actions/gnumeric-autosum.xpm
similarity index 100%
rename from src/pixmaps/auto-sum.xpm
rename to icons/24x24/actions/gnumeric-autosum.xpm
diff --git a/src/pixmaps/bucket.xpm b/icons/24x24/actions/gnumeric-bucket.xpm
similarity index 100%
rename from src/pixmaps/bucket.xpm
rename to icons/24x24/actions/gnumeric-bucket.xpm
diff --git a/src/pixmaps/merge_cells_24.xpm b/icons/24x24/actions/gnumeric-cells-merge.xpm
similarity index 100%
rename from src/pixmaps/merge_cells_24.xpm
rename to icons/24x24/actions/gnumeric-cells-merge.xpm
diff --git a/src/pixmaps/split_cells_24.xpm b/icons/24x24/actions/gnumeric-cells-split.xpm
similarity index 100%
rename from src/pixmaps/split_cells_24.xpm
rename to icons/24x24/actions/gnumeric-cells-split.xpm
diff --git a/src/pixmaps/center_across_selection_24.xpm
b/icons/24x24/actions/gnumeric-center-across-selection.xpm
similarity index 100%
rename from src/pixmaps/center_across_selection_24.xpm
rename to icons/24x24/actions/gnumeric-center-across-selection.xpm
diff --git a/src/pixmaps/column_add_24.xpm b/icons/24x24/actions/gnumeric-column-add.xpm
similarity index 100%
rename from src/pixmaps/column_add_24.xpm
rename to icons/24x24/actions/gnumeric-column-add.xpm
diff --git a/src/pixmaps/column_delete_24.xpm b/icons/24x24/actions/gnumeric-column-delete.xpm
similarity index 100%
rename from src/pixmaps/column_delete_24.xpm
rename to icons/24x24/actions/gnumeric-column-delete.xpm
diff --git a/src/pixmaps/column_hide_24.xpm b/icons/24x24/actions/gnumeric-column-hide.xpm
similarity index 100%
rename from src/pixmaps/column_hide_24.xpm
rename to icons/24x24/actions/gnumeric-column-hide.xpm
diff --git a/src/pixmaps/column_size_24.xpm b/icons/24x24/actions/gnumeric-column-size.xpm
similarity index 100%
rename from src/pixmaps/column_size_24.xpm
rename to icons/24x24/actions/gnumeric-column-size.xpm
diff --git a/src/pixmaps/column_unhide_24.xpm b/icons/24x24/actions/gnumeric-column-unhide.xpm
similarity index 100%
rename from src/pixmaps/column_unhide_24.xpm
rename to icons/24x24/actions/gnumeric-column-unhide.xpm
diff --git a/src/pixmaps/insert_shaped_component_24.xpm
b/icons/24x24/actions/gnumeric-component-insert-shaped.xpm
similarity index 100%
rename from src/pixmaps/insert_shaped_component_24.xpm
rename to icons/24x24/actions/gnumeric-component-insert-shaped.xpm
diff --git a/src/pixmaps/insert_component_24.xpm b/icons/24x24/actions/gnumeric-component-insert.xpm
similarity index 100%
rename from src/pixmaps/insert_component_24.xpm
rename to icons/24x24/actions/gnumeric-component-insert.xpm
diff --git a/src/pixmaps/hide_detail_24.xpm b/icons/24x24/actions/gnumeric-detail-hide.xpm
similarity index 100%
rename from src/pixmaps/hide_detail_24.xpm
rename to icons/24x24/actions/gnumeric-detail-hide.xpm
diff --git a/src/pixmaps/show_detail_24.xpm b/icons/24x24/actions/gnumeric-detail-show.xpm
similarity index 100%
rename from src/pixmaps/show_detail_24.xpm
rename to icons/24x24/actions/gnumeric-detail-show.xpm
diff --git a/src/pixmaps/equal-sign.xpm b/icons/24x24/actions/gnumeric-equal.xpm
similarity index 100%
rename from src/pixmaps/equal-sign.xpm
rename to icons/24x24/actions/gnumeric-equal.xpm
diff --git a/src/pixmaps/font.xpm b/icons/24x24/actions/gnumeric-font.xpm
similarity index 100%
rename from src/pixmaps/font.xpm
rename to icons/24x24/actions/gnumeric-font.xpm
diff --git a/src/pixmaps/thousands.xpm b/icons/24x24/actions/gnumeric-format-thousand-separator.xpm
similarity index 100%
rename from src/pixmaps/thousands.xpm
rename to icons/24x24/actions/gnumeric-format-thousand-separator.xpm
diff --git a/src/pixmaps/graph_guru_24.xpm b/icons/24x24/actions/gnumeric-graphguru.xpm
similarity index 100%
rename from src/pixmaps/graph_guru_24.xpm
rename to icons/24x24/actions/gnumeric-graphguru.xpm
diff --git a/src/pixmaps/group_24.xpm b/icons/24x24/actions/gnumeric-group.xpm
similarity index 100%
rename from src/pixmaps/group_24.xpm
rename to icons/24x24/actions/gnumeric-group.xpm
diff --git a/src/pixmaps/row_add_24.xpm b/icons/24x24/actions/gnumeric-row-add.xpm
similarity index 100%
rename from src/pixmaps/row_add_24.xpm
rename to icons/24x24/actions/gnumeric-row-add.xpm
diff --git a/src/pixmaps/row_delete_24.xpm b/icons/24x24/actions/gnumeric-row-delete.xpm
similarity index 100%
rename from src/pixmaps/row_delete_24.xpm
rename to icons/24x24/actions/gnumeric-row-delete.xpm
diff --git a/src/pixmaps/row_hide_24.xpm b/icons/24x24/actions/gnumeric-row-hide.xpm
similarity index 100%
rename from src/pixmaps/row_hide_24.xpm
rename to icons/24x24/actions/gnumeric-row-hide.xpm
diff --git a/src/pixmaps/row_size_24.xpm b/icons/24x24/actions/gnumeric-row-size.xpm
similarity index 100%
rename from src/pixmaps/row_size_24.xpm
rename to icons/24x24/actions/gnumeric-row-size.xpm
diff --git a/src/pixmaps/row_unhide_24.xpm b/icons/24x24/actions/gnumeric-row-unhide.xpm
similarity index 100%
rename from src/pixmaps/row_unhide_24.xpm
rename to icons/24x24/actions/gnumeric-row-unhide.xpm
diff --git a/src/pixmaps/ungroup_24.xpm b/icons/24x24/actions/gnumeric-ungroup.xpm
similarity index 100%
rename from src/pixmaps/ungroup_24.xpm
rename to icons/24x24/actions/gnumeric-ungroup.xpm
diff --git a/icons/24x24/apps/Makefile.am b/icons/24x24/apps/Makefile.am
new file mode 100644
index 0000000..5181edd
--- /dev/null
+++ b/icons/24x24/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/24x24/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/icons/256x256/Makefile.am b/icons/256x256/Makefile.am
index 8b21359..ebbd145 100644
--- a/icons/256x256/Makefile.am
+++ b/icons/256x256/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/256x256/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = apps
diff --git a/icons/256x256/apps/Makefile.am b/icons/256x256/apps/Makefile.am
new file mode 100644
index 0000000..aeb8c7c
--- /dev/null
+++ b/icons/256x256/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/256x256/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/icons/32x32/Makefile.am b/icons/32x32/Makefile.am
index bfb0a17..ebbd145 100644
--- a/icons/32x32/Makefile.am
+++ b/icons/32x32/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/32x32/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = apps
diff --git a/icons/32x32/apps/Makefile.am b/icons/32x32/apps/Makefile.am
new file mode 100644
index 0000000..e265dc7
--- /dev/null
+++ b/icons/32x32/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/32x32/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/icons/48x48/Makefile.am b/icons/48x48/Makefile.am
index 9beac84..ebbd145 100644
--- a/icons/48x48/Makefile.am
+++ b/icons/48x48/Makefile.am
@@ -1,4 +1 @@
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnumeric.png
-
-EXTRA_DIST = $(icon_DATA)
+SUBDIRS = apps
diff --git a/icons/48x48/apps/Makefile.am b/icons/48x48/apps/Makefile.am
new file mode 100644
index 0000000..e14de00
--- /dev/null
+++ b/icons/48x48/apps/Makefile.am
@@ -0,0 +1,6 @@
+icondir = $(datadir)/icons/hicolor/48x48/apps
+icon_DATA = gnumeric.png
+
+internalicons =
+
+EXTRA_DIST = $(internalicons) $(icon_DATA)
diff --git a/src/.gitignore b/src/.gitignore
index 318795c..f88f31d 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -15,6 +15,8 @@ parser.c
gnm-marshalers.c
gnm-marshalers.h
embedded-imgs.c
+gnmresources.c
+gnmresources.h
gnumeric-paths.h
ssconvert
ssconvert.exe
diff --git a/src/Makefile.am b/src/Makefile.am
index 027db57..739f16a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,10 +45,22 @@ BUILT_SOURCES = \
gnm-marshalers.c \
gnm-marshalers.h \
embedded-imgs.c \
+ gnmresources.c \
+ gnmresources.h \
gnumeric-paths.h
# Another hint, see bugs #172211 and #172212:
-non-intermediate: gnm-marshalers.c embedded-imgs.c
+non-intermediate: gnm-marshalers.c embedded-imgs.c gnmresources.c
+
+resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(top_srcdir) --generate-dependencies
$(srcdir)/gnm.gresource.xml)
+
+gnmresources.h: gnm.gresource.xml
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
+ --target=$@ --sourcedir=$(top_srcdir) --c-name _gnm --generate-header --manual-register
+gnmresources.c: gnm.gresource.xml $(resource_files) Makefile
+ $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) $< \
+ --target=$@ --sourcedir=$(top_srcdir) --c-name _gnm --generate-source --manual-register
+
CLEANFILES = $(BUILT_SOURCES) \
gnumeric.exe.a
@@ -202,7 +214,7 @@ libspreadsheet_la_SOURCES = \
print.c \
print-cell.c
-nodist_libspreadsheet_la_SOURCES = embedded-imgs.c
+nodist_libspreadsheet_la_SOURCES = embedded-imgs.c gnmresources.c gnmresources.h
# When we switch to subversion fix this to nest as
# libspreadsheet-ver/spreadsheet/header
@@ -425,12 +437,6 @@ gnumeric_app_libs = \
embedded_imgs = \
gnumeric.css \
- pixmaps/add_decimals.png \
- pixmaps/auto-sum.xpm \
- pixmaps/autofilter_16.png \
- pixmaps/autofilter_24.png \
- pixmaps/autofilter_delete_16.png \
- pixmaps/autofilter_delete_24.png \
pixmaps/border_all.xpm \
pixmaps/border_bottom.xpm \
pixmaps/border_double_bottom.xpm \
@@ -444,38 +450,9 @@ embedded_imgs = \
pixmaps/border_top_n_double_bottom.xpm \
pixmaps/border_top_n_thick_bottom.xpm \
pixmaps/bottom_border.xpm \
- pixmaps/brush-16.png \
- pixmaps/brush-22.png \
- pixmaps/bucket.xpm \
- pixmaps/center_across_selection_16.xpm \
- pixmaps/center_across_selection_24.xpm \
- pixmaps/column_add_16.xpm \
- pixmaps/column_add_24.xpm \
- pixmaps/column_delete_16.xpm \
- pixmaps/column_delete_24.xpm \
- pixmaps/column_hide_16.xpm \
- pixmaps/column_hide_24.xpm \
- pixmaps/column_size_16.xpm \
- pixmaps/column_size_24.xpm \
- pixmaps/column_unhide_16.xpm \
- pixmaps/column_unhide_24.xpm \
- pixmaps/comment_add_16.xpm \
- pixmaps/comment_delete_16.xpm \
- pixmaps/comment_edit_16.xpm \
- pixmaps/cursor_cross.xpm \
+ pixmaps/cursor_cross.xpm \
pixmaps/diag_border.xpm \
pixmaps/down-right.png \
- pixmaps/equal-sign.xpm \
- pixmaps/expr_entry.png \
- pixmaps/font.xpm \
- pixmaps/format_money_24.png \
- pixmaps/format_percent_24.png \
- pixmaps/formula_guru_16.png \
- pixmaps/formula_guru_24.png \
- pixmaps/gnm_subscript_16.png \
- pixmaps/gnm_subscript_24.png \
- pixmaps/gnm_superscript_16.png \
- pixmaps/gnm_superscript_24.png \
pixmaps/gnumeric_splash_1.4.png \
pixmaps/gp_125grey.xpm \
pixmaps/gp_25grey.xpm \
@@ -501,26 +478,12 @@ embedded_imgs = \
pixmaps/gp_thin_rev_diag.xpm \
pixmaps/gp_thin_vert.xpm \
pixmaps/gp_vert.xpm \
- pixmaps/graph_guru_16.xpm \
- pixmaps/graph_guru_24.xpm \
- pixmaps/group_16.xpm \
- pixmaps/group_24.xpm \
- pixmaps/halign-fill_24.png \
- pixmaps/halign-general_24.png \
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/hide_detail_16.xpm \
- pixmaps/hide_detail_24.xpm \
- pixmaps/insert_component_16.xpm \
- pixmaps/insert_component_24.xpm \
- pixmaps/insert_image_16.png \
- pixmaps/insert_image_24.png \
- pixmaps/insert_shaped_component_16.xpm \
- pixmaps/insert_shaped_component_24.xpm \
pixmaps/inside_border.xpm \
pixmaps/inside_horiz_border.xpm \
pixmaps/inside_vert_border.xpm \
@@ -538,66 +501,15 @@ embedded_imgs = \
pixmaps/line_pattern_slant.xpm \
pixmaps/line_pattern_thick.xpm \
pixmaps/line_pattern_thin.xpm \
- pixmaps/link_add_16.png \
- pixmaps/link_add_24.png \
- pixmaps/link_delete_16.png \
- pixmaps/link_edit_16.png \
- pixmaps/link_email_16.png \
- pixmaps/link_email_24.png \
- pixmaps/link_external_16.png \
- pixmaps/link_external_24.png \
- pixmaps/link_internal_16.png \
- pixmaps/link_internal_24.png \
- pixmaps/link_url_16.png \
- pixmaps/link_url_24.png \
- pixmaps/merge_cells_16.xpm \
- pixmaps/merge_cells_24.xpm \
pixmaps/no_border.xpm \
- pixmaps/object_arrow_24.png \
- pixmaps/object_button_24.png \
- pixmaps/object_checkbox_24.png \
- pixmaps/object_combo_24.png \
- pixmaps/object_ellipse_24.png \
- pixmaps/object_frame_24.png \
- pixmaps/object_label_24.png \
- pixmaps/object_line_24.png \
- pixmaps/object_list_24.png \
- pixmaps/object_radiobutton_24.png \
- pixmaps/object_rectangle_24.png \
- pixmaps/object_scrollbar_24.png \
- pixmaps/object_slider_24.png \
- pixmaps/object_spinbutton_24.png \
pixmaps/outline_border.xpm \
- pixmaps/pivottable_16.png \
- pixmaps/pivottable_24.png \
- pixmaps/protection_no_24.png \
- pixmaps/protection_yes_24.png \
pixmaps/protection_yes_48.png \
- pixmaps/remove_decimals.png \
pixmaps/rev_diag_border.xpm \
pixmaps/right-down.png \
pixmaps/right_border.xpm \
- pixmaps/row_add_16.xpm \
- pixmaps/row_add_24.xpm \
- pixmaps/row_delete_16.xpm \
- pixmaps/row_delete_24.xpm \
- pixmaps/row_hide_16.xpm \
- pixmaps/row_hide_24.xpm \
- pixmaps/row_size_16.xpm \
- pixmaps/row_size_24.xpm \
- pixmaps/row_unhide_16.xpm \
- pixmaps/row_unhide_24.xpm \
pixmaps/sheet_move_marker.xpm \
- pixmaps/show_detail_16.xpm \
- pixmaps/show_detail_24.xpm \
- pixmaps/split_cells_16.xpm \
- pixmaps/split_cells_24.xpm \
- pixmaps/thousands.xpm \
pixmaps/top_border.xpm \
- pixmaps/ungroup_16.xpm \
- pixmaps/ungroup_24.xpm \
- pixmaps/unknown_image.png \
- pixmaps/visible.png
+ pixmaps/unknown_image.png
embedded-imgs.c: $(top_srcdir)/tools/embedder $(embedded_imgs) Makefile
cd $(srcdir) && @PERL@ $(abs_top_srcdir)/tools/embedder \
diff --git a/src/application.c b/src/application.c
index 4a61ef3..a5aac16 100644
--- a/src/application.c
+++ b/src/application.c
@@ -798,8 +798,8 @@ install_icons (GnmApp *app)
static const char *icons[] = {
/* Cursors */
"cursor_cross.xpm",
- "bucket.xpm",
- "font.xpm",
+ //"bucket.xpm",
+ //"font.xpm",
"sheet_move_marker.xpm",
/* Patterns */
@@ -860,360 +860,11 @@ install_icons (GnmApp *app)
const char *stock_id;
} const icons2[] = {
{
- "column_add_24.xpm",
- "column_add_16.xpm",
- "Gnumeric_ColumnAdd"
- },
- {
- "column_delete_24.xpm",
- "column_delete_16.xpm",
- "Gnumeric_ColumnDelete"
- },
- {
- "column_size_24.xpm",
- "column_size_16.xpm",
- "Gnumeric_ColumnSize"
- },
- {
- "column_hide_24.xpm",
- "column_hide_16.xpm",
- "Gnumeric_ColumnHide"
- },
- {
- "column_unhide_24.xpm",
- "column_unhide_16.xpm",
- "Gnumeric_ColumnUnhide"
- },
- {
- "row_add_24.xpm",
- "row_add_16.xpm",
- "Gnumeric_RowAdd"
- },
- {
- "row_delete_24.xpm",
- "row_delete_16.xpm",
- "Gnumeric_RowDelete"
- },
- {
- "row_size_24.xpm",
- "row_size_16.xpm",
- "Gnumeric_RowSize"
- },
- {
- "row_hide_24.xpm",
- "row_hide_16.xpm",
- "Gnumeric_RowHide"
- },
- {
- "row_unhide_24.xpm",
- "row_unhide_16.xpm",
- "Gnumeric_RowUnhide"
- },
-
- {
- "group_24.xpm",
- "group_16.xpm",
- "Gnumeric_Group"
- },
- {
- "ungroup_24.xpm",
- "ungroup_16.xpm",
- "Gnumeric_Ungroup"
- },
- {
- "show_detail_24.xpm",
- "show_detail_16.xpm",
- "Gnumeric_ShowDetail"
- },
- {
- "hide_detail_24.xpm",
- "hide_detail_16.xpm",
- "Gnumeric_HideDetail"
- },
-
- {
- "graph_guru_24.xpm",
- "graph_guru_16.xpm",
- "Gnumeric_GraphGuru"
- },
- {
- "insert_component_24.xpm",
- "insert_component_16.xpm",
- "Gnumeric_InsertComponent"
- },
- {
- "insert_shaped_component_24.xpm",
- "insert_shaped_component_16.xpm",
- "Gnumeric_InsertShapedComponent"
- },
-
- {
- "center_across_selection_24.xpm",
- "center_across_selection_16.xpm",
- "Gnumeric_CenterAcrossSelection"
- },
- {
- "merge_cells_24.xpm",
- "merge_cells_16.xpm",
- "Gnumeric_MergeCells"
- },
- {
- "split_cells_24.xpm",
- "split_cells_16.xpm",
- "Gnumeric_SplitCells"
- },
-
- {
- "halign-fill_24.png",
- NULL,
- "Gnumeric_HAlignFill"
- },
- {
- "halign-general_24.png",
- NULL,
- "Gnumeric_HAlignGeneral"
- },
-
- {
- NULL,
- "comment_add_16.xpm",
- "Gnumeric_CommentAdd"
- },
- {
- NULL,
- "comment_delete_16.xpm",
- "Gnumeric_CommentDelete"
- },
- {
- NULL,
- "comment_edit_16.xpm",
- "Gnumeric_CommentEdit"
- },
-
- {
- "add_decimals.png",
- NULL,
- "Gnumeric_FormatAddPrecision"
- },
- {
- "remove_decimals.png",
- NULL,
- "Gnumeric_FormatRemovePrecision"
- },
- {
- "format_money_24.png",
- NULL,
- "Gnumeric_FormatAsAccounting"
- },
- {
- "format_percent_24.png",
- NULL,
- "Gnumeric_FormatAsPercentage"
- },
- {
- "thousands.xpm",
- NULL,
- "Gnumeric_FormatThousandSeparator"
- },
- {
- "gnm_subscript_24.png",
- "gnm_subscript_16.png",
- "Gnumeric_Subscript"
- },
- {
- "gnm_superscript_24.png",
- "gnm_superscript_16.png",
- "Gnumeric_Superscript"
- },
-
- {
- "auto-sum.xpm",
- NULL,
- "Gnumeric_AutoSum"
- },
- {
- "equal-sign.xpm",
- NULL,
- "Gnumeric_Equal"
- },
- {
- "formula_guru_24.png",
- "formula_guru_16.png",
- "Gnumeric_FormulaGuru"
- },
- {
- "insert_image_24.png",
- "insert_image_16.png",
- "Gnumeric_InsertImage"
- },
- {
- "bucket.xpm",
- NULL,
- "Gnumeric_Bucket"
- },
- {
- "font.xpm",
- NULL,
- "Gnumeric_Font"
- },
- {
- "expr_entry.png",
- NULL,
- "Gnumeric_ExprEntry"
- },
- {
- "brush-22.png",
- "brush-16.png",
- "Gnumeric_Brush"
- },
-
- {
- "object_arrow_24.png",
- NULL,
- "Gnumeric_ObjectArrow"
- },
- {
- "object_ellipse_24.png",
- NULL,
- "Gnumeric_ObjectEllipse"
- },
- {
- "object_line_24.png",
- NULL,
- "Gnumeric_ObjectLine"
- },
-
- {
- "object_rectangle_24.png",
- NULL,
- "Gnumeric_ObjectRectangle"
- },
-
- {
- "object_frame_24.png",
- NULL,
- "Gnumeric_ObjectFrame"
- },
- {
- "object_label_24.png",
- NULL,
- "Gnumeric_ObjectLabel"
- },
- {
- "object_button_24.png",
- NULL,
- "Gnumeric_ObjectButton"
- },
- {
- "object_checkbox_24.png",
- NULL,
- "Gnumeric_ObjectCheckbox"
- },
- {
- "object_radiobutton_24.png",
- NULL,
- "Gnumeric_ObjectRadioButton"
- },
- {
- "object_scrollbar_24.png",
- NULL,
- "Gnumeric_ObjectScrollbar"
- },
- {
- "object_spinbutton_24.png",
- NULL,
- "Gnumeric_ObjectSpinButton"
- },
- {
- "object_slider_24.png",
- NULL,
- "Gnumeric_ObjectSlider"
- },
- {
- "object_combo_24.png",
- NULL,
- "Gnumeric_ObjectCombo"
- },
- {
- "object_list_24.png",
- NULL,
- "Gnumeric_ObjectList"
- },
-
- {
- "pivottable_24.png",
- "pivottable_16.png",
- "Gnumeric_PivotTable"
- },
- {
- "protection_yes_24.png",
- NULL,
- "Gnumeric_Protection_Yes"
- },
- {
- "protection_no_24.png",
- NULL,
- "Gnumeric_Protection_No"
- },
- {
"protection_yes_48.png",
NULL,
"Gnumeric_Protection_Yes_Dialog"
},
{
- "visible.png",
- NULL,
- "Gnumeric_Visible"
- },
-
- {
- "link_add_24.png",
- "link_add_16.png",
- "Gnumeric_Link_Add"
- },
- {
- NULL,
- "link_delete_16.png",
- "Gnumeric_Link_Delete"
- },
- {
- NULL,
- "link_edit_16.png",
- "Gnumeric_Link_Edit"
- },
- {
- "link_external_24.png",
- "link_external_16.png",
- "Gnumeric_Link_External"
- },
- {
- "link_internal_24.png",
- "link_internal_16.png",
- "Gnumeric_Link_Internal"
- },
- {
- "link_email_24.png",
- "link_email_16.png",
- "Gnumeric_Link_EMail"
- },
- {
- "link_url_24.png",
- "link_url_16.png",
- "Gnumeric_Link_URL"
- },
-
- {
- "autofilter_24.png",
- "autofilter_16.png",
- "Gnumeric_AutoFilter"
- },
- {
- "autofilter_delete_24.png",
- "autofilter_delete_16.png",
- "Gnumeric_AutoFilterDelete"
- },
-
- {
"border_left.xpm",
NULL,
"Gnumeric_BorderLeft"
@@ -1314,12 +965,16 @@ install_icons (GnmApp *app)
char *res = g_strconcat ("res:gnm:pixmaps/", filename, NULL);
char *iconname;
GdkPixbuf *pixbuf = go_gdk_pixbuf_load_from_file (res);
- int size = gdk_pixbuf_get_width (pixbuf);
+
+ if (!pixbuf) {
+ g_warning ("Misssing icon %s\n", filename);
+ continue;
+ }
iconname = g_strdup (filename);
strchr(iconname, '.')[0] = 0;
gtk_icon_theme_add_builtin_icon (iconname,
- size,
+ gdk_pixbuf_get_width (pixbuf),
pixbuf);
g_object_unref (pixbuf);
diff --git a/src/dialogs/dialog-consolidate.c b/src/dialogs/dialog-consolidate.c
index af3fee0..44c561e 100644
--- a/src/dialogs/dialog-consolidate.c
+++ b/src/dialogs/dialog-consolidate.c
@@ -507,7 +507,7 @@ dialog_consolidate_tool_init (ConsolidateState *state)
setup_widgets (state, state->base.gui);
state->pixmap = gtk_widget_render_icon_pixbuf
(GTK_WIDGET(state->base.dialog),
- "Gnumeric_ExprEntry",
+ "gnumeric-exprentry",
GTK_ICON_SIZE_LARGE_TOOLBAR);
/* Dynamic initialization */
diff --git a/src/dialogs/dialog-define-names.c b/src/dialogs/dialog-define-names.c
index 908f894..2042f0f 100644
--- a/src/dialogs/dialog-define-names.c
+++ b/src/dialogs/dialog-define-names.c
@@ -1202,7 +1202,7 @@ name_guru_init (NameGuruState *state, WBCGtk *wbcg, gboolean is_paste_dialog)
GTK_ICON_SIZE_SMALL_TOOLBAR);
state->image_lock = gtk_widget_render_icon_pixbuf
(state->dialog,
- "Gnumeric_Protection_Yes",
+ "gnumeric-protection-yes",
GTK_ICON_SIZE_SMALL_TOOLBAR);
state->image_up = gtk_widget_render_icon_pixbuf
(state->dialog,
diff --git a/src/dialogs/dialog-doc-metadata.c b/src/dialogs/dialog-doc-metadata.c
index 8839a86..d542f24 100644
--- a/src/dialogs/dialog-doc-metadata.c
+++ b/src/dialogs/dialog-doc-metadata.c
@@ -2238,7 +2238,7 @@ typedef struct {
static page_info_t const page_info[] = {
/* IMPORTANT: OBEY THE ORDER 0 - 3 - 2 - 1 */
{N_("File"), GTK_STOCK_FILE, NULL, 0, &dialog_doc_metadata_init_file_page },
- {N_("Statistics"), "Gnumeric_GraphGuru", NULL, 3 ,&dialog_doc_metadata_init_statistics_page },
+ {N_("Statistics"), "gnumeric-graphguru", NULL, 3 ,&dialog_doc_metadata_init_statistics_page },
{N_("Properties"), GTK_STOCK_PROPERTIES, NULL, 2, &dialog_doc_metadata_init_properties_page },
{N_("Description"), GTK_STOCK_ABOUT, NULL, 1, &dialog_doc_metadata_init_description_page },
{N_("Keywords"), GTK_STOCK_INDEX, NULL, 5, &dialog_doc_metadata_init_keywords_page },
diff --git a/src/dialogs/dialog-hyperlink.c b/src/dialogs/dialog-hyperlink.c
index 23d1fc8..4e7011a 100644
--- a/src/dialogs/dialog-hyperlink.c
+++ b/src/dialogs/dialog-hyperlink.c
@@ -303,23 +303,23 @@ static struct {
void (*set_target) (HyperlinkState *state, const char* const target);
char * (*get_target) (HyperlinkState *state, gboolean *success);
} const type [] = {
- { N_("Internal Link"), "Gnumeric_Link_Internal",
+ { N_("Internal Link"), "gnumeric-link-internal",
"GnmHLinkCurWB", "internal-link-grid",
N_("Jump to specific cells or named range in the current workbook"),
dhl_set_target_cur_wb,
dhl_get_target_cur_wb },
- { N_("External Link"), "Gnumeric_Link_External",
+ { N_("External Link"), "gnumeric-link-external",
"GnmHLinkExternal", "external-link-grid" ,
N_("Open an external file with the specified name"),
dhl_set_target_external,
dhl_get_target_external },
- { N_("Email Link"), "Gnumeric_Link_EMail",
+ { N_("Email Link"), "gnumeric-link-email",
"GnmHLinkEMail", "email-grid" ,
N_("Prepare an email"),
dhl_set_target_email,
dhl_get_target_email },
- { N_("Web Link"), "Gnumeric_Link_URL",
+ { N_("Web Link"), "gnumeric-link-url",
"GnmHLinkURL", "url-grid" ,
N_("Browse to the specified URL"),
dhl_set_target_url,
diff --git a/src/dialogs/dialog-preferences.c b/src/dialogs/dialog-preferences.c
index d5c58f6..1e46cc8 100644
--- a/src/dialogs/dialog-preferences.c
+++ b/src/dialogs/dialog-preferences.c
@@ -1218,7 +1218,7 @@ static page_info_t const page_info[] = {
{N_("Files"), GTK_STOCK_FLOPPY, NULL, &pref_file_page_initializer },
{N_("Tools"), GTK_STOCK_EXECUTE, NULL, &pref_tool_page_initializer },
{N_("Undo"), GTK_STOCK_UNDO, NULL, &pref_undo_page_initializer },
- {N_("Windows"), "Gnumeric_ObjectCombo", NULL, &pref_window_page_initializer },
+ {N_("Windows"), "gnumeric-object-combo", NULL, &pref_window_page_initializer },
{N_("Header/Footer"), GTK_STOCK_ITALIC, "1", &pref_font_hf_initializer },
#ifndef G_OS_WIN32
{N_("Copy and Paste"),GTK_STOCK_PASTE, "3", &pref_copypaste_page_initializer},
diff --git a/src/dialogs/dialog-sheet-order.c b/src/dialogs/dialog-sheet-order.c
index 04c8f12..2f92b4f 100644
--- a/src/dialogs/dialog-sheet-order.c
+++ b/src/dialogs/dialog-sheet-order.c
@@ -1473,13 +1473,13 @@ dialog_sheet_order (WBCGtk *wbcg)
state->advanced_check = go_gtk_builder_get_widget (gui, "advanced-check");
state->initial_colors_set = FALSE;
state->image_padlock = gtk_widget_render_icon_pixbuf (state->dialog,
- "Gnumeric_Protection_Yes",
+ "gnumeric-protection-yes",
GTK_ICON_SIZE_LARGE_TOOLBAR);
state->image_padlock_no = gtk_widget_render_icon_pixbuf (state->dialog,
- "Gnumeric_Protection_No",
+ "gnumeric-protection-no",
GTK_ICON_SIZE_LARGE_TOOLBAR);
state->image_visible = gtk_widget_render_icon_pixbuf (state->dialog,
- "Gnumeric_Visible",
+ "gnumeric-visible",
GTK_ICON_SIZE_LARGE_TOOLBAR);
state->image_ltr = gtk_widget_render_icon_pixbuf (state->dialog,
"gtk-go-forward",
@@ -1502,7 +1502,7 @@ dialog_sheet_order (WBCGtk *wbcg)
cg = go_color_group_fetch ("back_color_group",
wb_control_view (WORKBOOK_CONTROL (wbcg)));
state->ccombo_back = go_combo_color_new (
- gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "bucket", 24, 0, NULL),
+ gtk_icon_theme_load_icon (gtk_icon_theme_get_default (), "gnumeric-bucket", 24, 0, NULL),
_("Default"), 0, cg);
g_object_unref (cg);
go_combo_color_set_instant_apply (
diff --git a/src/dialogs/dialog-workbook-attr.c b/src/dialogs/dialog-workbook-attr.c
index cef70fa..3fa6bb5 100644
--- a/src/dialogs/dialog-workbook-attr.c
+++ b/src/dialogs/dialog-workbook-attr.c
@@ -195,7 +195,7 @@ typedef struct {
} page_info_t;
static page_info_t const page_info[] = {
- {N_("Widgets"), "Gnumeric_ObjectScrollbar", NULL, 0, &attr_dialog_init_widget_page
},
+ {N_("Widgets"), "gnumeric-object-scrollbar", NULL, 0, &attr_dialog_init_widget_page
},
{N_("Protection"), GTK_STOCK_DIALOG_AUTHENTICATION, NULL, 1 ,&attr_dialog_init_protection_page
},
{N_("Auto Completion"), NULL, NULL, 2
,&attr_dialog_init_autocompletion_page },
{N_("Cell Markers"), NULL, NULL, 3 ,&attr_dialog_init_cell_marker_page
},
diff --git a/src/gnm.gresource.xml b/src/gnm.gresource.xml
new file mode 100644
index 0000000..cec316a
--- /dev/null
+++ b/src/gnm.gresource.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<gresources>
+ <gresource prefix='/org/gnumeric/gnumeric'>
+ <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-unhide.xpm</file>
+ <file>icons/24x24/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/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-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-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/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-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-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-object-arrow.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-radiobutton.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-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>
+ </gresource>
+</gresources>
diff --git a/src/gui-util.c b/src/gui-util.c
index 73ce840..120fe89 100644
--- a/src/gui-util.c
+++ b/src/gui-util.c
@@ -656,8 +656,8 @@ gnumeric_create_popup_menu (GnumericPopupMenuElement const *elements,
(elements->sensitive_filter & sensitive_filter))
gtk_widget_set_sensitive (GTK_WIDGET (item), FALSE);
if (pix_name != NULL) {
- GtkWidget *image = gtk_image_new_from_stock (pix_name,
- GTK_ICON_SIZE_MENU);
+ GtkWidget *image = gtk_image_new_from_icon_name (pix_name,
+ GTK_ICON_SIZE_MENU);
gtk_widget_show (image);
gtk_image_menu_item_set_image (
GTK_IMAGE_MENU_ITEM (item),
diff --git a/src/libgnumeric.c b/src/libgnumeric.c
index feebeb1..e8e8955 100644
--- a/src/libgnumeric.c
+++ b/src/libgnumeric.c
@@ -57,6 +57,7 @@
#include "mathfunc.h"
#include "hlink.h"
#include "wbc-gtk-impl.h"
+#include "gnmresources.h"
#include "embedded-imgs.h"
#include "dialogs/embedded-ui.h"
#include <goffice/goffice.h>
@@ -66,6 +67,66 @@
#endif
#include <locale.h>
+#ifndef HAVE_GTK_ICON_THEME_ADD_RESOURCE_PATH
+#define gtk_icon_theme_add_resource_path fake_gtk_icon_theme_add_resource_path
+
+
+static void
+walk_resource_path (const char *path, int level, int size)
+{
+ char **children = g_resources_enumerate_children (path, 0, NULL);
+ int i;
+
+ if (!children)
+ return;
+
+ for (i = 0; children[i]; i++) {
+ const char *child = children[i];
+ char *subpath;
+ GBytes *data;
+
+ if (level == 0) {
+ size = atol (child);
+ if (size <= 0)
+ continue;
+ }
+
+ subpath = g_build_path ("/", path, child, NULL);
+
+ data = g_resources_lookup_data (subpath, 0, NULL);
+ if (data) {
+ GdkPixbuf *pixbuf = gdk_pixbuf_new_from_resource (subpath, NULL);
+ if (pixbuf && size > 0 && strchr (child, '.')) {
+ char *iconname = g_strdup (child);
+ strchr(iconname, '.')[0] = 0;
+ if (gnm_debug_flag ("icons"))
+ g_printerr ("Defining icon %s at size %d\n", iconname, size);
+ gtk_icon_theme_add_builtin_icon (iconname,
+ size,
+ pixbuf);
+
+ g_object_unref (pixbuf);
+ g_free (iconname);
+ }
+
+ g_bytes_unref (data);
+ } else
+ walk_resource_path (subpath, level + 1, size);
+ g_free (subpath);
+ }
+
+ g_strfreev (children);
+}
+
+static void
+fake_gtk_icon_theme_add_resource_path (GtkIconTheme G_GNUC_UNUSED *theme,
+ const char *path)
+{
+ walk_resource_path (path, 0, -1);
+}
+
+#endif
+
/* TODO : get rid of this monstrosity */
gboolean initial_workbook_open_complete = FALSE;
@@ -236,6 +297,9 @@ gnm_init (void)
inited = TRUE;
libgoffice_init ();
+ _gnm_register_resource ();
+ gtk_icon_theme_add_resource_path (gtk_icon_theme_get_default (),
+ "/org/gnumeric/gnumeric/icons");
gnm_register_ui_files ();
gnm_register_imgs_files ();
go_plugin_service_define ("function_group",
@@ -330,6 +394,7 @@ gnm_shutdown (void)
gnm_conf_shutdown ();
gnm_style_shutdown ();
+ _gnm_unregister_resource ();
libgoffice_shutdown ();
go_plugin_services_shutdown ();
g_object_unref (gnm_app_get_app ());
diff --git a/src/sheet-control-gui.c b/src/sheet-control-gui.c
index ae48e2d..a4fcdac 100644
--- a/src/sheet-control-gui.c
+++ b/src/sheet-control-gui.c
@@ -1852,7 +1852,7 @@ scg_unant (SheetControl *sc)
for (l = pane->cursor.animated; l; l = l->next) {
GocItem *item = l->data;
- goc_item_destroy (l->data);
+ goc_item_destroy (item);
}
g_slist_free (pane->cursor.animated);
@@ -2181,19 +2181,19 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
{ N_("_Delete Cells..."), GTK_STOCK_DELETE,
CONTEXT_DISPLAY_FOR_CELLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION, CONTEXT_DELETE, NULL },
- { N_("_Insert Column(s)"), "Gnumeric_ColumnAdd",
+ { N_("_Insert Column(s)"), "gnumeric-column-add",
CONTEXT_DISPLAY_FOR_COLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_INSERT, NULL },
- { N_("_Delete Column(s)"), "Gnumeric_ColumnDelete",
+ { N_("_Delete Column(s)"), "gnumeric-column-delete",
CONTEXT_DISPLAY_FOR_COLS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_DELETE, NULL },
- { N_("_Insert Row(s)"), "Gnumeric_RowAdd",
+ { N_("_Insert Row(s)"), "gnumeric-row-add",
CONTEXT_DISPLAY_FOR_ROWS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_INSERT, NULL },
- { N_("_Delete Row(s)"), "Gnumeric_RowDelete",
+ { N_("_Delete Row(s)"), "gnumeric-row-delete",
CONTEXT_DISPLAY_FOR_ROWS,
CONTEXT_DISABLE_FOR_DISCONTIGUOUS_SELECTION,
CONTEXT_DELETE, NULL },
@@ -2203,20 +2203,20 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
{ "", NULL, CONTEXT_DISPLAY_FOR_CELLS, 0, 0, NULL },
- { N_("Add _Comment..."), "Gnumeric_CommentAdd",
+ { N_("Add _Comment..."), "gnumeric-comment-add",
CONTEXT_DISPLAY_WITHOUT_COMMENT, 0, CONTEXT_COMMENT_ADD, NULL },
- { N_("Edit Co_mment..."),"Gnumeric_CommentEdit",
+ { N_("Edit Co_mment..."),"gnumeric-comment-edit",
CONTEXT_DISPLAY_WITH_COMMENT, 0, CONTEXT_COMMENT_EDIT, NULL },
- { N_("_Remove Comments"), "Gnumeric_CommentDelete",
+ { N_("_Remove Comments"), "gnumeric-comment-delete",
CONTEXT_DISPLAY_WITH_COMMENT_IN_RANGE, 0, CONTEXT_COMMENT_REMOVE, NULL },
- { N_("Add _Hyperlink..."), "Gnumeric_Link_Add",
+ { N_("Add _Hyperlink..."), "gnumeric-link-add",
CONTEXT_DISPLAY_WITHOUT_HYPERLINK, 0,
CONTEXT_HYPERLINK_ADD, NULL },
- { N_("Edit _Hyperlink..."), "Gnumeric_Link_Edit",
+ { N_("Edit _Hyperlink..."), "gnumeric-link-edit",
CONTEXT_DISPLAY_WITH_HYPERLINK, 0,
CONTEXT_HYPERLINK_EDIT, NULL },
- { N_("_Remove Hyperlink"), "Gnumeric_Link_Delete",
+ { N_("_Remove Hyperlink"), "gnumeric-link-delete",
CONTEXT_DISPLAY_WITH_HYPERLINK_IN_RANGE, 0,
CONTEXT_HYPERLINK_REMOVE, NULL },
@@ -2253,29 +2253,29 @@ scg_context_menu (SheetControlGUI *scg, GdkEvent *event,
{ N_("C_onditional Formatting..."), GTK_STOCK_PROPERTIES,
0, 0, CONTEXT_FORMAT_CELL_COND, NULL },
{ N_("Cell"), NULL, 0, 0, -1, NULL},/* start sub menu */
- { N_("_Merge"), "Gnumeric_MergeCells", 0,
+ { N_("_Merge"), "gnumeric-cells-merge", 0,
CONTEXT_DISABLE_FOR_ONLYMERGES, CONTEXT_CELL_MERGE, NULL },
- { N_("_Unmerge"), "Gnumeric_SplitCells", 0,
+ { N_("_Unmerge"), "gnumeric-cells-split", 0,
CONTEXT_DISABLE_FOR_NOMERGES, CONTEXT_CELL_UNMERGE, NULL },
- { N_("Auto Fit _Width"), "Gnumeric_ColumnSize", 0, 0, CONTEXT_CELL_AUTOFIT_WIDTH, NULL },
- { N_("Auto Fit _Height"), "Gnumeric_RowSize", 0, 0, CONTEXT_CELL_AUTOFIT_HEIGHT, NULL },
+ { N_("Auto Fit _Width"), "gnumeric-column-size", 0, 0, CONTEXT_CELL_AUTOFIT_WIDTH, NULL },
+ { N_("Auto Fit _Height"), "gnumeric-row-size", 0, 0, CONTEXT_CELL_AUTOFIT_HEIGHT, NULL },
{ "", NULL, 0, 0, -1, NULL},/* end sub menu */
/* Column specific (Note some labels duplicate row labels) */
{ N_("Column"), NULL, 0, 0, -1, NULL},/* start sub menu */
- { N_("_Width..."), "Gnumeric_ColumnSize", 0, 0, CONTEXT_COL_WIDTH, NULL },
- { N_("_Auto Fit Width"), "Gnumeric_ColumnSize", 0, 0, CONTEXT_COL_AUTOFIT, NULL },
- { N_("_Hide"), "Gnumeric_ColumnHide", 0, CONTEXT_DISABLE_FOR_ALL_COLS,
CONTEXT_COL_HIDE, NULL },
- { N_("_Unhide"), "Gnumeric_ColumnUnhide", 0, 0, CONTEXT_COL_UNHIDE, NULL },
+ { N_("_Width..."), "gnumeric-column-size", 0, 0, CONTEXT_COL_WIDTH, NULL },
+ { N_("_Auto Fit Width"), "gnumeric-column-size", 0, 0, CONTEXT_COL_AUTOFIT, NULL },
+ { N_("_Hide"), "gnumeric-column-hide", 0, CONTEXT_DISABLE_FOR_ALL_COLS,
CONTEXT_COL_HIDE, NULL },
+ { N_("_Unhide"), "gnumeric-column-unhide", 0, 0, CONTEXT_COL_UNHIDE, NULL },
{ "", NULL, 0, 0, -1, NULL},/* end sub menu */
/* Row specific (Note some labels duplicate col labels) */
{ N_("Row"), NULL, 0, 0, -1, NULL},/* start sub menu */
- { N_("Hei_ght..."), "Gnumeric_RowSize", 0, 0, CONTEXT_ROW_HEIGHT, NULL },
- { N_("_Auto Fit Height"), "Gnumeric_RowSize", 0, 0, CONTEXT_ROW_AUTOFIT, NULL },
- { N_("_Hide"), "Gnumeric_RowHide", 0, CONTEXT_DISABLE_FOR_ALL_ROWS, CONTEXT_ROW_HIDE,
NULL },
- { N_("_Unhide"), "Gnumeric_RowUnhide", 0, 0, CONTEXT_ROW_UNHIDE, NULL },
+ { N_("Hei_ght..."), "gnumeric-row-size", 0, 0, CONTEXT_ROW_HEIGHT, NULL },
+ { N_("_Auto Fit Height"), "gnumeric-row-size", 0, 0, CONTEXT_ROW_AUTOFIT, NULL },
+ { N_("_Hide"), "gnumeric-row-hide", 0, CONTEXT_DISABLE_FOR_ALL_ROWS, CONTEXT_ROW_HIDE,
NULL },
+ { N_("_Unhide"), "gnumeric-row-unhide", 0, 0, CONTEXT_ROW_UNHIDE, NULL },
{ "", NULL, 0, 0, -1, NULL},/* end sub menu */
{ NULL, NULL, 0, 0, 0, NULL },
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index b25e500..87a3955 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -1963,7 +1963,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "MenuInsert", NULL, N_("_Insert"), NULL, NULL, G_CALLBACK (cb_insert_menu) },
{ "MenuInsertObject", NULL, N_("_Object") },
{ "MenuInsertSpecial", NULL, N_("S_pecial") },
- { "MenuInsertFormulaWrap", "Gnumeric_FormulaGuru",
+ { "MenuInsertFormulaWrap", "gnumeric-formulaguru",
N_("Func_tion Wrapper") },
{ "MenuFormat", NULL, N_("F_ormat") },
{ "MenuFormatCells", NULL, N_("_Cells") },
@@ -2009,7 +2009,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "FileSaveAs", "document-save-as", N_("Save _As"),
"<control><shift>s", N_("Save the current workbook with a different name"),
G_CALLBACK (cb_file_save_as) },
- { "FileSend", "Gnumeric_Link_EMail", N_("Sen_d To..."),
+ { "FileSend", "gnumeric-link-email", N_("Sen_d To..."),
NULL, N_("Send the current file via email"),
G_CALLBACK (cb_file_sendto) },
{ "FilePrintArea", NULL, N_("Print Area & Breaks")},
@@ -2044,7 +2044,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "HelpDocs", "help-browser", N_("_Contents"),
"F1", N_("Open a viewer for Gnumeric's documentation"),
G_CALLBACK (cb_help_docs) },
- { "HelpFunctions", "Gnumeric_FormulaGuru", N_("_Functions"),
+ { "HelpFunctions", "gnumeric-formulaguru", N_("_Functions"),
NULL, N_("Functions help"),
G_CALLBACK (cb_help_function) },
{ "HelpWeb", NULL, N_("Gnumeric on the _Web"),
@@ -2147,7 +2147,7 @@ static GtkActionEntry const actions[] = {
{ "EditClearFormats", NULL, N_("_Formats & Hyperlinks"),
NULL, N_("Clear the selected cells' formats and hyperlinks"),
G_CALLBACK (cb_edit_clear_formats) },
- { "EditClearComments", "Gnumeric_CommentDelete", N_("Co_mments"),
+ { "EditClearComments", "gnumeric-comment-delete", N_("Co_mments"),
NULL, N_("Delete the selected cells' comments"),
G_CALLBACK (cb_edit_clear_comments) },
{ "EditClearContent", "edit-clear", N_("_Contents"),
@@ -2159,7 +2159,7 @@ static GtkActionEntry const actions[] = {
{ "EditClearFormatsFiltered", NULL, N_("F_ormats & Hyperlinks in Filtered Rows"),
NULL, N_("Clear the selected cells' formats and hyperlinks in the filtered rows"),
G_CALLBACK (cb_edit_clear_formats_filtered) },
- { "EditClearCommentsFiltered", "Gnumeric_CommentDelete", N_("Comme_nts in Filtered Rows"),
+ { "EditClearCommentsFiltered", "gnumeric-comment-delete", N_("Comme_nts in Filtered Rows"),
NULL, N_("Delete the selected cells' comments in the filtered rows"),
G_CALLBACK (cb_edit_clear_comments_filtered) },
{ "EditClearContentFiltered", "edit-clear", N_("Content_s of Filtered Rows"),
@@ -2168,17 +2168,17 @@ static GtkActionEntry const actions[] = {
/* Edit -> Delete */
/*Translators: Delete "Rows"*/
- { "EditDeleteRows", "Gnumeric_RowDelete", N_("_Rows"),
+ { "EditDeleteRows", "gnumeric-row-delete", N_("_Rows"),
NULL, N_("Delete the row(s) containing the selected cells"),
G_CALLBACK (cb_edit_delete_rows) },
/*Translators: Delete "Columns"*/
- { "EditDeleteColumns", "Gnumeric_ColumnDelete", N_("_Columns"),
+ { "EditDeleteColumns", "gnumeric-column-delete", N_("_Columns"),
NULL, N_("Delete the column(s) containing the selected cells"),
G_CALLBACK (cb_edit_delete_columns) },
{ "EditDeleteCells", NULL, N_("C_ells..."),
"<control>minus", N_("Delete the selected cells, shifting others into their place"),
G_CALLBACK (cb_edit_delete_cells) },
- { "EditClearHyperlinks", "Gnumeric_Link_Delete", N_("_Hyperlinks"),
+ { "EditClearHyperlinks", "gnumeric-link-delete", N_("_Hyperlinks"),
NULL, N_("Delete the selected cells' hyperlinks"),
G_CALLBACK (cb_edit_delete_links) },
/* A duplicate that should not go into the menus, used only for the accelerator */
@@ -2246,10 +2246,10 @@ static GtkActionEntry const actions[] = {
"<shift><control>v", N_("Paste with optional filters and transformations"),
G_CALLBACK (cb_edit_paste_special) },
- { "EditComment", "Gnumeric_CommentEdit", N_("Co_mment..."),
+ { "EditComment", "gnumeric-comment-edit", N_("Co_mment..."),
NULL, N_("Edit the selected cell's comment"),
G_CALLBACK (cb_insert_comment) },
- { "EditHyperlink", "Gnumeric_Link_Edit", N_("Hyper_link..."),
+ { "EditHyperlink", "gnumeric-link-edit", N_("Hyper_link..."),
"<control>K", N_("Edit the selected cell's hyperlink"),
G_CALLBACK (cb_insert_hyperlink) },
#if 0
@@ -2296,15 +2296,15 @@ static GtkActionEntry const actions[] = {
"<control>KP_Add", N_("Insert new cells"),
G_CALLBACK (cb_insert_cells) },
/*Translators: Insert "Columns"*/
- { "InsertColumns", "Gnumeric_ColumnAdd", N_("_Columns"),
+ { "InsertColumns", "gnumeric-column-add", N_("_Columns"),
NULL, N_("Insert new columns"),
G_CALLBACK (cb_insert_cols) },
/*Translators: Insert "Rows"*/
- { "InsertRows", "Gnumeric_RowAdd", N_("_Rows"),
+ { "InsertRows", "gnumeric-row-add", N_("_Rows"),
NULL, N_("Insert new rows"),
G_CALLBACK (cb_insert_rows) },
- { "ChartGuru", "Gnumeric_GraphGuru", N_("C_hart..."),
+ { "ChartGuru", "gnumeric-graphguru", N_("C_hart..."),
NULL, N_("Insert a Chart"),
G_CALLBACK (cb_launch_chart_guru) },
{ "NewGOComponent", "New Goffice_Component", N_("_New..."),
@@ -2313,14 +2313,14 @@ static GtkActionEntry const actions[] = {
{ "GOComponentFromFile", "New Goffice_Component from a file", N_("_From File..."),
NULL, N_("Insert a new Goffice component object from a file"),
G_CALLBACK (cb_launch_go_component_from_file) },
- { "InsertImage", "Gnumeric_InsertImage", N_("_Image..."),
+ { "InsertImage", "insert-image", N_("_Image..."),
NULL, N_("Insert an image"),
G_CALLBACK (cb_insert_image) },
- { "InsertComment", "Gnumeric_CommentAdd", N_("Co_mment..."),
+ { "InsertComment", "gnumeric-comment-add", N_("Co_mment..."),
NULL, N_("Insert a comment"),
G_CALLBACK (cb_insert_comment) },
- { "InsertHyperlink", "Gnumeric_Link_Add", N_("Hyper_link..."),
+ { "InsertHyperlink", "gnumeric-link-add", N_("Hyper_link..."),
"<control>K", N_("Insert a Hyperlink"),
G_CALLBACK (cb_insert_hyperlink) },
{ "InsertSortDecreasing", "view-sort-descending", N_("Sort (_Descending)"),
@@ -2363,45 +2363,45 @@ static GtkActionEntry const actions[] = {
{ "FormatCellsCond", NULL, N_("_Conditional Formatting..."), NULL,
N_("Modify the conditional formatting of the selected cells"),
G_CALLBACK (cb_format_cells_cond) },
- { "FormatCellsFitHeight", "Gnumeric_RowSize", N_("Auto Fit _Height"), NULL,
+ { "FormatCellsFitHeight", "gnumeric-row-size", N_("Auto Fit _Height"), NULL,
N_("Ensure rows are just tall enough to display content of selection"),
G_CALLBACK (cb_format_cells_auto_fit_height) },
- { "FormatCellsFitWidth", "Gnumeric_ColumnSize", N_("Auto Fit _Width"), NULL,
+ { "FormatCellsFitWidth", "gnumeric-column-size", N_("Auto Fit _Width"), NULL,
N_("Ensure columns are just wide enough to display content of selection"),
G_CALLBACK (cb_format_cells_auto_fit_width) },
/* Format -> Col */
- { "ColumnSize", "Gnumeric_ColumnSize", N_("_Width..."),
+ { "ColumnSize", "gnumeric-column-size", N_("_Width..."),
NULL, N_("Change width of the selected columns"),
G_CALLBACK (cb_set_column_width) },
- { "ColumnAutoSize", "Gnumeric_ColumnSize", N_("_Auto Fit Width"),
+ { "ColumnAutoSize", "gnumeric-column-size", N_("_Auto Fit Width"),
NULL, N_("Ensure columns are just wide enough to display their content"),
G_CALLBACK (cb_format_column_auto_fit) },
- { "ColumnHide", "Gnumeric_ColumnHide", N_("_Hide"),
+ { "ColumnHide", "gnumeric-column-hide", N_("_Hide"),
"<control>0", N_("Hide the selected columns"),
G_CALLBACK (cb_format_column_hide) },
- { "ColumnUnhide", "Gnumeric_ColumnUnhide", N_("_Unhide"),
+ { "ColumnUnhide", "gnumeric-column-unhide", N_("_Unhide"),
"<control>parenright", N_("Make any hidden columns in the selection visible"),
G_CALLBACK (cb_format_column_unhide) },
- { "ColumnDefaultSize", "Gnumeric_ColumnSize", N_("_Standard Width"),
+ { "ColumnDefaultSize", "gnumeric-column-size", N_("_Standard Width"),
NULL, N_("Change the default column width"),
G_CALLBACK (cb_format_column_std_width) },
/* Format -> Row */
- { "RowSize", "Gnumeric_RowSize", N_("H_eight..."),
+ { "RowSize", "gnumeric-row-size", N_("H_eight..."),
NULL, N_("Change height of the selected rows"),
G_CALLBACK (cb_set_row_height) },
- { "RowAutoSize", "Gnumeric_RowSize", N_("_Auto Fit Height"),
+ { "RowAutoSize", "gnumeric-row-size", N_("_Auto Fit Height"),
NULL, N_("Ensure rows are just tall enough to display their content"),
G_CALLBACK (cb_format_row_auto_fit) },
- { "RowHide", "Gnumeric_RowHide", N_("_Hide"),
+ { "RowHide", "gnumeric-row-hide", N_("_Hide"),
"<control>9", N_("Hide the selected rows"),
G_CALLBACK (cb_format_row_hide) },
- { "RowUnhide", "Gnumeric_RowUnhide", N_("_Unhide"),
+ { "RowUnhide", "gnumeric-row-unhide", N_("_Unhide"),
"<control>parenleft", N_("Make any hidden rows in the selection visible"),
G_CALLBACK (cb_format_row_unhide) },
- { "RowDefaultSize", "Gnumeric_RowSize", N_("_Standard Height"),
+ { "RowDefaultSize", "gnumeric-row-size", N_("_Standard Height"),
NULL, N_("Change the default row height"),
G_CALLBACK (cb_format_row_std_height) },
@@ -2620,21 +2620,21 @@ static GtkActionEntry const actions[] = {
/* Data -> Outline */
- { "DataOutlineHideDetail", "Gnumeric_HideDetail", N_("_Hide Detail"),
+ { "DataOutlineHideDetail", "gnumeric-detail-hide", N_("_Hide Detail"),
NULL, N_("Collapse an outline group"),
G_CALLBACK (cb_data_hide_detail) },
- { "DataOutlineShowDetail", "Gnumeric_ShowDetail", N_("_Show Detail"),
+ { "DataOutlineShowDetail", "gnumeric-detail-show", N_("_Show Detail"),
NULL, N_("Uncollapse an outline group"),
G_CALLBACK (cb_data_show_detail) },
- { "DataOutlineGroup", "Gnumeric_Group", N_("_Group..."),
+ { "DataOutlineGroup", "gnumeric-group", N_("_Group..."),
"<shift><alt>Right", N_("Add an outline group"),
G_CALLBACK (cb_data_group) },
- { "DataOutlineUngroup", "Gnumeric_Ungroup", N_("_Ungroup..."),
+ { "DataOutlineUngroup", "gnumeric-ungroup", N_("_Ungroup..."),
"<shift><alt>Left", N_("Remove an outline group"),
G_CALLBACK (cb_data_ungroup) },
/* Data -> Filter */
- { "DataAutoFilter", "Gnumeric_AutoFilter", N_("Add _Auto Filter"),
+ { "DataAutoFilter", "gnumeric-autofilter", N_("Add _Auto Filter"),
NULL, N_("Add or remove a filter"),
G_CALLBACK (cb_auto_filter) },
{ "DataFilterShowAll", NULL, N_("_Clear Advanced Filter"),
@@ -2664,10 +2664,10 @@ static GtkActionEntry const actions[] = {
G_CALLBACK (cb_data_slicer_edit) },
/* Standard Toolbar */
- { "AutoSum", "Gnumeric_AutoSum", N_("Sum"),
+ { "AutoSum", "gnumeric-autosum", N_("Sum"),
"<alt>equal", N_("Sum into the current cell"),
G_CALLBACK (cb_autosum) },
- { "InsertFormula", "Gnumeric_FormulaGuru", N_("_Function..."), NULL,
+ { "InsertFormula", "gnumeric-formulaguru", N_("_Function..."), NULL,
N_("Edit a function in the current cell"),
G_CALLBACK (cb_formula_guru) },
@@ -2679,51 +2679,51 @@ static GtkActionEntry const actions[] = {
G_CALLBACK (cb_sort_descending) },
/* Object Toolbar */
- { "CreateFrame", "Gnumeric_ObjectFrame", N_("Frame"),
+ { "CreateFrame", "gnumeric-object-frame", N_("Frame"),
NULL, N_("Create a frame"),
G_CALLBACK (cmd_create_frame) },
- { "CreateCheckbox", "Gnumeric_ObjectCheckbox", N_("Checkbox"),
+ { "CreateCheckbox", "gnumeric-object-checkbox", N_("Checkbox"),
NULL, N_("Create a checkbox"),
G_CALLBACK (cmd_create_checkbox) },
- { "CreateScrollbar", "Gnumeric_ObjectScrollbar", N_("Scrollbar"),
+ { "CreateScrollbar", "gnumeric-object-scrollbar", N_("Scrollbar"),
NULL, N_("Create a scrollbar"),
G_CALLBACK (cmd_create_scrollbar) },
- { "CreateSlider", "Gnumeric_ObjectSlider", N_("Slider"),
+ { "CreateSlider", "gnumeric-object-slider", N_("Slider"),
NULL, N_("Create a slider"),
G_CALLBACK (cmd_create_slider) },
- { "CreateSpinButton", "Gnumeric_ObjectSpinButton", N_("SpinButton"),
+ { "CreateSpinButton", "gnumeric-object-spinbutton", N_("SpinButton"),
NULL, N_("Create a spin button"),
G_CALLBACK (cmd_create_spinbutton) },
- { "CreateList", "Gnumeric_ObjectList", N_("List"),
+ { "CreateList", "gnumeric-object-list", N_("List"),
NULL, N_("Create a list"),
G_CALLBACK (cmd_create_list) },
- { "CreateCombo", "Gnumeric_ObjectCombo", N_("Combo Box"),
+ { "CreateCombo", "gnumeric-object-combo", N_("Combo Box"),
NULL, N_("Create a combo box"),
G_CALLBACK (cmd_create_combo) },
- { "CreateLine", "Gnumeric_ObjectLine", N_("Line"),
+ { "CreateLine", "gnumeric-object-line", N_("Line"),
NULL, N_("Create a line object"),
G_CALLBACK (cmd_create_line) },
- { "CreateArrow", "Gnumeric_ObjectArrow", N_("Arrow"),
+ { "CreateArrow", "gnumeric-object-arrow", N_("Arrow"),
NULL, N_("Create an arrow object"),
G_CALLBACK (cmd_create_arrow) },
- { "CreateRectangle", "Gnumeric_ObjectRectangle", N_("Rectangle"),
+ { "CreateRectangle", "gnumeric-object-rectangle", N_("Rectangle"),
NULL, N_("Create a rectangle object"),
G_CALLBACK (cmd_create_rectangle) },
- { "CreateEllipse", "Gnumeric_ObjectEllipse", N_("Ellipse"),
+ { "CreateEllipse", "gnumeric-object-ellipse", N_("Ellipse"),
NULL, N_("Create an ellipse object"),
G_CALLBACK (cmd_create_ellipse) },
- { "CreateButton", "Gnumeric_ObjectButton", N_("Button"),
+ { "CreateButton", "gnumeric-object-button", N_("Button"),
NULL, N_("Create a button"),
G_CALLBACK (cmd_create_button) },
- { "CreateRadioButton", "Gnumeric_ObjectRadioButton", N_("RadioButton"),
+ { "CreateRadioButton", "gnumeric-object-radiobutton", N_("RadioButton"),
NULL, N_("Create a radio button"),
G_CALLBACK (cmd_create_radiobutton) },
/* Format toolbar */
- { "FormatMergeCells", "Gnumeric_MergeCells", N_("Merge"),
+ { "FormatMergeCells", "gnumeric-cells-merge", N_("Merge"),
NULL, N_("Merge a range of cells"),
G_CALLBACK (cb_merge_cells) },
- { "FormatUnmergeCells", "Gnumeric_SplitCells", N_("Unmerge"),
+ { "FormatUnmergeCells", "gnumeric-cells-split", N_("Unmerge"),
NULL, N_("Split merged ranges of cells"),
G_CALLBACK (cb_unmerge_cells) },
@@ -2736,10 +2736,10 @@ static GtkActionEntry const actions[] = {
{ "FormatAsCurrency", NULL, N_("Currency"),
"<control>dollar", N_("Format the selection as currency"),
G_CALLBACK (cb_format_as_currency) },
- { "FormatAsAccounting", "Gnumeric_FormatAsAccounting", N_("Accounting"),
+ { "FormatAsAccounting", "gnumeric-format-accounting", N_("Accounting"),
NULL, N_("Format the selection as accounting"),
G_CALLBACK (cb_format_as_accounting) },
- { "FormatAsPercentage", "Gnumeric_FormatAsPercentage", N_("Percentage"),
+ { "FormatAsPercentage", "gnumeric-format-percentage", N_("Percentage"),
"<control>percent", N_("Format the selection as percentage"),
G_CALLBACK (cb_format_as_percentage) },
{ "FormatAsScientific", NULL, N_("Scientific"),
@@ -2758,13 +2758,13 @@ static GtkActionEntry const actions[] = {
"<control>underscore", N_("Clear the border around the selection"),
G_CALLBACK (cb_format_clear_borders) },
- { "FormatWithThousands", "Gnumeric_FormatThousandSeparator", N_("Thousands Separator"),
+ { "FormatWithThousands", "gnumeric-format-thousand-separator", N_("Thousands Separator"),
NULL, N_("Set the format of the selected cells to include a thousands separator"),
G_CALLBACK (cb_format_with_thousands) },
- { "FormatIncreasePrecision", "Gnumeric_FormatAddPrecision", N_("Increase Precision"),
+ { "FormatIncreasePrecision", "gnumeric-format-precision-increase", N_("Increase Precision"),
NULL, N_("Increase the number of decimals displayed"),
G_CALLBACK (cb_format_inc_precision) },
- { "FormatDecreasePrecision", "Gnumeric_FormatRemovePrecision", N_("Decrease Precision"),
+ { "FormatDecreasePrecision", "gnumeric-format-precision-decrease", N_("Decrease Precision"),
NULL, N_("Decrease the number of decimals displayed"),
G_CALLBACK (cb_format_dec_precision) },
@@ -2810,7 +2810,7 @@ static GtkToggleActionEntry const toggle_actions[] = {
{ "SheetOutlineRight", NULL, N_("Outlines _Right"),
NULL, N_("Toggle whether to display column outlines on the left or right"),
G_CALLBACK (cb_sheet_pref_outline_symbols_right) },
- { "SheetDisplayFormulas", "Gnumeric_FormulaGuru",
+ { "SheetDisplayFormulas", "gnumeric-formulaguru",
N_("Display _Formul\303\246"),
"<control>quoteleft",
N_("Display the value of a formula or the formula itself"),
@@ -2842,7 +2842,7 @@ static GtkToggleActionEntry const toggle_actions[] = {
{ "AlignRight", "format-justify-right",
N_("_Right Align"), NULL,
N_("Align right"), G_CALLBACK (cb_align_right), FALSE },
- { "CenterAcrossSelection", "Gnumeric_CenterAcrossSelection",
+ { "CenterAcrossSelection", "gnumeric-center-across-selection",
N_("_Center Across Selection"), NULL,
N_("Center horizontally across the selection"),
G_CALLBACK (cb_center_across_selection), FALSE },
@@ -2899,10 +2899,10 @@ static GtkToggleActionEntry const font_toggle_actions[] = {
{ "FontStrikeThrough", "format-text-strikethrough",
N_("_Strikethrough"), "<control>5",
N_("Strikethrough"), G_CALLBACK (cb_font_strikethrough), FALSE },
- { "FontSuperscript", "Gnumeric_Superscript",
+ { "FontSuperscript", "gnumeric-superscript",
N_("Su_perscript"), "<control>asciicircum",
N_("Superscript"), G_CALLBACK (cb_font_superscript), FALSE },
- { "FontSubscript", "Gnumeric_Subscript",
+ { "FontSubscript", "gnumeric-subscript",
N_("Subscrip_t"), "<control>underscore",
N_("Subscript"), G_CALLBACK (cb_font_subscript), FALSE }
};
@@ -2913,12 +2913,12 @@ static GOActionComboPixmapsElement const halignment_combo_info[] = {
{ N_("Align left"), GTK_STOCK_JUSTIFY_LEFT, GNM_HALIGN_LEFT },
{ N_("Center horizontally"), GTK_STOCK_JUSTIFY_CENTER, GNM_HALIGN_CENTER },
{ N_("Align right"), GTK_STOCK_JUSTIFY_RIGHT, GNM_HALIGN_RIGHT },
- { N_("Fill Horizontally"), "Gnumeric_HAlignFill", GNM_HALIGN_FILL },
+ { N_("Fill Horizontally"), "gnumeric-format-halign-fill", GNM_HALIGN_FILL },
{ N_("Justify Horizontally"), GTK_STOCK_JUSTIFY_FILL, GNM_HALIGN_JUSTIFY },
{ N_("Center horizontally across the selection"),
- "Gnumeric_CenterAcrossSelection", GNM_HALIGN_CENTER_ACROSS_SELECTION
},
+ "gnumeric-center-across-selection",
GNM_HALIGN_CENTER_ACROSS_SELECTION },
{ N_("Align numbers right, and text left"),
- "Gnumeric_HAlignGeneral", GNM_HALIGN_GENERAL },
+ "gnumeric-format-halign-general", GNM_HALIGN_GENERAL },
{ NULL, NULL }
};
static GOActionComboPixmapsElement const valignment_combo_info[] = {
diff --git a/src/wbc-gtk.c b/src/wbc-gtk.c
index a3766cf..1c08d82 100644
--- a/src/wbc-gtk.c
+++ b/src/wbc-gtk.c
@@ -3446,7 +3446,7 @@ cb_back_color_changed (GOActionComboColor *a, WBCGtk *wbcg)
static void
wbc_gtk_init_color_back (WBCGtk *gtk)
{
- gtk->back_color = go_action_combo_color_new ("ColorBack", "bucket",
+ gtk->back_color = go_action_combo_color_new ("ColorBack", "gnumeric-bucket",
_("Clear Background"), 0, NULL);
g_object_set (G_OBJECT (gtk->back_color),
"label", _("Background"),
diff --git a/src/widgets/gnumeric-expr-entry.c b/src/widgets/gnumeric-expr-entry.c
index 2f9d0bf..43600f4 100644
--- a/src/widgets/gnumeric-expr-entry.c
+++ b/src/widgets/gnumeric-expr-entry.c
@@ -462,7 +462,7 @@ gee_set_with_icon (GnmExprEntry *gee, gboolean with_icon)
if (with_icon) {
gee->icon = gtk_toggle_button_new ();
gtk_container_add (GTK_CONTAINER (gee->icon),
- gtk_image_new_from_stock ("Gnumeric_ExprEntry",
+ gtk_image_new_from_stock ("gnumeric-exprentry",
GTK_ICON_SIZE_MENU));
gtk_box_pack_end (GTK_BOX (gee), gee->icon, FALSE, FALSE, 0);
gtk_widget_show_all (gee->icon);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
