font loader / color handler move

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@4204 a592a061-630c-0410-9148-cb99ea01b6c8

src/ChangeLog

@@ -1,3 +1,18 @@
+2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
+
+	* ColorHandler.h:
+	* ColorHandler.C:
+	* FontInfo.h:
+	* FontInfo.C: moved to frontends/xforms/
+
+	* FontLoader.h:
+	* FontLoader.C: moved into frontends for GUIIzation
+
+	* Makefile.am:
+	* lyx_gui.C:
+	* lyxfont.C: 
+	* lyxfunc.C: changes from above
+ 
 2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
 
 	* LColor.C: remove spurious X include

src/Makefile.am

@@ -50,8 +50,6 @@ lyx_SOURCES = \
 	Bullet.h \
 	Chktex.C \
 	Chktex.h \
-	ColorHandler.C \
-	ColorHandler.h \
 	CutAndPaste.C \
 	CutAndPaste.h \
 	DepTable.C \
@@ -60,10 +58,6 @@ lyx_SOURCES = \
 	FloatList.h \
 	Floating.C \
 	Floating.h \
-	FontInfo.C \
-	FontInfo.h \
-	FontLoader.C \
-	FontLoader.h \
 	FuncStatus.C \
 	FuncStatus.h \
 	LColor.C \

src/frontends/ChangeLog

@@ -1,3 +1,10 @@
+2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
+
+	* Makefile.am:
+	* font_loader.h: placeholder
+ 
+	* screen.C: use placeholder
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Makefile.am:

src/frontends/Makefile.am

@@ -36,6 +36,7 @@ libfrontends_la_SOURCES = \
 	LyXView.h \
 	WorkArea.C \
 	WorkArea.h \
+	font_loader.h \
 	font_metrics.h \
 	screen.C \
 	screen.h

src/frontends/font_loader.h

@@ -0,0 +1,3 @@
+// very temporary
+
+#include "xforms/xfont_loader.h"

src/frontends/screen.C

@@ -25,7 +25,7 @@
 #include "BufferView.h"
 #include "font_metrics.h"
 #include "insets/insettext.h"
-#include "ColorHandler.h"
+#include "frontends/xforms/ColorHandler.h"
 #include "language.h"
 
 using std::max;

src/frontends/xforms/ChangeLog

@@ -1,3 +1,16 @@
+2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
+
+	* ColorHandler.h:
+	* ColorHandler.C:
+	* FontInfo.h:
+	* FontInfo.C: moved here
+
+	* xfont_loader.h:
+	* xfont_loader.C: moved here
+
+	* Makefile.am:
+	* xfont_metrics.C: changes from above
+ 
 2002-05-23  John Levon  <moz@compsoc.man.ac.uk>
 
 	* Makefile.am:

src/frontends/xforms/Makefile.am

@@ -23,6 +23,8 @@ libxforms_la_SOURCES = \
 	bmtable.h \
 	Color.C \
 	Color.h \
+	ColorHandler.C \
+	ColorHandler.h \
 	combox.C \
 	combox.h \
 	Dialogs.C \
@@ -31,6 +33,8 @@ libxforms_la_SOURCES = \
 	FeedbackController.C \
 	FeedbackController.h \
 	FileDialog.C \
+	FontInfo.C \
+	FontInfo.h \
 	FormFiledialog.h \
 	FormFiledialog.C \
 	form_filedialog.C \
@@ -214,6 +218,8 @@ libxforms_la_SOURCES = \
 	XFormsView.h \
 	XPainter.C \
 	XPainter.h \
+	xfont_loader.C \
+	xfont_loader.h \
 	xfont_metrics.C \
 	xfont_metrics.h \
 	xforms_helpers.C \

src/frontends/xforms/xfont_loader.C

@@ -12,10 +12,10 @@
 #include <cmath>	// fabs()
 
 #ifdef __GNUG__
-#pragma implementation "FontLoader.h"
+#pragma implementation
 #endif
 
-#include "FontLoader.h"
+#include "xfont_loader.h"
 #include "FontInfo.h"
 #include "gettext.h"
 #include "debug.h"

src/frontends/xforms/xfont_metrics.C

@@ -16,7 +16,7 @@
 
 #include "support/lstrings.h"
 #include "xfont_metrics.h"
-#include "FontLoader.h"
+#include "xfont_loader.h"
 #include "lyxrc.h"
 #include "encoding.h"
 #include "language.h"

src/graphics/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
+
+	* GraphicsImageXPM.C: ColorHandler moved
+ 
 2002-05-24  Juergen Vigna  <jug@sad.it>
 
 	* GraphicsCache.h: 

src/graphics/GraphicsImageXPM.C

@@ -15,7 +15,7 @@
 
 #include "GraphicsImageXPM.h"
 #include "GraphicsParams.h"
-#include "ColorHandler.h"
+#include "frontends/xforms/ColorHandler.h"
 #include "debug.h"
 #include "frontends/GUIRunTime.h" // x11Display, x11Screen
 #include "support/filetools.h"    // IsFileReadable

src/lyx_gui.C

@@ -30,7 +30,7 @@
 #include "frontends/xforms/lyxlookup.h"
 #endif
 #include "bufferlist.h"
-#include "ColorHandler.h"
+#include "frontends/xforms/ColorHandler.h"
 
 #include "frontends/GUIRunTime.h"
 #include "frontends/xforms/xforms_helpers.h" // for XformColor

src/lyxfont.C

@@ -23,7 +23,7 @@
 #include "lyxrc.h"
 #include "lyxlex.h"
 #include "language.h"
-#include "FontLoader.h"
+#include "frontends/font_loader.h"
 #include "support/lstrings.h"
 #include "bufferparams.h" // stateText
 

src/lyxfunc.C

@@ -20,7 +20,7 @@
 #include "lyxrow.h"
 #include "bufferlist.h"
 #include "BufferView.h"
-#include "ColorHandler.h"
+#include "frontends/xforms/ColorHandler.h"
 #include "lyxserver.h"
 #include "intl.h"
 #include "lyx_main.h"
@@ -41,7 +41,7 @@
 #include "converter.h"
 #include "exporter.h"
 #include "importer.h"
-#include "FontLoader.h"
+#include "frontends/font_loader.h"
 #include "TextCache.h"
 #include "lyxfind.h"
 #include "undo_funcs.h"

src/mathed/ChangeLog

@@ -1,3 +1,7 @@
+2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
+
+	* math_support.C: font loader moved
+ 
 2002-05-24  John Levon  <moz@compsoc.man.ac.uk>
 
 	* formulabase.C:

src/mathed/math_support.C

@@ -4,7 +4,7 @@
 
 #include "math_support.h"
 #include "lyxfont.h"
-#include "FontLoader.h"
+#include "frontends/font_loader.h"
 #include "frontends/font_metrics.h"
 #include "math_cursor.h"
 #include "math_defs.h"