From 1c25a4eb551880955bcacd2166b2bc8dc351f503 Mon Sep 17 00:00:00 2001 From: Josh Andler Date: Wed, 7 Jul 2010 16:33:52 -0700 Subject: [PATCH] Disabling Print Colors dialog due to lack of resolution from mailing list thread and no response by author --- src/desktop.cpp | 4 ++-- src/desktop.h | 6 +++--- src/menus-skeleton.h | 5 +++-- src/ui/dialog/dialog-manager.cpp | 6 +++--- src/ui/dialog/print-colors-preview-dialog.cpp | 3 ++- src/verbs.cpp | 10 +++++----- src/verbs.h | 2 +- 7 files changed, 19 insertions(+), 17 deletions(-) diff --git a/src/desktop.cpp b/src/desktop.cpp index 52f172577..a93fb6a4a 100644 --- a/src/desktop.cpp +++ b/src/desktop.cpp @@ -462,9 +462,9 @@ void SPDesktop::displayModeToggle() { _setDisplayMode(Inkscape::RENDERMODE_OUTLINE); break; case Inkscape::RENDERMODE_OUTLINE: - _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW); + _setDisplayMode(Inkscape::RENDERMODE_NORMAL); break; - case Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW: +// case Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW: default: _setDisplayMode(Inkscape::RENDERMODE_NORMAL); } diff --git a/src/desktop.h b/src/desktop.h index 00f6cfdd5..af2473baf 100644 --- a/src/desktop.h +++ b/src/desktop.h @@ -203,9 +203,9 @@ struct SPDesktop : public Inkscape::UI::View::View void setDisplayModeOutline() { _setDisplayMode(Inkscape::RENDERMODE_OUTLINE); } - void setDisplayModePrintColorsPreview() { - _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW); - } +// void setDisplayModePrintColorsPreview() { +// _setDisplayMode(Inkscape::RENDERMODE_PRINT_COLORS_PREVIEW); +// } void displayModeToggle(); Inkscape::RenderMode _display_mode; Inkscape::RenderMode getMode() const { return _display_mode; } diff --git a/src/menus-skeleton.h b/src/menus-skeleton.h index 4e4c45b8c..9c0ca1767 100644 --- a/src/menus-skeleton.h +++ b/src/menus-skeleton.h @@ -108,8 +108,9 @@ static char const menus_skeleton[] = " \n" " \n" " \n" -" \n" -" \n" +// Better location in menu needs to be found +//" \n" +//" \n" " \n" " \n" " \n" diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp index 6d3bc817e..aab9d89d7 100644 --- a/src/ui/dialog/dialog-manager.cpp +++ b/src/ui/dialog/dialog-manager.cpp @@ -41,7 +41,7 @@ #include "ui/dialog/icon-preview.h" #include "ui/dialog/floating-behavior.h" #include "ui/dialog/dock-behavior.h" -#include "ui/dialog/print-colors-preview-dialog.h" +//#include "ui/dialog/print-colors-preview-dialog.h" #include "preferences.h" #ifdef ENABLE_SVG_FONTS @@ -104,7 +104,7 @@ DialogManager::DialogManager() { registerFactory("LivePathEffect", &create); registerFactory("Memory", &create); registerFactory("Messages", &create); - registerFactory("PrintColorsPreviewDialog", &create); +// registerFactory("PrintColorsPreviewDialog", &create); registerFactory("Script", &create); #ifdef ENABLE_SVG_FONTS registerFactory("SvgFontsDialog", &create); @@ -132,7 +132,7 @@ DialogManager::DialogManager() { registerFactory("LivePathEffect", &create); registerFactory("Memory", &create); registerFactory("Messages", &create); - registerFactory("PrintColorsPreviewDialog", &create); +// registerFactory("PrintColorsPreviewDialog", &create); registerFactory("Script", &create); #ifdef ENABLE_SVG_FONTS registerFactory("SvgFontsDialog", &create); diff --git a/src/ui/dialog/print-colors-preview-dialog.cpp b/src/ui/dialog/print-colors-preview-dialog.cpp index f4d83c271..1f999f692 100644 --- a/src/ui/dialog/print-colors-preview-dialog.cpp +++ b/src/ui/dialog/print-colors-preview-dialog.cpp @@ -7,7 +7,7 @@ * Copyright (C) 2009 Authors * Released under GNU GPLv2 (or later). Read the file 'COPYING' for more information. */ - +/* #include "desktop.h" #include "print-colors-preview-dialog.h" #include "preferences.h" @@ -98,3 +98,4 @@ PrintColorsPreviewDialog::~PrintColorsPreviewDialog(){} } // namespace Dialog } // namespace UI } // namespace Inkscape +*/ diff --git a/src/verbs.cpp b/src/verbs.cpp index 24c17aad8..c2af399c5 100644 --- a/src/verbs.cpp +++ b/src/verbs.cpp @@ -1682,9 +1682,9 @@ ZoomVerb::perform(SPAction *action, void *data, void */*pdata*/) case SP_VERB_VIEW_MODE_OUTLINE: dt->setDisplayModeOutline(); break; - case SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW: - dt->setDisplayModePrintColorsPreview(); - break; +// case SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW: +// dt->setDisplayModePrintColorsPreview(); +// break; case SP_VERB_VIEW_MODE_TOGGLE: dt->displayModeToggle(); break; @@ -2569,8 +2569,8 @@ Verb *Verb::_base_verbs[] = { N_("Switch to normal display without filters"), NULL), new ZoomVerb(SP_VERB_VIEW_MODE_OUTLINE, "ViewModeOutline", N_("_Outline"), N_("Switch to outline (wireframe) display mode"), NULL), - new ZoomVerb(SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW, "ViewModePrintColorsPreview", N_("_Print Colors Preview"), - N_("Switch to print colors preview mode"), NULL), +// new ZoomVerb(SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW, "ViewModePrintColorsPreview", N_("_Print Colors Preview"), +// N_("Switch to print colors preview mode"), NULL), new ZoomVerb(SP_VERB_VIEW_MODE_TOGGLE, "ViewModeToggle", N_("_Toggle"), N_("Toggle between normal and outline display modes"), NULL), diff --git a/src/verbs.h b/src/verbs.h index 36bb9f9d9..7c04ba3f6 100644 --- a/src/verbs.h +++ b/src/verbs.h @@ -214,7 +214,7 @@ enum { SP_VERB_VIEW_MODE_NORMAL, SP_VERB_VIEW_MODE_NO_FILTERS, SP_VERB_VIEW_MODE_OUTLINE, - SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW, +// SP_VERB_VIEW_MODE_PRINT_COLORS_PREVIEW, SP_VERB_VIEW_MODE_TOGGLE, SP_VERB_VIEW_CMS_TOGGLE, SP_VERB_VIEW_ICON_PREVIEW, -- 2.30.2