enable Font cache only for MacOSX and inline width() for other platform.

[lyx.git] / src / frontends / qt4 / QMathDialog.C

diff --git a/src/frontends/qt4/QMathDialog.C b/src/frontends/qt4/QMathDialog.C
index f03157402bbe197520cd8b25801d0b19def1742f..1de28ad8d7a11b598bcc5f3a34e3811e8251d352 100644 (file)
--- a/src/frontends/qt4/QMathDialog.C
+++ b/src/frontends/qt4/QMathDialog.C
@@ -47,7 +47,7 @@ char const ** panels[] = {
 
 int const nr_panels = sizeof(panels)/sizeof(panels[0]);
 
-bool panel_initialised[nr_panels];
+int  panel_index[nr_panels];
 
 } // namespace anon
 
@@ -124,7 +124,7 @@ QMathDialog::QMathDialog(QMath * form)
        connect(ma, SIGNAL(triggered()), this, SLOT(insertCubeRoot()));
        m->addAction(ma);
        addMenuItem(m, qt_("Other root  \\root"), "root");
-       sqrtPB->setPopup(m);
+       sqrtPB->setMenu(m);
 
        m = new QMenu(stylePB);
        m->setTitle(qt_("LyX: Math Styles"));
@@ -133,7 +133,18 @@ QMathDialog::QMathDialog(QMath * form)
        addMenuItem(m, qt_("Normal text style   \\textstyle"), "textstyle");
        addMenuItem(m, qt_("Script (small) style        \\scriptstyle"), "scriptstyle");
        addMenuItem(m, qt_("Scriptscript (smaller) style        \\scriptscriptstyle"), "scriptscriptstyle");
-       stylePB->setPopup(m);
+       stylePB->setMenu(m);
+
+       m = new QMenu(fracPB);
+       m->setTitle(qt_("LyX: Fractions"));
+       m->setTearOffEnabled(true);
+       addMenuItem(m, qt_("Standard    \\frac"), "frac");
+       addMenuItem(m, qt_("No hor. line        \\atop"), "atop");
+       addMenuItem(m, qt_("Nice        \\nicefrac"), "nicefrac");
+       addMenuItem(m, qt_("Text frac (amsmath) \\tfrac"), "tfrac");
+       addMenuItem(m, qt_("Display frac (amsmath)      \\dfrac"), "dfrac");
+       addMenuItem(m, qt_("Binomial    \\choose"),  "choose");
+       fracPB->setMenu(m);
 
        m = new QMenu(fontPB);
        m->setTitle(qt_("LyX: Math Fonts"));
@@ -148,7 +159,7 @@ QMathDialog::QMathDialog(QMath * form)
        addMenuItem(m, qt_("Fraktur     \\mathfrak"), "mathfrak");
        addMenuItem(m, qt_("Calligraphic        \\mathcal"), "mathcal");
        addMenuItem(m, qt_("Normal text mode    \\textrm"), "textrm");
-       fontPB->setPopup(m);
+       fontPB->setMenu(m);
 }
 
 void QMathDialog::addMenuItem(QMenu * menu, const QString & label, const std::string & action)
@@ -160,10 +171,10 @@ void QMathDialog::addMenuItem(QMenu * menu, const QString & label, const std::st
 
 void QMathDialog::showingPanel(int num)
 {
-       if (!panel_initialised[num])
+       if (!panel_index[num])
                addPanel(num);
 
-       symbolWS->setCurrentIndex(num);
+       symbolWS->setCurrentIndex(panel_index[num]);
 }
 
 
@@ -187,8 +198,7 @@ void QMathDialog::addPanel(int num)
        IconPalette * p = makePanel(this, panels[num]);
        p->resize(40 * 5, p->height());
        sc->setWidget(p);
-       symbolWS->insertWidget(num,sc);
-       panel_initialised[num] = true;
+       panel_index[num] = symbolWS->addWidget(sc);
 }
 
 
@@ -216,7 +226,7 @@ void QMathDialog::expandClicked()
        IconPalette * p = makePanel(0, panels[id]);
        string s = "LyX: ";
        s += fromqstr(symbolsCO->currentText());
-       p->setCaption(toqstr(s));
+       p->setWindowTitle(toqstr(s));
        p->resize(40 * 5, p->height());
        p->show();
        p->setMaximumSize(p->width(), p->height());