Preferences. New desktop integration preference for Windows users (native/gtk, see Bug #417365).

Preferences. Fix for a bug with the preferences dialog when Show dialogs is set to true (always opens on the Selector page).
Preferences. UI consistency fix (System information fields not correctly indented). 
This line and the following will be ignored --------------

modified:
  src/desktop.cpp
  src/preferences-skeleton.h
  src/ui/dialog/filedialog.cpp
  src/ui/dialog/inkscape-preferences.cpp
  src/ui/dialog/inkscape-preferences.h
unknown:
  inkscape.el.1
  inkscape.ja.1
  inkscape.sk.1
  inkscape.zh_TW.1
  libtool
  ltmain.sh@
  preferencesDialog.diff
  relink2.diff
  revert10761.diff
  rmbackups.sh
  doc/keys.gl.html
  doc/keys.pl.html
  packaging/win32/languages/.fr-xLpu9j/
  share/icons/inkscape-trunk.svg
  share/icons/application/48x48/inkscape-trunk.png
  src/.libs/
  src/libnr/
  src/relink.cpp
  src/relink.h
  src/extension/dbus/wrapper/inkdbus.pc

(bzr r11109)

1 files changed, 15 insertions, 2 deletions

diff --git a/src/ui/dialog/filedialog.cpp b/src/ui/dialog/filedialog.cpp
index cff2f2488..47ba6c748 100644
--- a/src/ui/dialog/filedialog.cpp
+++ b/src/ui/dialog/filedialog.cpp
@@ -22,6 +22,7 @@
 #include "gc-core.h"
 #include <dialogs/dialog-events.h>
 #include "extension/output.h"
+#include "preferences.h"
 
 namespace Inkscape
 {
@@ -86,7 +87,13 @@ FileOpenDialog *FileOpenDialog::create(Gtk::Window &parentWindow,
                                        const char *title)
 {
 #ifdef WIN32
-    FileOpenDialog *dialog = new FileOpenDialogImplWin32(parentWindow, path, fileTypes, title);
+    FileOpenDialog *dialog = NULL;
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    if (prefs->getBool( "/options/desktopintegration/value")) {
+        dialog = new FileOpenDialogImplWin32(parentWindow, path, fileTypes, title);
+    } else {
+        dialog = new FileOpenDialogImplGtk(parentWindow, path, fileTypes, title);
+    }
 #else
     FileOpenDialog *dialog = new FileOpenDialogImplGtk(parentWindow, path, fileTypes, title);
 #endif
@@ -115,7 +122,13 @@ FileSaveDialog *FileSaveDialog::create(Gtk::Window& parentWindow,
                                        const Inkscape::Extension::FileSaveMethod save_method)
 {
 #ifdef WIN32
-    FileSaveDialog *dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
+    FileSaveDialog *dialog = NULL;
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    if (prefs->getBool( "/options/desktopintegration/value")) {
+        dialog = new FileSaveDialogImplWin32(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
+    } else {
+        dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
+    }
 #else
     FileSaveDialog *dialog = new FileSaveDialogImplGtk(parentWindow, path, fileTypes, title, default_key, docTitle, save_method);
 #endif