r14571 - gnucash/branches/deprecated-cleanup - Regularize column names. Use enums instead of a sequence of #defines.
David Hampton
hampton at cvs.gnucash.org
Thu Jul 27 22:22:59 EDT 2006
Author: hampton
Date: 2006-07-27 22:22:58 -0400 (Thu, 27 Jul 2006)
New Revision: 14571
Trac: http://svn.gnucash.org/trac/changeset/14571
Modified:
gnucash/branches/deprecated-cleanup/ChangeLog
gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-billterms.c
gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/dialog-tax-table.c
gnucash/branches/deprecated-cleanup/src/gnome-search/dialog-search.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/dialog-account.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-account-sel.c
gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
gnucash/branches/deprecated-cleanup/src/gnome/druid-loan.c
gnucash/branches/deprecated-cleanup/src/gnome/druid-stock-split.c
gnucash/branches/deprecated-cleanup/src/gnome/lot-viewer.c
gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c
gnucash/branches/deprecated-cleanup/src/import-export/qif-import/druid-qif-import.c
gnucash/branches/deprecated-cleanup/src/report/report-gnome/dialog-column-view.c
Log:
Regularize column names. Use enums instead of a sequence of #defines.
Modified: gnucash/branches/deprecated-cleanup/ChangeLog
===================================================================
--- gnucash/branches/deprecated-cleanup/ChangeLog 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/ChangeLog 2006-07-28 02:22:58 UTC (rev 14571)
@@ -1,5 +1,21 @@
-2006-07-12 David Hampton <hampton at cisco.com>
+2006-07-27 David Hampton <hampton at employees.org>
+ * src/import-export/qif-import/druid-qif-import.c:
+ * src/import-export/hbci/druid-hbci-initial.c:
+ * src/report/report-gnome/dialog-column-view.c:
+ * src/business/business-gnome/dialog-billterms.c:
+ * src/business/dialog-tax-table/dialog-tax-table.c:
+ * src/gnome-utils/gnc-druid-provider-multifile-gnome.c:
+ * src/gnome-utils/gnc-account-sel.c:
+ * src/gnome-utils/dialog-account.c:
+ * src/gnome/druid-loan.c:
+ * src/gnome/lot-viewer.c:
+ * src/gnome/druid-stock-split.c:
+ * src/gnome-search/dialog-search.c: Regularize column names. Use
+ enums instead of a sequence of #defines.
+
+2006-07-12 David Hampton <hampton at employees.org>
+
* various: Pull trunk changes 14460:14486 into branch.
2006-07-03 David Hampton <hampton at employees.org>
Modified: gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-billterms.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-billterms.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/business/business-gnome/dialog-billterms.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -40,8 +40,11 @@
#define DIALOG_BILLTERMS_CM_CLASS "billterms-dialog"
-#define TERM_NAME 0
-#define TERM_TERM 1
+enum term_cols {
+ BILL_TERM_COL_NAME = 0,
+ BILL_TERM_COL_TERM,
+ NUM_BILL_TERM_COLS
+};
void billterms_new_term_cb (GtkButton *button, BillTermsWindow *btw);
void billterms_delete_term_cb (GtkButton *button, BillTermsWindow *btw);
@@ -511,8 +514,8 @@
gtk_list_store_prepend(store, &iter);
gtk_list_store_set(store, &iter,
- TERM_NAME, gncBillTermGetName(term),
- TERM_TERM, term,
+ BILL_TERM_COL_NAME, gncBillTermGetName(term),
+ BILL_TERM_COL_TERM, term,
-1);
if (term == btw->current_term) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
@@ -550,7 +553,7 @@
g_return_if_fail (btw);
if (gtk_tree_selection_get_selected(selection, &model, &iter))
- gtk_tree_model_get(model, &iter, TERM_TERM, &term, -1);
+ gtk_tree_model_get(model, &iter, BILL_TERM_COL_TERM, &term, -1);
/* If we've changed, then reset the term list */
if (term != btw->current_term)
@@ -700,12 +703,12 @@
/* Initialize the view */
view = GTK_TREE_VIEW(btw->terms_view);
- store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
+ store = gtk_list_store_new (NUM_BILL_TERM_COLS, G_TYPE_STRING, G_TYPE_POINTER);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", TERM_NAME,
+ "text", BILL_TERM_COL_NAME,
NULL);
gtk_tree_view_append_column(view, column);
Modified: gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/dialog-tax-table.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/dialog-tax-table.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/business/dialog-tax-table/dialog-tax-table.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -44,12 +44,18 @@
#define DIALOG_TAX_TABLE_CM_CLASS "tax-table-dialog"
#define GCONF_SECTION "dialogs/business/tax_tables"
-#define TABLE_NAME 0
-#define TABLE_POINTER 1
+enum tax_table_cols {
+ TAX_TABLE_COL_NAME = 0,
+ TAX_TABLE_COL_POINTER,
+ NUM_TAX_TABLE_COLS
+};
-#define ENTRY_NAME 0
-#define ENTRY_POINTER 1
-#define ENTRY_AMOUNT 2
+enum tax_entry_cols {
+ TAX_ENTRY_COL_NAME = 0,
+ TAX_ENTRY_COL_POINTER,
+ TAX_ENTRY_COL_AMOUNT,
+ NUM_TAX_ENTRY_COLS
+};
void tax_table_new_table_cb (GtkButton *button, TaxTableWindow *ttw);
void tax_table_delete_table_cb (GtkButton *button, TaxTableWindow *ttw);
@@ -362,9 +368,9 @@
gtk_list_store_prepend(store, &iter);
gtk_list_store_set(store, &iter,
- ENTRY_NAME, row_text[0],
- ENTRY_POINTER, entry,
- ENTRY_AMOUNT, row_text[1],
+ TAX_ENTRY_COL_NAME, row_text[0],
+ TAX_ENTRY_COL_POINTER, entry,
+ TAX_ENTRY_COL_AMOUNT, row_text[1],
-1);
if (entry == selected_entry) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
@@ -422,8 +428,8 @@
gtk_list_store_prepend(store, &iter);
gtk_list_store_set(store, &iter,
- TABLE_NAME, gncTaxTableGetName (table),
- TABLE_POINTER, table,
+ TAX_TABLE_COL_NAME, gncTaxTableGetName (table),
+ TAX_TABLE_COL_POINTER, table,
-1);
if (table == ttw->current_table) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
@@ -467,7 +473,7 @@
if (!gtk_tree_selection_get_selected(selection, &model, &iter))
return;
- gtk_tree_model_get(model, &iter, TABLE_POINTER, &table, -1);
+ gtk_tree_model_get(model, &iter, TAX_TABLE_COL_POINTER, &table, -1);
g_return_if_fail (table);
/* If we've changed, then reset the entry list */
@@ -494,7 +500,7 @@
return;
}
- gtk_tree_model_get(model, &iter, ENTRY_POINTER, &ttw->current_entry, -1);
+ gtk_tree_model_get(model, &iter, TAX_ENTRY_COL_POINTER, &ttw->current_entry, -1);
}
static void
@@ -677,12 +683,13 @@
/* Create the tax tables view */
view = GTK_TREE_VIEW(ttw->names_view);
- store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
+ store = gtk_list_store_new (NUM_TAX_TABLE_COLS, G_TYPE_STRING,
+ G_TYPE_POINTER);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", TABLE_NAME,
+ "text", TAX_TABLE_COL_NAME,
NULL);
gtk_tree_view_append_column(view, column);
@@ -693,12 +700,13 @@
/* Create the tax table entries view */
view = GTK_TREE_VIEW(ttw->entries_view);
- store = gtk_list_store_new (3, G_TYPE_STRING, G_TYPE_POINTER, G_TYPE_STRING);
+ store = gtk_list_store_new (NUM_TAX_ENTRY_COLS, G_TYPE_STRING,
+ G_TYPE_POINTER, G_TYPE_STRING);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", ENTRY_NAME,
+ "text", TAX_ENTRY_COL_NAME,
NULL);
gtk_tree_view_append_column(view, column);
Modified: gnucash/branches/deprecated-cleanup/src/gnome/druid-loan.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/druid-loan.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome/druid-loan.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -100,10 +100,13 @@
#define OPT_VBOX_SPACING 2
-#define COLUMN_DATE 0
-#define COLUMN_PAYMENT 1
-#define COLUMN_PRINCIPAL 2
-#define COLUMN_INTEREST 3
+enum loan_cols {
+ LOAN_COL_DATE = 0,
+ LOAN_COL_PAYMENT,
+ LOAN_COL_PRINCIPAL,
+ LOAN_COL_INTEREST,
+ NUM_LOAN_COLS
+};
typedef enum {
CURRENT_YEAR,
@@ -1774,25 +1777,25 @@
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
- "text", COLUMN_DATE,
+ "text", LOAN_COL_DATE,
NULL);
gtk_tree_view_append_column(ldd->revView, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Payment"), renderer,
- "text", COLUMN_PAYMENT,
+ "text", LOAN_COL_PAYMENT,
NULL);
gtk_tree_view_append_column(ldd->revView, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Principal"), renderer,
- "text", COLUMN_PRINCIPAL,
+ "text", LOAN_COL_PRINCIPAL,
NULL);
gtk_tree_view_append_column(ldd->revView, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Interest"), renderer,
- "text", COLUMN_INTEREST,
+ "text", LOAN_COL_INTEREST,
NULL);
gtk_tree_view_append_column(ldd->revView, column);
@@ -1806,7 +1809,7 @@
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes
(ldd->ld.repayOpts[i]->name, renderer,
- "text", COLUMN_INTEREST + i,
+ "text", LOAN_COL_INTEREST + i,
NULL);
gtk_tree_view_append_column(ldd->revView, column);
}
@@ -2835,7 +2838,7 @@
gtk_list_store_append(store, &iter);
qof_print_gdate( tmpBuf, MAX_DATE_LENGTH, &rrr->date );
- gtk_list_store_set( store, &iter, COLUMN_DATE, tmpBuf, -1 );
+ gtk_list_store_set( store, &iter, LOAN_COL_DATE, tmpBuf, -1 );
for ( i=0; i<ldd->ld.revNumPmts; i++ )
{
Modified: gnucash/branches/deprecated-cleanup/src/gnome/druid-stock-split.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/druid-stock-split.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome/druid-stock-split.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -47,10 +47,13 @@
#define DRUID_STOCK_SPLIT_CM_CLASS "druid-stock-split"
-#define COLUMN_ACCOUNT 0
-#define COLUMN_FULLNAME 1
-#define COLUMN_MNEMONIC 2
-#define COLUMN_SHARES 3
+enum split_cols {
+ SPLIT_COL_ACCOUNT = 0,
+ SPLIT_COL_FULLNAME,
+ SPLIT_COL_MNEMONIC,
+ SPLIT_COL_SHARES,
+ NUM_SPLIT_COLS
+};
/** structures *********************************************************/
typedef struct
@@ -154,10 +157,10 @@
gtk_list_store_append(list, &iter);
gtk_list_store_set(list, &iter,
- COLUMN_ACCOUNT, account,
- COLUMN_FULLNAME, full_name,
- COLUMN_MNEMONIC, gnc_commodity_get_mnemonic(commodity),
- COLUMN_SHARES, xaccPrintAmount(balance, print_info),
+ SPLIT_COL_ACCOUNT, account,
+ SPLIT_COL_FULLNAME, full_name,
+ SPLIT_COL_MNEMONIC, gnc_commodity_get_mnemonic(commodity),
+ SPLIT_COL_SHARES, xaccPrintAmount(balance, print_info),
-1);
if (account == selected_account) {
@@ -197,7 +200,7 @@
if (!gtk_tree_selection_get_selected(selection, &list, &iter))
return;
gtk_tree_model_get(list, &iter,
- COLUMN_ACCOUNT, &info->acct,
+ SPLIT_COL_ACCOUNT, &info->acct,
-1);
}
@@ -597,25 +600,25 @@
view = GTK_TREE_VIEW(info->account_view);
- store = gtk_list_store_new(4, G_TYPE_POINTER, G_TYPE_STRING,
+ store = gtk_list_store_new(NUM_SPLIT_COLS, G_TYPE_POINTER, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Account"), renderer,
- "text", COLUMN_FULLNAME,
+ "text", SPLIT_COL_FULLNAME,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Symbol"), renderer,
- "text", COLUMN_MNEMONIC,
+ "text", SPLIT_COL_MNEMONIC,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Shares"), renderer,
- "text", COLUMN_SHARES,
+ "text", SPLIT_COL_SHARES,
NULL);
gtk_tree_view_append_column(view, column);
Modified: gnucash/branches/deprecated-cleanup/src/gnome/lot-viewer.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome/lot-viewer.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome/lot-viewer.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -50,13 +50,15 @@
#define LOT_VIEWER_CM_CLASS "lot-viewer"
-#define OPEN_COL 0
-#define CLOSE_COL 1
-#define TITLE_COL 2
-#define BALN_COL 3
-#define GAINS_COL 4
-#define PNTR_COL 5
-#define NUM_COLS 6
+enum lot_cols {
+ LOT_COL_OPEN = 0,
+ LOT_COL_CLOSE,
+ LOT_COL_TITLE,
+ LOT_COL_BALN,
+ LOT_COL_GAINS,
+ LOT_COL_PNTR,
+ NUM_LOT_COLS
+};
#define RESPONSE_VIEW 1
#define RESPONSE_DELETE 2
@@ -299,7 +301,7 @@
GtkTreeIter iter;
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- gtk_tree_model_get(model, &iter, PNTR_COL, &lot, -1);
+ gtk_tree_model_get(model, &iter, LOT_COL_PNTR, &lot, -1);
lv_select_row(lv, lot);
} else {
lv_unselect_row(lv);
@@ -322,7 +324,7 @@
selection = gtk_tree_view_get_selection(lv->lot_view);
if (gtk_tree_selection_get_selected (selection, &model, &iter)) {
- gtk_list_store_set(GTK_LIST_STORE(model), &iter, TITLE_COL, title, -1);
+ gtk_list_store_set(GTK_LIST_STORE(model), &iter, LOT_COL_TITLE, title, -1);
}
}
@@ -391,7 +393,7 @@
selection = gtk_tree_view_get_selection(lv->lot_view);
if (gtk_tree_selection_get_selected (selection, &model, &iter))
- gtk_tree_model_get(model, &iter, PNTR_COL, &selected_lot, -1);
+ gtk_tree_model_get(model, &iter, LOT_COL_PNTR, &selected_lot, -1);
/* Crazy. Should update in place if possible. */
gtk_list_store_clear (lv->lot_store);
@@ -409,14 +411,13 @@
gnc_numeric amt_baln = gnc_lot_get_balance (lot);
gnc_commodity *currency = find_first_currency (lot);
gnc_numeric gains_baln = get_realized_gains (lot, currency);
- const char *row_vals[NUM_COLS];
store = lv->lot_store;
gtk_list_store_append(store, &iter);
/* Opening date */
qof_print_date_buff (obuff, MAX_DATE_LENGTH, open_date);
- gtk_list_store_set(store, &iter, OPEN_COL, obuff, -1);
+ gtk_list_store_set(store, &iter, LOT_COL_OPEN, obuff, -1);
/* Closing date */
if (gnc_lot_is_closed (lot))
@@ -426,29 +427,28 @@
time_t close_date = xaccTransGetDate (ftrans);
qof_print_date_buff (cbuff, MAX_DATE_LENGTH, close_date);
- gtk_list_store_set(store, &iter, CLOSE_COL, cbuff, -1);
- row_vals[CLOSE_COL] = cbuff;
+ gtk_list_store_set(store, &iter, LOT_COL_CLOSE, cbuff, -1);
}
else
{
- gtk_list_store_set(store, &iter, CLOSE_COL, cbuff, _("Open"), -1);
+ gtk_list_store_set(store, &iter, LOT_COL_CLOSE, cbuff, _("Open"), -1);
}
/* Title */
- gtk_list_store_set(store, &iter, TITLE_COL, gnc_lot_get_title(lot), -1);
+ gtk_list_store_set(store, &iter, LOT_COL_TITLE, gnc_lot_get_title(lot), -1);
/* Amount */
xaccSPrintAmount (baln_buff, amt_baln,
gnc_account_print_info (lv->account, TRUE));
- gtk_list_store_set(store, &iter, BALN_COL, baln_buff, -1);
+ gtk_list_store_set(store, &iter, LOT_COL_BALN, baln_buff, -1);
/* Capital Gains/Losses Appreciation/Depreciation */
xaccSPrintAmount (gain_buff, gains_baln,
gnc_commodity_print_info (currency, TRUE));
- gtk_list_store_set(store, &iter, GAINS_COL, gain_buff, -1);
+ gtk_list_store_set(store, &iter, LOT_COL_GAINS, gain_buff, -1);
/* Self-reference */
- gtk_list_store_set(store, &iter, PNTR_COL, lot, -1);
+ gtk_list_store_set(store, &iter, LOT_COL_PNTR, lot, -1);
}
/* re-select the row that the user had previously selected,
@@ -457,7 +457,7 @@
model = GTK_TREE_MODEL(lv->lot_store);
if (gtk_tree_model_get_iter_first(model, &iter)) {
do {
- gtk_tree_model_get(model, &iter, PNTR_COL, &this_lot, -1);
+ gtk_tree_model_get(model, &iter, LOT_COL_PNTR, &this_lot, -1);
if (this_lot == selected_lot) {
gtk_tree_selection_select_iter(selection, &iter);
found = TRUE;
@@ -598,7 +598,7 @@
g_return_if_fail(GTK_IS_TREE_VIEW(lv->lot_view));
view = lv->lot_view;
- store = gtk_list_store_new(NUM_COLS, G_TYPE_STRING, G_TYPE_STRING,
+ store = gtk_list_store_new(NUM_LOT_COLS, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_POINTER);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
@@ -607,27 +607,27 @@
/* Set up the columns */
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Opened"), renderer,
- "text", OPEN_COL, NULL);
+ "text", LOT_COL_OPEN, NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Closed"), renderer,
- "text", CLOSE_COL, NULL);
+ "text", LOT_COL_CLOSE, NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Title"), renderer,
- "text", TITLE_COL, NULL);
+ "text", LOT_COL_TITLE, NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Balance"), renderer,
- "text", BALN_COL, NULL);
+ "text", LOT_COL_BALN, NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Gains"), renderer,
- "text", GAINS_COL, NULL);
+ "text", LOT_COL_GAINS, NULL);
gtk_tree_view_append_column(view, column);
/* Set up the selection callbacks */
Modified: gnucash/branches/deprecated-cleanup/src/gnome-search/dialog-search.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-search/dialog-search.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome-search/dialog-search.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -52,9 +52,11 @@
GNC_SEARCH_MATCH_ANY = 1
} GNCSearchType;
-#define COL_NAME 0
-#define COL_POINTER 1
-#define NUM_COLS 2
+enum search_cols {
+ SEARCH_COL_NAME = 0,
+ SEARCH_COL_POINTER,
+ NUM_SEARCH_COLS
+};
struct _GNCSearchWindow {
GtkWidget * dialog;
@@ -565,7 +567,7 @@
if (!gtk_combo_box_get_active_iter(combo_box, &iter))
return;
model = gtk_combo_box_get_model(combo_box);
- gtk_tree_model_get(model, &iter, COL_POINTER, ¶m, -1);
+ gtk_tree_model_get(model, &iter, SEARCH_COL_POINTER, ¶m, -1);
if (gnc_search_param_type_match (param, data->param)) {
/* The param type is the same, just save the new param */
@@ -640,13 +642,13 @@
data->container = hbox;
data->param = sw->last_param;
- store = gtk_list_store_new(NUM_COLS, G_TYPE_STRING, G_TYPE_POINTER);
+ store = gtk_list_store_new(NUM_SEARCH_COLS, G_TYPE_STRING, G_TYPE_POINTER);
combo_box = gtk_combo_box_new_with_model(GTK_TREE_MODEL(store));
cell = gtk_cell_renderer_text_new ();
gtk_cell_layout_pack_start(GTK_CELL_LAYOUT (combo_box), cell, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), cell,
- "text", COL_NAME,
+ "text", SEARCH_COL_NAME,
NULL);
for (l = sw->params_list; l; l = l->next) {
@@ -654,8 +656,8 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- COL_NAME, _(param->title),
- COL_POINTER, param,
+ SEARCH_COL_NAME, _(param->title),
+ SEARCH_COL_POINTER, param,
-1);
if (param == sw->last_param) /* is this the right parameter to start? */
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/dialog-account.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/dialog-account.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/dialog-account.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -54,10 +54,13 @@
#define DIALOG_EDIT_ACCOUNT_CM_CLASS "dialog-edit-account"
#define GCONF_SECTION "dialogs/account"
-#define COLUMN_FULLNAME 0
-#define COLUMN_FIELDNAME 1
-#define COLUMN_OLD_VALUE 2
-#define COLUMN_NEW_VALUE 3
+enum account_cols {
+ ACCOUNT_COL_FULLNAME = 0,
+ ACCOUNT_COL_FIELDNAME,
+ ACCOUNT_COL_OLD_VALUE,
+ ACCOUNT_COL_NEW_VALUE,
+ NUM_ACCOUNT_COLS
+};
typedef enum
{
@@ -586,10 +589,10 @@
gtk_list_store_append(fs->list, &iter);
gtk_list_store_set(fs->list, &iter,
- COLUMN_FULLNAME, full_name,
- COLUMN_FIELDNAME, account_field_name,
- COLUMN_OLD_VALUE, account_field_value,
- COLUMN_NEW_VALUE, value_str,
+ ACCOUNT_COL_FULLNAME, full_name,
+ ACCOUNT_COL_FIELDNAME, account_field_name,
+ ACCOUNT_COL_OLD_VALUE, account_field_value,
+ ACCOUNT_COL_NEW_VALUE, value_str,
-1);
g_free(full_name);
fs->count++;
@@ -634,7 +637,7 @@
if (!account)
return FALSE;
- store = gtk_list_store_new(4, G_TYPE_STRING, G_TYPE_STRING,
+ store = gtk_list_store_new(NUM_ACCOUNT_COLS, G_TYPE_STRING, G_TYPE_STRING,
G_TYPE_STRING, G_TYPE_STRING);
size = 0;
@@ -647,31 +650,31 @@
}
gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
- COLUMN_FULLNAME,
+ ACCOUNT_COL_FULLNAME,
GTK_SORT_ASCENDING);
view = GTK_TREE_VIEW(gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Account"), renderer,
- "text", COLUMN_FULLNAME,
+ "text", ACCOUNT_COL_FULLNAME,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Field"), renderer,
- "text", COLUMN_FIELDNAME,
+ "text", ACCOUNT_COL_FIELDNAME,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Old Value"), renderer,
- "text", COLUMN_OLD_VALUE,
+ "text", ACCOUNT_COL_OLD_VALUE,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("New Value"), renderer,
- "text", COLUMN_NEW_VALUE,
+ "text", ACCOUNT_COL_NEW_VALUE,
NULL);
gtk_tree_view_append_column(view, column);
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-account-sel.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-account-sel.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-account-sel.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -45,8 +45,11 @@
LAST_SIGNAL
};
-#define COLUMN_ACCT_NAME 0
-#define COLUMN_ACCT_PTR 1
+enum account_cols {
+ ACCT_COL_NAME = 0,
+ ACCT_COL_PTR,
+ NUM_ACCT_COLS
+};
static guint account_sel_signals [LAST_SIGNAL] = { 0 };
@@ -137,9 +140,9 @@
gas->acctTypeFilters = FALSE;
gas->newAccountButton = NULL;
- gas->store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
+ gas->store = gtk_list_store_new(NUM_ACCT_COLS, G_TYPE_STRING, G_TYPE_POINTER);
widget =
- gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(gas->store), COLUMN_ACCT_NAME);
+ gtk_combo_box_entry_new_with_model(GTK_TREE_MODEL(gas->store), ACCT_COL_NAME);
gas->combo = GTK_COMBO_BOX_ENTRY(widget);
gtk_combo_box_set_model(GTK_COMBO_BOX(widget),
GTK_TREE_MODEL(gas->store));
@@ -195,8 +198,8 @@
name = xaccAccountGetFullName(acc);
gtk_list_store_append(gas->store, &iter);
gtk_list_store_set(gas->store, &iter,
- COLUMN_ACCT_NAME, name,
- COLUMN_ACCT_PTR, acc,
+ ACCT_COL_NAME, name,
+ ACCT_COL_PTR, acc,
-1);
if (g_utf8_collate(name, currentSel) == 0) {
active = i;
@@ -262,7 +265,7 @@
{
Account *model_acc;
- gtk_tree_model_get(model, iter, COLUMN_ACCT_PTR, &model_acc, -1);
+ gtk_tree_model_get(model, iter, ACCT_COL_PTR, &model_acc, -1);
if (data->acct != model_acc)
return FALSE;
@@ -295,7 +298,7 @@
return NULL;
gtk_tree_model_get(GTK_TREE_MODEL(gas->store), &iter,
- COLUMN_ACCT_PTR, &acc,
+ ACCT_COL_PTR, &acc,
-1);
return acc;
}
@@ -426,7 +429,7 @@
if (!recursive) {
do {
- gtk_tree_model_get(model, &iter, COLUMN_ACCT_PTR, &acc, -1);
+ gtk_tree_model_get(model, &iter, ACCT_COL_PTR, &acc, -1);
if (acc == target) {
gtk_list_store_remove(gas->store, &iter);
break;
@@ -434,7 +437,7 @@
} while (gtk_tree_model_iter_next(model, &iter));
} else {
do {
- gtk_tree_model_get(model, &iter, COLUMN_ACCT_PTR, &acc, -1);
+ gtk_tree_model_get(model, &iter, ACCT_COL_PTR, &acc, -1);
while (acc) {
if (acc == target)
break;
Modified: gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-druid-provider-multifile-gnome.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-druid-provider-multifile-gnome.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/gnome-utils/gnc-druid-provider-multifile-gnome.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -11,8 +11,11 @@
#include "gnc-ui.h"
#include "gnc-gui-query.h"
-#define FILE_FILENAME 0
-#define FILE_POINTER 1
+enum file_cols {
+ FILE_COL_FILENAME = 0,
+ FILE_COL_POINTER,
+ NUM_FILE_COLS
+};
static void gnc_druid_provider_multifile_gnome_class_init (GNCDruidProviderMultifileGnomeClass *class);
static void gnc_druid_provider_multifile_gnome_finalize (GObject *obj);
@@ -63,7 +66,7 @@
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
gtk_tree_model_get(model, &iter,
- FILE_POINTER, &prov_mf->selected_file,
+ FILE_COL_POINTER, &prov_mf->selected_file,
-1);
} else {
prov_mf->selected_file = NULL;
@@ -93,8 +96,8 @@
gtk_list_store_prepend(store, &iter);
gtk_list_store_set(store, &iter,
- FILE_FILENAME, filename,
- FILE_POINTER, list->data,
+ FILE_COL_FILENAME, filename,
+ FILE_COL_POINTER, list->data,
-1);
if (prov_mf->selected_file == list->data) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
@@ -260,12 +263,12 @@
prov->file_view = view;
/* Set up the file view */
- store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_POINTER);
+ store = gtk_list_store_new (NUM_FILE_COLS, G_TYPE_STRING, G_TYPE_POINTER);
gtk_tree_view_set_model(GTK_TREE_VIEW(view), GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", FILE_FILENAME,
+ "text", FILE_COL_FILENAME,
NULL);
gtk_tree_view_append_column(GTK_TREE_VIEW(view), column);
Modified: gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/import-export/hbci/druid-hbci-initial.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -51,11 +51,14 @@
/* #define DEFAULT_HBCI_VERSION 201 */
-#define COLUMN_INDEX 0
-#define COLUMN_HBCI_NAME 1
-#define COLUMN_HBCI_ACCT 2
-#define COLUMN_GNC_NAME 3
-#define COLUMN_CHECKED 4
+enum account_list_cols {
+ ACCOUNT_LIST_COL_INDEX = 0,
+ ACCOUNT_LIST_COL_HBCI_NAME,
+ ACCOUNT_LIST_COL_HBCI_ACCT,
+ ACCOUNT_LIST_COL_GNC_NAME,
+ ACCOUNT_LIST_COL_CHECKED,
+ NUM_ACCOUNT_LIST_COLS
+};
typedef enum _infostate {
INI_UPDATE_ACCOUNTS,
@@ -168,10 +171,10 @@
gtk_list_store_append(info->accountstore, &iter);
gtk_list_store_set(info->accountstore, &iter,
- COLUMN_HBCI_NAME, hbci_name,
- COLUMN_HBCI_ACCT, hacc,
- COLUMN_GNC_NAME, gnc_name,
- COLUMN_CHECKED, FALSE,
+ ACCOUNT_LIST_COL_HBCI_NAME, hbci_name,
+ ACCOUNT_LIST_COL_HBCI_ACCT, hacc,
+ ACCOUNT_LIST_COL_GNC_NAME, gnc_name,
+ ACCOUNT_LIST_COL_CHECKED, FALSE,
-1);
g_free(gnc_name);
@@ -371,7 +374,7 @@
return;
gtk_tree_selection_unselect_iter(selection, &iter);
gtk_tree_model_get(model, &iter,
- COLUMN_HBCI_ACCT, &hbci_acc,
+ ACCOUNT_LIST_COL_HBCI_ACCT, &hbci_acc,
-1);
if (hbci_acc) {
@@ -400,12 +403,12 @@
g_hash_table_insert (info->gnc_hash, hbci_acc, gnc_acc);
gnc_name = xaccAccountGetFullName (gnc_acc);
gtk_list_store_set(info->accountstore, &iter,
- COLUMN_GNC_NAME, gnc_name,
+ ACCOUNT_LIST_COL_GNC_NAME, gnc_name,
-1);
g_free(gnc_name);
} else {
gtk_list_store_set(info->accountstore, &iter,
- COLUMN_GNC_NAME, "",
+ ACCOUNT_LIST_COL_GNC_NAME, "",
-1);
}
} /* hbci_acc */
@@ -702,7 +705,8 @@
info->accountpage = page;
info->accountview =
GTK_TREE_VIEW(glade_xml_get_widget(xml, "account_page_view"));
- info->accountstore = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_STRING,
+ info->accountstore = gtk_list_store_new(NUM_ACCOUNT_LIST_COLS,
+ G_TYPE_INT, G_TYPE_STRING,
G_TYPE_POINTER, G_TYPE_STRING,
G_TYPE_BOOLEAN);
gtk_tree_view_set_model(info->accountview, GTK_TREE_MODEL(info->accountstore));
@@ -710,14 +714,14 @@
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("HBCI account name"),
renderer,
- "text", COLUMN_HBCI_NAME,
+ "text", ACCOUNT_LIST_COL_HBCI_NAME,
NULL);
gtk_tree_view_append_column(info->accountview, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("GnuCash account name"),
renderer,
- "text", COLUMN_GNC_NAME,
+ "text", ACCOUNT_LIST_COL_GNC_NAME,
NULL);
gtk_tree_view_append_column(info->accountview, column);
gtk_tree_view_column_set_expand(column, TRUE);
@@ -725,7 +729,7 @@
renderer = gtk_cell_renderer_toggle_new();
column = gtk_tree_view_column_new_with_attributes(_("New?"),
renderer,
- "active", COLUMN_CHECKED,
+ "active", ACCOUNT_LIST_COL_CHECKED,
NULL);
gtk_tree_view_append_column(info->accountview, column);
Modified: gnucash/branches/deprecated-cleanup/src/import-export/qif-import/druid-qif-import.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/import-export/qif-import/druid-qif-import.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/import-export/qif-import/druid-qif-import.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -55,19 +55,28 @@
#define PREV_ROW "prev_row"
-#define FILENAME_INDEX 0
-#define FILENAME_NAME 1
+enum filename_cols {
+ FILENAME_COL_INDEX = 0,
+ FILENAME_COL_NAME,
+ NUM_FILENAME_COLS
+};
-#define ACCOUNT_INDEX 0
-#define ACCOUNT_QIF_NAME 1
-#define ACCOUNT_GNC_NAME 2
-#define ACCOUNT_NEW 3
+enum account_cols {
+ ACCOUNT_COL_INDEX = 0,
+ ACCOUNT_COL_QIF_NAME,
+ ACCOUNT_COL_GNC_NAME,
+ ACCOUNT_COL_NEW,
+ NUM_ACCOUNT_COLS
+};
-#define QIF_TRANS_INDEX 0
-#define QIF_TRANS_DATE 1
-#define QIF_TRANS_DESCRIPTION 2
-#define QIF_TRANS_AMOUNT 3
-#define QIF_TRANS_CHECKED 4
+enum qif_trans_cols {
+ QIF_TRANS_COL_INDEX = 0,
+ QIF_TRANS_COL_DATE,
+ QIF_TRANS_COL_DESCRIPTION,
+ QIF_TRANS_COL_AMOUNT,
+ QIF_TRANS_COL_CHECKED,
+ NUM_QIF_TRANS_COLS
+};
struct _qifimportwindow {
GtkWidget * window;
@@ -688,7 +697,7 @@
gint row;
if (gtk_tree_selection_get_selected(selection, &model, &iter)) {
- gtk_tree_model_get(model, &iter, FILENAME_INDEX, &row, -1);
+ gtk_tree_model_get(model, &iter, FILENAME_COL_INDEX, &row, -1);
if(SCM_LISTP(wind->imported_files) &&
(scm_ilength(wind->imported_files) > row)) {
scm_gc_unprotect_object(wind->selected_file);
@@ -805,8 +814,8 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- FILENAME_INDEX, row++,
- FILENAME_NAME, row_text,
+ FILENAME_COL_INDEX, row++,
+ FILENAME_COL_NAME, row_text,
-1);
if(scm_qiffile == wind->selected_file) {
path = gtk_tree_model_get_path(GTK_TREE_MODEL(store), &iter);
@@ -939,10 +948,10 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- ACCOUNT_INDEX, row++,
- ACCOUNT_QIF_NAME, qif_name,
- ACCOUNT_GNC_NAME, gnc_name,
- ACCOUNT_NEW, checked,
+ ACCOUNT_COL_INDEX, row++,
+ ACCOUNT_COL_QIF_NAME, qif_name,
+ ACCOUNT_COL_GNC_NAME, gnc_name,
+ ACCOUNT_COL_NEW, checked,
-1);
accts_left = SCM_CDR(accts_left);
}
@@ -1017,19 +1026,20 @@
GtkTreeViewColumn *column;
GtkTreeSelection *selection;
- store = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
+ store = gtk_list_store_new(NUM_ACCOUNT_COLS, G_TYPE_INT, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_BOOLEAN);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(col_name, renderer,
- "text", ACCOUNT_QIF_NAME,
+ "text", ACCOUNT_COL_QIF_NAME,
NULL);
g_object_set(column, "expand", TRUE, NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("GnuCash account name"), renderer,
- "text", ACCOUNT_GNC_NAME,
+ "text", ACCOUNT_COL_GNC_NAME,
NULL);
g_object_set(column, "expand", TRUE, NULL);
gtk_tree_view_append_column(view, column);
@@ -1037,7 +1047,7 @@
renderer = gtk_cell_renderer_toggle_new();
g_object_set(renderer, "activatable", FALSE, NULL);
column = gtk_tree_view_column_new_with_attributes(_("New?"), renderer,
- "active", ACCOUNT_NEW,
+ "active", ACCOUNT_COL_NEW,
NULL);
gtk_tree_view_append_column(view, column);
@@ -1067,10 +1077,12 @@
if (!gtk_tree_selection_get_selected (selection, &model, &iter))
return;
- gtk_tree_model_get(model, &iter, ACCOUNT_INDEX, &row, -1);
+ gtk_tree_model_get(model, &iter, ACCOUNT_COL_INDEX, &row, -1);
prev_row = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(model), PREV_ROW));
+ if (row == prev_row)
+ return;
g_object_set_data(G_OBJECT(model), PREV_ROW, GINT_TO_POINTER(row));
- if ((row == -1) || (row == prev_row))
+ if (row == -1)
return;
/* find the <qif-map-entry> corresponding to the selected row */
@@ -1317,10 +1329,10 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set
(store, &iter,
- QIF_TRANS_INDEX, rownum++,
- QIF_TRANS_DATE, gnc_print_date(xaccTransRetDatePostedTS(gnc_xtn)),
- QIF_TRANS_DESCRIPTION, xaccTransGetDescription(gnc_xtn),
- QIF_TRANS_AMOUNT, amount_str,
+ QIF_TRANS_COL_INDEX, rownum++,
+ QIF_TRANS_COL_DATE, gnc_print_date(xaccTransRetDatePostedTS(gnc_xtn)),
+ QIF_TRANS_COL_DESCRIPTION, xaccTransGetDescription(gnc_xtn),
+ QIF_TRANS_COL_AMOUNT, amount_str,
-1);
retval = SCM_CDR(retval);
@@ -1764,11 +1776,11 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set
(store, &iter,
- QIF_TRANS_INDEX, rownum++,
- QIF_TRANS_DATE, gnc_print_date(xaccTransRetDatePostedTS(gnc_xtn)),
- QIF_TRANS_DESCRIPTION, xaccTransGetDescription(gnc_xtn),
- QIF_TRANS_AMOUNT, amount_str,
- QIF_TRANS_CHECKED, selected != SCM_BOOL_F,
+ QIF_TRANS_COL_INDEX, rownum++,
+ QIF_TRANS_COL_DATE, gnc_print_date(xaccTransRetDatePostedTS(gnc_xtn)),
+ QIF_TRANS_COL_DESCRIPTION, xaccTransGetDescription(gnc_xtn),
+ QIF_TRANS_COL_AMOUNT, amount_str,
+ QIF_TRANS_COL_CHECKED, selected != SCM_BOOL_F,
-1);
possible_matches = SCM_CDR(possible_matches);
@@ -1785,7 +1797,7 @@
if (gtk_tree_selection_get_selected(selection, &model, &iter))
gtk_tree_model_get(model, &iter,
- QIF_TRANS_INDEX, &wind->selected_transaction,
+ QIF_TRANS_COL_INDEX, &wind->selected_transaction,
-1);
refresh_old_transactions(wind, -1);
}
@@ -1823,7 +1835,7 @@
/* Get the row the user clicked on and update the scheme
* code/rebuild the list store. */
gtk_tree_model_get(model, &iter,
- QIF_TRANS_INDEX, &row,
+ QIF_TRANS_COL_INDEX, &row,
-1);
refresh_old_transactions(wind, row);
}
@@ -2083,12 +2095,12 @@
/* Set up the selected file view */
view = GTK_TREE_VIEW(retval->selected_file_view);
- store = gtk_list_store_new(2, G_TYPE_INT, G_TYPE_STRING);
+ store = gtk_list_store_new(NUM_FILENAME_COLS, G_TYPE_INT, G_TYPE_STRING);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Account"), renderer,
- "text", FILENAME_NAME,
+ "text", FILENAME_COL_NAME,
NULL);
gtk_tree_view_append_column(view, column);
@@ -2109,26 +2121,26 @@
/* Set up the new transaction view */
view = GTK_TREE_VIEW(retval->new_transaction_view);
- store = gtk_list_store_new(4, G_TYPE_INT, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING);
+ store = gtk_list_store_new(NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
- "text", QIF_TRANS_DATE,
+ "text", QIF_TRANS_COL_DATE,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Description"), renderer,
- "text", QIF_TRANS_DESCRIPTION,
+ "text", QIF_TRANS_COL_DESCRIPTION,
NULL);
gtk_tree_view_append_column(view, column);
gtk_tree_view_column_set_expand(column, TRUE);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Amount"), renderer,
- "text", QIF_TRANS_AMOUNT,
+ "text", QIF_TRANS_COL_AMOUNT,
NULL);
gtk_tree_view_append_column(view, column);
@@ -2140,33 +2152,32 @@
/* Set up the old transaction view */
view = GTK_TREE_VIEW(retval->old_transaction_view);
- store = gtk_list_store_new(5, G_TYPE_INT, G_TYPE_STRING,
- G_TYPE_STRING, G_TYPE_STRING,
- G_TYPE_BOOLEAN);
+ store = gtk_list_store_new(NUM_QIF_TRANS_COLS, G_TYPE_INT, G_TYPE_STRING,
+ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_BOOLEAN);
gtk_tree_view_set_model(view, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Date"), renderer,
- "text", QIF_TRANS_DATE,
+ "text", QIF_TRANS_COL_DATE,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Description"), renderer,
- "text", QIF_TRANS_DESCRIPTION,
+ "text", QIF_TRANS_COL_DESCRIPTION,
NULL);
gtk_tree_view_append_column(view, column);
gtk_tree_view_column_set_expand(column, TRUE);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Amount"), renderer,
- "text", QIF_TRANS_AMOUNT,
+ "text", QIF_TRANS_COL_AMOUNT,
NULL);
gtk_tree_view_append_column(view, column);
renderer = gtk_cell_renderer_toggle_new();
column = gtk_tree_view_column_new_with_attributes(_("Dup?"), renderer,
- "active", QIF_TRANS_CHECKED,
+ "active", QIF_TRANS_COL_CHECKED,
NULL);
gtk_tree_view_append_column(view, column);
Modified: gnucash/branches/deprecated-cleanup/src/report/report-gnome/dialog-column-view.c
===================================================================
--- gnucash/branches/deprecated-cleanup/src/report/report-gnome/dialog-column-view.c 2006-07-28 01:45:55 UTC (rev 14570)
+++ gnucash/branches/deprecated-cleanup/src/report/report-gnome/dialog-column-view.c 2006-07-28 02:22:58 UTC (rev 14571)
@@ -35,13 +35,19 @@
#include "guile-mappings.h"
#include "gnc-report.h"
-#define AVAILABLE_NAME 0
-#define AVAILABLE_ROW 1
+enum available_cols {
+ AVAILABLE_COL_NAME = 0,
+ AVAILABLE_COL_ROW,
+ NUM_AVAILABLE_COLS
+};
-#define CONTENTS_NAME 0
-#define CONTENTS_ROW 1
-#define CONTENTS_REPORT_ROWS 2
-#define CONTENTS_REPORT_COLS 3
+enum contents_cols {
+ CONTENTS_COL_NAME = 0,
+ CONTENTS_COL_ROW,
+ CONTENTS_COL_REPORT_ROWS,
+ CONTENTS_COL_REPORT_COLS,
+ NUM_CONTENTS_COLS
+};
struct gncp_column_view_edit {
GNCOptionWin * optwin;
@@ -141,8 +147,8 @@
name = SCM_STRING_CHARS(scm_call_1(template_menu_name, SCM_CAR(names)));
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
- AVAILABLE_NAME, name,
- AVAILABLE_ROW, i,
+ AVAILABLE_COL_NAME, name,
+ AVAILABLE_COL_ROW, i,
-1);
}
}
@@ -182,13 +188,13 @@
gtk_list_store_append(store, &iter);
gtk_list_store_set
(store, &iter,
- CONTENTS_NAME, SCM_STRING_CHARS(scm_call_1(report_menu_name,
- this_report)),
- CONTENTS_ROW, i,
- CONTENTS_REPORT_COLS, scm_num2int(SCM_CADR(SCM_CAR(contents)),
- SCM_ARG1, __FUNCTION__),
- CONTENTS_REPORT_ROWS, scm_num2int(SCM_CADDR(SCM_CAR(contents)),
- SCM_ARG1, __FUNCTION__),
+ CONTENTS_COL_NAME, SCM_STRING_CHARS(scm_call_1(report_menu_name,
+ this_report)),
+ CONTENTS_COL_ROW, i,
+ CONTENTS_COL_REPORT_COLS, scm_num2int(SCM_CADR(SCM_CAR(contents)),
+ SCM_ARG1, __FUNCTION__),
+ CONTENTS_COL_REPORT_ROWS, scm_num2int(SCM_CADDR(SCM_CAR(contents)),
+ SCM_ARG1, __FUNCTION__),
-1);
}
}
@@ -209,7 +215,7 @@
if (gtk_tree_selection_get_selected(selection, &model, &iter))
gtk_tree_model_get(model, &iter,
- AVAILABLE_ROW, &r->available_selected,
+ AVAILABLE_COL_ROW, &r->available_selected,
-1);
}
@@ -222,7 +228,7 @@
if (gtk_tree_selection_get_selected(selection, &model, &iter))
gtk_tree_model_get(model, &iter,
- AVAILABLE_ROW, &r->contents_selected,
+ AVAILABLE_COL_ROW, &r->contents_selected,
-1);
}
@@ -331,12 +337,12 @@
scm_gc_protect_object(r->contents_list);
/* Build the 'available' view */
- store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
+ store = gtk_list_store_new (NUM_AVAILABLE_COLS, G_TYPE_STRING, G_TYPE_INT);
gtk_tree_view_set_model(r->available, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes("", renderer,
- "text", AVAILABLE_NAME,
+ "text", AVAILABLE_COL_NAME,
NULL);
gtk_tree_view_append_column(r->available, column);
@@ -345,24 +351,25 @@
G_CALLBACK(gnc_column_view_select_avail_cb), r);
/* Build the 'contents' view */
- store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT, G_TYPE_INT);
+ store = gtk_list_store_new (NUM_CONTENTS_COLS, G_TYPE_STRING, G_TYPE_INT,
+ G_TYPE_INT, G_TYPE_INT);
gtk_tree_view_set_model(r->contents, GTK_TREE_MODEL(store));
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Report"), renderer,
- "text", CONTENTS_NAME,
+ "text", CONTENTS_COL_NAME,
NULL);
gtk_tree_view_append_column(r->contents, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Cols"), renderer,
- "text", CONTENTS_REPORT_COLS,
+ "text", CONTENTS_COL_REPORT_COLS,
NULL);
gtk_tree_view_append_column(r->contents, column);
renderer = gtk_cell_renderer_text_new();
column = gtk_tree_view_column_new_with_attributes(_("Rows"), renderer,
- "text", CONTENTS_REPORT_ROWS,
+ "text", CONTENTS_COL_REPORT_ROWS,
NULL);
gtk_tree_view_append_column(r->contents, column);
More information about the gnucash-changes
mailing list