Merge from trunk.

[inkscape.git] / src / preferences-skeleton.h

diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h
index c12b8f9ba3d441af10a1a7c2456fe02b208f9aff..40e1c892a6f553741eb4b62d861fad6a29c3b189 100644 (file)
--- a/src/preferences-skeleton.h
+++ b/src/preferences-skeleton.h
@@ -17,6 +17,7 @@ static char const preferences_skeleton[] =
 "  xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\"\n"
 "  xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\">\n"
 "  <group id=\"window\">\n"
+"    <group id=\"task\" />\n"
 "    <group id=\"menu\" state=\"1\"/>\n"
 "    <group id=\"commands\" state=\"1\"/>\n"
 "    <group id=\"snaptoolbox\" state=\"1\"/>\n"
@@ -28,6 +29,7 @@ static char const preferences_skeleton[] =
 "    <group id=\"scrollbars\" state=\"1\"/>\n"
 "  </group>\n"
 "  <group id=\"fullscreen\">\n"
+"    <group id=\"task\" />\n"
 "    <group id=\"menu\" state=\"1\"/>\n"
 "    <group id=\"commands\" state=\"1\"/>\n"
 "    <group id=\"snaptoolbox\" state=\"1\"/>\n"
@@ -39,6 +41,7 @@ static char const preferences_skeleton[] =
 "    <group id=\"scrollbars\" state=\"1\"/>\n"
 "  </group>\n"
 "  <group id=\"focus\">\n"
+"    <group id=\"task\" />\n"
 "    <group id=\"menu\" state=\"0\"/>\n"
 "    <group id=\"commands\" state=\"0\"/>\n"
 "    <group id=\"snaptoolbox\" state=\"0\"/>\n"
@@ -115,7 +118,7 @@ static char const preferences_skeleton[] =
 "                  style=\"fill:black;fill-opacity:1;stroke:none;font-family:Sans;font-style:normal;font-weight:normal;font-size:40px;\" selcue=\"1\"/>\n"
 "    <eventcontext id=\"nodes\" selcue=\"1\" gradientdrag=\"1\" highlight_color=\"4278190335\" pathflash_enabled=\"1\" pathflash_unselected=\"0\" pathflash_timeout=\"500\" show_handles=\"1\" show_outline=\"0\" sculpting_profile=\"1\" single_node_transform_handles=\"0\" show_transform_handles=\"0\" live_outline=\"1\" live_objects=\"1\" show_helperpath=\"0\" x=\"0\" y=\"0\" edit_clipping_paths=\"0\" edit_masks=\"0\" />\n"
 "    <eventcontext id=\"tweak\" selcue=\"0\" gradientdrag=\"0\" show_handles=\"0\" width=\"0.2\" force=\"0.2\" fidelity=\"0.5\" usepressure=\"1\" style=\"fill:red;stroke:none;\" usecurrent=\"0\"/>\n"
-"    <eventcontext id=\"spray\" selcue=\"0\" gradientdrag=\"0\" show_handles=\"0\" width=\"0.2\" force=\"0.2\" fidelity=\"0.5\" usepressure=\"1\" style=\"fill:red;stroke:none;\" usecurrent=\"0\"/>\n"
+"    <eventcontext id=\"spray\" usepressure=\"1\" width=\"15\" population=\"70\" mode=\"1\" rotation_variation=\"0\" scale_variation=\"0\" standard_deviation=\"70\" mean=\"0\"/>\n"
 "    <eventcontext id=\"gradient\" selcue=\"1\"/>\n"
 "    <eventcontext id=\"zoom\" selcue=\"1\" gradientdrag=\"0\"/>\n"
 "    <eventcontext id=\"dropper\" selcue=\"1\" gradientdrag=\"1\" pick=\"1\" setalpha=\"1\"/>\n"
@@ -190,7 +193,7 @@ static char const preferences_skeleton[] =
 "      <group id=\"exportarea\"/>\n"
 "      <group id=\"defaultxdpi\"/>\n"
 "    </group>\n"
-"    <group id=\"save_as\" default=\"\" append_extension=\"1\" enable_preview=\"1\" path=\"\"/>\n"
+"    <group id=\"save_as\" default=\"\" append_extension=\"1\" enable_preview=\"1\" path=\"\" use_current_dir=\"1\"/>\n"
 "    <group id=\"save_copy\" default=\"\" append_extension=\"1\" enable_preview=\"1\" path=\"\"/>\n"
 "    <group id=\"open\" enable_preview=\"1\" path=\"\"/>\n"
 "    <group id=\"import\" enable_preview=\"1\" path=\"\"/>\n"
@@ -340,6 +343,7 @@ static char const preferences_skeleton[] =
 "    </group>\n"
 "    <group id=\"workarounds\"\n"
 "           colorsontop=\"0\"\n"
+"           floatallowed=\"0\"\n"
 "           partialdynamic=\"0\"/>\n"
 "    <group id=\"threading\" numthreads=\"1\"/>\n"
 "  </group>\n"
@@ -387,7 +391,12 @@ static char const preferences_skeleton[] =
 "  </group>\n"
 "\n"
 "  <group\n"
-"     id=\"iconpreview\">\n"
+"     id=\"iconpreview\"\n"
+"     autoRefresh=\"1\"\n"
+"     pack=\"1\"\n"
+"     selectionHold=\"1\"\n"
+"     showFrames=\"1\"\n"
+"     selectionOnly=\"0\">\n"
 "    <group\n"
 "       id=\"sizes\">\n"
 "      <group\n"
@@ -397,6 +406,10 @@ static char const preferences_skeleton[] =
 "           show=\"1\"\n"
 "           id=\"size16\" />\n"
 "        <group\n"
+"           value=\"22\"\n"
+"           show=\"0\"\n"
+"           id=\"size22\" />\n"
+"        <group\n"
 "           value=\"24\"\n"
 "           show=\"1\"\n"
 "           id=\"size24\" />\n"
@@ -465,4 +478,4 @@ static char const preferences_skeleton[] =
   fill-column:99
   End:
 */
-// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:encoding=utf-8:textwidth=99 :
+// vim: filetype=cpp:expandtab:shiftwidth=4:tabstop=8:softtabstop=4:fileencoding=utf-8:textwidth=99 :