IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge Jean Laroche's branch 'set_focus_to_filter_in_search' into maint

Browse Source
This commit is contained in:
Robert Fewell 2020-04-18 14:46:25 +01:00
commit ee57e0f483
1 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
gnucash/import-export/import-account-matcher.c
View File

@ -278,6 +278,54 @@ account_tree_row_changed_cb (GtkTreeSelection *selection,
gtk_widget_hide (GTK_WIDGET(picker->pwhbox)); // hide the placeholder warning gtk_widget_hide (GTK_WIDGET(picker->pwhbox)); // hide the placeholder warning
} }
static gboolean
account_tree_key_press_cb(GtkWidget *widget, GdkEventKey *event, gpointer user_data)
{
// Expand the tree when the user starts typing, this will allow sub-accounts to be found.
if (event->length == 0)
return FALSE;
switch (event->keyval)
{
case GDK_KEY_plus:
case GDK_KEY_minus:
case GDK_KEY_asterisk:
case GDK_KEY_slash:
case GDK_KEY_KP_Add:
case GDK_KEY_KP_Subtract:
case GDK_KEY_KP_Multiply:
case GDK_KEY_KP_Divide:
case GDK_KEY_Up:
case GDK_KEY_KP_Up:
case GDK_KEY_Down:
case GDK_KEY_KP_Down:
case GDK_KEY_Home:
case GDK_KEY_KP_Home:
case GDK_KEY_End:
case GDK_KEY_KP_End:
case GDK_KEY_Page_Up:
case GDK_KEY_KP_Page_Up:
case GDK_KEY_Page_Down:
case GDK_KEY_KP_Page_Down:
case GDK_KEY_Right:
case GDK_KEY_Left:
case GDK_KEY_KP_Right:
case GDK_KEY_KP_Left:
case GDK_KEY_space:
case GDK_KEY_KP_Space:
case GDK_KEY_backslash:
case GDK_KEY_Return:
case GDK_KEY_ISO_Enter:
case GDK_KEY_KP_Enter:
return FALSE;
break;
default:
gtk_tree_view_expand_all (GTK_TREE_VIEW(user_data));
return FALSE;
}
return FALSE;
}
/******************************************************* /*******************************************************
* account_tree_row_activated_cb * account_tree_row_activated_cb
@ -385,11 +433,14 @@ Account * gnc_import_select_account(GtkWidget *parent,
} }
gtk_label_set_text((GtkLabel*)online_id_label, account_description_text); gtk_label_set_text((GtkLabel*)online_id_label, account_description_text);
build_acct_tree(picker); build_acct_tree(picker);
gtk_window_set_modal(GTK_WINDOW(picker->dialog), TRUE); gtk_window_set_modal(GTK_WINDOW(picker->dialog), TRUE);
g_signal_connect(picker->account_tree, "row-activated", g_signal_connect(picker->account_tree, "row-activated",
G_CALLBACK(account_tree_row_activated_cb), picker); G_CALLBACK(account_tree_row_activated_cb), picker);
/* Connect key press event so we can expand the tree when the user starts typing, allowing
* any subaccount to match */
g_signal_connect (picker->account_tree, "key-press-event", G_CALLBACK (account_tree_key_press_cb), picker->account_tree);
selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(picker->account_tree)); selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(picker->account_tree));
g_signal_connect(selection, "changed", g_signal_connect(selection, "changed",
G_CALLBACK(account_tree_row_changed_cb), picker); G_CALLBACK(account_tree_row_changed_cb), picker);