[gnumeric] GUI: Make the VAlignmentSelector action actually work.
- From: Morten Welinder <mortenw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnumeric] GUI: Make the VAlignmentSelector action actually work.
- Date: Mon, 29 Dec 2014 23:36:57 +0000 (UTC)
commit 911a0008a18920b84e675543bb1db2f37238cc13
Author: Morten Welinder <terra gnome org>
Date: Mon Dec 29 18:35:08 2014 -0500
GUI: Make the VAlignmentSelector action actually work.
I hacked up a few icons. Nothing great. "justify" and "distributed"
are the same icon. They are supposed to be identical for multiple
lines. For a single line, distributed is center and justify is, I
think, bottom.
icons/32x32/actions/Makefile.am | 8 +++++++-
src/gnm.gresource.xml | 5 +++++
src/wbc-gtk-actions.c | 12 +++++++-----
3 files changed, 19 insertions(+), 6 deletions(-)
---
diff --git a/icons/32x32/actions/Makefile.am b/icons/32x32/actions/Makefile.am
index f30193a..95e763b 100644
--- a/icons/32x32/actions/Makefile.am
+++ b/icons/32x32/actions/Makefile.am
@@ -1,3 +1,9 @@
-internalicons = cursor-cross.xpm
+internalicons = \
+ gnumeric-format-valign-bottom.png \
+ gnumeric-format-valign-center.png \
+ gnumeric-format-valign-distributed.png \
+ gnumeric-format-valign-justify.png \
+ gnumeric-format-valign-top.png \
+ cursor-cross.xpm
EXTRA_DIST = $(internalicons)
diff --git a/src/gnm.gresource.xml b/src/gnm.gresource.xml
index 30d54ae..bf81213 100644
--- a/src/gnm.gresource.xml
+++ b/src/gnm.gresource.xml
@@ -155,6 +155,11 @@
<file>icons/24x24/actions/gnumeric-superscript.png</file>
<file>icons/24x24/actions/gnumeric-ungroup.xpm</file>
<file>icons/32x32/actions/cursor-cross.xpm</file>
+ <file>icons/32x32/actions/gnumeric-format-valign-bottom.png</file>
+ <file>icons/32x32/actions/gnumeric-format-valign-center.png</file>
+ <file>icons/32x32/actions/gnumeric-format-valign-distributed.png</file>
+ <file>icons/32x32/actions/gnumeric-format-valign-justify.png</file>
+ <file>icons/32x32/actions/gnumeric-format-valign-top.png</file>
<file>icons/48x48/actions/gnumeric-protection-yes-dialog.png</file>
<file alias="images/line_pattern_dash_dot.xpm">src/pixmaps/line_pattern_dash_dot.xpm</file>
<file alias="images/line_pattern_dash_dot_dot.xpm">src/pixmaps/line_pattern_dash_dot_dot.xpm</file>
diff --git a/src/wbc-gtk-actions.c b/src/wbc-gtk-actions.c
index fd87f13..b6ce926 100644
--- a/src/wbc-gtk-actions.c
+++ b/src/wbc-gtk-actions.c
@@ -2913,8 +2913,8 @@ static GOActionComboPixmapsElement const halignment_combo_info[] = {
{ N_("Align left"), "format-justify-left", GNM_HALIGN_LEFT },
{ N_("Center horizontally"), "format-justify-center", GNM_HALIGN_CENTER },
{ N_("Align right"), "format-justify-right", GNM_HALIGN_RIGHT },
- { N_("Fill Horizontally"), "gnumeric-format-halign-fill", GNM_HALIGN_FILL },
- { N_("Justify Horizontally"), "format-justify-fill", GNM_HALIGN_JUSTIFY },
+ { N_("Fill horizontally"), "gnumeric-format-halign-fill", GNM_HALIGN_FILL },
+ { N_("Justify horizontally"), "format-justify-fill", GNM_HALIGN_JUSTIFY },
{ N_("Center horizontally across the selection"),
"gnumeric-center-across-selection",
GNM_HALIGN_CENTER_ACROSS_SELECTION },
{ N_("Align numbers right, and text left"),
@@ -2922,9 +2922,11 @@ static GOActionComboPixmapsElement const halignment_combo_info[] = {
{ NULL, NULL }
};
static GOActionComboPixmapsElement const valignment_combo_info[] = {
- { N_("Align Top"), "stock_alignment-top", GNM_VALIGN_TOP },
- { N_("Center Vertically"), "stock_alignment-centered-vertically", GNM_VALIGN_CENTER },
- { N_("Align Bottom"), "stock_alignment-bottom", GNM_VALIGN_BOTTOM },
+ { N_("Align top"), "gnumeric-format-valign-top", GNM_VALIGN_TOP },
+ { N_("Center vertically"), "gnumeric-format-valign-center", GNM_VALIGN_CENTER },
+ { N_("Align bottom"), "gnumeric-format-valign-bottom", GNM_VALIGN_BOTTOM },
+ { N_("Justify"), "gnumeric-format-valign-justify", GNM_VALIGN_JUSTIFY },
+ { N_("Align distributed"), "gnumeric-format-valign-distributed",
GNM_VALIGN_DISTRIBUTED },
{ NULL, NULL}
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]