From b866698517e88d95cb12a6a3b402f795770f4eec Mon Sep 17 00:00:00 2001 From: joncruz Date: Wed, 3 Oct 2007 08:42:14 +0000 Subject: [PATCH] Split CMS to separate prefs page --- src/ui/dialog/inkscape-preferences.cpp | 39 +++++++++++++++----------- src/ui/dialog/inkscape-preferences.h | 4 ++- 2 files changed, 25 insertions(+), 18 deletions(-) diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index 964073782..2f1030746 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -103,6 +103,7 @@ InkscapePreferences::InkscapePreferences(Behavior::BehaviorFactory behavior_fact initPageFilters(); initPageSelecting(); initPageImportExport(); + initPageCMS(); initPageMisc(); //calculate the size request for this dialog @@ -657,19 +658,10 @@ static void proofComboChanged( Gtk::ComboBoxText* combo ) } #endif // ENABLE_LCMS - -void InkscapePreferences::initPageMisc() +void InkscapePreferences::initPageCMS() { - _misc_comment.init( _("Add label comments to printing output"), "printing.debug", "show-label-comments", false); - _page_misc.add_line( false, "", _misc_comment, "", - _("When on, a comment will be added to the raw print output, marking the rendered output for an object with its label"), true); - - _misc_small_toolbar.init( _("Make commands toolbar smaller"), "toolbox", "small", true); - _page_misc.add_line( false, "", _misc_small_toolbar, "", - _("Make the commands toolbar use the 'secondary' toolbar size (requires restart)"), true); - _misc_cms_display.init( _("Enable display calibration"), "options.displayprofile", "enable", false); - _page_misc.add_line( false, "", _misc_cms_display, "", + _page_cms.add_line( false, "", _misc_cms_display, "", _("Enables application of the display using an ICC profile."), true); int const numIntents = 4; @@ -677,26 +669,26 @@ void InkscapePreferences::initPageMisc() int intentValues[numIntents] = {0, 1, 2, 3}; _misc_cms_intent.init("options.displayprofile", "intent", intentLabels, intentValues, numIntents, 0); - _page_misc.add_line( false, _("Display intent:"), _misc_cms_intent, "", + _page_cms.add_line( false, _("Display intent:"), _misc_cms_intent, "", _("The rendering intent to use to calibrate display output."), true); - _page_misc.add_line( false, _("Display profile:"), _misc_cms_display_profile, "", + _page_cms.add_line( false, _("Display profile:"), _misc_cms_display_profile, "", _("The ICC profile to use to calibrate display output."), true); _misc_cms_softproof.init( _("Simulate output on screen."), "options.softproof", "enable", false); - _page_misc.add_line( false, "", _misc_cms_softproof, "", + _page_cms.add_line( false, "", _misc_cms_softproof, "", _("Simulates output of target device."), true); _misc_cms_gamutwarn.init( _("Mark out of gamut colors."), "options.softproof", "gamutwarn", false); - _page_misc.add_line( false, "", _misc_cms_gamutwarn, "", + _page_cms.add_line( false, "", _misc_cms_gamutwarn, "", _("Highlights colors that are out of gamut for the target device."), true); _misc_cms_proof_intent.init("options.softproof", "intent", intentLabels, intentValues, numIntents, 0); - _page_misc.add_line( false, _("Device intent:"), _misc_cms_proof_intent, "", + _page_cms.add_line( false, _("Device intent:"), _misc_cms_proof_intent, "", _("The rendering intent to use to calibrate display output."), true); - _page_misc.add_line( false, _("Device profile:"), _misc_cms_proof_profile, "", + _page_cms.add_line( false, _("Device profile:"), _misc_cms_proof_profile, "", _("The ICC profile to use to simulate device output."), true); #if ENABLE_LCMS @@ -746,6 +738,19 @@ void InkscapePreferences::initPageMisc() _misc_cms_proof_profile.set_sensitive( false ); #endif // ENABLE_LCMS + this->AddPage(_page_cms, _("Color Management"), PREFS_PAGE_CMS); +} + +void InkscapePreferences::initPageMisc() +{ + _misc_comment.init( _("Add label comments to printing output"), "printing.debug", "show-label-comments", false); + _page_misc.add_line( false, "", _misc_comment, "", + _("When on, a comment will be added to the raw print output, marking the rendered output for an object with its label"), true); + + _misc_small_toolbar.init( _("Make commands toolbar smaller"), "toolbox", "small", true); + _page_misc.add_line( false, "", _misc_small_toolbar, "", + _("Make the commands toolbar use the 'secondary' toolbar size (requires restart)"), true); + _misc_recent.init("options.maxrecentdocuments", "value", 0.0, 1000.0, 1.0, 1.0, 1.0, true, false); _page_misc.add_line( false, _("Max recent documents:"), _misc_recent, "", _("The maximum length of the Open Recent list in the File menu"), false); diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index f88c5e0c6..615ef984f 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -63,6 +63,7 @@ enum { PREFS_PAGE_TRANSFORMS, PREFS_PAGE_SELECTING, PREFS_PAGE_IMPORTEXPORT, + PREFS_PAGE_CMS, PREFS_PAGE_MISC }; @@ -104,7 +105,7 @@ protected: DialogPage _page_mouse, _page_scrolling, _page_steps, _page_tools, _page_windows, _page_clones, _page_mask, _page_transforms, _page_filters, _page_select, - _page_importexport, _page_misc; + _page_importexport, _page_cms, _page_misc; DialogPage _page_selector, _page_node, _page_zoom, _page_shapes, _page_pencil, _page_pen, _page_calligraphy, _page_text, _page_gradient, _page_connector, _page_dropper; DialogPage _page_rectangle, _page_3dbox, _page_ellipse, _page_star, _page_spiral, _page_paintbucket; @@ -201,6 +202,7 @@ protected: void initPageFilters(); void initPageSelecting(); void initPageImportExport(); + void initPageCMS(); void initPageMisc(); private: -- 2.30.2