Disabling Print Colors dialog due to lack of resolution from mailing list thread...

diff --git a/src/desktop.cpp b/src/desktop.cpp
index 52f1725779a2b0a00fd89c704b04bf6a8995920c..a93fb6a4a59aff704a52ac4748930411248f358b 100644 (file)
--- 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 00f6cfdd57c6e4ce9a700ffcb5c17196fc795493..af2473bafaa729759e18de38bb564f9989b4a2e2 100644 (file)
--- 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 4e4c45b8c474232de1b44ae9fe593a9a7b189f97..9c0ca1767e6ef405c424f313b92546456a6a863b 100644 (file)
--- a/src/menus-skeleton.h
+++ b/src/menus-skeleton.h
@@ -108,8 +108,9 @@ static char const menus_skeleton[] =
 "         <verb verb-id=\"ViewModeNormal\" radio=\"yes\" default=\"yes\"/>\n"
 "         <verb verb-id=\"ViewModeNoFilters\" radio=\"yes\"/>\n"
 "         <verb verb-id=\"ViewModeOutline\" radio=\"yes\"/>\n"
-"         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
-"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
+// Better location in menu needs to be found
+//"         <verb verb-id=\"ViewModePrintColorsPreview\" radio=\"yes\"/>\n"
+//"         <verb verb-id=\"DialogPrintColorsPreview\" />\n"
 "       </submenu>\n"
 "       <separator/>\n"
 "       <verb verb-id=\"ToggleGrid\" />\n"

diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index 6d3bc817e166bd1df6284d6f834c60d4b791dd5b..aab9d89d7dea89928e446bd3026d404d16370a87 100644 (file)
--- 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<LivePathEffectEditor, FloatingBehavior>);
         registerFactory("Memory",              &create<Memory,               FloatingBehavior>);
         registerFactory("Messages",            &create<Messages,             FloatingBehavior>);
-        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
+//        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       FloatingBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         FloatingBehavior>);
 #ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       FloatingBehavior>);
@@ -132,7 +132,7 @@ DialogManager::DialogManager() {
         registerFactory("LivePathEffect",      &create<LivePathEffectEditor, DockBehavior>);
         registerFactory("Memory",              &create<Memory,               DockBehavior>);
         registerFactory("Messages",            &create<Messages,             DockBehavior>);
-        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
+//        registerFactory("PrintColorsPreviewDialog",      &create<PrintColorsPreviewDialog,       DockBehavior>);
         registerFactory("Script",              &create<ScriptDialog,         DockBehavior>);
 #ifdef ENABLE_SVG_FONTS
         registerFactory("SvgFontsDialog",      &create<SvgFontsDialog,       DockBehavior>);

diff --git a/src/ui/dialog/print-colors-preview-dialog.cpp b/src/ui/dialog/print-colors-preview-dialog.cpp
index f4d83c2714ac1eee5f18d89763dd3593e1c47211..1f999f69273f24f9f3a5807b18c5e306fa8b6b36 100644 (file)
--- 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 24c17aad8fd93f4035f486201cd626324c8b396b..c2af399c543a6df412ca91f4264c6a6146f8b6cb 100644 (file)
--- 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 36bb9f9d9963624c252a4e86828043f6480da868..7c04ba3f6be9c39000b88f23d251bc2159e3a3f5 100644 (file)
--- 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,