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

Complete the change from using associate in the source files

Browse Source 
This commit changes some further use of associate and derivates in the
source files to doclink to make it more consistent.
This commit is contained in:
Robert Fewell 2020-09-13 13:05:46 +01:00
parent 7c1026783b
commit d2af5d703b
21 changed files with 132 additions and 130 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gnucash/gnome-utils/dialog-doclink-utils.c
View File

@ -166,12 +166,9 @@ static gchar *
doclink_get_path_head_and_set (gboolean *path_head_set)
{
gchar *ret_path = NULL;
gchar *path_head = gnc_prefs_get_string (GNC_PREFS_GROUP_GENERAL, "assoc-head");
gchar *path_head = gnc_prefs_get_string (GNC_PREFS_GROUP_GENERAL, GNC_DOC_LINK_PATH_HEAD);
*path_head_set = FALSE;
/* Note, assoc-head is the old name for the document link head which has been
kept for compatability */
if (path_head && *path_head) // not default entry
{
*path_head_set = TRUE;
@ -196,9 +193,9 @@ doclink_get_path_head_and_set (gboolean *path_head_set)
if (*path_head_set) // prior to 3.5, assoc-head could be with or without a trailing '/'
{
if (!gnc_prefs_set_string (GNC_PREFS_GROUP_GENERAL, "assoc-head", ret_path))
if (!gnc_prefs_set_string (GNC_PREFS_GROUP_GENERAL, GNC_DOC_LINK_PATH_HEAD, ret_path))
PINFO ("Failed to save preference at %s, %s with %s",
GNC_PREFS_GROUP_GENERAL, "assoc-head", ret_path);
GNC_PREFS_GROUP_GENERAL, GNC_DOC_LINK_PATH_HEAD, ret_path);
}
}
g_free (path_head);

5
gnucash/gnome-utils/dialog-doclink-utils.h
View File

@ -23,6 +23,11 @@
#ifndef DIALOG_DOCLINK_UTILS_H
#define DIALOG_DOCLINK_UTILS_H
#define GNC_DOC_LINK_PATH_HEAD "assoc-head"
/* Note, assoc-head is the old name for the document link head which has been
kept for compatability */
/** Return the current documentation-link file path head uri.
*
* This function will get the current documentation-link path head from prefs.

38
gnucash/gnome-utils/dialog-dup-trans.h
View File

@ -31,29 +31,29 @@
#include <gnc-date.h>
/********************************************************************\
* gnc_dup_trans_dialog *
* opens up a window to do an automatic transfer between accounts *
* *
* Args: parent - the parent of the window to be created *
* title - the text of the title label, otherwise *
* defaults to "New Transaction Information" *
* show_date - TRUE to display date label and edit widgets *
* date - the initial date to use, and the output *
* parameter for the new date *
* num - input num field *
* out_num - output num field, g_newed string *
* tnum - input tnum field, if used, else NULL *
* out_tnum - output tnum field, g_newed string *
* tassoc - input association field, if used, else NULL *
* out_tnum - output association field, g_newed string *
* Return: TRUE if user closes dialog with 'OK' *
\********************************************************************/
/***********************************************************************\
* gnc_dup_trans_dialog *
* opens up a window to do an automatic transfer between accounts *
* *
* Args: parent - the parent of the window to be created *
* title - the text of the title label, otherwise *
* defaults to "New Transaction Information" *
* show_date - TRUE to display date label and edit widgets *
* date - the initial date to use, and the output *
* parameter for the new date *
* num - input num field *
* out_num - output num field, g_newed string *
* tnum - input tnum field, if used, else NULL *
* out_tnum - output tnum field, g_newed string *
* tdoclink - input document link field, if used, else NULL*
* out_tdoclink - output document link field, g_newed string *
* Return: TRUE if user closes dialog with 'OK' *
\***********************************************************************/
gboolean
gnc_dup_trans_dialog (GtkWidget * parent, const char* title, gboolean show_date,
time64 *date_p, const char *num, char **out_num,
const char *tnum, char **out_tnum,
const char *tassoc, char **out_tassoc);
const char *tdoclink, char **out_tdoclink);
gboolean
gnc_dup_trans_dialog_gdate (GtkWidget * parent, GDate *gdate_p,

2
gnucash/gnome-utils/dialog-preferences.c
View File

@ -1367,7 +1367,7 @@ gnc_preferences_dialog_create(GtkWindow *parent)
gtk_box_pack_start(GTK_BOX (box), currency, TRUE, TRUE, 0);
box = GTK_WIDGET(gtk_builder_get_object (builder,
"pref/" GNC_PREFS_GROUP_GENERAL "/assoc-head"));
"pref/" GNC_PREFS_GROUP_GENERAL "/" GNC_DOC_LINK_PATH_HEAD));
fcb = gtk_file_chooser_button_new (_("Select a folder"),
GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
gtk_box_pack_start (GTK_BOX (box), fcb, TRUE, TRUE, 0);

6
gnucash/gnome/gnc-plugin-basic-commands.c
View File

@ -91,7 +91,7 @@ static void gnc_main_window_cmd_tools_close_book (GtkAction *action, GncMainWind
static void gnc_main_window_cmd_tools_find_transactions (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_tools_price_editor (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_tools_imap_editor (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_tools_trans_assoc (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_tools_trans_doclink (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_tools_commodity_editor (GtkAction *action, GncMainWindowActionData *data);
static void gnc_main_window_cmd_help_totd (GtkAction *action, GncMainWindowActionData *data);
@ -215,7 +215,7 @@ static GtkActionEntry gnc_plugin_actions [] =
{
"ToolsTransLinkedDocsAction", NULL, N_("_Transaction Linked Documents"), NULL,
N_("View all Transaction Linked Documents"),
G_CALLBACK (gnc_main_window_cmd_tools_trans_assoc)
G_CALLBACK (gnc_main_window_cmd_tools_trans_doclink)
},
/* Help menu */
@ -603,7 +603,7 @@ gnc_main_window_cmd_tools_imap_editor (GtkAction *action, GncMainWindowActionDat
}
static void
gnc_main_window_cmd_tools_trans_assoc (GtkAction *action, GncMainWindowActionData *data)
gnc_main_window_cmd_tools_trans_doclink (GtkAction *action, GncMainWindowActionData *data)
{
gnc_set_busy_cursor (NULL, TRUE);
gnc_doclink_trans_dialog (GTK_WINDOW (data->window));

8
gnucash/gnome/gnc-plugin-business.c
View File

@ -114,7 +114,7 @@ static void gnc_plugin_business_cmd_employee_find_expense_voucher (GtkAction *ac
static void gnc_plugin_business_cmd_employee_process_payment (GtkAction *action,
GncMainWindowActionData *data);
static void gnc_plugin_business_cmd_assoc (GtkAction *action,
static void gnc_plugin_business_cmd_doclink (GtkAction *action,
GncMainWindowActionData *data);
static void gnc_plugin_business_cmd_tax_tables (GtkAction *action,
GncMainWindowActionData *data);
@ -277,7 +277,7 @@ static GtkActionEntry gnc_plugin_actions [] =
{
"BusinessLinkOpenAction", NULL, N_("Business Links"), NULL,
N_("View all Linked Business Documents"),
G_CALLBACK (gnc_plugin_business_cmd_assoc)
G_CALLBACK (gnc_plugin_business_cmd_doclink)
},
{
"TaxTablesOpenAction", NULL, N_("Sales _Tax Table"), NULL,
@ -753,8 +753,8 @@ gnc_plugin_business_cmd_employee_process_payment (GtkAction *action,
}
static void
gnc_plugin_business_cmd_assoc (GtkAction *action,
GncMainWindowActionData *mw)
gnc_plugin_business_cmd_doclink (GtkAction *action,
GncMainWindowActionData *mw)
{
g_return_if_fail (mw != NULL);
g_return_if_fail (GNC_IS_PLUGIN_BUSINESS (mw->data));

8
gnucash/gnome/gnc-plugin-page-invoice.c
View File

@ -602,7 +602,7 @@ gnc_plugin_page_invoice_finalize (GObject *object)
}
static void
update_assoc_actions (GncPluginPage *plugin_page, gboolean has_uri)
update_doclink_actions (GncPluginPage *plugin_page, gboolean has_uri)
{
GtkAction *uri_action;
@ -746,7 +746,7 @@ gnc_plugin_page_invoice_update_menus (GncPluginPage *page, gboolean is_posted, g
if (gncInvoiceGetDocLink (invoice))
has_uri = TRUE;
update_assoc_actions (page, has_uri);
update_doclink_actions (page, has_uri);
}
@ -1384,7 +1384,7 @@ gnc_plugin_page_invoice_cmd_link (GtkAction *action,
}
// update the menu actions
update_assoc_actions (GNC_PLUGIN_PAGE(plugin_page), has_uri);
update_doclink_actions (GNC_PLUGIN_PAGE(plugin_page), has_uri);
g_free (ret_uri);
LEAVE(" ");
@ -1414,7 +1414,7 @@ gnc_plugin_page_invoice_cmd_link_remove (GtkAction *action,
gtk_widget_hide (GTK_WIDGET(doclink_button));
// update the menu actions
update_assoc_actions (GNC_PLUGIN_PAGE(plugin_page), FALSE);
update_doclink_actions (GNC_PLUGIN_PAGE(plugin_page), FALSE);
LEAVE(" ");
}

6
gnucash/gnome/gnc-plugin-page-register.c
View File

@ -4557,7 +4557,7 @@ gnc_plugin_page_register_cmd_linked_transaction (GtkAction *action,
g_return_if_fail (GNC_IS_PLUGIN_PAGE_REGISTER (plugin_page));
priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (plugin_page);
gsr_default_associate_handler (priv->gsr);
gsr_default_doclink_handler (priv->gsr);
gnc_plugin_page_register_ui_update (NULL, plugin_page);
LEAVE (" ");
}
@ -4573,7 +4573,7 @@ gnc_plugin_page_register_cmd_linked_transaction_open (GtkAction *action,
g_return_if_fail (GNC_IS_PLUGIN_PAGE_REGISTER (plugin_page));
priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (plugin_page);
gsr_default_associate_open_handler (priv->gsr);
gsr_default_doclink_open_handler (priv->gsr);
LEAVE (" ");
}
@ -4588,7 +4588,7 @@ gnc_plugin_page_register_cmd_linked_transaction_remove (GtkAction *action,
g_return_if_fail (GNC_IS_PLUGIN_PAGE_REGISTER (plugin_page));
priv = GNC_PLUGIN_PAGE_REGISTER_GET_PRIVATE (plugin_page);
gsr_default_associate_remove_handler (priv->gsr);
gsr_default_doclink_remove_handler (priv->gsr);
gnc_plugin_page_register_ui_update (NULL, plugin_page);
LEAVE (" ");

28
gnucash/gnome/gnc-split-reg.c
View File

@ -116,10 +116,10 @@ void gsr_default_paste_txn_handler( GNCSplitReg *w, gpointer ud );
void gsr_default_void_txn_handler ( GNCSplitReg *w, gpointer ud );
void gsr_default_unvoid_txn_handler ( GNCSplitReg *w, gpointer ud );
void gsr_default_reverse_txn_handler ( GNCSplitReg *w, gpointer ud );
void gsr_default_associate_handler ( GNCSplitReg *w );
void gsr_default_associate_open_handler ( GNCSplitReg *w );
void gsr_default_associate_remove_handler ( GNCSplitReg *w );
static void gsr_default_associate_from_sheet_handler ( GNCSplitReg *w );
void gsr_default_doclink_handler ( GNCSplitReg *w );
void gsr_default_doclink_open_handler ( GNCSplitReg *w );
void gsr_default_doclink_remove_handler ( GNCSplitReg *w );
static void gsr_default_doclink_from_sheet_handler ( GNCSplitReg *w );
static void gsr_emit_simple_signal ( GNCSplitReg *gsr, const char *sigName );
static void gsr_emit_help_changed ( GnucashRegister *reg, gpointer user_data );
@ -488,9 +488,9 @@ gsr_create_table( GNCSplitReg *gsr )
gtk_box_pack_start (GTK_BOX (gsr), GTK_WIDGET(gsr->reg), TRUE, TRUE, 0);
gnucash_sheet_set_window (gnucash_register_get_sheet (gsr->reg), gsr->window);
// setup the callback for when the associate cell clicked on
gnucash_register_set_open_assoc_cb (gsr->reg,
(GFunc)gsr_default_associate_from_sheet_handler, gsr);
// setup the callback for when the doclink cell clicked on
gnucash_register_set_open_doclink_cb (gsr->reg,
(GFunc)gsr_default_doclink_from_sheet_handler, gsr);
gtk_widget_show ( GTK_WIDGET(gsr->reg) );
g_signal_connect (gsr->reg, "activate_cursor",
@ -1264,9 +1264,9 @@ gnc_split_reg_reinitialize_trans_cb(GtkWidget *widget, gpointer data)
gsr_emit_simple_signal( gsr, "reinit_ent" );
}
/* Edit the associated link for the current transaction. */
/* Edit the document link for the current transaction. */
void
gsr_default_associate_handler (GNCSplitReg *gsr)
gsr_default_doclink_handler (GNCSplitReg *gsr)
{
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
Split *split = gnc_split_register_get_current_split (reg);
@ -1306,9 +1306,9 @@ gsr_default_associate_handler (GNCSplitReg *gsr)
g_free (uri);
}
/* Opens the associated link for the current transaction. */
/* Opens the document link for the current transaction. */
void
gsr_default_associate_open_handler (GNCSplitReg *gsr)
gsr_default_doclink_open_handler (GNCSplitReg *gsr)
{
CursorClass cursor_class;
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
@ -1336,9 +1336,9 @@ gsr_default_associate_open_handler (GNCSplitReg *gsr)
g_free (uri);
}
/* Removes the associated link for the current transaction. */
/* Removes the document link for the current transaction. */
void
gsr_default_associate_remove_handler (GNCSplitReg *gsr)
gsr_default_doclink_remove_handler (GNCSplitReg *gsr)
{
CursorClass cursor_class;
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);
@ -1365,7 +1365,7 @@ gsr_default_associate_remove_handler (GNCSplitReg *gsr)
}
static void
gsr_default_associate_from_sheet_handler (GNCSplitReg *gsr)
gsr_default_doclink_from_sheet_handler (GNCSplitReg *gsr)
{
CursorClass cursor_class;
SplitRegister *reg = gnc_ledger_display_get_split_register (gsr->ledger);

12
gnucash/gnome/gnc-split-reg.h
View File

@ -274,23 +274,23 @@ void gnc_split_reg_set_sheet_focus (GNCSplitReg *gsr, gboolean has_focus);
void gnc_split_reg_balancing_entry (GNCSplitReg *gsr, Account *account,
time64 statement_date, gnc_numeric balancing_amount);
/** Default transaction association edit handler
/** Default transaction document link edit handler
*
* @param gsr A pointer to GNCSplitReg
**/
void gsr_default_associate_handler (GNCSplitReg *gsr);
void gsr_default_doclink_handler (GNCSplitReg *gsr);
/** Default transaction association open handler
/** Default transaction document link open handler
*
* @param gsr A pointer to GNCSplitReg
**/
void gsr_default_associate_open_handler (GNCSplitReg *gsr);
void gsr_default_doclink_open_handler (GNCSplitReg *gsr);
/** Default transaction association delete handler
/** Default transaction document link delete handler
*
* @param gsr A pointer to GNCSplitReg
**/
void gsr_default_associate_remove_handler (GNCSplitReg *gsr);
void gsr_default_doclink_remove_handler (GNCSplitReg *gsr);
void gnc_split_reg_enter( GNCSplitReg *gsr, gboolean next_transaction );
void gsr_default_delete_handler( GNCSplitReg *gsr, gpointer data );

42
gnucash/register/ledger-core/split-register-layout.c
View File

@ -117,7 +117,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_LEDGER_NUM_ACTN);
@ -127,7 +127,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SINGLE_JOURNAL);
@ -148,7 +148,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_JOURNAL_NUM_ACTN);
@ -158,7 +158,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SPLIT);
@ -204,7 +204,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
copy_cursor_row (layout, curs, curs_last, 0);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, MEMO_CELL, 1, 4);
@ -213,7 +213,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
copy_cursor_row (layout, curs, curs_last, 0);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, MEMO_CELL, 1, 4);
@ -243,7 +243,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
copy_cursor_row (layout, curs, curs_last, 0);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, MEMO_CELL, 1, 4);
@ -301,7 +301,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_LEDGER_NUM_ACTN);
@ -311,7 +311,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SINGLE_JOURNAL);
@ -345,7 +345,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_JOURNAL_NUM_ACTN);
@ -354,7 +354,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SPLIT);
@ -405,7 +405,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_LEDGER_NUM_ACTN);
@ -415,7 +415,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SINGLE_JOURNAL);
@ -436,7 +436,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_JOURNAL_NUM_ACTN);
@ -446,7 +446,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SPLIT);
@ -488,7 +488,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, ACTN_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_LEDGER_NUM_ACTN);
@ -498,7 +498,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SINGLE_JOURNAL);
@ -518,7 +518,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_DOUBLE_JOURNAL_NUM_ACTN);
@ -528,7 +528,7 @@ gnc_split_register_set_cells (SplitRegister* reg, TableLayout* layout)
gnc_table_layout_set_cell (layout, curs, TNUM_CELL, 1, 1);
gnc_table_layout_set_cell (layout, curs, NOTES_CELL, 1, 2);
gnc_table_layout_set_cell (layout, curs, VNOTES_CELL, 1, 3);
gnc_table_layout_set_cell (layout, curs, ASSOC_CELL, 1, 4);
gnc_table_layout_set_cell (layout, curs, DOCLINK_CELL, 1, 4);
curs = gnc_table_layout_get_cursor (layout,
CURSOR_SPLIT);
@ -698,8 +698,8 @@ gnc_split_register_layout_add_cells (SplitRegister* reg,
FALSE);
gnc_register_add_cell (layout,
ASSOC_CELL,
ASSOC_CELL_TYPE_NAME,
DOCLINK_CELL,
DOCLINK_CELL_TYPE_NAME,
C_ ("Column header for 'Document Link'", "L"),
CELL_ALIGN_CENTER,
FALSE,

8
gnucash/register/ledger-core/split-register-load.c
View File

@ -70,7 +70,7 @@ gnc_split_register_load_recn_cells (SplitRegister* reg)
}
static void
gnc_split_register_load_associate_cells (SplitRegister* reg)
gnc_split_register_load_doclink_cells (SplitRegister* reg)
{
Doclinkcell *cell;
const char * s;
@ -78,7 +78,7 @@ gnc_split_register_load_associate_cells (SplitRegister* reg)
if (!reg) return;
cell = (Doclinkcell *)
gnc_table_layout_get_cell (reg->table->layout, ASSOC_CELL);
gnc_table_layout_get_cell (reg->table->layout, DOCLINK_CELL);
if (!cell) return;
@ -417,7 +417,7 @@ gnc_split_register_load (SplitRegister* reg, GList* slist,
gnc_account_print_info (default_account, FALSE));
gnc_doclink_cell_set_use_glyphs
((Doclinkcell *) gnc_table_layout_get_cell (table->layout, ASSOC_CELL));
((Doclinkcell *) gnc_table_layout_get_cell (table->layout, DOCLINK_CELL));
/* make sure we have a blank split */
if (blank_split == NULL)
@ -519,7 +519,7 @@ gnc_split_register_load (SplitRegister* reg, GList* slist,
/* load up account names into the transfer combobox menus */
gnc_split_register_load_xfer_cells (reg, default_account);
gnc_split_register_load_associate_cells (reg);
gnc_split_register_load_doclink_cells (reg);
gnc_split_register_load_recn_cells (reg);
gnc_split_register_load_type_cells (reg);
}

50
gnucash/register/ledger-core/split-register-model.c
View File

@ -328,8 +328,8 @@ gnc_split_register_get_action_label (VirtualLocation virt_loc,
}
static const char*
gnc_split_register_get_associate_label (VirtualLocation virt_loc,
gpointer user_data)
gnc_split_register_get_doclink_label (VirtualLocation virt_loc,
gpointer user_data)
{
return C_ ("Column header for 'Document Link'", "L");
}
@ -545,8 +545,8 @@ gnc_split_register_get_recn_tooltip (VirtualLocation virt_loc,
}
static char*
gnc_split_register_get_associate_tooltip (VirtualLocation virt_loc,
gpointer user_data)
gnc_split_register_get_doclink_tooltip (VirtualLocation virt_loc,
gpointer user_data)
{
SplitRegister* reg = user_data;
Transaction* trans;
@ -797,10 +797,10 @@ gnc_split_register_get_border (VirtualLocation virt_loc,
}
static const char*
gnc_split_register_get_associate_entry (VirtualLocation virt_loc,
gboolean translate,
gboolean* conditionally_changed,
gpointer user_data)
gnc_split_register_get_doclink_entry (VirtualLocation virt_loc,
gboolean translate,
gboolean* conditionally_changed,
gpointer user_data)
{
SplitRegister* reg = user_data;
Transaction* trans;
@ -808,7 +808,7 @@ gnc_split_register_get_associate_entry (VirtualLocation virt_loc,
const char* uri;
Doclinkcell *cell;
cell = (Doclinkcell *)gnc_table_layout_get_cell (reg->table->layout, ASSOC_CELL);
cell = (Doclinkcell *)gnc_table_layout_get_cell (reg->table->layout, DOCLINK_CELL);
if (!cell)
return NULL;
@ -851,8 +851,8 @@ gnc_split_register_get_associate_entry (VirtualLocation virt_loc,
}
static char *
gnc_split_register_get_associate_help (VirtualLocation virt_loc,
gpointer user_data)
gnc_split_register_get_doclink_help (VirtualLocation virt_loc,
gpointer user_data)
{
// do not want contents displayed as help so return space
return g_strdup (" ");
@ -861,12 +861,12 @@ gnc_split_register_get_associate_help (VirtualLocation virt_loc,
#if 0
// this code is not used yet
static char
gnc_split_register_get_associate_value (SplitRegister* reg,
VirtualLocation virt_loc)
gnc_split_register_get_doclink_value (SplitRegister* reg,
VirtualLocation virt_loc)
{
Doclinkcell *cell;
cell = (Doclinkcell *)gnc_table_layout_get_cell (reg->table->layout, ASSOC_CELL);
cell = (Doclinkcell *)gnc_table_layout_get_cell (reg->table->layout, DOCLINK_CELL);
if (!cell)
return '\0';
@ -2015,8 +2015,8 @@ gnc_split_register_get_recn_io_flags (VirtualLocation virt_loc,
}
static CellIOFlags
gnc_split_register_get_assoc_io_flags (VirtualLocation virt_loc,
gpointer user_data)
gnc_split_register_get_doclink_io_flags (VirtualLocation virt_loc,
gpointer user_data)
{
if (gnc_split_register_cursor_is_readonly (virt_loc, user_data))
return XACC_CELL_ALLOW_READ_ONLY;
@ -2582,8 +2582,8 @@ gnc_split_register_model_new (void)
TCRED_CELL);
gnc_table_model_set_entry_handler (model,
gnc_split_register_get_associate_entry,
ASSOC_CELL);
gnc_split_register_get_doclink_entry,
DOCLINK_CELL);
gnc_table_model_set_entry_handler (model,
gnc_split_register_get_type_entry,
@ -2683,8 +2683,8 @@ gnc_split_register_model_new (void)
TBALN_CELL);
gnc_table_model_set_label_handler (model,
gnc_split_register_get_associate_label,
ASSOC_CELL);
gnc_split_register_get_doclink_label,
DOCLINK_CELL);
gnc_table_model_set_label_handler (model,
gnc_split_register_get_type_label,
@ -2715,8 +2715,8 @@ gnc_split_register_model_new (void)
RECN_CELL);
gnc_table_model_set_tooltip_handler (model,
gnc_split_register_get_associate_tooltip,
ASSOC_CELL);
gnc_split_register_get_doclink_tooltip,
DOCLINK_CELL);
// help handlers
@ -2784,8 +2784,8 @@ gnc_split_register_model_new (void)
FDEBT_CELL);
gnc_table_model_set_help_handler (model,
gnc_split_register_get_associate_help,
ASSOC_CELL);
gnc_split_register_get_doclink_help,
DOCLINK_CELL);
// io flag handlers
gnc_table_model_set_io_flags_handler (
@ -2839,7 +2839,7 @@ gnc_split_register_model_new (void)
model, gnc_split_register_get_recn_io_flags, RECN_CELL);
gnc_table_model_set_io_flags_handler (
model, gnc_split_register_get_assoc_io_flags, ASSOC_CELL);
model, gnc_split_register_get_doclink_io_flags, DOCLINK_CELL);
gnc_table_model_set_io_flags_handler (
model, gnc_split_register_get_recn_io_flags, TYPE_CELL);

10
gnucash/register/ledger-core/split-register.c
View File

@ -579,7 +579,7 @@ gnc_split_register_duplicate_current (SplitRegister* reg)
const char* in_tnum = NULL;
char* out_num = NULL;
char* out_tnum = NULL;
char* out_tassoc = NULL;
char* out_tdoclink = NULL;
time64 date;
gboolean use_autoreadonly = qof_book_uses_autoreadonly (
gnc_get_current_book ());
@ -602,7 +602,7 @@ gnc_split_register_duplicate_current (SplitRegister* reg)
if (!gnc_dup_trans_dialog (gnc_split_register_get_parent (reg), NULL,
TRUE, &date, in_num, &out_num, in_tnum, &out_tnum,
xaccTransGetDocLink (trans), &out_tassoc))
xaccTransGetDocLink (trans), &out_tdoclink))
{
gnc_resume_gui_refresh ();
LEAVE ("dup cancelled");
@ -654,11 +654,11 @@ gnc_split_register_duplicate_current (SplitRegister* reg)
* because otherwise the ordering is not deterministic */
xaccTransSetDateEnteredSecs (new_trans, gnc_time (NULL));
/* clear the associated entry if returned value NULL */
if (out_tassoc == NULL)
/* clear the document link entry if returned value NULL */
if (out_tdoclink == NULL)
xaccTransSetDocLink (new_trans, "");
else
g_free (out_tassoc);
g_free (out_tdoclink);
/* set per book option */
gnc_set_num_action (new_trans, NULL, out_num, out_tnum);

2
gnucash/register/ledger-core/split-register.h
View File

@ -193,7 +193,7 @@ typedef enum
* @{
*/
#define ACTN_CELL "action"
#define ASSOC_CELL "associate"
#define DOCLINK_CELL "doclink"
#define BALN_CELL "balance"
#define CRED_CELL "credit"
#define DATE_CELL "date"

2
gnucash/register/register-core/register-common.c
View File

@ -58,7 +58,7 @@ gnc_register_init (void)
gnc_register_add_cell_type (RECN_CELL_TYPE_NAME, gnc_recn_cell_new);
gnc_register_add_cell_type (ASSOC_CELL_TYPE_NAME, gnc_doclink_cell_new);
gnc_register_add_cell_type (DOCLINK_CELL_TYPE_NAME, gnc_doclink_cell_new);
gnc_register_add_cell_type (QUICKFILL_CELL_TYPE_NAME,
gnc_quickfill_cell_new);

2
gnucash/register/register-core/register-common.h
View File

@ -67,7 +67,7 @@
#define NUM_CELL_TYPE_NAME "num-cell"
#define PRICE_CELL_TYPE_NAME "price-cell"
#define RECN_CELL_TYPE_NAME "recn-cell"
#define ASSOC_CELL_TYPE_NAME "assoc-cell"
#define DOCLINK_CELL_TYPE_NAME "doclink-cell"
#define QUICKFILL_CELL_TYPE_NAME "quickfill-cell"
#define FORMULA_CELL_TYPE_NAME "formula-cell"
#define CHECKBOX_CELL_TYPE_NAME "checkbox-cell"

8
gnucash/register/register-gnome/gnucash-register.c
View File

@ -646,16 +646,16 @@ GnucashSheet *gnucash_register_get_sheet (GnucashRegister *reg)
void
gnucash_register_set_open_assoc_cb (GnucashRegister *reg,
GFunc cb, gpointer cb_data)
gnucash_register_set_open_doclink_cb (GnucashRegister *reg,
GFunc cb, gpointer cb_data)
{
GnucashSheet *sheet;
if (!reg || !reg->sheet)
return;
sheet = GNUCASH_SHEET(reg->sheet);
sheet->open_assoc_cb = cb;
sheet->open_assoc_cb_data = cb_data;
sheet->open_doclink_cb = cb;
sheet->open_doclink_cb_data = cb_data;
}

4
gnucash/register/register-gnome/gnucash-register.h
View File

@ -81,8 +81,8 @@ void gnucash_register_paste_clipboard (GnucashRegister *reg);
void gnucash_register_refresh_from_prefs (GnucashRegister *reg);
void gnucash_register_set_moved_cb (GnucashRegister *reg,
GFunc cb, gpointer cb_data);
void gnucash_register_set_open_assoc_cb (GnucashRegister *reg,
GFunc cb, gpointer cb_data);
void gnucash_register_set_open_doclink_cb (GnucashRegister *reg,
GFunc cb, gpointer cb_data);
GnucashSheet *gnucash_register_get_sheet (GnucashRegister *reg);
void gnucash_register_reset_sheet_layout (GnucashRegister *reg);

8
gnucash/register/register-gnome/gnucash-sheet.c
View File

@ -1546,11 +1546,11 @@ gnucash_sheet_button_press_event (GtkWidget *widget, GdkEventButton *event)
//FIXME does something need to be done if changed_cells is true or false ?
gnucash_sheet_cursor_move (sheet, new_virt_loc);
// if clicked in associate cell, run call back
if (g_strcmp0 (gnc_table_get_cell_name (table, new_virt_loc), ASSOC_CELL) == 0)
// if clicked in ocument link cell, run call back
if (g_strcmp0 (gnc_table_get_cell_name (table, new_virt_loc), DOCLINK_CELL) == 0)
{
if (sheet->open_assoc_cb)
(sheet->open_assoc_cb)(sheet->open_assoc_cb_data, NULL);
if (sheet->open_doclink_cb)
(sheet->open_doclink_cb)(sheet->open_doclink_cb_data, NULL);
}
if (button_1)

4
gnucash/register/register-gnome/gnucash-sheetP.h
View File

@ -95,8 +95,8 @@ struct _GnucashSheet
GFunc moved_cb;
gpointer moved_cb_data;
GFunc open_assoc_cb;
gpointer open_assoc_cb_data;
GFunc open_doclink_cb;
gpointer open_doclink_cb_data;
guint shift_state;
guint keyval_state;