From: Andrea Zagli Date: Sat, 2 Oct 2010 08:56:18 +0000 (+0200) Subject: Added "output-type", "output-filename" and "copies" to xml for report X-Git-Tag: 0.2.0~6 X-Git-Url: https://saetta.ns0.it/gitweb?a=commitdiff_plain;h=bd6451ccbb96c03be7d39a7a4901e5d5416530b3;p=reptool%2Flibreptool Added "output-type", "output-filename" and "copies" to xml for report and print definition. Added functions RptCommon::stroutputtype_to_enum, RptCommon::enum_to_stroutputtype, RptPrint::set_output_type, RptPrint::set_output_filename, RptPrint::set_copies, RptReport::set_output_type, RptReport::set_output_filename, RptReport::set_copies. Renamed RPTP_OUTPUT* to RPT_OUTPUT*. --- diff --git a/.gitignore b/.gitignore index a3169c8..e1ac3ef 100644 --- a/.gitignore +++ b/.gitignore @@ -38,6 +38,9 @@ config.status docs/reference/version.xml docs/reference/html/ docs/reference/xml/ +docs/reference/libreptool-decl-list.txt +docs/reference/libreptool-decl.txt +docs/reference/libreptool-scan.c libtool stamp-h1 tests/test*.png diff --git a/data/reptool.dtd b/data/reptool.dtd index ebf2e93..c809b7c 100644 --- a/data/reptool.dtd +++ b/data/reptool.dtd @@ -111,8 +111,11 @@ - + + + + diff --git a/data/reptool_report.dtd b/data/reptool_report.dtd index f9f1ab6..90842c7 100644 --- a/data/reptool_report.dtd +++ b/data/reptool_report.dtd @@ -105,8 +105,11 @@ - + + + + output_type = output_type; @@ -283,9 +296,32 @@ rpt_print_set_output_type (RptPrint *rpt_print, RptPrintOutputType output_type) void rpt_print_set_output_filename (RptPrint *rpt_print, const gchar *output_filename) { + g_return_if_fail (IS_RPT_PRINT (rpt_print)); + RptPrintPrivate *priv = RPT_PRINT_GET_PRIVATE (rpt_print); priv->output_filename = g_strdup (output_filename); + if (g_strcmp0 (priv->output_filename, "") == 0) + { + g_warning ("It's not possible to set an empty output filename."); + priv->output_filename = g_strdup ("rptreport.pdf"); + } +} + +/** + * rpt_print_set_copies: + * @rpt_print: an #RptPrint object. + * @copies: number of copies. + * + */ +void +rpt_print_set_copies (RptPrint *rpt_print, guint copies) +{ + g_return_if_fail (IS_RPT_PRINT (rpt_print)); + + RptPrintPrivate *priv = RPT_PRINT_GET_PRIVATE (rpt_print); + + priv->copies = copies; } /** @@ -344,6 +380,18 @@ rpt_print_print (RptPrint *rpt_print) { g_object_set (G_OBJECT (rpt_print), "unit-length", rpt_common_strunit_to_enum ((const gchar *)xmlNodeGetContent (cur_property)), NULL); } + else if (strcmp (cur_property->name, "output-type") == 0) + { + rpt_print_set_output_type (rpt_print, rpt_common_stroutputtype_to_enum ((const gchar *)xmlNodeGetContent (cur_property))); + } + else if (strcmp (cur_property->name, "output-filename") == 0) + { + rpt_print_set_output_filename (rpt_print, (const gchar *)xmlNodeGetContent (cur_property)); + } + else if (strcmp (cur_property->name, "copies") == 0) + { + rpt_print_set_copies (rpt_print, strtol ((const gchar *)xmlNodeGetContent (cur_property), NULL, 10)); + } cur_property = cur_property->next; } @@ -365,8 +413,8 @@ rpt_print_print (RptPrint *rpt_print) return; } - if (priv->output_type == RPTP_OUTPUT_GTK - || priv->output_type == RPTP_OUTPUT_GTK_DEFAULT_PRINTER) + if (priv->output_type == RPT_OUTPUT_GTK + || priv->output_type == RPT_OUTPUT_GTK_DEFAULT_PRINTER) { gchar *locale_old; gchar *locale_num; @@ -385,7 +433,7 @@ rpt_print_print (RptPrint *rpt_print) locale_num = setlocale (LC_NUMERIC, "C"); gtk_print_operation_run (operation, - (priv->output_type == RPTP_OUTPUT_GTK ? GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG : GTK_PRINT_OPERATION_ACTION_PRINT), + (priv->output_type == RPT_OUTPUT_GTK ? GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG : GTK_PRINT_OPERATION_ACTION_PRINT), NULL, NULL); setlocale (LC_NUMERIC, locale_num); setlocale (LC_ALL, locale_old); @@ -396,21 +444,21 @@ rpt_print_print (RptPrint *rpt_print) { switch (priv->output_type) { - case RPTP_OUTPUT_PNG: + case RPT_OUTPUT_PNG: priv->output_filename = g_strdup ("reptool.png"); break; - case RPTP_OUTPUT_PDF: + case RPT_OUTPUT_PDF: priv->output_filename = g_strdup ("reptool.pdf"); break; - case RPTP_OUTPUT_PS: + case RPT_OUTPUT_PS: priv->output_filename = g_strdup ("reptool.ps"); break; - case RPTP_OUTPUT_SVG: + case RPT_OUTPUT_SVG: priv->output_filename = g_strdup ("reptool.svg"); break; } } - if (priv->output_type != RPTP_OUTPUT_PNG && priv->output_type != RPTP_OUTPUT_SVG) + if (priv->output_type != RPT_OUTPUT_PNG && priv->output_type != RPT_OUTPUT_SVG) { fout = fopen (priv->output_filename, "w"); if (fout == NULL) @@ -432,19 +480,19 @@ rpt_print_print (RptPrint *rpt_print) width = rpt_common_value_to_points (priv->unit, priv->width); height = rpt_common_value_to_points (priv->unit, priv->height); - if (priv->output_type == RPTP_OUTPUT_PNG) + if (priv->output_type == RPT_OUTPUT_PNG) { priv->surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, (int)width, (int)height); } - else if (priv->output_type == RPTP_OUTPUT_PDF && npage == 0) + else if (priv->output_type == RPT_OUTPUT_PDF && npage == 0) { priv->surface = cairo_pdf_surface_create (priv->output_filename, width, height); } - else if (priv->output_type == RPTP_OUTPUT_PS && npage == 0) + else if (priv->output_type == RPT_OUTPUT_PS && npage == 0) { priv->surface = cairo_ps_surface_create (priv->output_filename, width, height); } - else if (priv->output_type == RPTP_OUTPUT_SVG) + else if (priv->output_type == RPT_OUTPUT_SVG) { gchar *new_out_filename = rpt_print_new_numbered_filename (priv->output_filename, npage + 1); fout = fopen (new_out_filename, "w"); @@ -460,7 +508,7 @@ rpt_print_print (RptPrint *rpt_print) if (cairo_surface_status (priv->surface) == CAIRO_STATUS_SUCCESS) { - if (priv->output_type == RPTP_OUTPUT_PNG || priv->output_type == RPTP_OUTPUT_SVG) + if (priv->output_type == RPT_OUTPUT_PNG || priv->output_type == RPT_OUTPUT_SVG) { priv->cr = cairo_create (priv->surface); } @@ -469,7 +517,7 @@ rpt_print_print (RptPrint *rpt_print) priv->cr = cairo_create (priv->surface); } - if (priv->output_type != RPTP_OUTPUT_PNG && priv->output_type != RPTP_OUTPUT_SVG && npage == 0) + if (priv->output_type != RPT_OUTPUT_PNG && priv->output_type != RPT_OUTPUT_SVG && npage == 0) { cairo_surface_destroy (priv->surface); } @@ -478,7 +526,7 @@ rpt_print_print (RptPrint *rpt_print) { rpt_print_page (rpt_print, cur); - if (priv->output_type == RPTP_OUTPUT_PNG) + if (priv->output_type == RPT_OUTPUT_PNG) { gchar *new_out_filename = rpt_print_new_numbered_filename (priv->output_filename, npage + 1); @@ -492,7 +540,7 @@ rpt_print_print (RptPrint *rpt_print) cairo_show_page (priv->cr); } - if (priv->output_type == RPTP_OUTPUT_SVG) + if (priv->output_type == RPT_OUTPUT_SVG) { cairo_surface_destroy (priv->surface); cairo_destroy (priv->cr); @@ -529,7 +577,7 @@ rpt_print_print (RptPrint *rpt_print) { cairo_destroy (priv->cr); } - if (priv->output_type != RPTP_OUTPUT_PNG && priv->output_type != RPTP_OUTPUT_SVG) + if (priv->output_type != RPT_OUTPUT_PNG && priv->output_type != RPT_OUTPUT_SVG) { fclose (fout); } @@ -557,6 +605,10 @@ rpt_print_set_property (GObject *object, guint property_id, const GValue *value, rpt_print_set_output_filename (rpt_print, g_value_get_string (value)); break; + case PROP_COPIES: + rpt_print_set_copies (rpt_print, g_value_get_uint (value)); + break; + case PROP_PATH_RELATIVES_TO: priv->path_relatives_to = g_strstrip (g_strdup (g_value_get_string (value))); break; @@ -588,6 +640,10 @@ rpt_print_get_property (GObject *object, guint property_id, GValue *value, GPara g_value_set_string (value, priv->output_filename); break; + case PROP_COPIES: + g_value_set_uint (value, priv->copies); + break; + case PROP_PATH_RELATIVES_TO: g_value_set_string (value, priv->path_relatives_to); break; @@ -1324,6 +1380,14 @@ rpt_print_gtk_begin_print (GtkPrintOperation *operation, gtk_print_operation_set_default_page_setup (operation, page_set); gtk_print_operation_set_unit (operation, GTK_UNIT_POINTS); gtk_print_operation_set_n_pages (operation, priv->pages->nodeNr); + + GtkPrintSettings *settings = gtk_print_operation_get_print_settings (operation); + if (settings == NULL) + { + settings = gtk_print_settings_new (); + } + gtk_print_settings_set_n_copies (settings, priv->copies); + gtk_print_operation_set_print_settings (operation, settings); } static void diff --git a/src/rptprint.h b/src/rptprint.h index 01a8b88..a1a91cd 100644 --- a/src/rptprint.h +++ b/src/rptprint.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2006-2010 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -24,6 +24,8 @@ #include #include +#include "rptcommon.h" + G_BEGIN_DECLS @@ -51,22 +53,14 @@ struct _RptPrintClass GType rpt_print_get_type (void) G_GNUC_CONST; -typedef enum -{ - RPTP_OUTPUT_PNG, - RPTP_OUTPUT_PDF, - RPTP_OUTPUT_PS, - RPTP_OUTPUT_SVG, - RPTP_OUTPUT_GTK, - RPTP_OUTPUT_GTK_DEFAULT_PRINTER -} RptPrintOutputType; - RptPrint *rpt_print_new_from_xml (xmlDoc *xdoc); RptPrint *rpt_print_new_from_file (const gchar *filename); -void rpt_print_set_output_type (RptPrint *rpt_print, RptPrintOutputType output_type); +void rpt_print_set_output_type (RptPrint *rpt_print, eRptOutputType output_type); void rpt_print_set_output_filename (RptPrint *rpt_print, const gchar *output_filename); +void rpt_print_set_copies (RptPrint *rpt_print, guint copies); + void rpt_print_print (RptPrint *rpt_print); diff --git a/src/rptreport.c b/src/rptreport.c index b3dd530..25a9cbb 100644 --- a/src/rptreport.c +++ b/src/rptreport.c @@ -132,7 +132,7 @@ static void rpt_report_rptprint_section (RptReport *rpt_report, gdouble *cur_y, RptReportSection section, gint row); - + static void rpt_report_rptprint_parse_text_source (RptReport *rpt_report, RptObject *rptobj, xmlNode *xnode, @@ -148,6 +148,11 @@ struct _RptReportPrivate { eRptUnitLength unit; + eRptOutputType output_type; + gchar *output_filename; + + guint copies; + Database *db; Page *page; @@ -251,6 +256,10 @@ rpt_report_init (RptReport *rpt_report) priv->body->height = 0.0; priv->body->objects = NULL; priv->body->new_page_after = FALSE; + + priv->output_type = RPT_OUTPUT_PDF; + priv->output_filename = g_strdup ("rptreport.pdf"); + priv->copies = 1; } /** @@ -331,6 +340,18 @@ RptReport { g_object_set (G_OBJECT (rpt_report), "unit-length", rpt_common_strunit_to_enum ((const gchar *)xmlNodeGetContent (cur_property)), NULL); } + else if (strcmp (cur_property->name, "output-type") == 0) + { + rpt_report_set_output_type (rpt_report, rpt_common_stroutputtype_to_enum ((const gchar *)xmlNodeGetContent (cur_property))); + } + else if (strcmp (cur_property->name, "output-filename") == 0) + { + rpt_report_set_output_filename (rpt_report, (const gchar *)xmlNodeGetContent (cur_property)); + } + else if (strcmp (cur_property->name, "copies") == 0) + { + rpt_report_set_copies (rpt_report, strtol ((const gchar *)xmlNodeGetContent (cur_property), NULL, 10)); + } cur_property = cur_property->next; } @@ -517,6 +538,59 @@ RptReport return rpt_report; } +/** + * rpt_report_set_output_type: + * @rpt_report: + * @output_type: + * + */ +void +rpt_report_set_output_type (RptReport *rpt_report, eRptOutputType output_type) +{ + g_return_if_fail (IS_RPT_REPORT (rpt_report)); + + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + priv->output_type = output_type; +} + +/** + * rpt_report_set_output_filename: + * @rpt_report: + * @output_filename: + * + */ +void +rpt_report_set_output_filename (RptReport *rpt_report, const gchar *output_filename) +{ + g_return_if_fail (IS_RPT_REPORT (rpt_report)); + + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + priv->output_filename = g_strstrip (g_strdup (output_filename)); + if (g_strcmp0 (priv->output_filename, "") == 0) + { + g_warning ("It's not possible to set an empty output filename."); + priv->output_filename = g_strdup ("rptreport.pdf"); + } +} + +/** + * rpt_report_set_copies: + * @rpt_report: + * @copies: + * + */ +void +rpt_report_set_copies (RptReport *rpt_report, guint copies) +{ + g_return_if_fail (IS_RPT_REPORT (rpt_report)); + + RptReportPrivate *priv = RPT_REPORT_GET_PRIVATE (rpt_report); + + priv->copies = copies; +} + /** * rpt_report_database_get_provider: * @rpt_report: @@ -1127,6 +1201,18 @@ xmlDoc xmlNodeSetContent (xnode, rpt_common_enum_to_strunit (priv->unit)); xmlAddChild (xnodeprop, xnode); + xnode = xmlNewNode (NULL, "output-type"); + xmlNodeSetContent (xnode, rpt_common_enum_to_stroutputtype (priv->output_type)); + xmlAddChild (xnodeprop, xnode); + + xnode = xmlNewNode (NULL, "output-filename"); + xmlNodeSetContent (xnode, priv->output_filename); + xmlAddChild (xnodeprop, xnode); + + xnode = xmlNewNode (NULL, "copies"); + xmlNodeSetContent (xnode, g_strdup_printf ("%d", priv->copies)); + xmlAddChild (xnodeprop, xnode); + if (priv->db != NULL) { xmlNode *xnodedb = xmlNewNode (NULL, "database"); @@ -1229,6 +1315,18 @@ xmlDoc xmlNodeSetContent (xnode, rpt_common_enum_to_strunit (priv->unit)); xmlAddChild (xnodeprop, xnode); + xnode = xmlNewNode (NULL, "output-type"); + xmlNodeSetContent (xnode, rpt_common_enum_to_stroutputtype (priv->output_type)); + xmlAddChild (xnodeprop, xnode); + + xnode = xmlNewNode (NULL, "output-filename"); + xmlNodeSetContent (xnode, priv->output_filename); + xmlAddChild (xnodeprop, xnode); + + xnode = xmlNewNode (NULL, "copies"); + xmlNodeSetContent (xnode, g_strdup_printf ("%d", priv->copies)); + xmlAddChild (xnodeprop, xnode); + if (priv->db != NULL) { gint row; diff --git a/src/rptreport.h b/src/rptreport.h index 2b728ba..9a81511 100644 --- a/src/rptreport.h +++ b/src/rptreport.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2007 Andrea Zagli + * Copyright (C) 2007-2010 Andrea Zagli * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -70,6 +70,11 @@ RptReport *rpt_report_new (void); RptReport *rpt_report_new_from_xml (xmlDoc *xdoc); RptReport *rpt_report_new_from_file (const gchar *filename); +void rpt_report_set_output_type (RptReport *rpt_report, eRptOutputType output_type); +void rpt_report_set_output_filename (RptReport *rpt_report, const gchar *output_filename); + +void rpt_report_set_copies (RptReport *rpt_report, guint copies); + const gchar *rpt_report_database_get_provider (RptReport *rpt_report); const gchar *rpt_report_database_get_connection_string (RptReport *rpt_report); const gchar *rpt_report_database_get_sql (RptReport *rpt_report); @@ -107,7 +112,7 @@ void rpt_report_section_remove (RptReport *rpt_report, RptReportSection section) gboolean rpt_report_get_report_header_new_page_after (RptReport *rpt_report); void rpt_report_set_report_header_new_page_after (RptReport *rpt_report, gboolean new_page_after); - + gboolean rpt_report_get_report_footer_new_page_before (RptReport *rpt_report); void rpt_report_set_report_footer_new_page_before (RptReport *rpt_report, gboolean new_page_before); diff --git a/tests/test_rptprint.c b/tests/test_rptprint.c index 4f8d264..eff361b 100644 --- a/tests/test_rptprint.c +++ b/tests/test_rptprint.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andrea Zagli + * Copyright (C) 2006-2010 Andrea Zagli * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -29,7 +29,7 @@ main (int argc, char **argv) if (rptp != NULL) { - rpt_print_set_output_type (rptp, RPTP_OUTPUT_PNG); + rpt_print_set_output_type (rptp, RPT_OUTPUT_PNG); rpt_print_set_output_filename (rptp, "test.png"); rpt_print_print (rptp); } diff --git a/tests/test_rptreport.c b/tests/test_rptreport.c index 45b9638..23ccacf 100644 --- a/tests/test_rptreport.c +++ b/tests/test_rptreport.c @@ -67,7 +67,7 @@ main (int argc, char **argv) rptp = rpt_print_new_from_xml (rptprint); if (rptp != NULL) { - rpt_print_set_output_type (rptp, RPTP_OUTPUT_PDF); + rpt_print_set_output_type (rptp, RPT_OUTPUT_PDF); rpt_print_set_output_filename (rptp, "test.pdf"); rpt_print_print (rptp); } diff --git a/tests/test_rptreport_creation.c b/tests/test_rptreport_creation.c index e85cb77..f2156af 100644 --- a/tests/test_rptreport_creation.c +++ b/tests/test_rptreport_creation.c @@ -121,7 +121,7 @@ main (int argc, char **argv) rptp = rpt_print_new_from_xml (rptprint); if (rptp != NULL) { - rpt_print_set_output_type (rptp, RPTP_OUTPUT_PDF); + rpt_print_set_output_type (rptp, RPT_OUTPUT_PDF); rpt_print_set_output_filename (rptp, "test_report_created.pdf"); rpt_print_print (rptp); }