Revision: 2168
http://geany.svn.sourceforge.net/geany/?rev=2168&view=rev
Author: eht16
Date: 2008-01-12 04:22:46 -0800 (Sat, 12 Jan 2008)
Log Message:
-----------
Add POTFILES.skip to ignore files with translatable strings.
Make "distcheck" working.
Modified Paths:
--------------
trunk/ChangeLog
trunk/Makefile.am
Added Paths:
-----------
trunk/po/POTFILES.skip
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-12 11:03:52 UTC (rev 2167)
+++ trunk/ChangeLog 2008-01-12 12:22:46 UTC (rev 2168)
@@ -5,6 +5,9 @@
* src/printing.c:
Avoid double status message if print dialog was cancelled.
Print status messages in status-changed handler.
+ * Makefile.am, po/POTFILES.skip:
+ Add POTFILES.skip to ignore files with translatable strings.
+ Make "distcheck" working.
2008-01-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2008-01-12 11:03:52 UTC (rev 2167)
+++ trunk/Makefile.am 2008-01-12 12:22:46 UTC (rev 2168)
@@ -50,7 +50,7 @@
@$(NORMAL_INSTALL)
if test -d $(srcdir)/pixmaps; then \
$(mkinstalldirs) $(DESTDIR)$(datadir)/pixmaps; \
- $(INSTALL_DATA) pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \
+ $(INSTALL_DATA) $(srcdir)/pixmaps/geany.png $(DESTDIR)$(datadir)/pixmaps; \
fi
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
$(INSTALL_DATA) $(srcdir)/data/global.tags $(DESTDIR)$(pkgdatadir); \
Added: trunk/po/POTFILES.skip
===================================================================
--- trunk/po/POTFILES.skip (rev 0)
+++ trunk/po/POTFILES.skip 2008-01-12 12:22:46 UTC (rev 2168)
@@ -0,0 +1,8 @@
+# List of source files containing translatable strings but should be ignored.
+
+# geany.desktop.in will be translated
+geany.desktop.in.in
+# generated src/interface.c will be translated
+geany.glade
+# no need to translate this file
+plugins/demoplugin.c
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2167
http://geany.svn.sourceforge.net/geany/?rev=2167&view=rev
Author: eht16
Date: 2008-01-12 03:03:52 -0800 (Sat, 12 Jan 2008)
Log Message:
-----------
Avoid double status message if print dialog was cancelled.
Print status messages in status-changed handler.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/printing.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-12 10:14:58 UTC (rev 2166)
+++ trunk/ChangeLog 2008-01-12 11:03:52 UTC (rev 2167)
@@ -2,6 +2,9 @@
* src/keyfile.c: Try to fix changing message window height when using
full screen (closes #1869415).
+ * src/printing.c:
+ Avoid double status message if print dialog was cancelled.
+ Print status messages in status-changed handler.
2008-01-11 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/printing.c
===================================================================
--- trunk/src/printing.c 2008-01-12 10:14:58 UTC (rev 2166)
+++ trunk/src/printing.c 2008-01-12 11:03:52 UTC (rev 2167)
@@ -83,7 +83,6 @@
gint styles[STYLE_MAX + 1][MAX_TYPES];
gdouble line_height;
gboolean long_line; // whether we have a wrapped line on page end to take care of on next page
- gboolean cancelled;
// set in begin_print() to hold the time when printing was started to ensure all printed
// pages have the same date and time (in case of slow machines and many pages where rendering
// takes more than a second)
@@ -423,7 +422,6 @@
dinfo->cur_line = 0;
dinfo->cur_pos = 0;
dinfo->long_line = FALSE;
- dinfo->cancelled = FALSE;
dinfo->print_time = time(NULL);
dinfo->max_line_number_margin = get_line_numbers_arity(dinfo->lines) + 1;
// increase font width by 1 (looks better)
@@ -459,11 +457,6 @@
if (dinfo->n_pages >= 0)
gtk_print_operation_set_n_pages(operation, dinfo->n_pages);
- // if we have many pages we show GTK's progress dialog which also allows cancelling of the
- // print operation
- if (dinfo->n_pages > 3)
- gtk_print_operation_set_show_progress(operation, TRUE);
-
pango_font_description_free(desc);
}
@@ -719,9 +712,9 @@
static void status_changed(GtkPrintOperation *op, gpointer data)
{
if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED_ABORTED)
- {
- ((DocInfo*)data)->cancelled = TRUE;
- }
+ msgwin_status_add(_("Printing of file %s was cancelled."), (gchar *) data);
+ else if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED)
+ msgwin_status_add(_("File %s printed."), (gchar *) data);
}
@@ -743,11 +736,12 @@
op = gtk_print_operation_new();
gtk_print_operation_set_unit(op, GTK_UNIT_POINTS);
+ gtk_print_operation_set_show_progress(op, TRUE);
g_signal_connect(op, "begin-print", G_CALLBACK(begin_print), dinfo);
g_signal_connect(op, "end-print", G_CALLBACK(end_print), dinfo);
g_signal_connect(op, "draw-page", G_CALLBACK(draw_page), dinfo);
- g_signal_connect(op, "status-changed", G_CALLBACK(status_changed), dinfo);
+ g_signal_connect(op, "status-changed", G_CALLBACK(status_changed), doc_list[idx].file_name);
g_signal_connect(op, "create-custom-widget", G_CALLBACK(create_custom_widget), widgets);
g_signal_connect(op, "custom-widget-apply", G_CALLBACK(custom_widget_apply), widgets);
@@ -764,10 +758,7 @@
if (settings != NULL)
g_object_unref(settings);
settings = g_object_ref(gtk_print_operation_get_print_settings(op));
- if (dinfo->cancelled)
- msgwin_status_add(_("Printing of file %s was cancelled."), doc_list[idx].file_name);
- else
- msgwin_status_add(_("File %s printed."), doc_list[idx].file_name);
+ // status message is printed in the status-changed handler
}
else if (res == GTK_PRINT_OPERATION_RESULT_ERROR)
{
@@ -775,10 +766,6 @@
doc_list[idx].file_name, error->message);
g_error_free(error);
}
- else if (res == GTK_PRINT_OPERATION_RESULT_CANCEL)
- { // not sure when this actually happens but just in case we print a message
- msgwin_status_add(_("Printing of file %s was cancelled."), doc_list[idx].file_name);
- }
g_object_unref(op);
g_free(dinfo);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2165
http://geany.svn.sourceforge.net/geany/?rev=2165&view=rev
Author: ntrel
Date: 2008-01-11 09:30:58 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Add Yura Siamashka to list of contributors.
Modified Paths:
--------------
trunk/THANKS
Modified: trunk/THANKS
===================================================================
--- trunk/THANKS 2008-01-11 17:09:23 UTC (rev 2164)
+++ trunk/THANKS 2008-01-11 17:30:58 UTC (rev 2165)
@@ -39,6 +39,7 @@
Sebastian Kraft <kraft(dot)sebastian(at)googlemail(dot)com> - new Geany icon
Catalin Marinas <catalin(dot)marinas(at)gmail(dot)com> - newline strips trailing spaces patch
Bo Lorentsen <bl(at)lue(dot)dk> - project session patch
+Yura Siamashka <yurand2(at)gmail(dot)com> - many patches
Translators:
------------
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2164
http://geany.svn.sourceforge.net/geany/?rev=2164&view=rev
Author: ntrel
Date: 2008-01-11 09:09:23 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Apply patch from Yura Siamashka to speed up removing several
workspace object's tags without updating the workspace until
necessary (thanks).
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/dialogs.c
trunk/src/document.c
trunk/src/plugindata.h
trunk/tagmanager/include/tm_workspace.h
trunk/tagmanager/tm_project.c
trunk/tagmanager/tm_workspace.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/ChangeLog 2008-01-11 17:09:23 UTC (rev 2164)
@@ -4,6 +4,12 @@
doc/geany.html:
Add 'Make in base path' project file preference, on by default.
Add project_get_base_path(), separated from project_get_make_dir().
+ * src/dialogs.c, src/plugindata.h, src/document.c,
+ tagmanager/tm_project.c, tagmanager/tm_workspace.c,
+ tagmanager/include/tm_workspace.h:
+ Apply patch from Yura Siamashka to speed up removing several
+ workspace object's tags without updating the workspace until
+ necessary (thanks).
2008-01-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/dialogs.c
===================================================================
--- trunk/src/dialogs.c 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/src/dialogs.c 2008-01-11 17:09:23 UTC (rev 2164)
@@ -426,7 +426,7 @@
g_free(old_filename);
}
// create a new tm_source_file object otherwise tagmanager won't work correctly
- tm_workspace_remove_object(doc_list[idx].tm_file, TRUE);
+ tm_workspace_remove_object(doc_list[idx].tm_file, TRUE, TRUE);
doc_list[idx].tm_file = NULL;
g_free(doc_list[idx].file_name);
}
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/src/document.c 2008-01-11 17:09:23 UTC (rev 2164)
@@ -494,7 +494,7 @@
g_free(doc_list[idx].encoding);
g_free(doc_list[idx].saved_encoding.encoding);
g_free(doc_list[idx].file_name);
- tm_workspace_remove_object(doc_list[idx].tm_file, TRUE);
+ tm_workspace_remove_object(doc_list[idx].tm_file, TRUE, TRUE);
doc_list[idx].is_valid = FALSE;
doc_list[idx].sci = NULL;
@@ -1943,7 +1943,7 @@
// delete tm file object to force creation of a new one
if (doc_list[idx].tm_file != NULL)
{
- tm_workspace_remove_object(doc_list[idx].tm_file, TRUE);
+ tm_workspace_remove_object(doc_list[idx].tm_file, TRUE, TRUE);
doc_list[idx].tm_file = NULL;
}
highlighting_set_styles(doc_list[idx].sci, type->id);
Modified: trunk/src/plugindata.h
===================================================================
--- trunk/src/plugindata.h 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/src/plugindata.h 2008-01-11 17:09:23 UTC (rev 2164)
@@ -93,12 +93,12 @@
/* The API version should be incremented whenever any plugin data types below are
* modified or appended to. */
-static const gint api_version = 37;
+static const gint api_version = 38;
/* The ABI version should be incremented whenever existing fields in the plugin
* data types below have to be changed or reordered. It should stay the same if fields
* are only appended, as this doesn't affect existing fields. */
-static const gint abi_version = 19;
+static const gint abi_version = 20;
/* This performs runtime checks that try to ensure:
* 1. Geany ABI data types are compatible with this plugin.
@@ -373,7 +373,7 @@
gboolean (*source_file_update) (TMWorkObject *source_file, gboolean force,
gboolean recurse, gboolean update_parent);
void (*work_object_free) (gpointer work_object);
- gboolean (*workspace_remove_object) (TMWorkObject *w, gboolean do_free);
+ gboolean (*workspace_remove_object) (TMWorkObject *w, gboolean do_free, gboolean update);
}
TagManagerFuncs;
Modified: trunk/tagmanager/include/tm_workspace.h
===================================================================
--- trunk/tagmanager/include/tm_workspace.h 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/tagmanager/include/tm_workspace.h 2008-01-11 17:09:23 UTC (rev 2164)
@@ -79,9 +79,10 @@
/*! Removes a member object from the workspace if it exists.
\param work_object Pointer to the work object to be removed.
\param free Whether the work object is to be freed as well.
+ \param update Whether to update workspace objects.
\return TRUE on success, FALSE on failure (e.g. the work object does not exist).
*/
-gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean free);
+gboolean tm_workspace_remove_object(TMWorkObject *work_object, gboolean free, gboolean update);
/*! Loads the global tag list from the specified file. The global tag list should
have been first created using tm_workspace_create_global_tags().
Modified: trunk/tagmanager/tm_project.c
===================================================================
--- trunk/tagmanager/tm_project.c 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/tagmanager/tm_project.c 2008-01-11 17:09:23 UTC (rev 2164)
@@ -139,7 +139,7 @@
tm_source_file_free(project->file_list->pdata[i]);
g_ptr_array_free(project->file_list, TRUE);
}
- tm_workspace_remove_object(TM_WORK_OBJECT(project), FALSE);
+ tm_workspace_remove_object(TM_WORK_OBJECT(project), FALSE, TRUE);
g_free(project->dir);
tm_work_object_destroy(&(project->work_object));
}
@@ -175,7 +175,7 @@
#ifdef TM_DEBUG
g_message("%s moved from workspace to project", path);
#endif
- tm_workspace_remove_object(source_file, FALSE);
+ tm_workspace_remove_object(source_file, FALSE, TRUE);
}
else if (TM_WORK_OBJECT(project) == source_file->parent)
{
Modified: trunk/tagmanager/tm_workspace.c
===================================================================
--- trunk/tagmanager/tm_workspace.c 2008-01-11 16:53:25 UTC (rev 2163)
+++ trunk/tagmanager/tm_workspace.c 2008-01-11 17:09:23 UTC (rev 2164)
@@ -98,12 +98,14 @@
return TRUE;
}
-gboolean tm_workspace_remove_object(TMWorkObject *w, gboolean do_free)
+gboolean tm_workspace_remove_object(TMWorkObject *w, gboolean do_free, gboolean update)
{
guint i;
if ((NULL == theWorkspace) || (NULL == theWorkspace->work_objects)
|| (NULL == w))
return FALSE;
+
+
for (i=0; i < theWorkspace->work_objects->len; ++i)
{
if (theWorkspace->work_objects->pdata[i] == w)
@@ -111,10 +113,12 @@
if (do_free)
tm_work_object_free(w);
g_ptr_array_remove_index_fast(theWorkspace->work_objects, i);
- tm_workspace_update(TM_WORK_OBJECT(theWorkspace), TRUE, FALSE, FALSE);
+ if (update)
+ tm_workspace_update(TM_WORK_OBJECT(theWorkspace), TRUE, FALSE, FALSE);
return TRUE;
}
}
+
return FALSE;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2162
http://geany.svn.sourceforge.net/geany/?rev=2162&view=rev
Author: eht16
Date: 2008-01-11 07:02:42 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Fix crash while reading Scintilla styles.
Append "_export" to the exported file name when the exported file has the same extension as the source file.
Modified Paths:
--------------
trunk/ChangeLog
trunk/plugins/export.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-11 14:23:29 UTC (rev 2161)
+++ trunk/ChangeLog 2008-01-11 15:02:42 UTC (rev 2162)
@@ -5,6 +5,10 @@
Fix crash while reading Scintilla styles.
Add GTK's progress dialog when printing large documents which also
provides the ability to cancel a print operation.
+ * plugins/export.c:
+ Fix crash while reading Scintilla styles.
+ Append "_export" to the exported file name when the exported file has
+ the same extension as the source file.
2008-01-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/plugins/export.c
===================================================================
--- trunk/plugins/export.c 2008-01-11 14:23:29 UTC (rev 2161)
+++ trunk/plugins/export.c 2008-01-11 15:02:42 UTC (rev 2162)
@@ -25,6 +25,7 @@
/* Export plugin. */
#include <ctype.h>
+#include <math.h>
#include "geany.h"
#include "support.h"
@@ -210,9 +211,17 @@
{
gchar *base_name = g_path_get_basename(doc_list[idx].file_name);
gchar *short_name = utils->remove_ext_from_filename(base_name);
- gchar *file_name = g_strconcat(short_name, extension, NULL);
- gchar *locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name);
- gchar *locale_dirname = g_path_get_dirname(locale_filename);
+ gchar *file_name;
+ gchar *locale_filename;
+ gchar *locale_dirname;
+ gchar *suffix = "";
+
+ if (g_str_has_suffix(doc_list[idx].file_name, extension))
+ suffix = "_export";
+
+ file_name = g_strconcat(short_name, suffix, extension, NULL);
+ locale_filename = utils->get_locale_from_utf8(doc_list[idx].file_name);
+ locale_dirname = g_path_get_dirname(locale_filename);
// set the current name to base_name.html which probably doesn't exist yet so
// gtk_file_chooser_set_filename() can't be used and we need
// gtk_file_chooser_set_current_folder() additionally
@@ -346,9 +355,10 @@
GString *body;
GString *cmds;
GString *latex;
+ gint style_max = pow(2, scintilla->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0));
// first read all styles from Scintilla
- for (i = 0; i <= STYLE_MAX; i++)
+ for (i = 0; i < style_max; i++)
{
styles[i][FORE] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0);
styles[i][BACK] = scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0);
@@ -552,9 +562,10 @@
GString *body;
GString *css;
GString *html;
+ gint style_max = pow(2, scintilla->send_message(doc_list[idx].sci, SCI_GETSTYLEBITS, 0, 0));
// first read all styles from Scintilla
- for (i = 0; i <= STYLE_MAX; i++)
+ for (i = 0; i < style_max; i++)
{
styles[i][FORE] = ROTATE_RGB(scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETFORE, i, 0));
styles[i][BACK] = ROTATE_RGB(scintilla->send_message(doc_list[idx].sci, SCI_STYLEGETBACK, i, 0));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 2161
http://geany.svn.sourceforge.net/geany/?rev=2161&view=rev
Author: eht16
Date: 2008-01-11 06:23:29 -0800 (Fri, 11 Jan 2008)
Log Message:
-----------
Fix crash while reading Scintilla styles.
Add GTK's progress dialog when printing large documents which also provides the ability to cancel a print operation.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/printing.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2008-01-11 13:17:00 UTC (rev 2160)
+++ trunk/ChangeLog 2008-01-11 14:23:29 UTC (rev 2161)
@@ -1,6 +1,10 @@
2008-01-11 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/dialogs.c: Fix broken Rename functionality (closes #1868621).
+ * src/printing.c:
+ Fix crash while reading Scintilla styles.
+ Add GTK's progress dialog when printing large documents which also
+ provides the ability to cancel a print operation.
2008-01-10 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
Modified: trunk/src/printing.c
===================================================================
--- trunk/src/printing.c 2008-01-11 13:17:00 UTC (rev 2160)
+++ trunk/src/printing.c 2008-01-11 14:23:29 UTC (rev 2161)
@@ -83,6 +83,7 @@
gint styles[STYLE_MAX + 1][MAX_TYPES];
gdouble line_height;
gboolean long_line; // whether we have a wrapped line on page end to take care of on next page
+ gboolean cancelled;
// set in begin_print() to hold the time when printing was started to ensure all printed
// pages have the same date and time (in case of slow machines and many pages where rendering
// takes more than a second)
@@ -266,7 +267,7 @@
g_free(data);
g_free(file_name);
- data = g_strdup_printf("<b>page %d of %d</b>", page_nr + 1, dinfo->n_pages);
+ data = g_strdup_printf(_("<b>Page %d of %d</b>"), page_nr + 1, dinfo->n_pages);
pango_layout_set_markup(layout, data, -1);
pango_layout_set_alignment(layout, PANGO_ALIGN_LEFT);
cairo_move_to(cr, 4, dinfo->line_height * 1.5);
@@ -409,6 +410,7 @@
DocInfo *dinfo = user_data;
PangoFontDescription *desc;
gint i;
+ gint style_max;
if (dinfo == NULL)
return;
@@ -421,6 +423,7 @@
dinfo->cur_line = 0;
dinfo->cur_pos = 0;
dinfo->long_line = FALSE;
+ dinfo->cancelled = FALSE;
dinfo->print_time = time(NULL);
dinfo->max_line_number_margin = get_line_numbers_arity(dinfo->lines) + 1;
// increase font width by 1 (looks better)
@@ -432,7 +435,8 @@
dinfo->n_pages = get_page_count(context, dinfo);
// read all styles from Scintilla
- for (i = 0; i <= STYLE_MAX; i++)
+ style_max = pow(2, scintilla_send_message(doc_list[dinfo->idx].sci, SCI_GETSTYLEBITS, 0, 0));
+ for (i = 0; i < style_max; i++)
{
dinfo->styles[i][FORE] = ROTATE_RGB(scintilla_send_message(
doc_list[dinfo->idx].sci, SCI_STYLEGETFORE, i, 0));
@@ -455,6 +459,11 @@
if (dinfo->n_pages >= 0)
gtk_print_operation_set_n_pages(operation, dinfo->n_pages);
+ // if we have many pages we show GTK's progress dialog which also allows cancelling of the
+ // print operation
+ if (dinfo->n_pages > 3)
+ gtk_print_operation_set_show_progress(operation, TRUE);
+
pango_font_description_free(desc);
}
@@ -707,6 +716,15 @@
}
+static void status_changed(GtkPrintOperation *op, gpointer data)
+{
+ if (gtk_print_operation_get_status(op) == GTK_PRINT_STATUS_FINISHED_ABORTED)
+ {
+ ((DocInfo*)data)->cancelled = TRUE;
+ }
+}
+
+
static void printing_print_gtk(gint idx)
{
GtkPrintOperation *op;
@@ -729,6 +747,7 @@
g_signal_connect(op, "begin-print", G_CALLBACK(begin_print), dinfo);
g_signal_connect(op, "end-print", G_CALLBACK(end_print), dinfo);
g_signal_connect(op, "draw-page", G_CALLBACK(draw_page), dinfo);
+ g_signal_connect(op, "status-changed", G_CALLBACK(status_changed), dinfo);
g_signal_connect(op, "create-custom-widget", G_CALLBACK(create_custom_widget), widgets);
g_signal_connect(op, "custom-widget-apply", G_CALLBACK(custom_widget_apply), widgets);
@@ -745,14 +764,21 @@
if (settings != NULL)
g_object_unref(settings);
settings = g_object_ref(gtk_print_operation_get_print_settings(op));
- msgwin_status_add(_("File %s printed."), doc_list[idx].file_name);
+ if (dinfo->cancelled)
+ msgwin_status_add(_("Printing of file %s was cancelled."), doc_list[idx].file_name);
+ else
+ msgwin_status_add(_("File %s printed."), doc_list[idx].file_name);
}
else if (res == GTK_PRINT_OPERATION_RESULT_ERROR)
{
- dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Printing of \"%s\" failed (%s)."),
+ dialogs_show_msgbox(GTK_MESSAGE_ERROR, _("Printing of %s failed (%s)."),
doc_list[idx].file_name, error->message);
g_error_free(error);
}
+ else if (res == GTK_PRINT_OPERATION_RESULT_CANCEL)
+ { // not sure when this actually happens but just in case we print a message
+ msgwin_status_add(_("Printing of file %s was cancelled."), doc_list[idx].file_name);
+ }
g_object_unref(op);
g_free(dinfo);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.