Add user preference for rendering cache size

(bzr r10347.1.34)

2 files changed, 34 insertions, 29 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index d11ffd565..0129f196f 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -124,7 +124,7 @@ InkscapePreferences::InkscapePreferences()
     initPageTransforms();
     initPageClones();
     initPageMasks();
-    initPageFilters();
+    initPageRendering();
     initPageBitmaps();
     initPageCMS();
     initPageGrids();
@@ -739,8 +739,22 @@ void InkscapePreferences::initPageTransforms()
     this->AddPage(_page_transforms, _("Transforms"), PREFS_PAGE_TRANSFORMS);
 }
 
-void InkscapePreferences::initPageFilters()
+void InkscapePreferences::initPageRendering()
 {
+    /* show infobox */
+    _show_filters_info_box.init( _("Show filter primitives infobox"), "/options/showfiltersinfobox/value", true);
+    _page_rendering.add_line(true, "", _show_filters_info_box, "",
+                        _("Show icons and descriptions for the filter primitives available at the filter effects dialog"));
+
+    /* threaded blur */ //related comments/widgets/functions should be renamed and option should be moved elsewhere when inkscape is fully multi-threaded
+    _filter_multi_threaded.init("/options/threading/numthreads", 1.0, 8.0, 1.0, 2.0, 4.0, true, false);
+    _page_rendering.add_line( false, _("Number of Threads:"), _filter_multi_threaded, _("(requires restart)"),
+                           _("Configure number of processors/threads to use when rendering filters"), false);
+
+    // rendering cache
+    _rendering_cache_size.init("/options/renderingcache/size", 0.0, 4096.0, 1.0, 32.0, 128.0, true, false);
+    _page_rendering.add_line( false, _("Rendering cache size:"), _rendering_cache_size, C_("mebibyte (2^20 bytes) abbreviation","MiB"), _("Set the amount of memory per drawing which can be used to store rendered parts of the drawing for later reuse; set to zero to disable caching"), false);
+
     /* blur quality */
     _blur_quality_best.init ( _("Best quality (slowest)"), "/options/blurquality/value",
                                   BLUR_QUALITY_BEST, false, 0);
@@ -753,16 +767,16 @@ void InkscapePreferences::initPageFilters()
     _blur_quality_worst.init ( _("Lowest quality (fastest)"), "/options/blurquality/value",
                                   BLUR_QUALITY_WORST, false, &_blur_quality_best);
 
-    _page_filters.add_group_header( _("Gaussian blur quality for display"));
-    _page_filters.add_line( true, "", _blur_quality_best, "",
+    _page_rendering.add_group_header( _("Gaussian blur quality for display"));
+    _page_rendering.add_line( true, "", _blur_quality_best, "",
                            _("Best quality, but display may be very slow at high zooms (bitmap export always uses best quality)"));
-    _page_filters.add_line( true, "", _blur_quality_better, "",
+    _page_rendering.add_line( true, "", _blur_quality_better, "",
                            _("Better quality, but slower display"));
-    _page_filters.add_line( true, "", _blur_quality_normal, "",
+    _page_rendering.add_line( true, "", _blur_quality_normal, "",
                            _("Average quality, acceptable display speed"));
-    _page_filters.add_line( true, "", _blur_quality_worse, "",
+    _page_rendering.add_line( true, "", _blur_quality_worse, "",
                            _("Lower quality (some artifacts), but display is faster"));
-    _page_filters.add_line( true, "", _blur_quality_worst, "",
+    _page_rendering.add_line( true, "", _blur_quality_worst, "",
                            _("Lowest quality (considerable artifacts), but display is fastest"));
 
     /* filter quality */
@@ -777,29 +791,19 @@ void InkscapePreferences::initPageFilters()
     _filter_quality_worst.init ( _("Lowest quality (fastest)"), "/options/filterquality/value",
                                   Inkscape::Filters::FILTER_QUALITY_WORST, false, &_filter_quality_best);
 
-    _page_filters.add_group_header( _("Filter effects quality for display"));
-    _page_filters.add_line( true, "", _filter_quality_best, "",
+    _page_rendering.add_group_header( _("Filter effects quality for display"));
+    _page_rendering.add_line( true, "", _filter_quality_best, "",
                            _("Best quality, but display may be very slow at high zooms (bitmap export always uses best quality)"));
-    _page_filters.add_line( true, "", _filter_quality_better, "",
+    _page_rendering.add_line( true, "", _filter_quality_better, "",
                            _("Better quality, but slower display"));
-    _page_filters.add_line( true, "", _filter_quality_normal, "",
+    _page_rendering.add_line( true, "", _filter_quality_normal, "",
                            _("Average quality, acceptable display speed"));
-    _page_filters.add_line( true, "", _filter_quality_worse, "",
+    _page_rendering.add_line( true, "", _filter_quality_worse, "",
                            _("Lower quality (some artifacts), but display is faster"));
-    _page_filters.add_line( true, "", _filter_quality_worst, "",
+    _page_rendering.add_line( true, "", _filter_quality_worst, "",
                            _("Lowest quality (considerable artifacts), but display is fastest"));
 
-    /* show infobox */
-    _show_filters_info_box.init( _("Show filter primitives infobox"), "/options/showfiltersinfobox/value", true);
-    _page_filters.add_line(true, "", _show_filters_info_box, "",
-                        _("Show icons and descriptions for the filter primitives available at the filter effects dialog"));
-
-    /* threaded blur */ //related comments/widgets/functions should be renamed and option should be moved elsewhere when inkscape is fully multi-threaded
-    _filter_multi_threaded.init("/options/threading/numthreads", 1.0, 8.0, 1.0, 2.0, 4.0, true, false);
-    _page_filters.add_line( false, _("Number of Threads:"), _filter_multi_threaded, _("(requires restart)"),
-                           _("Configure number of processors/threads to use with rendering of gaussian blur"), false);
-
-    this->AddPage(_page_filters, _("Filters"), PREFS_PAGE_FILTERS);
+    this->AddPage(_page_rendering, _("Rendering"), PREFS_PAGE_RENDERING);
 }
 
 
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index 13851e525..d783a2df1 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -44,7 +44,7 @@ enum {
     PREFS_PAGE_TOOLS_SELECTOR,
     PREFS_PAGE_TOOLS_NODE,
     PREFS_PAGE_TOOLS_TWEAK,
-  PREFS_PAGE_TOOLS_SPRAY,
+    PREFS_PAGE_TOOLS_SPRAY,
     PREFS_PAGE_TOOLS_ZOOM,
     PREFS_PAGE_TOOLS_MEASURE,
     PREFS_PAGE_TOOLS_SHAPES,
@@ -67,7 +67,7 @@ enum {
     PREFS_PAGE_TRANSFORMS,
     PREFS_PAGE_CLONES,
     PREFS_PAGE_MASKS,
-    PREFS_PAGE_FILTERS,
+    PREFS_PAGE_RENDERING,
     PREFS_PAGE_BITMAPS,
     PREFS_PAGE_CMS,
     PREFS_PAGE_GRIDS,
@@ -124,7 +124,7 @@ protected:
     UI::Widget::DialogPage _page_clones;
     UI::Widget::DialogPage _page_mask;
     UI::Widget::DialogPage _page_transforms;
-    UI::Widget::DialogPage _page_filters;
+    UI::Widget::DialogPage _page_rendering;
     UI::Widget::DialogPage _page_select;
     UI::Widget::DialogPage _page_importexport;
     UI::Widget::DialogPage _page_cms;
@@ -254,6 +254,7 @@ protected:
     UI::Widget::PrefRadioButton _filter_quality_worse;
     UI::Widget::PrefRadioButton _filter_quality_worst;
     UI::Widget::PrefCheckButton _show_filters_info_box;
+    UI::Widget::PrefSpinButton  _rendering_cache_size;
     UI::Widget::PrefSpinButton  _filter_multi_threaded;
 
     UI::Widget::PrefCheckButton _trans_scale_stroke;
@@ -389,7 +390,7 @@ protected:
     void initPageClones();
     void initPageMasks();
     void initPageTransforms();
-    void initPageFilters();
+    void initPageRendering();
     void initPageSelecting();
     void initPageImportExport();
     void initPageCMS();