IntenseFinance/gnucash
3
0 Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2026-10-12 17:32:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

2001-10-14 Joshua Sled <jsled@asynchronous.org>

Browse Source 
* src/gnome/dialog-scheduledxaction.c (delete_button_clicked):
	Fixed multiple bugs in deletion selection-handling.
	(schedXact_editor_populate), (schedXact_editor_create_ledger):
	Added code for respecting the user's Preferences.

	* src/gnome/dialog-scheduledxaction.c
	(gnc_ui_scheduled_xaction_dialog_create): Added support for only a
	single SX list to be up at any one time; if one already exists,
	show and raise that window instead of creating a new one.

	* src/gnome/dialog-scheduledxaction.c
	(gnc_ui_scheduled_xaction_editor_dialog_create): Only one editor
	for any Scheduled Transaction open at a time; if one already
	exists, show and raise it's window.

	* src/gnome/dialog-scheduledxaction.c
	(schedXact_editor_create_ledger): Add [read: steal from
	window-register.c] register toolbar, suitably modified for SXes.

	* src/app-utils/prefs.scm: Updates to wording, defaults for
	Scheduled Transaction preferences.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@5659 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Joshua Sled committed 2001-10-16 06:44:30 +00:00
1 parent bcae323c49
commit 47fd364d72
7 files changed
+474 -214
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ChangeLog
+25
View File
@@ -1,3 +1,28 @@
2001-10-14 Joshua Sled <jsled@asynchronous.org>
* src/gnome/dialog-scheduledxaction.c (delete_button_clicked):
Fixed multiple bugs in deletion selection-handling.
(schedXact_editor_populate), (schedXact_editor_create_ledger):
Added code for respecting the user's Preferences.
* src/gnome/dialog-scheduledxaction.c
(gnc_ui_scheduled_xaction_dialog_create): Added support for only a
single SX list to be up at any one time; if one already exists,
show and raise that window instead of creating a new one.
* src/gnome/dialog-scheduledxaction.c
(gnc_ui_scheduled_xaction_editor_dialog_create): Only one editor
for any Scheduled Transaction open at a time; if one already
exists, show and raise it's window.
* src/gnome/dialog-scheduledxaction.c
(schedXact_editor_create_ledger): Add [read: steal from
window-register.c] register toolbar, suitably modified for SXes.
* src/app-utils/prefs.scm: Updates to wording, defaults for
Scheduled Transaction preferences.
2001-10-14 Rob Browning <rlb@defaultvalue.org>
* src/backend/file/test/Makefile.am
src/app-utils/prefs.scm
+6 -6
View File
@@ -544,7 +544,7 @@ without one.")
(N_ "Scheduled Transactions")
(N_ "Run on GnuCash start")
"a" (N_ "Should the Since-Last-Run window appear on GnuCash startup?")
#f ))
#t ))
(gnc:register-configuration-option
(gnc:make-simple-boolean-option
@@ -556,18 +556,18 @@ without one.")
(gnc:register-configuration-option
(gnc:make-simple-boolean-option
(N_ "Scheduled Transactions")
(N_ "Notify on new, auto-created scheduled transactions")
(N_ "Notify on new, auto-created Scheduled Transactions")
"c" (N_ "Should new SchedXactions with the 'AutoCreate' flag set also be set to notify?")
#t ))
(gnc:register-configuration-option
(gnc:make-number-range-option
(N_ "Scheduled Transactions")
(N_ "Number of days in advance to create")
(N_ "Default number of days in advance to create")
"d" (N_ "Default number of days in advance to create new SXes")
0 ; default
0 ; min
99999999 ; max
99999 ; max
0 ; num decimals
1 ; step size
))
@@ -575,7 +575,7 @@ without one.")
(gnc:register-configuration-option
(gnc:make-number-range-option
(N_ "Scheduled Transactions")
(N_ "Number of days in advance to remind")
(N_ "Default number of days in advance to remind")
"e" (N_ "Default number of days in advance to remind on new SXes")
0 ; default
0 ; min
@@ -589,7 +589,7 @@ without one.")
(N_ "Scheduled Transactions")
(N_ "Template Register Lines")
"f" (N_ "How many lines in the template register?")
4 ; default
6 ; default
1 ; min
50 ; max
0 ; num-decimals
src/gnome/dialog-scheduledxaction.c
+361 -88
View File
@@ -40,6 +40,7 @@
#include "gnc-ledger-display.h"
#include "gnc-ui.h"
#include "gnc-ui-util.h"
#include "global-options.h"
#include "gnucash-sheet.h"
#include "messages.h"
#include "window-help.h"
@@ -50,6 +51,14 @@ static short module = MOD_SX;
#define DIALOG_SCHEDXACTION_CM_CLASS "dialog-scheduledtransactions"
#define DIALOG_SCHEDXACTION_EDITOR_CM_CLASS "dialog-scheduledtransaction-editor"
#define SX_OPT_STR "Scheduled Transactions"
#define AUTOCREATE_OPT "autocreate_opt"
#define NOTIFY_OPT "notify_opt"
#define ADVANCE_OPT "advance_opt"
#define ADVANCE_DAYS_SPIN "advance_days"
#define REMIND_OPT "remind_opt"
#define REMIND_DAYS_SPIN "remind_days"
#define END_OPTION 0
#define NUM_OCCUR_OPTION 1
@@ -91,6 +100,8 @@ struct _SchedXactionEditorDialog
GNCFrequency *gncfreq;
char *sxGUIDstr;
GtkWidget *toolbar;
};
/** Prototypes **********************************************************/
@@ -127,7 +138,12 @@ static void sxed_reg_duplicateCB( GtkWidget *w, gpointer d );
static void sxed_reg_expand_trans_checkCB( GtkWidget *w, gpointer d );
static void sxed_reg_new_transCB( GtkWidget *w, gpointer d );
static void sxed_reg_jumpCB( GtkWidget *w, gpointer d );
static void sxed_reg_xferCB( GtkWidget *w, gpointer d );
static void gnc_sxed_reg_check_close(SchedXactionEditorDialog *sxed);
gboolean _editor_component_sx_equality( gpointer find_data,
gpointer user_data );
/** Implementations *****************************************************/
@@ -146,6 +162,8 @@ sxed_close_handler ( gpointer user_data )
{
SchedXactionEditorDialog *sxed = user_data;
gnc_sxed_reg_check_close( sxed );
gnc_ledger_display_close( sxed->ledger );
sxed->ledger = NULL;
@@ -344,10 +362,23 @@ scheduledxaction_editor_dialog_destroy(GtkObject *object, gpointer data)
SchedXactionDialog*
gnc_ui_scheduled_xaction_dialog_create(void)
{
SchedXactionDialog *sxd;
SchedXactionDialog *sxd = NULL;
GtkObject *sxdo;
GtkWidget *button;
GtkWidget *clist;
GList *alreadyExisting = NULL;
alreadyExisting =
gnc_find_gui_components( DIALOG_SCHEDXACTION_CM_CLASS,
NULL,
(gpointer)sxd );
if ( alreadyExisting != NULL ) {
sxd = (SchedXactionDialog*)alreadyExisting->data;
gtk_widget_show( sxd->dialog );
gdk_window_raise( sxd->dialog->window );
g_list_free( alreadyExisting );
return sxd;
}
sxd = g_new0( SchedXactionDialog, 1 );
@@ -423,8 +454,7 @@ row_select_handler( GtkCList *clist,
switch ( event->type ) {
case GDK_2BUTTON_PRESS:
sx = (SchedXaction*)gtk_clist_get_row_data( clist, row );
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx );
sxed->new = 0;
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx, 0 );
break;
default:
/* noop */
@@ -460,11 +490,13 @@ schedXact_populate( SchedXactionDialog *sxd )
SchedXactionEditorDialog *
gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
SchedXaction *sx )
SchedXaction *sx,
int newP )
{
SchedXactionEditorDialog *sxed;
GtkWidget *button;
int i;
GList *alreadyExists = NULL;
static struct widgetSignalCallback {
char *name;
@@ -483,11 +515,21 @@ gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
{ "advance_opt", "toggled", advance_toggle, (gpointer)"advance_days" },
{ "remind_opt", "toggled", advance_toggle, (gpointer)"remind_days" },
{ "rec_button", "clicked", sxed_reg_recordCB, NULL },
{ NULL, NULL, NULL, NULL }
};
alreadyExists = gnc_find_gui_components( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
_editor_component_sx_equality,
sx );
if ( alreadyExists ) {
sxed = (SchedXactionEditorDialog*)alreadyExists->data;
gtk_widget_show( sxed->dialog );
gdk_window_raise( sxed->dialog );
g_list_free( alreadyExists );
return sxed;
}
sxed = g_new0( SchedXactionEditorDialog, 1 );
/* sxed->dialog = create_Scheduled_Transaction_Editor(); */
@@ -498,6 +540,7 @@ gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
}
sxed->sxd = sxd;
sxed->sx = sx;
sxed->new = newP;
gnc_register_gui_component( DIALOG_SCHEDXACTION_EDITOR_CM_CLASS,
NULL, /* no refresh handler */
@@ -555,16 +598,17 @@ schedXact_editor_init( SchedXactionEditorDialog *sxed )
gtk_widget_set_sensitive( w, FALSE );
/* Allow grow, allow shrink, auto-shrink */
gtk_window_set_policy (GTK_WINDOW(sxed->dialog), TRUE, TRUE, FALSE);
}
static
GtkWidget *
schedXaction_editor_create_reg_popup( SchedXactionEditorDialog *sxed )
{
GtkWidget *popup;
GnomeUIInfo transaction_menu[] =
static GnomeUIInfo transaction_menu[] =
{
{
GNOME_APP_UI_ITEM,
@@ -599,6 +643,14 @@ schedXaction_editor_create_reg_popup( SchedXactionEditorDialog *sxed )
GNOME_APP_PIXMAP_NONE, NULL,
0, 0, NULL
},
{
GNOME_APP_UI_ITEM,
N_("_Schedule..."),
N_("Create a scheduled transaction using the current one as a template"),
NULL, NULL, NULL,
GNOME_APP_PIXMAP_NONE, NULL,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_TOGGLEITEM,
@@ -636,6 +688,151 @@ schedXaction_editor_create_reg_popup( SchedXactionEditorDialog *sxed )
return popup;
}
static GtkWidget *
schedXaction_editor_create_reg_tool_bar( SchedXactionEditorDialog *sxed )
{
/* RegWindow *regData */
GtkWidget *toolbar;
static GnomeUIInfo toolbar_info[] =
{
/*
{
GNOME_APP_UI_ITEM,
N_("Close"),
N_("Close this register window"),
sxed_close_handler, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_CLOSE,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
*/
{
GNOME_APP_UI_ITEM,
N_("Enter"),
N_("Record the current transaction"),
sxed_reg_recordCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_ADD,
0, 0, NULL
},
{
GNOME_APP_UI_ITEM,
N_("Cancel"),
N_("Cancel the current transaction"),
sxed_reg_cancelCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_UNDELETE,
0, 0, NULL
},
{
GNOME_APP_UI_ITEM,
N_("Delete"),
N_("Delete the current transaction"),
sxed_reg_deleteCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_TRASH,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM,
N_("Duplicate"),
N_("Make a copy of the current transaction"),
sxed_reg_duplicateCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_COPY,
0, 0, NULL
},
/*
{
GNOME_APP_UI_ITEM,
N_("Schedule"),
N_("Create a scheduled transaction using the current one as a template"),
NULL, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_LINE_IN,
0, 0, NULL
},
*/
GNOMEUIINFO_SEPARATOR,
/*
{
GNOME_APP_UI_TOGGLEITEM,
N_("Split"),
N_("Show all splits in the current transaction"),
expand_trans_cb, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_BOOK_OPEN,
0, 0, NULL
},
*/
{
GNOME_APP_UI_ITEM,
N_("Blank"),
N_("Move to the blank transaction at the "
"bottom of the register"),
sxed_reg_new_transCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_NEW,
0, 0, NULL
},
{
GNOME_APP_UI_ITEM,
N_("Jump"),
N_("Jump to the corresponding transaction in "
"the other account"),
sxed_reg_jumpCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_JUMP_TO,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM,
N_("Transfer"),
N_("Transfer funds from one account to another"),
sxed_reg_xferCB, NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_CONVERT,
0, 0, NULL
},
GNOMEUIINFO_SEPARATOR,
{
GNOME_APP_UI_ITEM,
N_("Find"),
N_("Find transactions with a search"),
/* FIXME:gnc_ui_find_transactions_cb */ NULL,
NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_SEARCH,
0, 0, NULL
},
/*
{
GNOME_APP_UI_ITEM,
N_("Report"),
N_("Open a report window for this register"),
reportCB,
NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_BOOK_GREEN,
0, 0, NULL
},
{
GNOME_APP_UI_ITEM,
N_("Print"),
N_("Print a report for this register"),
printReportCB,
NULL, NULL,
GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_PRINT,
0, 0, NULL
},
*/
GNOMEUIINFO_END
};
toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_TOOLBAR_BOTH);
gnome_app_fill_toolbar_with_data (GTK_TOOLBAR(toolbar), toolbar_info,
NULL, sxed);
sxed->toolbar = toolbar;
/* regData->split_button = toolbar_info[9].widget; */
return toolbar;
}
static
void
schedXact_editor_create_freq_sel( SchedXactionEditorDialog *sxed )
@@ -659,10 +856,11 @@ static
void
schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed )
{
GtkFrame *tempxaction_frame;
SplitRegister *splitreg;
GtkWidget *regWidget;
GtkWidget *popup;
GtkFrame *tempxaction_frame;
SplitRegister *splitreg;
GtkWidget *regWidget, *vbox, *popup, *toolbar;
#define NUM_LEDGER_LINES_DEFAULT 6
int numLedgerLines = NUM_LEDGER_LINES_DEFAULT;
tempxaction_frame =
GTK_FRAME( glade_xml_get_widget( sxed->gxml,
@@ -675,19 +873,36 @@ schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed )
gnc_ledger_display_set_user_data( sxed->ledger, (gpointer)sxed );
splitreg = gnc_ledger_display_get_split_register( sxed->ledger );
/* FIXME: make configurable */
gnucash_register_set_initial_rows( 6 );
numLedgerLines =
(int)gnc_lookup_number_option( SX_OPT_STR,
"Template Register Lines",
NUM_LEDGER_LINES_DEFAULT );
/* Watch the order of operations, here... */
gnucash_register_set_initial_rows( numLedgerLines );
regWidget = gnucash_register_new( splitreg->table );
gnc_table_init_gui( regWidget, splitreg );
gtk_container_add( GTK_CONTAINER(glade_xml_get_widget( sxed->gxml,
"register_vbox" )),
regWidget );
sxed->reg = GNUCASH_REGISTER(regWidget);
GNUCASH_SHEET(sxed->reg->sheet)->window = GTK_WIDGET(sxed->dialog);
vbox = glade_xml_get_widget( sxed->gxml, "register_vbox" );
popup = schedXaction_editor_create_reg_popup( sxed );
gnucash_register_attach_popup( sxed->reg, popup, sxed );
toolbar = schedXaction_editor_create_reg_tool_bar( sxed );
gtk_container_set_border_width( GTK_CONTAINER(toolbar), 2 );
gtk_container_add( GTK_CONTAINER(vbox), toolbar );
gtk_container_add( GTK_CONTAINER(vbox), regWidget );
/* FIXME: This doesn't actually do what we want. */
gtk_box_set_child_packing( GTK_BOX(vbox), regWidget,
TRUE, TRUE, 2,
GTK_PACK_END /* it already has a
* position... */ );
#if 0
gtk_signal_connect( GTK_OBJECT(sxed->dialog), "activate_cursor",
GTK_SIGNAL_FUNC(sxe_register_record_cb), sxed );
@@ -696,8 +911,6 @@ schedXact_editor_create_ledger( SchedXactionEditorDialog *sxed )
#endif /* 0 */
popup = schedXaction_editor_create_reg_popup( sxed );
gnucash_register_attach_popup( sxed->reg, popup, sxed );
/* configure... */
/* don't use double-line */
@@ -716,18 +929,19 @@ static
void
schedXact_editor_populate( SchedXactionEditorDialog *sxed )
{
GtkEntry *nameEntry;
char *name;
time_t tmpDate;
int numRec;
int numRecRem;
GnomeDateEdit *gde;
SplitRegister *splitReg;
GList *splitList;
GtkWidget *w;
GString *tmpgStr;
struct tm *tmpTm;
GDate *gd;
GtkEntry *nameEntry;
char *name;
time_t tmpDate;
int numRec, numRecRem;
GnomeDateEdit *gde;
SplitRegister *splitReg;
GList *splitList;
GtkWidget *w;
GString *tmpgStr;
struct tm *tmpTm;
GDate *gd;
gint daysInAdvance;
gboolean autoCreateState, notifyState;
nameEntry = GTK_ENTRY(glade_xml_get_widget( sxed->gxml, "sxe_name" ));
name = xaccSchedXactionGetName(sxed->sx);
@@ -762,38 +976,64 @@ schedXact_editor_populate( SchedXactionEditorDialog *sxed )
set_endgroup_toggle_states( sxed, END_NONE );
}
{
gboolean autoCreateState, notifyState;
xaccSchedXactionGetAutoCreate( sxed->sx, &autoCreateState, &notifyState );
w = glade_xml_get_widget( sxed->gxml, "autocreate_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), autoCreateState );
w = glade_xml_get_widget( sxed->gxml, "notify_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), notifyState );
/* Do auto-create/notify setup */
if ( sxed->new ) {
autoCreateState =
gnc_lookup_boolean_option( SX_OPT_STR,
"Auto-Create new Scheduled "
"Transactions by default", FALSE );
notifyState =
gnc_lookup_boolean_option( SX_OPT_STR,
"Notify on new, auto-created "
"Scheduled Transactions", FALSE );
} else {
xaccSchedXactionGetAutoCreate( sxed->sx,
&autoCreateState,
&notifyState );
}
{
gint daysInAdvance;
w = glade_xml_get_widget( sxed->gxml, "autocreate_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), autoCreateState );
if ( ! autoCreateState ) {
notifyState = FALSE;
}
w = glade_xml_get_widget( sxed->gxml, "notify_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), notifyState );
/* Do days-in-advance-to-create widget[s] setup. */
if ( sxed->new ) {
daysInAdvance =
(int)gnc_lookup_number_option( SX_OPT_STR,
"Default number of days in "
"advance to create", 0 );
} else {
daysInAdvance =
xaccSchedXactionGetAdvanceCreation( sxed->sx );
if ( daysInAdvance != 0 ) {
w = glade_xml_get_widget( sxed->gxml, "advance_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), TRUE );
w = glade_xml_get_widget( sxed->gxml, "advance_days" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w),
(gfloat)daysInAdvance );
}
}
if ( daysInAdvance != 0 ) {
w = glade_xml_get_widget( sxed->gxml, "advance_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), TRUE );
w = glade_xml_get_widget( sxed->gxml, "advance_days" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w),
(gfloat)daysInAdvance );
}
/* Do days-in-advance-to-remind widget[s] setup. */
if ( sxed->new ) {
daysInAdvance =
(int)gnc_lookup_number_option( SX_OPT_STR,
"Default number of days in "
"advance to remind", 0 );
} else {
daysInAdvance =
xaccSchedXactionGetAdvanceReminder( sxed->sx );
if ( daysInAdvance != 0 ) {
w = glade_xml_get_widget( sxed->gxml, "remind_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), TRUE );
w= glade_xml_get_widget( sxed->gxml, "remind_days" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w),
(gfloat)daysInAdvance );
}
}
if ( daysInAdvance != 0 ) {
w = glade_xml_get_widget( sxed->gxml, "remind_opt" );
gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(w), TRUE );
w= glade_xml_get_widget( sxed->gxml, "remind_days" );
gtk_spin_button_set_value( GTK_SPIN_BUTTON(w),
(gfloat)daysInAdvance );
}
/* populate the ledger */
@@ -833,8 +1073,7 @@ new_button_clicked( GtkButton *b, gpointer d )
SchedXactionEditorDialog *sxed;
sxd = (SchedXactionDialog*)d;
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, tmpSX );
sxed->new = 1;
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, tmpSX, 1 );
}
static
@@ -862,8 +1101,7 @@ edit_button_clicked( GtkButton *b, gpointer d )
/* get the clist row for this listitem */
/* get the object UD */
sx = (SchedXaction*)gtk_clist_get_row_data( cl, row );
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx );
sxed->new = 0;
sxed = gnc_ui_scheduled_xaction_editor_dialog_create( sxd, sx, 0 );
} while ( (sel = g_list_next(sel)) );
}
@@ -871,19 +1109,18 @@ static
void
delete_button_clicked( GtkButton *b, gpointer d )
{
GNCBook *book;
GtkCList *cl;
GList *sel;
GList *sxList;
SchedXactionDialog *sxd;
GnomeDialog *confirmDlg;
GtkLabel *dlgMsgLbl;
static char *confirmMessage =
GNCBook *book;
GtkCList *cl;
GList *sel, *sxList;
SchedXactionDialog *sxd;
GnomeDialog *confirmDlg;
GtkLabel *dlgMsgLbl;
static char *confirmMessage =
"Delete the selected scheduled transactions?";
int confirmSel;
GtkVBox *vb;
GString *realMsg;
SchedXaction *sx;
int confirmSel;
GtkVBox *vb;
GString *realMsg;
SchedXaction *sx;
sxd = (SchedXactionDialog*)d;
@@ -920,18 +1157,17 @@ delete_button_clicked( GtkButton *b, gpointer d )
sel = cl->selection;
book = gnc_get_current_book ();
sxList = gnc_book_get_schedxactions( book );
gtk_clist_freeze( cl );
/* delete back-to-front so clist index numbers aren't
invalidated */
sel = g_list_last( sel );
do {
sx = (SchedXaction*)
gtk_clist_get_row_data( cl, (int)sel->data );
gtk_clist_get_row_data( cl, (int)sel->data );
sxList = g_list_remove( sxList, (gpointer)sx );
gtk_clist_remove( cl, (int)sel->data );
xaccSchedXactionFree( sx );
} while ( (sel = g_list_previous(sel)) );
} while ( (sel = g_list_next(sel)) );
gnc_book_set_schedxactions( book, sxList );
gtk_clist_freeze( cl );
gtk_clist_clear( cl );
g_list_foreach( sxList, putSchedXactionInClist, sxd );
gtk_clist_thaw( cl );
break;
case 1:
@@ -1066,11 +1302,6 @@ sxed_reg_recordCB( GtkWidget *w, gpointer d )
if ( !gnc_split_register_save( reg, TRUE ) )
return;
#if 0
if ( trans != NULL )
gnc_register_include_date( reg, xaccTransGetDate(trans) );
#endif /* 0 */
gnc_split_register_redraw( reg );
}
@@ -1352,6 +1583,48 @@ static
void
sxed_reg_jumpCB( GtkWidget *w, gpointer d )
{
/* FIXME This one gets funky because of the accounts stored in
the kvp-frames */
/* FIXME This one gets funky because of the accounts stored in
* the kvp-frames */
}
static
void
sxed_reg_xferCB( GtkWidget *w, gpointer d )
{
GnomeDialog *gd;
/* FIXME: should use a "templatized" xfer dlg. */
}
/********************************************************************\
* gnc_register_check_close *
* *
* Args: regData - the data struct for this register *
* Return: none *
\********************************************************************/
static void
gnc_sxed_reg_check_close(SchedXactionEditorDialog *sxed)
{
gboolean pending_changes;
SplitRegister *reg;
reg = gnc_ledger_display_get_split_register (sxed->ledger);
pending_changes = gnc_split_register_changed (reg);
if (pending_changes) {
const char *message = _("The current transaction has been changed.\n"
"Would you like to record it?");
if (gnc_verify_dialog_parented(sxed->dialog, message, TRUE)) {
sxed_reg_recordCB(sxed->dialog, sxed);
} else {
gnc_split_register_cancel_cursor_trans_changes (reg);
}
}
}
static gboolean
_editor_component_sx_equality( gpointer find_data,
gpointer user_data )
{
return ( (SchedXaction*)find_data
== ((SchedXactionEditorDialog*)user_data)->sx );
}
src/gnome/dialog-scheduledxaction.h
+2 -1
View File
@@ -39,7 +39,8 @@ void row_select_handler( GtkCList *clist, gint row, gint col, GdkEventButton *ev
SchedXactionEditorDialog *
gnc_ui_scheduled_xaction_editor_dialog_create( SchedXactionDialog *sxd,
SchedXaction *sx );
SchedXaction *sx,
int newP );
void gnc_ui_scheduled_xaction_editor_dialog_destroy(SchedXactionEditorDialog *sxd);
#endif
src/gnome/dialog-sx-from-trans.c
+1 -1
View File
@@ -397,7 +397,7 @@ sxftd_advanced_clicked(GtkWidget *w, gpointer user_data)
{
adv_dlg = gnc_ui_scheduled_xaction_dialog_create();
adv_edit_dlg = gnc_ui_scheduled_xaction_editor_dialog_create(adv_dlg,
sxfti->sx);
sxfti->sx, 1);
}
src/gnome/dialog-sxsincelast.c
+78 -78
View File
@@ -150,7 +150,7 @@ static int tcl_row = 0;
static void sxsincelast_init( sxSinceLastData *sxsld );
static void _create_autoCreate_gen_ledger( sxSinceLastData *sxsld );
static void create_autoCreate_gen_ledger( sxSinceLastData *sxsld );
static gncUIWidget _sxsld_ledger_get_parent( GNCLedgerDisplay *ld );
static gboolean sxsincelast_populate( sxSinceLastData *sxsld );
@@ -372,23 +372,20 @@ sxsincelast_init( sxSinceLastData *sxsld )
clist_set_all_cols_autoresize(GTK_CLIST(w), TO_CREATE_CLIST_WIDTH);
w = glade_xml_get_widget( sxsld->gxml_remind, REMINDER_CLIST );
clist_set_all_cols_autoresize(GTK_CLIST(w), REMINDER_CLIST_WIDTH);
w = glade_xml_get_widget( sxsld->gxml_obsolete,
SX_OBSOLETE_CLIST);
w = glade_xml_get_widget( sxsld->gxml_obsolete, SX_OBSOLETE_CLIST);
clist_set_all_cols_autoresize(GTK_CLIST(w), SX_OBSOLETE_CLIST_WIDTH);
rl_row = tcl_row = 0;
sxsld->n_obsolete = 0;
_create_autoCreate_gen_ledger( sxsld );
create_autoCreate_gen_ledger( sxsld );
/* FIXME: deal with neither dialog being displayed [read:
nothing-to-do.] */
if ( ! sxsincelast_populate( sxsld ) ) {
sxsincelast_close_handler( sxsld );
return;
}
gtk_widget_show_all( sxsld->sxsincelastDlg );
sxsld->sincelast_displayed = TRUE;
@@ -397,7 +394,8 @@ sxsincelast_init( sxSinceLastData *sxsld )
static void
_generate_instances( SchedXaction *sx,
GDate *end,
GList **instanceList )
GList **instanceList,
GList **deadList )
{
GDate gd, *gdToReturn;
char tmpBuf[GNC_D_BUF_WIDTH];
@@ -415,8 +413,10 @@ _generate_instances( SchedXaction *sx,
gd = xaccSchedXactionGetInstanceAfter( sx, &gd );
}
if ( ! g_date_valid( &gd ) ) {
PERR( "Should be added to dead-list..." );
PINFO( "Should be added to dead-list..." );
*deadList = g_list_append( *deadList, sx );
}
}
@@ -587,42 +587,48 @@ processRemoveList(GList *removeList, sxSinceLastData *sxsld)
GtkCList *cl;
char *rowtext[3];
int row;
GList *sx_listentry;
//GList *sx_listEntry;
GString *tmp_str;
SchedXaction *sx;
FreqSpec *fs;
rowtext[1] = g_new0(gchar, GNC_D_BUF_WIDTH );
cl = GTK_CLIST( glade_xml_get_widget( sxsld->gxml_obsolete, SX_OBSOLETE_CLIST ));
cl = GTK_CLIST( glade_xml_get_widget( sxsld->gxml_obsolete,
SX_OBSOLETE_CLIST ));
tmp_str = g_string_new(NULL);
gtk_clist_freeze(cl);
for(row = 0; removeList != NULL; row++, removeList = removeList->next)
{
sx_listentry = (GList *) removeList->data;
sx = (SchedXaction *) sx_listentry->data;
for(row = 0; removeList != NULL; row++, removeList = removeList->next) {
/*sx_listEntry = (GList *) removeList->data;
*sx = (SchedXaction *) sx_listEntry->data;*/
sx = (SchedXaction*)removeList->data;
rowtext[0] = xaccSchedXactionGetName( sx );
rowtext[0] = xaccSchedXactionGetName( sx );
g_date_strftime(rowtext[1], GNC_D_WIDTH, GNC_D_FMT,
xaccSchedXactionGetEndDate( sx ));
g_date_strftime(rowtext[1], GNC_D_WIDTH, GNC_D_FMT,
xaccSchedXactionGetEndDate( sx ));
fs = xaccSchedXactionGetFreqSpec( sx );
fs = xaccSchedXactionGetFreqSpec( sx );
xaccFreqSpecGetFreqStr(fs, tmp_str );
rowtext[2] = tmp_str->str;
xaccFreqSpecGetFreqStr(fs, tmp_str );
rowtext[2] = tmp_str->str;
gtk_clist_insert( cl, row, rowtext );
gtk_clist_set_row_data(cl, row, sx_listentry );
sxsld->n_obsolete++;
gtk_clist_insert( cl, row, rowtext );
/* gtk_clist_set_row_data(cl, row, sx_listEntry ); */
gtk_clist_set_row_data( cl, row, sx );
sxsld->n_obsolete++;
}
gtk_clist_thaw( cl );
/* FIXME: This can't be right -- jsled
g_string_free(tmp_str, TRUE);
g_free(rowtext[1]);
*/
/* FIXME: THIS IS UGLY!!! */
@@ -752,23 +758,17 @@ sxsincelast_populate( sxSinceLastData *sxsld )
}
#endif /* 0 */
instanceList = NULL;
_generate_instances( sx, &endPlusReminders, &instanceList );
_generate_instances( sx, &endPlusReminders,
&instanceList, &removeList );
if ( instanceList == NULL )
{
/* check to see whether sx can be removed */
if( sx_obsolete(sx) )
{
removeList = g_list_prepend(removeList, sxList); /* note, list pointers rather
* than data pointers
*/
}
}
else
{
xaccSchedXactionGetAutoCreate( sx, &autocreateState, &notifyState );
do {
instDate = (GDate*)instanceList->data;
if ( instanceList == NULL ) {
break;
}
xaccSchedXactionGetAutoCreate( sx, &autocreateState,
&notifyState );
do {
instDate = (GDate*)instanceList->data;
#if 0
/* NOT USED */
{
@@ -779,53 +779,53 @@ sxsincelast_populate( sxSinceLastData *sxsld )
}
#endif /* 0 */
if ( (g_date_compare( &end, &endPlusReminders ) != 0)
&& (g_date_compare( &end, instDate ) <= 0) ) {
rt = g_new0( reminderTuple, 1 );
rt->sx = sx;
rt->endDate = &end;
rt->occurDate = instDate;
rt->isSelected = FALSE;
reminderList = g_list_append( reminderList, rt );
} else {
if ( autocreateState ) {
autoCreateList = g_list_append( autoCreateList,
instDate );
} else {
toCreateList = g_list_append( toCreateList,
instDate );
}
}
} while ( (instanceList = instanceList->next) );
/* Report RE:showing the dialog iff there's stuff in it to
* show. */
showIt |= (g_list_length( autoCreateList ) > 0);
showIt |= (g_list_length( toCreateList ) > 0);
processAutoCreateList( autoCreateList, sxsld, sx );
processReminderList ( reminderList, sxsld, sx );
processToCreateList ( toCreateList, sxsld, sx );
if ( (g_date_compare( &end, &endPlusReminders ) != 0)
&& (g_date_compare( &end, instDate ) <= 0) ) {
rt = g_new0( reminderTuple, 1 );
rt->sx = sx;
rt->endDate = &end;
rt->occurDate = instDate;
rt->isSelected = FALSE;
reminderList = g_list_append( reminderList, rt );
} else {
if ( autocreateState ) {
autoCreateList =
g_list_append( autoCreateList,
instDate );
} else {
toCreateList =
g_list_append( toCreateList,
instDate );
}
}
} while ( (instanceList = instanceList->next) );
/* Report RE:showing the dialog iff there's stuff in it to
* show. */
showIt |= (g_list_length( autoCreateList ) > 0);
showIt |= (g_list_length( toCreateList ) > 0);
processAutoCreateList( autoCreateList, sxsld, sx );
processReminderList ( reminderList, sxsld, sx );
processToCreateList ( toCreateList, sxsld, sx );
g_list_foreach( autoCreateList, _free_gdate_list_elts, NULL );
g_list_free( autoCreateList );
autoCreateList = NULL;
g_list_foreach( autoCreateList, _free_gdate_list_elts, NULL );
g_list_free( autoCreateList );
autoCreateList = NULL;
/* We have moved the GDates over to the toCreateData list in
sxsld, so we don't free them here. */
g_list_free( toCreateList );
toCreateList = NULL;
g_list_free( toCreateList );
toCreateList = NULL;
/* We have moved the reminderTuples over to the reminderData
list in sxsld, so we don't free them here. */
g_list_free( reminderList );
reminderList = NULL;
}
g_list_free( reminderList );
reminderList = NULL;
} while ( (sxList = sxList->next) );
processRemoveList( removeList, sxsld);
processRemoveList( removeList, sxsld );
return showIt;
}
@@ -1932,7 +1932,7 @@ sx_obsolete_unselect_all_clicked(GtkButton *button, gpointer user_data)
}
static void
_create_autoCreate_gen_ledger( sxSinceLastData *sxsld )
create_autoCreate_gen_ledger( sxSinceLastData *sxsld )
{
GtkFrame *autoCreate_frame;
SplitRegister *splitreg;
src/gnome/glade/sched-xact.glade
+1 -40
View File
@@ -574,46 +574,7 @@
<spacing>0</spacing>
<widget>
<class>GtkHBox</class>
<name>hbox143</name>
<homogeneous>False</homogeneous>
<spacing>0</spacing>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
<widget>
<class>GtkButton</class>
<name>rec_button</name>
<can_default>True</can_default>
<can_focus>True</can_focus>
<label>Record</label>
<relief>GTK_RELIEF_NORMAL</relief>
<child>
<padding>0</padding>
<expand>False</expand>
<fill>False</fill>
</child>
</widget>
<widget>
<class>GtkLabel</class>
<name>label847788</name>
<label>REPLACEME with the Register control box</label>
<justify>GTK_JUSTIFY_CENTER</justify>
<wrap>False</wrap>
<xalign>0.5</xalign>
<yalign>0.5</yalign>
<xpad>0</xpad>
<ypad>0</ypad>
<child>
<padding>0</padding>
<expand>True</expand>
<fill>True</fill>
</child>
</widget>
<class>Placeholder</class>
</widget>
<widget>