IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-09-03 20:53:02 -05:00
Code Issues Packages Projects Releases Wiki Activity

Bug #618434 - Decimal separator is always '.' when using the keypad, patch by Yasuaki Taniguchi

Browse Source 
git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@19222 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Geert Janssens
2010-06-03 19:56:29 +00:00
parent 28a9de6ab8
commit 298c4c986c
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/register/register-gnome/gnucash-sheet.c
+20 -7
View File
@@ -1219,7 +1219,10 @@ gnucash_sheet_check_direct_update_cell(GnucashSheet *sheet,
type_name = gnc_table_get_cell_type_name (sheet->table, virt_loc); type_name = gnc_table_get_cell_type_name (sheet->table, virt_loc);
if( (g_strcmp0 (type_name, DATE_CELL_TYPE_NAME) == 0) if( (g_strcmp0 (type_name, DATE_CELL_TYPE_NAME) == 0)
|| (g_strcmp0 (type_name, COMBO_CELL_TYPE_NAME) == 0) ) return TRUE; || (g_strcmp0 (type_name, COMBO_CELL_TYPE_NAME) == 0)
|| (g_strcmp0 (type_name, NUM_CELL_TYPE_NAME) == 0)
|| (g_strcmp0 (type_name, PRICE_CELL_TYPE_NAME) == 0)
|| (g_strcmp0 (type_name, FORMULA_CELL_TYPE_NAME) == 0)) return TRUE;
return FALSE; return FALSE;
} }
@@ -1902,14 +1905,21 @@ gnucash_sheet_key_press_event (GtkWidget *widget, GdkEventKey *event)
sheet = GNUCASH_SHEET (widget); sheet = GNUCASH_SHEET (widget);
/* save shift state to enable <shift minus> and <shift equal>. /* bug#60582 comment#27 2
see bug#60582 comment#27 2) save shift state to enable <shift minus> and <shift equal>
bug#618434
save keyval to handle GDK_KP_Decimal event
*/ */
if (sheet->preedit_length) if (sheet->preedit_length)
sheet->shift_state = 0; {
sheet->shift_state = 0;
sheet->keyval_state = 0;
}
else else
sheet->shift_state = event->state & GDK_SHIFT_MASK; {
sheet->shift_state = event->state & GDK_SHIFT_MASK;
sheet->keyval_state = (event->keyval == GDK_KP_Decimal)? GDK_KP_Decimal:0;
}
if (gtk_im_context_filter_keypress (sheet->im_context, event)) if (gtk_im_context_filter_keypress (sheet->im_context, event))
{ {
sheet->need_im_reset = TRUE; sheet->need_im_reset = TRUE;
@@ -1986,7 +1996,9 @@ gnucash_sheet_commit_cb (GtkIMContext *context, const gchar *str,
event = gdk_event_new (GDK_KEY_PRESS); event = gdk_event_new (GDK_KEY_PRESS);
keyevent = (GdkEventKey *) event; keyevent = (GdkEventKey *) event;
keyevent->keyval = gdk_unicode_to_keyval(str[0]); keyevent->keyval =
sheet->keyval_state ? sheet->keyval_state
: gdk_unicode_to_keyval(str[0]);
keyevent->state |= sheet->shift_state; keyevent->state |= sheet->shift_state;
result = gnucash_sheet_direct_event(sheet, event); result = gnucash_sheet_direct_event(sheet, event);
gdk_event_free(event); gdk_event_free(event);
@@ -2805,6 +2817,7 @@ gnucash_sheet_init (GnucashSheet *sheet)
sheet->retrieve_surrounding_signal = 0; sheet->retrieve_surrounding_signal = 0;
sheet->delete_surrounding_signal = 0; sheet->delete_surrounding_signal = 0;
sheet->shift_state = 0; sheet->shift_state = 0;
sheet->keyval_state = 0;
} }
src/register/register-gnome/gnucash-sheet.h
+2 -1
View File
@@ -144,6 +144,7 @@ typedef struct
guint delete_surrounding_signal; guint delete_surrounding_signal;
guint shift_state; guint shift_state;
guint keyval_state;
} GnucashSheet; } GnucashSheet;
@@ -258,6 +259,6 @@ GdkColor *get_gtkrc_color (GnucashSheet *sheet, RegisterColor field_type);
/* /*
Local Variables: Local Variables:
c-basic-offset: 8 c-basic-offset: 4
End: End:
*/ */