From 865b6050782a9d976f70e6d8bc5e7ca80ace5d74 Mon Sep 17 00:00:00 2001
From: Angus Leeming <leeming@lyx.org>
Date: Fri, 1 Mar 2002 09:52:49 +0000
Subject: [PATCH] Martin's prettification patch.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@3620 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/xforms/ChangeLog         |  5 +++++
 src/frontends/xforms/FormMathsBitmap.C |  4 ++--
 src/frontends/xforms/FormMathsBitmap.h |  2 +-
 src/frontends/xforms/FormMathsPanel.C  | 25 +++++++++++++------------
 4 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 12dd259839..ba9365dfc0 100644
--- a/src/frontends/xforms/ChangeLog
+++ b/src/frontends/xforms/ChangeLog
@@ -1,3 +1,8 @@
+2002-03-01  Martin Vermeer <martin.vermeer@hut.fi>
+
+	* FormMathsBitmap.[Ch]:
+	* FormMathsPanel.C: Give window titles to bit map sub-panels.
+
 2002-02-28  Angus Leeming  <a.leeming@ic.ac.uk>
 
 	* Dialogs.C (initialiseGraphics): a new static method.
diff --git a/src/frontends/xforms/FormMathsBitmap.C b/src/frontends/xforms/FormMathsBitmap.C
index 932fe93257..4ef8548871 100644
--- a/src/frontends/xforms/FormMathsBitmap.C
+++ b/src/frontends/xforms/FormMathsBitmap.C
@@ -37,9 +37,9 @@ extern  "C" void C_FormBaseDeprecatedCancelCB(FL_OBJECT *, long);
 extern  "C" void C_FormBaseDeprecatedInputCB(FL_OBJECT *, long);
 
 FormMathsBitmap::FormMathsBitmap(LyXView * lv, Dialogs * d,   
-				 FormMathsPanel const & p,
+				 FormMathsPanel const & p, string const & t,
 				 vector<string> const & l)
-	: FormMathsSub(lv, d, p, _("Maths Bitmaps"), false),
+	: FormMathsSub(lv, d, p, t, false),
 	  latex_(l), form_(0), ww_(0), x_(0), y_(0), w_(0), h_(0)
 {
 	ww_ = 2 * FL_abs(FL_BOUND_WIDTH);
diff --git a/src/frontends/xforms/FormMathsBitmap.h b/src/frontends/xforms/FormMathsBitmap.h
index 4d9495e630..d7d6c7c3dc 100644
--- a/src/frontends/xforms/FormMathsBitmap.h
+++ b/src/frontends/xforms/FormMathsBitmap.h
@@ -37,7 +37,7 @@ public:
 	
 	///
 	FormMathsBitmap(LyXView *, Dialogs * d, FormMathsPanel const &,
-			std::vector<string> const &);
+			string const &, std::vector<string> const &);
 	///
 	~FormMathsBitmap();
 	///
diff --git a/src/frontends/xforms/FormMathsPanel.C b/src/frontends/xforms/FormMathsPanel.C
index 4559fa9cd7..f5998d1a9d 100644
--- a/src/frontends/xforms/FormMathsPanel.C
+++ b/src/frontends/xforms/FormMathsPanel.C
@@ -82,75 +82,76 @@ FormMathsPanel::FormMathsPanel(LyXView * lv, Dialogs * d)
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_arrow[i];
 	}
-	arrow_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	arrow_.reset(new FormMathsBitmap(lv, d, *this, _("Arrows"), latex));
 
 	latex.resize(nr_latex_bop);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_bop[i];
 	}
-	boperator_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	boperator_.reset(new FormMathsBitmap(lv, d, *this, _("Binary Ops"), latex));
 
 	latex.resize(nr_latex_brel);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_brel[i];
 	}
-	brelats_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	brelats_.reset(new FormMathsBitmap(lv, d, *this, _("Bin Relations"), latex));
 
 	latex.resize(nr_latex_greek);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_greek[i];
 	}
-	greek_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	greek_.reset(new FormMathsBitmap(lv, d, *this, _("Greek"),latex));
 
 	latex.resize(nr_latex_misc);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_misc[i];
 	}
-	misc_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	misc_.reset(new FormMathsBitmap(lv, d, *this, _("Misc"),latex));
 
 	latex.resize(nr_latex_dots);
 	for (StringVec::size_type i = 0; i<latex.size(); ++i) {
 		latex[i] = latex_dots[i];
 	}
 
-	dots_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	dots_.reset(new FormMathsBitmap(lv, d, *this, _("Dots"), latex));
 
 	latex.resize(nr_latex_varsz);
 	for (StringVec::size_type i = 0; i<latex.size(); ++i) {
 		latex[i] = latex_varsz[i];
 	}
-	varsize_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	varsize_.reset(new FormMathsBitmap(lv, d, *this, _("Big Operators"),latex));
 
 	latex.resize(nr_latex_ams_misc);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_ams_misc[i];
 	}
-	ams_misc_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	ams_misc_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Misc"), latex));
 
 	latex.resize(nr_latex_ams_arrows);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_ams_arrows[i];
 	}
-	ams_arrows_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	ams_arrows_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Arrows"), latex));
 
 	latex.resize(nr_latex_ams_rel);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_ams_rel[i];
 	}
-	ams_rel_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	ams_rel_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Relations"), latex));
 
 	latex.resize(nr_latex_ams_nrel);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_ams_nrel[i];
 	}
-	ams_nrel_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	ams_nrel_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Negated Rel"), latex));
 
 	latex.resize(nr_latex_ams_ops);
 	for (StringVec::size_type i = 0; i < latex.size(); ++i) {
 		latex[i] = latex_ams_ops[i];
 	}
-	ams_ops_.reset(new FormMathsBitmap(lv, d, *this, latex));
+	ams_ops_.reset(new FormMathsBitmap(lv, d, *this, _("AMS Operators"), latex));
 
+	//showUnderMouse(false);
 	d->showMathPanel.connect(slot(this, &FormMathsPanel::show));
 }
 
-- 
2.39.5