diff options
| author | Nicolas Dufour <nicoduf@yahoo.fr> | 2012-03-21 12:59:45 +0000 |
|---|---|---|
| committer | JazzyNico <nicoduf@yahoo.fr> | 2012-03-21 12:59:45 +0000 |
| commit | 6fe8f224601795c237bbd74763bc8a386d726e82 (patch) | |
| tree | 895a98b0ef06eb68ace64bd1fcfb7ee5b0af48a8 /src/preferences-skeleton.h | |
| parent | UI. Patch for Bug #789797 (Add an icon/definiton for Duplicate Current Layer). (diff) | |
| download | inkscape-6fe8f224601795c237bbd74763bc8a386d726e82.tar.gz inkscape-6fe8f224601795c237bbd74763bc8a386d726e82.zip | |
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)
Diffstat (limited to 'src/preferences-skeleton.h')
| -rw-r--r-- | src/preferences-skeleton.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 18b7150f5..2b674d015 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -281,6 +281,9 @@ static char const preferences_skeleton[] = " <group id=\"bitmapeditor\" value=\"gimp\"/>\n" " <group id=\"bitmapautoreload\" value=\"1\"/>\n" " <group id=\"dialogtype\" value=\"1\"/>\n" +#ifdef WIN32 +" <group id=\"desktopintegration\" value=\"1\"/>\n" +#endif " <group id=\"dock\" " " cancenterdock=\"1\"" " dockbarstyle=\"2\"" // GDL_DOCK_BAR_BOTH |