From dc1f7ce719d703d8dd4d7747d1967a3e8a1bfb18 Mon Sep 17 00:00:00 2001
From: "Liam P. White" <inkscapebronyat-signgmaildotcom>
Date: Tue, 4 Mar 2014 16:53:56 -0500
Subject: Remove tag dialog temporarily

(bzr r13090.1.13)
---
 src/ui/dialog/Makefile_insert    |  2 --
 src/ui/dialog/dialog-manager.cpp |  6 +++---
 src/ui/dialog/swatches.cpp       | 18 ++++++++++++++++++
 3 files changed, 21 insertions(+), 5 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/Makefile_insert b/src/ui/dialog/Makefile_insert
index bdb1abcda..1cf667f2a 100644
--- a/src/ui/dialog/Makefile_insert
+++ b/src/ui/dialog/Makefile_insert
@@ -113,6 +113,4 @@ ink_common_sources +=		\
 	ui/dialog/lpe-powerstroke-properties.h	\
 	ui/dialog/objects.cpp	\
 	ui/dialog/objects.h	\
-	ui/dialog/tags.cpp	\
-	ui/dialog/tags.h	\
 	$(inkboard_dialogs)
diff --git a/src/ui/dialog/dialog-manager.cpp b/src/ui/dialog/dialog-manager.cpp
index bbfea8cf0..1fddbf007 100644
--- a/src/ui/dialog/dialog-manager.cpp
+++ b/src/ui/dialog/dialog-manager.cpp
@@ -55,7 +55,7 @@
 #include "ui/dialog/clonetiler.h"
 #include "ui/dialog/svg-fonts-dialog.h"
 #include "ui/dialog/objects.h"
-#include "ui/dialog/tags.h"
+//#include "ui/dialog/tags.h"
 
 namespace Inkscape {
 namespace UI {
@@ -111,7 +111,7 @@ DialogManager::DialogManager() {
         registerFactory("InkscapePreferences", &create<InkscapePreferences,  FloatingBehavior>);
         registerFactory("LayersPanel",         &create<LayersPanel,          FloatingBehavior>);
         registerFactory("ObjectsPanel",        &create<ObjectsPanel,         FloatingBehavior>);
-        registerFactory("TagsPanel",           &create<TagsPanel,            FloatingBehavior>);
+        //registerFactory("TagsPanel",           &create<TagsPanel,            FloatingBehavior>);
         registerFactory("LivePathEffect",      &create<LivePathEffectEditor, FloatingBehavior>);
         registerFactory("Memory",              &create<Memory,               FloatingBehavior>);
         registerFactory("Messages",            &create<Messages,             FloatingBehavior>);
@@ -147,7 +147,7 @@ DialogManager::DialogManager() {
         registerFactory("InkscapePreferences", &create<InkscapePreferences,  DockBehavior>);
         registerFactory("LayersPanel",         &create<LayersPanel,          DockBehavior>);
         registerFactory("ObjectsPanel",        &create<ObjectsPanel,         DockBehavior>);
-        registerFactory("TagsPanel",           &create<TagsPanel,            FloatingBehavior>);
+        //registerFactory("TagsPanel",           &create<TagsPanel,            FloatingBehavior>);
         registerFactory("LivePathEffect",      &create<LivePathEffectEditor, DockBehavior>);
         registerFactory("Memory",              &create<Memory,               DockBehavior>);
         registerFactory("Messages",            &create<Messages,             DockBehavior>);
diff --git a/src/ui/dialog/swatches.cpp b/src/ui/dialog/swatches.cpp
index 5e77a28ab..711bcfe2d 100644
--- a/src/ui/dialog/swatches.cpp
+++ b/src/ui/dialog/swatches.cpp
@@ -20,6 +20,7 @@
 
 #include "swatches.h"
 #include <gtkmm/radiomenuitem.h>
+#include <gtkmm/widget.h>
 
 #include <glibmm/i18n.h>
 #include <glibmm/main.h>
@@ -57,6 +58,22 @@
 #include "gradient-chemistry.h"
 #include "helper/action.h"
 #include "helper/action-context.h"
+#include "xml/node-observer.h"
+#include "xml/repr.h"
+#include "sp-pattern.h"
+#include "icon-size.h"
+#include "widgets/icon.h"
+#include "filedialog.h"
+#include "sp-stop.h"
+#include "svg/svg-color.h"
+#include "sp-radial-gradient.h"
+#include "color-rgba.h"
+#include "event-context.h"
+#include <queue>
+//sorry!
+#ifdef WIN32
+#include <windows.h>
+#endif
 
 namespace Inkscape {
 namespace UI {
@@ -64,6 +81,7 @@ namespace Dialogs {
 
 #define VBLOCK 16
 #define PREVIEW_PIXBUF_WIDTH 128
+#define SWATCHES_FILE_NAME "swatches.svg"
 
 void _loadPaletteFile( gchar const *filename, gboolean user=FALSE );
 
-- 
cgit v1.2.3