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

have the order dialog stay open when you "close the order", so you

Browse Source 
can actually see the change take place.

Remove the links to GNC modules and just make sure those dependencies
are loaded here.


git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@6708 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Derek Atkins 2002-02-11 03:04:31 +00:00
parent ea0d741c3b
commit 8fe6a5f821
3 changed files with 132 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/business/business-gnome/Makefile.am
View File

@ -51,12 +51,8 @@ noinst_HEADERS = \
libgncmod_business_gnome_la_LDFLAGS = -module
libgncmod_business_gnome_la_LIBADD = \
../business-core/libgncmod-business-core.la \
../business-ledger/libgnc-business-ledger.la \
${top_srcdir}/src/gnc-module/libgncmodule.la \
${top_srcdir}/src/engine/libgncmod-engine.la \
${top_srcdir}/src/app-utils/libgncmod-app-utils.la \
${top_srcdir}/src/gnome-utils/libgncmod-gnome-utils.la \
${GUILE_LIBS} \
${GNOMEUI_LIBS} \
${G_WRAP_LINK_ARGS} \

9
src/business/business-gnome/businessmod-gnome.c
View File

@ -36,10 +36,17 @@ gnc_module_description(void)
int
gnc_module_init(int refcount)
{
/* load business-core: we depend on it */
/* load business-core: we depend on it -- and it depends on the engine */
if (!gnc_module_load ("gnucash/business-core", 0)) {
return FALSE;
}
/* We also depend on app-utils and gnome-utils modules */
if (!gnc_module_load ("gnucash/app-utils", 0)) {
return FALSE;
}
if (!gnc_module_load ("gnucash/gnome-utils", 0)) {
return FALSE;
}
gh_eval_str("(use-modules (g-wrapped gw-business-gnome))");
gh_eval_str("(use-modules (gnucash business-gnome))");

213
src/business/business-gnome/dialog-order.c
View File

@ -45,6 +45,8 @@ struct _order_select_window {
};
typedef struct _order_window {
GladeXML * xml;
GtkWidget * dialog;
GtkWidget * id_entry;
@ -67,6 +69,8 @@ typedef struct _order_window {
} OrderWindow;
static void gnc_order_update_window (OrderWindow *ow);
static GncOrder *
ow_get_order (OrderWindow *ow)
{
@ -136,16 +140,14 @@ gnc_order_window_verify_ok (OrderWindow *ow)
return TRUE;
}
static void
gnc_order_window_ok_cb (GtkWidget *widget, gpointer data)
static gboolean
gnc_order_window_ok_save (OrderWindow *ow)
{
OrderWindow *ow = data;
if (!gnc_entry_ledger_check_close (ow->dialog, ow->ledger))
return;
return FALSE;
if (!gnc_order_window_verify_ok (ow))
return;
return FALSE;
/* Now save it off */
{
@ -155,8 +157,20 @@ gnc_order_window_ok_cb (GtkWidget *widget, gpointer data)
}
ow->created_order = order;
ow->order_guid = *xaccGUIDNULL ();
}
return TRUE;
}
static void
gnc_order_window_ok_cb (GtkWidget *widget, gpointer data)
{
OrderWindow *ow = data;
if (!gnc_order_window_ok_save (ow))
return;
/* Ok, we don't need this anymore */
ow->order_guid = *xaccGUIDNULL ();
gnc_close_gui_component (ow->component_id);
}
@ -189,10 +203,10 @@ gnc_order_window_invoice_cb (GtkWidget *widget, gpointer data)
/* Ok, go make an invoice */
gnc_invoice_new (ow->dialog, &(ow->owner), ow->book);
/* XXX: now refresh this window, it's possible a number of
* entries have changed
*/
return;
/* XXX: This should really be unparented */
/* refresh the window */
gnc_order_update_window (ow);
}
static void
@ -205,9 +219,6 @@ gnc_order_window_close_order_cb (GtkWidget *widget, gpointer data)
gboolean non_inv = FALSE;
Timespec ts;
if (!gnc_entry_ledger_check_close (ow->dialog, ow->ledger))
return;
/* Make sure the order is ok */
if (!gnc_order_window_verify_ok (ow))
return;
@ -249,8 +260,15 @@ gnc_order_window_close_order_cb (GtkWidget *widget, gpointer data)
gncOrderSetDateClosed (order, &ts);
/* And close the order */
return gnc_order_window_ok_cb (widget, data);
/* save it off */
gnc_order_window_ok_save (ow);
/* Reset the type; change to read-only */
ow->dialog_type = VIEW_ORDER;
gnc_entry_ledger_set_readonly (ow->ledger);
/* And redisplay the window */
gnc_order_update_window (ow);
}
static void
@ -381,16 +399,98 @@ gnc_configure_register_colors (void)
gnc_entry_ledger_set_colors (reg_colors);
}
static void
gnc_order_update_window (OrderWindow *ow)
{
GncOrder *order;
GncOwner *owner;
gboolean hide_cd = FALSE;
order = ow_get_order (ow);
owner = gncOrderGetOwner (order);
gtk_widget_show_all (ow->dialog);
{
const char *string;
Timespec ts, ts_zero = {0,0};
time_t tt;
gint pos = 0;
string = gncOrderGetNotes (order);
gtk_editable_delete_text (GTK_EDITABLE (ow->notes_text), 0, -1);
gtk_editable_insert_text (GTK_EDITABLE (ow->notes_text), string,
strlen (string), &pos);
ts = gncOrderGetDateOpened (order);
if (timespec_equal (&ts, &ts_zero)) {
tt = time(NULL);
} else {
tt = ts.tv_sec; /* XXX */
}
gnome_date_edit_set_time (GNOME_DATE_EDIT (ow->opened_date), tt);
ts = gncOrderGetDateClosed (order);
if (timespec_equal (&ts, &ts_zero)) {
tt = time(NULL);
hide_cd = TRUE;
} else {
tt = ts.tv_sec; /* XXX */
}
gnome_date_edit_set_time (GNOME_DATE_EDIT (ow->closed_date), tt);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->active_check),
gncOrderGetActive (order));
}
gnc_gui_component_watch_entity_type (ow->component_id,
GNC_ORDER_MODULE_NAME,
GNC_EVENT_MODIFY | GNC_EVENT_DESTROY);
gnc_table_refresh_gui (gnc_entry_ledger_get_table (ow->ledger), TRUE);
if (hide_cd) {
GtkWidget *hide;
gtk_widget_hide_all (ow->closed_date);
hide = glade_xml_get_widget (ow->xml, "cd_label");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (ow->xml, "hide1");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (ow->xml, "hide2");
gtk_widget_hide_all (hide);
}
if (ow->dialog_type == VIEW_ORDER) {
GtkWidget *hide;
/* Setup viewer for read-only access */
gtk_widget_set_sensitive (ow->id_entry, FALSE);
gtk_widget_set_sensitive (ow->opened_date, FALSE);
gtk_widget_set_sensitive (ow->closed_date, FALSE);
gtk_widget_set_sensitive (ow->notes_text, FALSE); /* XXX: Should notes remain writable? */
/* Hide the 'close order' button */
hide = glade_xml_get_widget (ow->xml, "close_order_button");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (ow->xml, "cancel_button");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (ow->xml, "new_invoice_button");
gtk_widget_hide_all (hide);
}
}
static OrderWindow *
gnc_order_new_window (GtkWidget *parent, GNCBook *bookp,
OrderDialogType type, GncOrder *order, GncOwner *owner)
{
OrderWindow *ow;
GladeXML *xml;
GtkWidget *label, *hbox, *vbox, *regWidget, *cd_label;
GtkWidget *label, *hbox, *vbox, *regWidget;
GncEntryLedger *entry_ledger = NULL;
GnomeDialog *owd;
gboolean hide_cd = FALSE;
gnc_configure_register_colors ();
@ -407,7 +507,7 @@ gnc_order_new_window (GtkWidget *parent, GNCBook *bookp,
gncOwnerCopy (owner, &(ow->owner));
/* Find the dialog */
xml = gnc_glade_xml_new ("order.glade", "Order Entry Dialog");
ow->xml = xml = gnc_glade_xml_new ("order.glade", "Order Entry Dialog");
ow->dialog = glade_xml_get_widget (xml, "Order Entry Dialog");
owd = GNOME_DIALOG (ow->dialog);
@ -420,7 +520,6 @@ gnc_order_new_window (GtkWidget *parent, GNCBook *bookp,
ow->opened_date = glade_xml_get_widget (xml, "opened_date");
ow->closed_date = glade_xml_get_widget (xml, "closed_date");
ow->active_check = glade_xml_get_widget (xml, "active_check");
cd_label = glade_xml_get_widget (xml, "cd_label");
hbox = glade_xml_get_widget (xml, "owner_hbox");
label = glade_xml_get_widget (xml, "owner_label");
@ -521,79 +620,13 @@ gnc_order_new_window (GtkWidget *parent, GNCBook *bookp,
GTK_SIGNAL_FUNC (gnc_order_owner_changed_cb),
ow);
gnc_table_realize_gui (gnc_entry_ledger_get_table (entry_ledger));
/* Set the Reference */
gnc_order_owner_changed_cb (ow->owner_choice, ow);
{
const char *string;
Timespec ts, ts_zero = {0,0};
time_t tt;
gint pos = 0;
string = gncOrderGetNotes (order);
gtk_editable_delete_text (GTK_EDITABLE (ow->notes_text), 0, -1);
gtk_editable_insert_text (GTK_EDITABLE (ow->notes_text), string,
strlen (string), &pos);
ts = gncOrderGetDateOpened (order);
if (timespec_equal (&ts, &ts_zero)) {
tt = time(NULL);
} else {
tt = ts.tv_sec; /* XXX */
}
gnome_date_edit_set_time (GNOME_DATE_EDIT (ow->opened_date), tt);
ts = gncOrderGetDateClosed (order);
if (timespec_equal (&ts, &ts_zero)) {
tt = time(NULL);
hide_cd = TRUE;
} else {
tt = ts.tv_sec; /* XXX */
}
gnome_date_edit_set_time (GNOME_DATE_EDIT (ow->closed_date), tt);
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ow->active_check),
gncOrderGetActive (order));
}
gnc_gui_component_watch_entity_type (ow->component_id,
GNC_ORDER_MODULE_NAME,
GNC_EVENT_MODIFY | GNC_EVENT_DESTROY);
gnc_table_realize_gui (gnc_entry_ledger_get_table (entry_ledger));
gtk_widget_show_all (ow->dialog);
gnc_table_refresh_gui (gnc_entry_ledger_get_table (entry_ledger), TRUE);
if (hide_cd) {
GtkWidget *hide;
gtk_widget_hide_all (ow->closed_date);
gtk_widget_hide_all (cd_label);
hide = glade_xml_get_widget (xml, "hide1");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (xml, "hide2");
gtk_widget_hide_all (hide);
}
if (type == VIEW_ORDER) {
GtkWidget *hide;
/* Setup viewer for read-only access */
gtk_widget_set_sensitive (ow->id_entry, FALSE);
gtk_widget_set_sensitive (ow->opened_date, FALSE);
gtk_widget_set_sensitive (ow->closed_date, FALSE);
gtk_widget_set_sensitive (ow->notes_text, FALSE); /* XXX: Should notes remain writable? */
/* Hide the 'close order' button */
hide = glade_xml_get_widget (xml, "close_order_button");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (xml, "cancel_button");
gtk_widget_hide_all (hide);
hide = glade_xml_get_widget (xml, "new_invoice_button");
gtk_widget_hide_all (hide);
}
/* Now fill in a lot of the pirces and display properly */
gnc_order_update_window (ow);
return ow;
}