diff options
| author | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-01 19:19:22 +0000 |
|---|---|---|
| committer | Jabiertxo Arraiza Cenoz <jtx@jtx-desktop.markerlab.es> | 2017-12-01 19:19:22 +0000 |
| commit | c3a73643b3525f428c1698603c5cd428b5cd04c3 (patch) | |
| tree | 118998ce998b93e05a171c19deceb27bd47ae72c /src | |
| parent | Working bspline, to fine tune (diff) | |
| parent | Add a warning dialog for previous commit (diff) | |
| download | inkscape-c3a73643b3525f428c1698603c5cd428b5cd04c3.tar.gz inkscape-c3a73643b3525f428c1698603c5cd428b5cd04c3.zip | |
Merge branch 'master' into PowerStrokeSmooth
Diffstat (limited to 'src')
| -rw-r--r-- | src/extension/implementation/script.cpp | 15 | ||||
| -rw-r--r-- | src/file-update.cpp | 1 | ||||
| -rw-r--r-- | src/ui/dialog/export.cpp | 1 |
3 files changed, 14 insertions, 3 deletions
diff --git a/src/extension/implementation/script.cpp b/src/extension/implementation/script.cpp index eb98711bc..0f0a79bfb 100644 --- a/src/extension/implementation/script.cpp +++ b/src/extension/implementation/script.cpp @@ -732,9 +732,18 @@ void Script::effect(Inkscape::Extension::Effect *module, SPDocument * mydoc = NULL; if (data_read > 10) { - mydoc = Inkscape::Extension::open( - Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG), - tempfilename_out.c_str()); + try { + mydoc = Inkscape::Extension::open( + Inkscape::Extension::db.get(SP_MODULE_KEY_INPUT_SVG), + tempfilename_out.c_str()); + } catch (const Inkscape::Extension::Input::open_failed &e) { + g_warning("Extension returned output that could not be parsed: %s", e.what()); + Gtk::MessageDialog warning( + _("The output from the extension could not be parsed."), + false, Gtk::MESSAGE_WARNING, Gtk::BUTTONS_OK, true); + warning.set_transient_for( *(INKSCAPE.active_desktop()->getToplevel()) ); + warning.run(); + } } // data_read pump_events(); diff --git a/src/file-update.cpp b/src/file-update.cpp index 303a5c4f1..1d95b5d4c 100644 --- a/src/file-update.cpp +++ b/src/file-update.cpp @@ -318,6 +318,7 @@ void sp_file_convert_dpi(SPDocument *doc) bool backup = prefs->getBool("/options/dpifixbackup", true); if (INKSCAPE.use_gui() && sp_file_convert_dpi_method_commandline == -1) { Gtk::Dialog scale_dialog(_("Convert legacy Inkscape file")); + scale_dialog.set_transient_for( *(INKSCAPE.active_desktop()->getToplevel()) ); scale_dialog.set_border_width(10); scale_dialog.set_resizable(false); Gtk::Label explanation; diff --git a/src/ui/dialog/export.cpp b/src/ui/dialog/export.cpp index 8c710c8e5..53629a1a2 100644 --- a/src/ui/dialog/export.cpp +++ b/src/ui/dialog/export.cpp @@ -901,6 +901,7 @@ void Export::setExporting(bool exporting, Glib::ustring const &text) Gtk::Dialog * Export::create_progress_dialog (Glib::ustring progress_text) { Gtk::Dialog *dlg = new Gtk::Dialog(_("Export in progress"), TRUE); + dlg->set_transient_for( *(INKSCAPE.active_desktop()->getToplevel()) ); Gtk::ProgressBar *prg = new Gtk::ProgressBar (); prg->set_text(progress_text); |