X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2Finsetinfo.C;h=3c58a89091a6712664fb6cd0b797b7019277fab9;hb=3c8aba3b556871fb1100a2f98cd93d5d4e3f70c9;hp=21a7f066803817ef61afc9e691463c218fc3fcd3;hpb=a94cb21697336d5e81e21d0f1ec2a8b8b78dbbcc;p=lyx.git

diff --git a/src/insets/insetinfo.C b/src/insets/insetinfo.C
index 21a7f06680..3c58a89091 100644
--- a/src/insets/insetinfo.C
+++ b/src/insets/insetinfo.C
@@ -4,9 +4,9 @@
  *           LyX, The Document Processor
  * 	 
  *	    Copyright 1995 Matthias Ettrich
- *          Copyright 1995-1999 The LyX Team.
+ *          Copyright 1995-2000 The LyX Team.
  *
- * ======================================================*/
+ * ====================================================== */
 
 #include <config.h>
 
@@ -19,16 +19,21 @@
 #include "insetinfo.h"
 #include "lyxparagraph.h"
 #include "debug.h"
-#include "lyxdraw.h"
 #include "gettext.h"
 #include "lyx_gui_misc.h" // CancelCloseBoxCB
 #include "buffer.h"
 #include "support/lstrings.h"
+#include "Painter.h"
+#include "font.h"
+
+using std::ostream;
+using std::endl;
 
 /* Info, used for the Info boxes */
 
 extern BufferView * current_view;
 
+
 InsetInfo::InsetInfo()
 {
 	form = 0;
@@ -52,47 +57,51 @@ InsetInfo::~InsetInfo()
 }
 
 
-int InsetInfo::Ascent(LyXFont const & font) const
+int InsetInfo::ascent(Painter &, LyXFont const & font) const
 {
-	return font.maxAscent() + 1;
+	return lyxfont::maxAscent(font) + 1;
 }
 
 
-int InsetInfo::Descent(LyXFont const & font) const
+int InsetInfo::descent(Painter &, LyXFont const & font) const
 {
-	return font.maxDescent() + 1;
+	return lyxfont::maxDescent(font) + 1;
 }
 
 
-int InsetInfo::Width(LyXFont const & font) const
+int InsetInfo::width(Painter &, LyXFont const & font) const
 {
-	return 6 + font.textWidth(_("Note"), strlen(_("Note")));
+	return 6 + lyxfont::width(_("Note"), font);
 }
 
 
-void InsetInfo::Draw(LyXFont font, LyXScreen & scr,
-		     int baseline, float & x)
+void InsetInfo::draw(Painter & pain, LyXFont const & f,
+		     int baseline, float & x) const
 {
+	LyXFont font(f);
+	
 	/* Info-insets are never LaTeX, so just correct the font */
-	font.setLatex(LyXFont::OFF);
-
+	font.setLatex(LyXFont::OFF).setColor(LColor::note);
+	
 	// Draw as "Note" in a yellow box
 	x += 1;
-	scr.fillRectangle(gc_note,
-			  int(x), baseline - Ascent(font)+1,
-			  Width(font)-2, Ascent(font)+Descent(font)-2);
-	scr.drawRectangle(gc_note_frame,
-			  int(x), baseline- Ascent(font)+1,
-			  Width(font)-2, Ascent(font)+Descent(font)-2);
+	pain.fillRectangle(int(x), baseline - ascent(pain, font) + 1,
+			   width(pain, font) - 2,
+			   ascent(pain, font) + descent(pain, font) - 2,
+			   LColor::notebg);
+	pain.rectangle(int(x), baseline - ascent(pain, font) + 1,
+		       width(pain, font) - 2,
+		       ascent(pain, font) + descent(pain, font) - 2,
+		       LColor::noteframe);
 	
-	scr.drawString(font, _("Note"), baseline, int(x+2));
-	x +=  Width(font) - 1;
+	pain.text(int(x + 2), baseline, _("Note"), font);
+	x +=  width(pain, font) - 1;
 }
 
 
-void InsetInfo::Write(FILE * file)
+void InsetInfo::Write(ostream & os) const
 {
-	fprintf(file, "Info %s", contents.c_str());
+	os << "Info " << contents;
 }
 
 
@@ -123,33 +132,34 @@ void InsetInfo::Read(LyXLex & lex)
 }
       
 
-int InsetInfo::Latex(FILE *, signed char /*fragile*/)
+int InsetInfo::Latex(ostream &,
+		     bool /*fragile*/, bool /*free_spc*/) const
 {
 	return 0;
 }
 
 
-int InsetInfo::Latex(string &, signed char /*fragile*/)
+int InsetInfo::Ascii(ostream &) const
 {
 	return 0;
 }
 
 
-int InsetInfo::Linuxdoc(string &)
+int InsetInfo::Linuxdoc(ostream &) const
 {
 	return 0;
 }
 
 
-int InsetInfo::DocBook(string &)
+int InsetInfo::DocBook(ostream &) const
 {
 	return 0;
 }
 
 
-unsigned char InsetInfo::Editable() const
+Inset::EDITABLE InsetInfo::Editable() const
 {
-	return 1;
+	return IS_EDITABLE;
 }
 
 
@@ -177,21 +187,27 @@ extern "C" void C_InsetInfo_CloseInfoCB(FL_OBJECT * ob, long data)
 }
 
 
-void InsetInfo::Edit(int, int)
+char const * InsetInfo::EditMessage() const 
+{
+	return _("Opened note");
+}
+
+
+void InsetInfo::Edit(BufferView *bv, int, int, unsigned int)
 {
 	static int ow = -1, oh;
 
-	if(current_view->buffer()->isReadonly())
-		WarnReadonly();
+	if(bv->buffer()->isReadonly())
+		WarnReadonly(bv->buffer()->fileName());
 	
 	if (!form) {
 		FL_OBJECT *obj;
-		form = fl_bgn_form(FL_UP_BOX,400,180);
-		strobj = obj = fl_add_input(FL_MULTILINE_INPUT,10,10,380,120,"");
-		fl_set_object_color(obj,FL_MCOL,FL_MCOL);
+		form = fl_bgn_form(FL_UP_BOX, 400, 180);
+		strobj = obj = fl_add_input(FL_MULTILINE_INPUT, 10, 10, 380, 120, "");
+		fl_set_object_color(obj, FL_MCOL, FL_MCOL);
 		fl_set_object_resize(obj, FL_RESIZE_ALL);
 		fl_set_object_gravity(obj, NorthWestGravity, SouthEastGravity);
-		obj = fl_add_button(FL_NORMAL_BUTTON,130,140,120,30,idex(_("Close|#C^[")));
+		obj = fl_add_button(FL_NORMAL_BUTTON, 130, 140, 120, 30, idex(_("Close|#C^[")));
 		fl_set_object_resize(obj, FL_RESIZE_NONE);
 		fl_set_object_gravity(obj, SouthEastGravity, SouthEastGravity);
 		fl_set_object_callback(obj, C_InsetInfo_CloseInfoCB, 0);
@@ -204,7 +220,7 @@ void InsetInfo::Edit(int, int)
 	if (form->visible) {
 		fl_raise_form(form);
 	} else {
-		fl_show_form(form,FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER, 
+		fl_show_form(form, FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER, 
 			     _("Note"));
 		if (ow < 0) {
 			ow = form->w;
@@ -215,10 +231,9 @@ void InsetInfo::Edit(int, int)
 }
 
 
-Inset* InsetInfo::Clone()
+Inset * InsetInfo::Clone() const
 {
-	InsetInfo * result = new InsetInfo(contents);
-	return result;
+	return new InsetInfo(contents);
 }