Commit f88cadec authored by Jody Goldberg's avatar Jody Goldberg Committed by Jody Goldberg

Chift/Ctrl space are not active while editing.


2000-05-27  Jody Goldberg <jgoldberg@home.com>

	* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
	  space are not active while editing.
parent f09360db
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
2000-05-27 Jody Goldberg <jgoldberg@home.com>
* src/gnumeric-sheet.c (gnumeric_sheet_key_mode_sheet) : Chift/Ctrl
space are not active while editing.
* src/workbook.c (function_druid) : Disable until this works better.
* src/commands.c (cmd_paste_copy_undo) : Mark the sheet as dirt, and
do a recalc.
......
......@@ -634,7 +634,8 @@ gnumeric_sheet_key_mode_sheet (GnumericSheet *gsheet, GdkEventKey *event)
* Magic : Some of these are accelerators,
* we need to catch them before entering because they appear to be printable
*/
if (event->keyval == GDK_space && (event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) )
if (wb->editing && event->keyval == GDK_space &&
(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)))
return FALSE;
switch (event->keyval){
......
......@@ -634,7 +634,8 @@ gnumeric_sheet_key_mode_sheet (GnumericSheet *gsheet, GdkEventKey *event)
* Magic : Some of these are accelerators,
* we need to catch them before entering because they appear to be printable
*/
if (event->keyval == GDK_space && (event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)) )
if (wb->editing && event->keyval == GDK_space &&
(event->state & (GDK_SHIFT_MASK|GDK_CONTROL_MASK)))
return FALSE;
switch (event->keyval){
......
......@@ -9,7 +9,9 @@
#include "pixmaps/sort-descending.xpm"
#include "pixmaps/auto-sum.xpm"
#include "pixmaps/equal-sign.xpm"
#ifdef FUNCTION_DRUID
#include "pixmaps/function_selector.xpm"
#endif
#ifdef GNUMERIC_TEST_ACTIVE_OBJECT
#include "pixmaps/button.xpm"
#include "pixmaps/checkbox.xpm"
......
......@@ -1083,11 +1083,13 @@ autosum_cmd (GtkWidget *widget, Workbook *wb)
}
}
#ifdef FUNCTION_DRUID
static void
function_druid (GtkWidget *widget, Workbook *wb)
{
dialog_function_druid (wb);
}
#endif
static void
sort_ascend_cmd (GtkWidget *widget, Workbook *wb)
......@@ -1517,9 +1519,12 @@ static GnomeUIInfo workbook_standard_toolbar [] = {
GNOMEUIINFO_ITEM_DATA (
N_("Sum"), N_("Sum into the current cell."),
autosum_cmd, NULL, auto_sum_xpm),
#ifdef FUNCTION_DRUID
GNOMEUIINFO_ITEM_DATA (
N_("Function"), N_("Edit a function in the current cell."),
&function_druid, NULL, function_selector_xpm),
#endif
GNOMEUIINFO_ITEM_DATA (
N_("Sort Ascending"), N_("Sorts the selected region in ascending order based on the first column selected."),
sort_ascend_cmd, NULL, sort_ascending_xpm),
......
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