[Gnucash-changes] Convert to gnc_file_dialog() to get the code to
build on EL3/FC1.
Derek Atkins
warlord at cvs.gnucash.org
Sat Apr 2 23:48:51 EST 2005
Log Message:
-----------
Convert to gnc_file_dialog() to get the code to build on EL3/FC1.
Tags:
----
gnucash-gnome2-dev
Modified Files:
--------------
gnucash/src/business/business-gnome:
Makefile.am
gnc-plugin-business.c
gnucash/src/gnome:
dialog-chart-export.c
Revision Data
-------------
Index: gnc-plugin-business.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Attic/gnc-plugin-business.c,v
retrieving revision 1.1.2.6
retrieving revision 1.1.2.7
diff -Lsrc/business/business-gnome/gnc-plugin-business.c -Lsrc/business/business-gnome/gnc-plugin-business.c -u -r1.1.2.6 -r1.1.2.7
--- src/business/business-gnome/gnc-plugin-business.c
+++ src/business/business-gnome/gnc-plugin-business.c
@@ -39,6 +39,7 @@
#include "gncOwner.h"
#include "messages.h"
#include "gnc-ui-util.h"
+#include "gnc-file-dialog.h"
/* g_object functions */
@@ -618,19 +619,14 @@
QofCollection *coll;
gchar *filename;
gboolean success;
- GtkWidget *qsffilechooser;
current_session = qof_session_get_current_session();
book = qof_session_get_book(current_session);
chart_session = qof_session_new();
success = FALSE;
- filename = g_strdup("/tmp/qsf-invoices.xml");
- qsffilechooser = gtk_file_chooser_dialog_new("Export Invoices to XML",
- (GtkWindow*)mw->window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_CONVERT, GTK_RESPONSE_ACCEPT, NULL);
- if (gtk_dialog_run (GTK_DIALOG (qsffilechooser)) == GTK_RESPONSE_ACCEPT)
+ filename = gnc_file_dialog(_("Export Invoices to XML"), NULL, "/tmp/qsf-invoices.xml");
+ if (filename)
{
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (qsffilechooser));
qof_session_begin(chart_session, filename, TRUE, TRUE);
coll = qof_book_get_collection(book, GNC_ID_INVOICE);
success = qof_entity_copy_coll(chart_session, coll);
@@ -641,7 +637,6 @@
}
g_free(filename);
qof_session_end(chart_session);
- gtk_widget_destroy(qsffilechooser);
qof_session_set_current_session(current_session);
}
@@ -653,19 +648,14 @@
QofCollection *coll;
gchar *filename;
gboolean success;
- GtkWidget *qsffilechooser;
current_session = qof_session_get_current_session();
book = qof_session_get_book(current_session);
chart_session = qof_session_new();
success = FALSE;
- filename = g_strdup("/tmp/qsf-customers.xml");
- qsffilechooser = gtk_file_chooser_dialog_new("Export Customers to XML",
- (GtkWindow*)mw->window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_CONVERT, GTK_RESPONSE_ACCEPT, NULL);
- if (gtk_dialog_run (GTK_DIALOG (qsffilechooser)) == GTK_RESPONSE_ACCEPT)
+ filename = gnc_file_dialog(_("Export Customers to XML"), NULL, "/tmp/qsf-customers.xml");
+ if (filename)
{
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (qsffilechooser));
qof_session_begin(chart_session, filename, TRUE, TRUE);
coll = qof_book_get_collection(book, GNC_ID_CUSTOMER);
success = qof_entity_copy_coll(chart_session, coll);
@@ -676,7 +666,6 @@
}
qof_session_end(chart_session);
g_free(filename);
- gtk_widget_destroy(qsffilechooser);
qof_session_set_current_session(current_session);
}
@@ -688,19 +677,14 @@
QofCollection *coll;
gchar *filename;
gboolean success;
- GtkWidget *qsffilechooser;
current_session = qof_session_get_current_session();
book = qof_session_get_book(current_session);
chart_session = qof_session_new();
success = FALSE;
- filename = g_strdup("/tmp/qsf-vendors.xml");
- qsffilechooser = gtk_file_chooser_dialog_new("Export Vendors to XML",
- (GtkWindow*)mw->window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_CONVERT, GTK_RESPONSE_ACCEPT, NULL);
- if (gtk_dialog_run (GTK_DIALOG (qsffilechooser)) == GTK_RESPONSE_ACCEPT)
+ filename = gnc_file_dialog(_("Export Vendors to XML"), NULL, "/tmp/qsf-vendors.xml");
+ if (filename)
{
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (qsffilechooser));
qof_session_begin(chart_session, filename, TRUE, TRUE);
coll = qof_book_get_collection(book, GNC_ID_VENDOR);
success = qof_entity_copy_coll(chart_session, coll);
@@ -712,7 +696,6 @@
qof_session_end(chart_session);
g_free(filename);
qof_session_set_current_session(current_session);
- gtk_widget_destroy(qsffilechooser);
}
static void
@@ -723,19 +706,14 @@
QofCollection *coll;
gchar *filename;
gboolean success;
- GtkWidget *qsffilechooser;
current_session = qof_session_get_current_session();
book = qof_session_get_book(current_session);
chart_session = qof_session_new();
success = FALSE;
- filename = g_strdup("/tmp/qsf-employee.xml");
- qsffilechooser = gtk_file_chooser_dialog_new("Export Employees to XML",
- (GtkWindow*)mw->window, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_CONVERT, GTK_RESPONSE_ACCEPT, NULL);
- if (gtk_dialog_run (GTK_DIALOG (qsffilechooser)) == GTK_RESPONSE_ACCEPT)
+ filename = gnc_file_dialog(_("Export Employees to XML"), NULL, "/tmp/qsf-employee.xml");
+ if (filename)
{
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (qsffilechooser));
qof_session_begin(chart_session, filename, TRUE, TRUE);
coll = qof_book_get_collection(book, GNC_ID_EMPLOYEE);
success = qof_entity_copy_coll(chart_session, coll);
@@ -746,6 +724,5 @@
}
qof_session_end(chart_session);
g_free(filename);
- gtk_widget_destroy(qsffilechooser);
qof_session_set_current_session(current_session);
}
Index: Makefile.am
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/business/business-gnome/Makefile.am,v
retrieving revision 1.31.4.6
retrieving revision 1.31.4.7
diff -Lsrc/business/business-gnome/Makefile.am -Lsrc/business/business-gnome/Makefile.am -u -r1.31.4.6 -r1.31.4.7
--- src/business/business-gnome/Makefile.am
+++ src/business/business-gnome/Makefile.am
@@ -10,6 +10,7 @@
-I${top_srcdir}/src/gnome-utils \
-I${top_srcdir}/src/gnome \
-I${top_srcdir}/src/app-utils \
+ -I${top_srcdir}/src/app-file \
-I${top_srcdir}/src/gnome-search \
-I${top_srcdir}/src/report/report-gnome \
-I${top_srcdir}/src/business/business-core \
Index: dialog-chart-export.c
===================================================================
RCS file: /home/cvs/cvsroot/gnucash/src/gnome/Attic/dialog-chart-export.c,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -Lsrc/gnome/dialog-chart-export.c -Lsrc/gnome/dialog-chart-export.c -u -r1.1.2.3 -r1.1.2.4
--- src/gnome/dialog-chart-export.c
+++ src/gnome/dialog-chart-export.c
@@ -33,6 +33,7 @@
#include "gnc-engine-util.h"
#include "global-options.h"
#include "gnc-event.h"
+#include "gnc-file-dialog.h"
#define EQUITY_ACCOUNT_NAME _("Opening Balances")
#define OPENING_BALANCE_DESC _("Opening Balance")
@@ -202,7 +203,6 @@
chart_data *data;
GtkCalendar *calendar;
struct tm *chart_tm;
- GtkWidget *qsffilechooser;
GtkWindow *parent;
gchar *filename;
QofSession *current_session, *chart_session;
@@ -234,12 +234,10 @@
book = qof_session_get_book(current_session);
filename = g_strdup("/tmp/qsf-chartofaccounts.xml");
chart_session = qof_session_new();
- qsffilechooser = gtk_file_chooser_dialog_new("Export Chart of Accounts to QSF XML",
- parent, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL, GTK_STOCK_CONVERT, GTK_RESPONSE_ACCEPT, NULL);
- if (gtk_dialog_run (GTK_DIALOG (qsffilechooser)) == GTK_RESPONSE_ACCEPT)
+ filename = gnc_file_dialog(_("Export Chart of Accounts to QSF XML"),
+ NULL, NULL);
+ if (filename)
{
- filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (qsffilechooser));
gnc_engine_suspend_events();
qof_session_begin(chart_session, filename, TRUE, TRUE);
data->chart_session = chart_session;
@@ -266,7 +264,6 @@
gnc_engine_resume_events();
}
qof_session_end(chart_session);
- gtk_widget_destroy(qsffilechooser);
g_free(data);
qof_session_set_current_session(current_session);
}
More information about the gnucash-changes
mailing list