X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiPainter.h;h=263b3a851c44cae99c4522f835a3566cb31fa758;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=c28857e68f77214e09732da4aafd21796366b278;hpb=814a8411ebeac155f9ee9df915bce4ff731dd21b;p=lyx.git

diff --git a/src/frontends/qt4/GuiPainter.h b/src/frontends/qt4/GuiPainter.h
index c28857e68f..263b3a851c 100644
--- a/src/frontends/qt4/GuiPainter.h
+++ b/src/frontends/qt4/GuiPainter.h
@@ -13,6 +13,8 @@
 #ifndef GUIPAINTER_H
 #define GUIPAINTER_H
 
+#include "Color.h"
+
 #include "frontends/Painter.h"
 
 #include <QPainter>
@@ -38,7 +40,7 @@ public:
 	virtual void line(
 		int x1, int y1,
 		int x2, int y2,
-		ColorCode,
+		Color,
 		line_style = line_solid,
 		line_width = line_thin);
 
@@ -52,7 +54,7 @@ public:
 		int const * xp,
 		int const * yp,
 		int np,
-		ColorCode,
+		Color,
 		line_style = line_solid,
 		line_width = line_thin);
 
@@ -60,7 +62,7 @@ public:
 	virtual void rectangle(
 		int x, int y,
 		int w, int h,
-		ColorCode,
+		Color,
 		line_style = line_solid,
 		line_width = line_thin);
 
@@ -68,17 +70,17 @@ public:
 	virtual void fillRectangle(
 		int x, int y,
 		int w, int h,
-		ColorCode);
+		Color);
 
 	/// draw an arc
 	virtual void arc(
 		int x, int y,
 		unsigned int w, unsigned int h,
 		int a1, int a2,
-		ColorCode);
+		Color);
 
 	/// draw a pixel
-	virtual void point(int x, int y, ColorCode);
+	virtual void point(int x, int y, Color);
 
 	/// draw an image from the image cache
 	virtual void image(int x, int y, int w, int h,
@@ -96,8 +98,8 @@ public:
 		FontInfo const & font, bool mouseHover);
 
 	/// start monochrome painting mode, i.e. map every color into [min,max]
-	virtual void enterMonochromeMode(ColorCode const & min, 
-		ColorCode const & max);
+	virtual void enterMonochromeMode(Color const & min, 
+		Color const & max);
 	/// leave monochrome painting mode
 	virtual void leaveMonochromeMode();
 	
@@ -108,7 +110,7 @@ public:
 	 * around the text with the given color.
 	 */
 	virtual void rectText(int x, int baseline, docstring const & str,
-		FontInfo const & font, ColorCode back, ColorCode frame);
+		FontInfo const & font, Color back, Color frame);
 
 	/// draw a filled rectangle with the shape of a 3D button
 	virtual void button(int x, int y, int w, int h, bool mouseHover);
@@ -117,6 +119,8 @@ public:
 	virtual int preeditText(int x, int y,
 		char_type c, FontInfo const & f, preedit_style style);
 
+	void wavyHorizontalLine(int x, int y, int width, ColorCode col);
+
 private:
 	/// check the font, and if set, draw an underline
 	void underline(FontInfo const & f,
@@ -126,6 +130,14 @@ private:
 	void dashedUnderline(FontInfo const & f,
 		int x, int y, int width);
 
+	/// check the font, and if set, draw an strike-through line
+	void strikeoutLine(FontInfo const & f,
+		int x, int y, int width);
+
+	/// check the font, and if set, draw double underline
+	void doubleUnderline(FontInfo const & f,
+		int x, int y, int width);
+
 	/// draw a bevelled button border
 	void buttonFrame(int x, int y, int w, int h);
 
@@ -150,7 +162,7 @@ private:
 	///
 	std::stack<QColor> monochrome_max_;
 	/// convert into Qt color, possibly applying the monochrome mode
-	QColor computeColor(ColorCode col);
+	QColor computeColor(Color col);
 	/// possibly apply monochrome mode
 	QColor filterColor(QColor const & col);
 	///