diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-05-26 17:37:48 +0000 |
|---|---|---|
| committer | jabiertxof <info@marker.es> | 2016-05-26 17:37:48 +0000 |
| commit | 43bc2051d07eb88f0ef3bff36880d9b39e809cc5 (patch) | |
| tree | 18582075e686eb9bcc2e1af5ef9e2a4ceb19e65b /src | |
| parent | Fixing pointwise (diff) | |
| parent | [Bug #1538277] Translations in inkex.py fail unless extension script itself i... (diff) | |
| download | inkscape-43bc2051d07eb88f0ef3bff36880d9b39e809cc5.tar.gz inkscape-43bc2051d07eb88f0ef3bff36880d9b39e809cc5.zip | |
update to trunk
(bzr r13645.1.144)
Diffstat (limited to 'src')
| -rw-r--r-- | src/display/nr-filter.cpp | 4 | ||||
| -rw-r--r-- | src/inkscape-x64.rc | 8 | ||||
| -rw-r--r-- | src/inkscape.rc | 8 | ||||
| -rw-r--r-- | src/inkview-x64.rc | 8 | ||||
| -rw-r--r-- | src/inkview.rc | 8 | ||||
| -rw-r--r-- | src/preferences-skeleton.h | 4 |
6 files changed, 21 insertions, 19 deletions
diff --git a/src/display/nr-filter.cpp b/src/display/nr-filter.cpp index 8591be7eb..789758d9c 100644 --- a/src/display/nr-filter.cpp +++ b/src/display/nr-filter.cpp @@ -108,7 +108,9 @@ int Filter::render(Inkscape::DrawingItem const *item, DrawingContext &graphic, D graphic.setOperator(CAIRO_OPERATOR_OVER); return 1; } - + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + item->drawing().setFilterQuality(prefs->getInt("/options/filterquality/value", 0)); + item->drawing().setBlurQuality(prefs->getInt("/options/blurquality/value", 0)); FilterQuality const filterquality = (FilterQuality)item->drawing().filterQuality(); int const blurquality = item->drawing().blurQuality(); diff --git a/src/inkscape-x64.rc b/src/inkscape-x64.rc index 7f4d5b9ae..2f4710a36 100644 --- a/src/inkscape-x64.rc +++ b/src/inkscape-x64.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkscape-manifest-x64.xml" 1 VERSIONINFO - FILEVERSION 0,91,0,9 - PRODUCTVERSION 0,91,0,9 + FILEVERSION 0,92,0,0 + PRODUCTVERSION 0,92,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL" VALUE "CompanyName", "inkscape.org" VALUE "FileDescription", "Inkscape" - VALUE "FileVersion", "0.91+devel" + VALUE "FileVersion", "0.92pre1" VALUE "InternalName", "Inkscape" VALUE "LegalCopyright", "© 2014 Inkscape" VALUE "ProductName", "Inkscape" - VALUE "ProductVersion", "0.91+devel" + VALUE "ProductVersion", "0.92pre1" END END BLOCK "VarFileInfo" diff --git a/src/inkscape.rc b/src/inkscape.rc index 92d38f60e..087c5862d 100644 --- a/src/inkscape.rc +++ b/src/inkscape.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkscape-manifest.xml" 1 VERSIONINFO - FILEVERSION 0,91,0,9 - PRODUCTVERSION 0,91,0,9 + FILEVERSION 0,92,0,0 + PRODUCTVERSION 0,92,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL" VALUE "CompanyName", "inkscape.org" VALUE "FileDescription", "Inkscape" - VALUE "FileVersion", "0.91+devel" + VALUE "FileVersion", "0.92pre1" VALUE "InternalName", "Inkscape" VALUE "LegalCopyright", "© 2014 Inkscape" VALUE "ProductName", "Inkscape" - VALUE "ProductVersion", "0.91+devel" + VALUE "ProductVersion", "0.92pre1" END END BLOCK "VarFileInfo" diff --git a/src/inkview-x64.rc b/src/inkview-x64.rc index 1b7287993..465de4af1 100644 --- a/src/inkview-x64.rc +++ b/src/inkview-x64.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkview-manifest-x64.xml" 1 VERSIONINFO - FILEVERSION 0,91,0,9 - PRODUCTVERSION 0,91,0,9 + FILEVERSION 0,92,0,0 + PRODUCTVERSION 0,92,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL" VALUE "CompanyName", "inkscape.org" VALUE "FileDescription", "Inkview" - VALUE "FileVersion", "0.91+devel" + VALUE "FileVersion", "0.92pre1" VALUE "InternalName", "Inkview" VALUE "LegalCopyright", "© 2014 Inkscape" VALUE "ProductName", "Inkview" - VALUE "ProductVersion", "0.91+devel" + VALUE "ProductVersion", "0.92pre1" END END BLOCK "VarFileInfo" diff --git a/src/inkview.rc b/src/inkview.rc index 326b0873a..34632bd14 100644 --- a/src/inkview.rc +++ b/src/inkview.rc @@ -3,8 +3,8 @@ APPLICATION_ICON ICON DISCARDABLE "../inkscape.ico" 1 24 DISCARDABLE "./inkview-manifest.xml" 1 VERSIONINFO - FILEVERSION 0,91,0,9 - PRODUCTVERSION 0,91,0,9 + FILEVERSION 0,92,0,0 + PRODUCTVERSION 0,92,0,0 BEGIN BLOCK "StringFileInfo" BEGIN @@ -13,11 +13,11 @@ BEGIN VALUE "Comments", "Published under the GNU GPL" VALUE "CompanyName", "inkscape.org" VALUE "FileDescription", "Inkview" - VALUE "FileVersion", "0.91+devel" + VALUE "FileVersion", "0.92pre1" VALUE "InternalName", "Inkview" VALUE "LegalCopyright", "© 2014 Inkscape" VALUE "ProductName", "Inkview" - VALUE "ProductVersion", "0.91+devel" + VALUE "ProductVersion", "0.92pre1" END END BLOCK "VarFileInfo" diff --git a/src/preferences-skeleton.h b/src/preferences-skeleton.h index 9f2e68b1d..5ccc4d729 100644 --- a/src/preferences-skeleton.h +++ b/src/preferences-skeleton.h @@ -91,11 +91,11 @@ static char const preferences_skeleton[] = " <eventcontext id=\"spiral\" style=\"fill:none;\" usecurrent=\"0\"/>\n" " </group>\n" " <group id=\"freehand\"\n" -" style=\"fill:none;fill-rule:evenodd;stroke:black;stroke-opacity:1;stroke-linejoin:miter;stroke-linecap:butt;\">\n" +" style=\"fill:none;stroke:black;stroke-opacity:1;stroke-linejoin:miter;stroke-linecap:butt;\">\n" " <eventcontext id=\"pencil\" tolerance=\"4.0\" selcue=\"1\" style=\"stroke-width:1px;\" usecurrent=\"0\" average_all_sketches=\"1\"/>\n" " <eventcontext id=\"pen\" mode=\"drag\" selcue=\"1\" style=\"stroke-width:1px;\" usecurrent=\"0\"/>\n" " </group>\n" -" <eventcontext id=\"calligraphic\" style=\"fill:black;fill-opacity:1;stroke:none;\"\n" +" <eventcontext id=\"calligraphic\" style=\"fill:black;fill-opacity:1;fill-rule:nonzero;stroke:none;\"\n" " mass=\"2\" angle=\"30\" width=\"15\" thinning=\"10\" flatness=\"90\" cap_rounding=\"0.0\" usecurrent=\"1\"\n" " tracebackground=\"0\" usepressure=\"1\" usetilt=\"0\" keep_selected=\"1\">\n" " <group id=\"preset\">\n" |