Martin's prettification patch.

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

diff --git a/src/frontends/xforms/ChangeLog b/src/frontends/xforms/ChangeLog
index 12dd2598396b4861399746c47ed60463b740bc68..ba9365dfc0ff926d4d9fb5b471f3d3ea7af76542 100644 (file)
--- 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 932fe932576575989d459145046a7ae829e049de..4ef8548871c70728a5b1f8407f0c5e76d13c2c29 100644 (file)
--- 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 4d9495e630643f724fde6db7245f6eee423e57b3..d7d6c7c3dc1c4463d8418c662e6ebc0eab182cc8 100644 (file)
--- 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 4559fa9cd7c46fae30adeaf4f9f6194cbae0994e..f5998d1a9d507e2f8de26db3f9c8444b1ad1ce62 100644 (file)
--- 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));
 }