mirror of
https://github.com/Gnucash/gnucash.git
synced 2026-09-03 20:53:02 -05:00
move the account-name quickfill code to the utilities directory, where
it can eb shared with the business ledger git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@10007 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Linas Vepstas
@@ -23,8 +23,8 @@
|
||||
#include "config.h"
|
||||
|
||||
#include "Group.h"
|
||||
#include "account-quickfill.h"
|
||||
#include "combocell.h"
|
||||
#include "dialog-utils.h"
|
||||
#include "global-options.h"
|
||||
#include "gnc-component-manager.h"
|
||||
#include "gnc-engine-util.h"
|
||||
@@ -37,7 +37,7 @@
|
||||
|
||||
|
||||
/* This static indicates the debugging module that this .o belongs to. */
|
||||
static short module = MOD_LEDGER;
|
||||
/* static short module = MOD_REGISTER; */
|
||||
|
||||
|
||||
static void
|
||||
@@ -540,169 +540,41 @@ gnc_split_register_load (SplitRegister *reg, GList * slist,
|
||||
gnc_table_control_allow_move (table->control, TRUE);
|
||||
}
|
||||
|
||||
static void
|
||||
gnc_load_xfer_cell (ComboCell * cell, AccountGroup * grp)
|
||||
/* ===================================================================== */
|
||||
/* Splat the account name into the transfer cell combobox menu */
|
||||
|
||||
static gpointer
|
||||
load_xfer_cell_cb (Account *account, gpointer data)
|
||||
{
|
||||
GList *list;
|
||||
GList *node;
|
||||
ComboCell *cell = data;
|
||||
char *name;
|
||||
|
||||
ENTER ("\n");
|
||||
if (xaccAccountGetPlaceholder (account)) return NULL;
|
||||
|
||||
if (!grp) return;
|
||||
name = xaccAccountGetFullName (account, gnc_get_account_separator ());
|
||||
if (NULL == name) return NULL;
|
||||
gnc_combo_cell_add_menu_item (cell, name);
|
||||
g_free(name);
|
||||
|
||||
/* Build the xfer menu out of account names. */
|
||||
|
||||
list = xaccGroupGetSubAccounts (grp);
|
||||
|
||||
for (node = list; node; node = node->next)
|
||||
{
|
||||
Account *account = node->data;
|
||||
char *name;
|
||||
|
||||
if (xaccAccountGetPlaceholder (account)) continue;
|
||||
|
||||
name = xaccAccountGetFullName (account, gnc_get_account_separator ());
|
||||
if (name != NULL)
|
||||
{
|
||||
gnc_combo_cell_add_menu_item (cell, name);
|
||||
g_free(name);
|
||||
}
|
||||
}
|
||||
|
||||
g_list_free (list);
|
||||
|
||||
LEAVE ("\n");
|
||||
return NULL;
|
||||
}
|
||||
|
||||
/* ===================================================================== */
|
||||
/* In order to speed up register starts for registers htat have a huge
|
||||
* number of accounts in them (where 'huge' is >500) we build a quickfill
|
||||
* cache of account names. This cache is needed because some users on
|
||||
* some machines experience register open times in the tens of seconds
|
||||
* type timescales. Building the quickfill list accounts for almost
|
||||
* all of that cpu time (about 90% of the xfer_cell build time for 600
|
||||
* accounts).
|
||||
*/
|
||||
|
||||
#define QKEY "split_reg_shared_quickfill"
|
||||
|
||||
typedef struct {
|
||||
QuickFill *qf;
|
||||
QofBook *book;
|
||||
gint listener;
|
||||
} QFB;
|
||||
|
||||
static void
|
||||
shared_quickfill_destroy (QofBook *book, gpointer key, gpointer user_data)
|
||||
static gboolean
|
||||
skip_cb (Account *account, gpointer x)
|
||||
{
|
||||
QFB *qfb = user_data;
|
||||
gnc_quickfill_destroy (qfb->qf);
|
||||
gnc_engine_unregister_event_handler (qfb->listener);
|
||||
g_free (qfb);
|
||||
return xaccAccountGetPlaceholder (account);
|
||||
}
|
||||
|
||||
/* Since we are maintaining a 'global' quickfill list, we need to
|
||||
* update it whenever the user creates a new account. So listen
|
||||
* for account modification events, and add new accounts.
|
||||
*/
|
||||
static void
|
||||
listen_for_account_events (GUID *guid, QofIdType type,
|
||||
GNCEngineEventType event_type,
|
||||
gpointer user_data)
|
||||
{
|
||||
QFB *qfb = user_data;
|
||||
QuickFill *qf = qfb->qf;
|
||||
QuickFill *match;
|
||||
char * name;
|
||||
GdkWChar *wc_text;
|
||||
const char *match_str;
|
||||
QofCollection *col;
|
||||
Account *account;
|
||||
|
||||
if (! (event_type & GNC_EVENT_MODIFY)) return;
|
||||
if (QSTRCMP (type, GNC_ID_ACCOUNT)) return;
|
||||
|
||||
col = qof_book_get_collection (qfb->book, GNC_ID_ACCOUNT);
|
||||
account = GNC_ACCOUNT (qof_collection_lookup_entity (col, guid));
|
||||
name = xaccAccountGetFullName (account, gnc_get_account_separator ());
|
||||
if (NULL == name) return;
|
||||
|
||||
/* The match routines all expect wide-chars. */
|
||||
if (gnc_mbstowcs (&wc_text, name) < 0)
|
||||
{
|
||||
PERR ("bad text conversion");
|
||||
g_free (name);
|
||||
return;
|
||||
}
|
||||
|
||||
match = gnc_quickfill_get_string_match (qf, wc_text);
|
||||
if (!match) goto add_string;
|
||||
match_str = gnc_quickfill_string (match);
|
||||
if (!match_str) goto add_string;
|
||||
if (safe_strcmp (match_str, name)) goto add_string;
|
||||
|
||||
PINFO ("got match for %s", name);
|
||||
goto done;
|
||||
|
||||
add_string:
|
||||
PINFO ("insert new account %s into qf=%p\n", name, qf);
|
||||
gnc_quickfill_insert (qf, name, QUICKFILL_ALPHA);
|
||||
done:
|
||||
g_free(wc_text);
|
||||
g_free(name);
|
||||
}
|
||||
|
||||
/* Build the quickfill list out of account names.
|
||||
* Essentially same loop as in gnc_load_xfer_cell() above.
|
||||
*/
|
||||
static QuickFill *
|
||||
build_shared_quickfill (QofBook *book, AccountGroup *group)
|
||||
{
|
||||
QuickFill *qf;
|
||||
GList *list, *node;
|
||||
QFB *qfb;
|
||||
|
||||
qf = gnc_quickfill_new ();
|
||||
|
||||
list = xaccGroupGetSubAccounts (group);
|
||||
for (node = list; node; node = node->next)
|
||||
{
|
||||
Account *account = node->data;
|
||||
char *name;
|
||||
|
||||
if (xaccAccountGetPlaceholder (account)) continue;
|
||||
|
||||
name = xaccAccountGetFullName (account, gnc_get_account_separator ());
|
||||
if (name != NULL)
|
||||
{
|
||||
gnc_quickfill_insert (qf, name, QUICKFILL_ALPHA);
|
||||
g_free(name);
|
||||
}
|
||||
}
|
||||
g_list_free (list);
|
||||
|
||||
PINFO ("Built shared qf=%p", qf);
|
||||
|
||||
qfb = g_new0(QFB, 1);
|
||||
qfb->qf = qf;
|
||||
qfb->book = book;
|
||||
qfb->listener =
|
||||
gnc_engine_register_event_handler (listen_for_account_events, qfb);
|
||||
|
||||
qof_book_set_data_fin (book, QKEY, qfb, shared_quickfill_destroy);
|
||||
|
||||
return qf;
|
||||
}
|
||||
|
||||
|
||||
void
|
||||
gnc_split_register_load_xfer_cells (SplitRegister *reg, Account *base_account)
|
||||
{
|
||||
QofBook *book;
|
||||
AccountGroup *group;
|
||||
QuickFill *qf;
|
||||
ComboCell *cell;
|
||||
QFB *qfb;
|
||||
|
||||
group = xaccAccountGetRoot(base_account);
|
||||
if (group == NULL)
|
||||
@@ -711,28 +583,19 @@ gnc_split_register_load_xfer_cells (SplitRegister *reg, Account *base_account)
|
||||
if (group == NULL)
|
||||
return;
|
||||
|
||||
book = xaccGroupGetBook (group);
|
||||
qfb = qof_book_get_data (book, QKEY);
|
||||
if (!qfb)
|
||||
{
|
||||
qf = build_shared_quickfill (book, group);
|
||||
}
|
||||
else
|
||||
{
|
||||
qf = qfb->qf;
|
||||
}
|
||||
qf = gnc_get_shared_account_name_quickfill (group, QKEY, skip_cb, NULL);
|
||||
|
||||
cell = (ComboCell *)
|
||||
gnc_table_layout_get_cell (reg->table->layout, XFRM_CELL);
|
||||
gnc_combo_cell_clear_menu (cell);
|
||||
gnc_combo_cell_use_quickfill_cache (cell, qf);
|
||||
gnc_load_xfer_cell (cell, group);
|
||||
xaccGroupForEachAccount (group, load_xfer_cell_cb, cell, TRUE);
|
||||
|
||||
cell = (ComboCell *)
|
||||
gnc_table_layout_get_cell (reg->table->layout, MXFRM_CELL);
|
||||
gnc_combo_cell_clear_menu (cell);
|
||||
gnc_combo_cell_use_quickfill_cache (cell, qf);
|
||||
gnc_load_xfer_cell (cell, group);
|
||||
xaccGroupForEachAccount (group, load_xfer_cell_cb, cell, TRUE);
|
||||
}
|
||||
|
||||
/* ====================== END OF FILE ================================== */
|
||||
|
||||
Reference in New Issue
Block a user