Commit 28339991 authored by Andreas J. Guelzow 's avatar Andreas J. Guelzow

Add merge and unmerge menu items

2010-07-08  Andreas J. Guelzow <aguelzow@pyrshep.ca>

	* src/GNOME_Gnumeric-gtk.xml.in: add merge and unmerge menu items
	* src/HILDON_Gnumeric-gtk.xml.in: ditto
	* component/Gnumeric-embed.xml.in: ditto
	* src/wbc-gtk-actions.c (permanent_actions): add cellformat sub menu
	(actions): modify menu text
parent 43708562
2010-07-08 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/GNOME_Gnumeric-gtk.xml.in: add merge and unmerge menu items
* src/HILDON_Gnumeric-gtk.xml.in: ditto
* component/Gnumeric-embed.xml.in: ditto
* src/wbc-gtk-actions.c (permanent_actions): add cellformat sub menu
(actions): modify menu text
2010-07-07 Andreas J. Guelzow <aguelzow@pyrshep.ca>
* src/wbc-gtk-actions.c (cb_edit_clear_all): include CLEAR_COMMENTS
......
......@@ -20,6 +20,7 @@ Andreas:
* New functions DATE2HDATE, DATE2HDATE_HEB and DATE2JULIAN.
* Add hyperlink and comment removal menu items.
* Fix undoing of Clear->All. [#623803]
* Add merge and unmerge menu items.
Jean:
* Fix strong/weak cursor display. [#623241]
......
......@@ -127,7 +127,11 @@
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menu name="FormatCellsMenu" action="MenuFormatCells">
<menuitem action="FormatCells"/>
<menuitem action="FormatMergeCells"/>
<menuitem action="FormatUnmergeCells"/>
</menu>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem action="ColumnSize"/>
<menuitem action="ColumnAutoSize"/>
......
......@@ -128,7 +128,11 @@
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menu name="FormatCellsMenu" action="MenuFormatCells">
<menuitem action="FormatCells"/>
<menuitem action="FormatMergeCells"/>
<menuitem action="FormatUnmergeCells"/>
</menu>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem action="ColumnSize"/>
<menuitem action="ColumnAutoSize"/>
......
......@@ -137,7 +137,11 @@
</menu>
</menu>
<menu name="Format" action="MenuFormat">
<menu name="FormatCellsMenu" action="MenuFormatCells">
<menuitem action="FormatCells"/>
<menuitem action="FormatMergeCells"/>
<menuitem action="FormatUnmergeCells"/>
</menu>
<menu name="FormatColumn" action="MenuFormatColumn">
<menuitem action="ColumnSize"/>
<menuitem action="ColumnAutoSize"/>
......
......@@ -1775,6 +1775,7 @@ static GtkActionEntry const permanent_actions[] = {
{ "MenuInsert", NULL, N_("_Insert") },
{ "MenuInsertSpecial", NULL, N_("S_pecial") },
{ "MenuFormat", NULL, N_("F_ormat") },
{ "MenuFormatCells", NULL, N_("_Cells") },
{ "MenuFormatColumn", NULL, N_("C_olumn") },
{ "MenuFormatRow", NULL, N_("_Row") },
{ "MenuFormatSheet", NULL, N_("_Sheet") },
......@@ -2120,7 +2121,7 @@ static GtkActionEntry const actions[] = {
G_CALLBACK (cb_define_name) },
/* Format */
{ "FormatCells", NULL, N_("_Cells..."),
{ "FormatCells", NULL, N_("_Format..."),
"<control>1", N_("Modify the formatting of the selected cells"),
G_CALLBACK (cb_format_cells) },
{ "FormatWorkbook", NULL, N_("View _Properties..."),
......@@ -2467,7 +2468,7 @@ static GtkActionEntry const actions[] = {
{ "FormatMergeCells", "Gnumeric_MergeCells", N_("Merge"),
NULL, N_("Merge a range of cells"),
G_CALLBACK (cb_merge_cells) },
{ "FormatUnmergeCells", "Gnumeric_SplitCells", N_("Split"),
{ "FormatUnmergeCells", "Gnumeric_SplitCells", N_("Unmerge"),
NULL, N_("Split merged ranges of cells"),
G_CALLBACK (cb_unmerge_cells) },
......
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