Merge branch 'master' into PowerStrokeSmooth

4 files changed, 21 insertions, 12 deletions

diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake
index a192f459f..6f66d5e26 100644
--- a/CMakeScripts/InstallMSYS2.cmake
+++ b/CMakeScripts/InstallMSYS2.cmake
@@ -39,7 +39,6 @@ if(WIN32)
     ${MINGW_BIN}/libfreetype-[0-9]*.dll

     ${MINGW_BIN}/libfribidi-[0-9]*.dll

     ${MINGW_BIN}/libgc-[0-9]*.dll

-    ${MINGW_BIN}/libgdbm-[0-9]*.dll

     ${MINGW_BIN}/libgdk-3-[0-9]*.dll

     ${MINGW_BIN}/libgdk_pixbuf-2.0-[0-9]*.dll

     ${MINGW_BIN}/libgdkmm-3.0-[0-9]*.dll

@@ -50,8 +49,6 @@ if(WIN32)
     ${MINGW_BIN}/libglib-2.0-[0-9]*.dll

     ${MINGW_BIN}/libglibmm-2.4-[0-9]*.dll

     ${MINGW_BIN}/libgmodule-2.0-[0-9]*.dll

-    ${MINGW_BIN}/libgmp-[0-9]*.dll

-    ${MINGW_BIN}/libgnutls-[0-9]*.dll

     ${MINGW_BIN}/libgobject-2.0-[0-9]*.dll

     ${MINGW_BIN}/libgomp-[0-9]*.dll

     ${MINGW_BIN}/libgraphite[0-9]*.dll

@@ -61,7 +58,6 @@ if(WIN32)
     ${MINGW_BIN}/libgtkmm-3.0-[0-9]*.dll

     ${MINGW_BIN}/libgtkspell3-3-[0-9]*.dll

     ${MINGW_BIN}/libharfbuzz-[0-9]*.dll

-    ${MINGW_BIN}/libhogweed-[0-9]*.dll

     ${MINGW_BIN}/libiconv-[0-9]*.dll

     ${MINGW_BIN}/libicudt[0-9]*.dll

     ${MINGW_BIN}/libicuin[0-9]*.dll

@@ -71,14 +67,11 @@ if(WIN32)
     ${MINGW_BIN}/libjpeg-[0-9]*.dll

     ${MINGW_BIN}/liblcms2-[0-9]*.dll

     ${MINGW_BIN}/liblqr-1-[0-9]*.dll

-    ${MINGW_BIN}/libltdl-[0-9]*.dll

     ${MINGW_BIN}/liblzma-[0-9]*.dll

-    ${MINGW_BIN}/libnettle-[0-9]*.dll

     ${MINGW_BIN}/libnghttp2-[0-9]*.dll

     ${MINGW_BIN}/libnspr[0-9]*.dll

     ${MINGW_BIN}/libopenblas.dll

     ${MINGW_BIN}/libopenjp2-[0-9]*.dll

-    ${MINGW_BIN}/libp11-kit-[0-9]*.dll

     ${MINGW_BIN}/libpango-1.0-[0-9]*.dll

     ${MINGW_BIN}/libpangocairo-1.0-[0-9]*.dll

     ${MINGW_BIN}/libpangoft2-1.0-[0-9]*.dll

@@ -99,13 +92,11 @@ if(WIN32)
     ${MINGW_BIN}/librevenge-0.[0-9]*.dll

     ${MINGW_BIN}/librevenge-stream-0.[0-9]*.dll

     ${MINGW_BIN}/librsvg-2-[0-9]*.dll

-    ${MINGW_BIN}/librtmp-[0-9]*.dll

     ${MINGW_BIN}/libsigc-2.0-[0-9]*.dll

     ${MINGW_BIN}/libsoup-2.4-[0-9]*.dll

     ${MINGW_BIN}/libsqlite3-[0-9]*.dll

     ${MINGW_BIN}/libssh2-[0-9]*.dll

     ${MINGW_BIN}/libstdc++-[0-9]*.dll

-    ${MINGW_BIN}/libtasn1-[0-9]*.dll

     ${MINGW_BIN}/libtermcap-[0-9]*.dll

     ${MINGW_BIN}/libtiff-[0-9]*.dll

     ${MINGW_BIN}/libunistring-[0-9]*.dll

@@ -205,6 +196,13 @@ if(WIN32)
     ${MINGW_LIB}/enchant/libenchant_aspell.dll

     DESTINATION lib/enchant)

 

+  # tcl/tk related files (required for tkinter)

+  install(DIRECTORY

+    ${MINGW_PATH}/lib/tcl8

+    ${MINGW_PATH}/lib/tcl8.6

+    ${MINGW_PATH}/lib/tk8.6

+    DESTINATION lib)

+

   # Necessary to run extensions on windows if it is not in the path

   if (HAVE_MINGW64)

     install(FILES

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);