diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py index 598fa70986..ab95c2098a 100644 --- a/development/scons/scons_manifest.py +++ b/development/scons/scons_manifest.py @@ -628,7 +628,6 @@ src_frontends_qt4_ui_files = Split(''' QIndexUi.ui QLogUi.ui QMathMatrixUi.ui - QMathUi.ui QNomenclUi.ui QNoteUi.ui QParagraphUi.ui @@ -803,8 +802,6 @@ src_frontends_qt4_header_files = Split(''' QLog.h QLogDialog.h QLyXKeySym.h - QMath.h - QMathDialog.h QMathMatrixDialog.h QNomencl.h QNomenclDialog.h @@ -925,8 +922,6 @@ src_frontends_qt4_files = Split(''' QLog.C QLogDialog.C QLyXKeySym.C - QMath.C - QMathDialog.C QMathMatrixDialog.C QNomencl.C QNomenclDialog.C diff --git a/lib/ui/classic.ui b/lib/ui/classic.ui index 85523631d1..0465b4d650 100644 --- a/lib/ui/classic.ui +++ b/lib/ui/classic.ui @@ -274,7 +274,6 @@ Menuset Item "Split Environment|S" "command-sequence math-insert \split; tabular-feature append-column" Separator Submenu "Font Change|o" "insert_math_font" - Item "Math Panel|l" "dialog-show mathpanel" End Menu "insert_math_font" diff --git a/lib/ui/stdtoolbars.inc b/lib/ui/stdtoolbars.inc index 782801527f..07d7697444 100644 --- a/lib/ui/stdtoolbars.inc +++ b/lib/ui/stdtoolbars.inc @@ -135,7 +135,6 @@ ToolbarSet End Toolbar "math" "Math" - Item "Show math panel" "dialog-show mathpanel" Item "Set display mode" "math-display" Separator Item "Subscript" "math-subscript" diff --git a/src/frontends/qt4/Dialogs.C b/src/frontends/qt4/Dialogs.C index 594dba645a..2eab9ae84a 100644 --- a/src/frontends/qt4/Dialogs.C +++ b/src/frontends/qt4/Dialogs.C @@ -55,6 +55,7 @@ #include "QCharacter.h" #include "QCitation.h" #include "QCitationDialog.h" +#include "QDelimiterDialog.h" #include "QDocument.h" #include "QErrorList.h" #include "QERT.h" @@ -63,11 +64,11 @@ #include "QGraphics.h" #include "QInclude.h" #include "QIndex.h" +#include "QMathMatrixDialog.h" #include "QNomencl.h" #include "QLog.h" #include "QViewSource.h" #include "QViewSourceDialog.h" -#include "QMath.h" #include "QNote.h" #include "QParagraph.h" #include "QPrefs.h" @@ -105,7 +106,7 @@ char const * const dialognames[] = { "aboutlyx", "bibitem", "bibtex", "box", "branch", "changes", "character", "citation", "document", "errorlist", "ert", "external", "file", "findreplace", "float", "graphics", "include", "index", "nomenclature", "label", "log", -"mathpanel", "mathdelimiter", "mathmatrix", "note", "paragraph", +"mathdelimiter", "mathmatrix", "note", "paragraph", "prefs", "print", "ref", "sendto", "spellchecker","tabular", "tabularcreate", #ifdef HAVE_LIBAIKSAURUS @@ -244,10 +245,6 @@ Dialogs::DialogPtr Dialogs::build(string const & name) dialog->setView(new DockView( *dialog, qvs, &gui_view, _("LaTeX Source"), Qt::BottomDockWidgetArea)); dialog->bc().bp(new OkCancelPolicy); - } else if (name == "mathpanel") { - dialog->setController(new ControlMath(*dialog)); - dialog->setView(new QMath(*dialog)); - dialog->bc().bp(new IgnorantPolicy); } else if (name == "mathdelimiter") { dialog->setController(new ControlMath(*dialog)); dialog->setView(new QMathDelimiter(*dialog)); diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am index 20113224e7..b4a801312e 100644 --- a/src/frontends/qt4/Makefile.am +++ b/src/frontends/qt4/Makefile.am @@ -64,7 +64,6 @@ libqt4_la_SOURCES = \ QViewSource.C QViewSource.h \ QLPainter.C QLPainter.h \ QLyXKeySym.C QLyXKeySym.h \ - QMath.C QMath.h \ QNomencl.C QNomencl.h \ QNote.C QNote.h \ QParagraph.C QParagraph.h \ diff --git a/src/frontends/qt4/Makefile.dialogs b/src/frontends/qt4/Makefile.dialogs index 67276001fb..5b8bdfdc72 100644 --- a/src/frontends/qt4/Makefile.dialogs +++ b/src/frontends/qt4/Makefile.dialogs @@ -35,7 +35,6 @@ UIFILES = \ QIndexUi.ui \ QLogUi.ui \ QViewSourceUi.ui \ - QMathUi.ui \ QMathMatrixUi.ui \ QNomenclUi.ui \ QNoteUi.ui \ diff --git a/src/frontends/qt4/QDelimiterDialog.C b/src/frontends/qt4/QDelimiterDialog.C index 3f31b58e9e..e3402e725c 100644 --- a/src/frontends/qt4/QDelimiterDialog.C +++ b/src/frontends/qt4/QDelimiterDialog.C @@ -13,7 +13,6 @@ #include "QDelimiterDialog.h" #include "GuiApplication.h" -#include "QMath.h" #include "qt_helpers.h" #include "controllers/ControlMath.h" @@ -62,6 +61,19 @@ QString fix_name(QString const & str, bool big) } // namespace anon +typedef QController > delimiter_base; + +QMathDelimiter::QMathDelimiter(Dialog & parent) + : delimiter_base(parent, _("Math Delimiter")) +{} + + +void QMathDelimiter::build_dialog() +{ + dialog_.reset(new QDelimiterDialog(this)); +} + + char_type QDelimiterDialog::doMatch(char_type const symbol) const { string const & str = form_->controller().texName(symbol); diff --git a/src/frontends/qt4/QDelimiterDialog.h b/src/frontends/qt4/QDelimiterDialog.h index 410a69be0d..dded616d9a 100644 --- a/src/frontends/qt4/QDelimiterDialog.h +++ b/src/frontends/qt4/QDelimiterDialog.h @@ -12,6 +12,8 @@ #ifndef QDELIMITERDIALOG_H #define QDELIMITERDIALOG_H +#include "QDialogView.h" + #include "ui/QDelimiterUi.h" #include @@ -21,6 +23,7 @@ class QListWidgetItem; namespace lyx { namespace frontend { +class ControlMath; class QMathDelimiter; class QDelimiterDialog : public QDialog, public Ui::QDelimiterUi { @@ -46,6 +49,21 @@ private: QString tex_code_; }; + +class QMathDelimiter : public QController > { +public: + friend class QDelimiterDialog; + + QMathDelimiter(Dialog &); + +private: + virtual void apply() {} + virtual void update_contents() {} + /// Build the dialog. + virtual void build_dialog(); +}; + + } // namespace frontend } // namespace lyx diff --git a/src/frontends/qt4/QMath.C b/src/frontends/qt4/QMath.C deleted file mode 100644 index 59e6ce6d0c..0000000000 --- a/src/frontends/qt4/QMath.C +++ /dev/null @@ -1,65 +0,0 @@ -/** - * \file QMath.C - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "QMath.h" -#include "QMathDialog.h" -#include "QMathMatrixDialog.h" -#include "QDelimiterDialog.h" - -#include "gettext.h" - -namespace lyx { -namespace frontend { - -typedef QController > math_base; - - -QMath::QMath(Dialog & parent) - : math_base(parent, _("Math Panel")) -{} - - -void QMath::build_dialog() -{ - dialog_.reset(new QMathDialog(this)); -} - - -typedef QController > matrix_base; - - -QMathMatrix::QMathMatrix(Dialog & parent) - : matrix_base(parent, _("Math Matrix")) -{} - - -void QMathMatrix::build_dialog() -{ - dialog_.reset(new QMathMatrixDialog(this)); -} - - -typedef QController > delimiter_base; - - -QMathDelimiter::QMathDelimiter(Dialog & parent) - : delimiter_base(parent, _("Math Delimiter")) -{} - - -void QMathDelimiter::build_dialog() -{ - dialog_.reset(new QDelimiterDialog(this)); -} - -} // namespace frontend -} // namespace lyx diff --git a/src/frontends/qt4/QMath.h b/src/frontends/qt4/QMath.h deleted file mode 100644 index 43be5bb368..0000000000 --- a/src/frontends/qt4/QMath.h +++ /dev/null @@ -1,69 +0,0 @@ -// -*- C++ -*- -/** - * \file QMath.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - -#ifndef QMATH_H -#define QMATH_H - -#include "QDialogView.h" -#include "QDelimiterDialog.h" -#include "QMathDialog.h" -#include "QMathMatrixDialog.h" - -namespace lyx { -namespace frontend { - -class ControlMath; - -class QMath : public QController > { -public: - friend class QMathDialog; - - QMath(Dialog &); - -private: - virtual void apply() {} - virtual void update_contents() {} - /// Build the dialog. - virtual void build_dialog(); -}; - - -class QMathMatrix : public QController > { -public: - friend class QMathMatrixDialog; - - QMathMatrix(Dialog &); - -private: - virtual void apply() {} - virtual void update_contents() {} - /// Build the dialog. - virtual void build_dialog(); -}; - - -class QMathDelimiter : public QController > { -public: - friend class QDelimiterDialog; - - QMathDelimiter(Dialog &); - -private: - virtual void apply() {} - virtual void update_contents() {} - /// Build the dialog. - virtual void build_dialog(); -}; - -} // namespace frontend -} // namespace lyx - -#endif // QMATH_H diff --git a/src/frontends/qt4/QMathDialog.C b/src/frontends/qt4/QMathDialog.C deleted file mode 100644 index 9dc776d2a3..0000000000 --- a/src/frontends/qt4/QMathDialog.C +++ /dev/null @@ -1,261 +0,0 @@ -/** - * \file QMathDialog.C - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - -#include - -#include "QMathDialog.h" -#include "QMath.h" - -#include -#include -#include -#include -#include -#include -#include - -#include "iconpalette.h" -#include "qt_helpers.h" -#include "controllers/ControlMath.h" - -#include "support/filetools.h" - -using std::string; - -namespace lyx { - -using support::FileName; -using support::libFileSearch; - -namespace frontend { - - -namespace { - -char const ** panels[] = { - latex_bop, latex_varsz, latex_brel, latex_greek, latex_arrow, - latex_dots, latex_deco, latex_misc, latex_ams_ops, - latex_ams_rel, latex_ams_nrel, latex_ams_arrows, - latex_ams_misc -}; - -int const nr_panels = sizeof(panels)/sizeof(panels[0]); - -int panel_index[nr_panels]; - -} // namespace anon - - -QMathDialog::QMathDialog(QMath * form) - : form_(form) -{ - setupUi(this); - - // enlarge the symbols ComboBox (no scrollbar) - //symbolsCO->setSizeLimit(13); - - connect( tearoffPB, SIGNAL( clicked() ), this, SLOT( expandClicked() ) ); - connect( closePB, SIGNAL( clicked() ), this, SLOT( accept() ) ); - connect( superscriptPB, SIGNAL( clicked() ), this, SLOT( superscriptClicked() ) ); - connect( subscriptPB, SIGNAL( clicked() ), this, SLOT( subscriptClicked() ) ); - connect( delimitersPB, SIGNAL( clicked() ), this, SLOT( delimiterClicked() ) ); - connect( matrixPB, SIGNAL( clicked() ), this, SLOT( matrixClicked() ) ); - connect( functionsLW, SIGNAL( itemActivated(QListWidgetItem *) ), this, SLOT( functionSelected(QListWidgetItem *) ) ); - connect( equationPB, SIGNAL( clicked() ), this, SLOT( equationClicked() ) ); - connect( symbolsCO, SIGNAL(activated(int)), this, SLOT(showingPanel(int))); - - FileName icon_path = libFileSearch("images/math", "sqrt-square", "xpm"); - sqrtPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "space", "xpm"); - spacePB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "style", "xpm"); - stylePB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "font", "xpm"); - fontPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "equation", "xpm"); - equationPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "frac-square", "xpm"); - fracPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "sub", "xpm"); - subscriptPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "super", "xpm"); - superscriptPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "matrix", "xpm"); - matrixPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - icon_path = libFileSearch("images/math", "delim", "xpm"); - delimitersPB->setIcon(QIcon(toqstr(icon_path.absFilename()))); - - // function list - for (int i = 0; *function_names[i]; ++i) { - functionsLW->addItem(function_names[i]); - } - //functionsLW->setFixedWidth(functionsLW->sizeHint().width()); - - // show first symbol panel - showingPanel(0); - - // add menu's to the buttons - QMenu * m = new QMenu(spacePB); - m->setTitle(qt_("LyX: Math Spacing")); - m->setTearOffEnabled(true); - addMenuItem(m, qt_("Thin space \\,"), ","); - addMenuItem(m, qt_("Medium space \\:"), ":"); - addMenuItem(m, qt_("Thick space \\;"), ";"); - addMenuItem(m, qt_("Quadratin space \\quad"), "quad"); - addMenuItem(m, qt_("Double quadratin space \\qquad"), "qquad"); - addMenuItem(m, qt_("Negative space \\!"), "!"); - spacePB->setMenu(m); - - m = new QMenu(sqrtPB); - m->setTitle(qt_("LyX: Math Roots")); - m->setTearOffEnabled(true); - addMenuItem(m, qt_("Square root \\sqrt"), "sqrt"); - QAction * ma = new QAction(qt_("Cube root \\root"), this); - connect(ma, SIGNAL(triggered()), this, SLOT(insertCubeRoot())); - m->addAction(ma); - addMenuItem(m, qt_("Other root \\root"), "root"); - sqrtPB->setMenu(m); - - m = new QMenu(stylePB); - m->setTitle(qt_("LyX: Math Styles")); - m->setTearOffEnabled(true); - addMenuItem(m, qt_("Display style \\displaystyle"), "displaystyle"); - 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->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")); - m->setTearOffEnabled(true); - addMenuItem(m, qt_("Roman \\mathrm"), "mathrm"); - addMenuItem(m, qt_("Bold \\mathbf"), "mathbf"); - addMenuItem(m, qt_("Bold symbol \\boldsymbol"), "boldsymbol"); - addMenuItem(m, qt_("Sans serif \\mathsf"), "mathsf"); - addMenuItem(m, qt_("Italic \\mathit"), "mathit"); - addMenuItem(m, qt_("Typewriter \\mathtt"), "mathtt"); - addMenuItem(m, qt_("Blackboard \\mathbb"), "mathbb"); - addMenuItem(m, qt_("Fraktur \\mathfrak"), "mathfrak"); - addMenuItem(m, qt_("Calligraphic \\mathcal"), "mathcal"); - addMenuItem(m, qt_("Normal text mode \\textrm"), "textrm"); - fontPB->setMenu(m); -} - -void QMathDialog::addMenuItem(QMenu * menu, const QString & label, const std::string & action) -{ - QMAction * ma = new QMAction(label,action, this); - connect(ma, SIGNAL(action(const std::string &)), this, SLOT(symbol_clicked(const std::string &))); - menu->addAction(ma); -} - -void QMathDialog::showingPanel(int num) -{ - if (!panel_index[num]) - addPanel(num); - - symbolWS->setCurrentIndex(panel_index[num]); -} - - -IconPalette * QMathDialog::makePanel(QWidget * parent, char const ** entries) -{ - IconPalette * p = new IconPalette(parent, entries); - // Leave these std:: qualifications alone ! - connect(p, SIGNAL(button_clicked(const std::string &)), - this, SLOT(symbol_clicked(const std::string &))); - - return p; -} - - -void QMathDialog::addPanel(int num) -{ - QScrollArea * sc = new QScrollArea(symbolWS); - IconPalette * p = makePanel(this, panels[num]); - sc->setWidget(p); - panel_index[num] = symbolWS->addWidget(sc); -} - - -void QMathDialog::symbol_clicked(const string & str) -{ - form_->controller().dispatchInsert(str); -} - - -void QMathDialog::delimiterClicked() -{ - form_->controller().showDialog("mathdelimiter"); -} - - -void QMathDialog::expandClicked() -{ - int const id = symbolsCO->currentIndex(); - IconPalette * p = makePanel(this, panels[id]); - string s = "LyX: "; - s += fromqstr(symbolsCO->currentText()); - p->setWindowTitle(toqstr(s)); - p->setWindowFlags(Qt::Dialog); - p->show(); -} - - -void QMathDialog::functionSelected(QListWidgetItem * item) -{ - form_->controller().dispatchInsert(fromqstr(item->text())); -} - - -void QMathDialog::matrixClicked() -{ - form_->controller().showDialog("mathmatrix"); -} - - -void QMathDialog::equationClicked() -{ - form_->controller().dispatchToggleDisplay(); -} - - -void QMathDialog::subscriptClicked() -{ - form_->controller().dispatchSubscript(); -} - - -void QMathDialog::superscriptClicked() -{ - form_->controller().dispatchSuperscript(); -} - - -void QMathDialog::insertCubeRoot() -{ - form_->controller().dispatchCubeRoot(); -} - - -} // namespace frontend -} // namespace lyx - -#include "QMathDialog_moc.cpp" diff --git a/src/frontends/qt4/QMathDialog.h b/src/frontends/qt4/QMathDialog.h deleted file mode 100644 index ba198910f6..0000000000 --- a/src/frontends/qt4/QMathDialog.h +++ /dev/null @@ -1,83 +0,0 @@ -// -*- C++ -*- -/** - * \file QMathDialog.h - * This file is part of LyX, the document processor. - * Licence details can be found in the file COPYING. - * - * \author John Levon - * - * Full author contact details are available in file CREDITS. - */ - -#ifndef QMATHDIALOG_H -#define QMATHDIALOG_H - -#include "ui/QMathUi.h" -#include - -#include - -class QListWidgetItem; - -namespace lyx { -namespace frontend { - -class IconPalette; - -class QMAction : public QAction { - Q_OBJECT -public: - QMAction( const QString & text, const std::string & action, QObject * parent) - : QAction(text,parent), action_(action) { - connect(this, SIGNAL(triggered()), this, SLOT(action())); - } -Q_SIGNALS: - void action(const std::string &); -protected Q_SLOTS: - void action() { - // emit signal - action(action_); - } -private: - std::string action_; -}; - - -class QMath; - -class QMathDialog : public QDialog, public Ui::QMathUi -{ - Q_OBJECT -public: - QMathDialog(QMath * form); -public Q_SLOTS: - virtual void delimiterClicked(); - virtual void expandClicked(); - virtual void functionSelected(QListWidgetItem *); - virtual void matrixClicked(); - virtual void subscriptClicked(); - virtual void superscriptClicked(); - virtual void equationClicked(); - void symbol_clicked(const std::string &); - void insertCubeRoot(); - - /// about to show a symbol panel - void showingPanel(int); -protected: - //needed ? virtual void closeEvent(QCloseEvent * e); -private: - /// add item to popup menu - void addMenuItem(QMenu * menu, const QString & label, const std::string &); - /// make a symbol panel - IconPalette * makePanel(QWidget * parent, char const ** entries); - /// add a symbol panel - void addPanel(int num); - - /// owning form - QMath * form_; -}; - -} // namespace frontend -} // namespace lyx - -#endif // QMATHDIALOG_H diff --git a/src/frontends/qt4/QMathMatrixDialog.C b/src/frontends/qt4/QMathMatrixDialog.C index b9b050ba62..1ca435794f 100644 --- a/src/frontends/qt4/QMathMatrixDialog.C +++ b/src/frontends/qt4/QMathMatrixDialog.C @@ -11,7 +11,6 @@ #include #include "QMathMatrixDialog.h" -#include "QMath.h" #include "emptytable.h" #include "qt_helpers.h" @@ -24,6 +23,8 @@ #include #include +#include "gettext.h" + using std::ostringstream; using std::string; @@ -38,6 +39,20 @@ char v_align_c[] = "tcb"; } // namespace anon +typedef QController > matrix_base; + + +QMathMatrix::QMathMatrix(Dialog & parent) + : matrix_base(parent, _("Math Matrix")) +{} + + +void QMathMatrix::build_dialog() +{ + dialog_.reset(new QMathMatrixDialog(this)); +} + + QMathMatrixDialog::QMathMatrixDialog(QMathMatrix * form) : form_(form) { diff --git a/src/frontends/qt4/QMathMatrixDialog.h b/src/frontends/qt4/QMathMatrixDialog.h index 19028620de..3497198cad 100644 --- a/src/frontends/qt4/QMathMatrixDialog.h +++ b/src/frontends/qt4/QMathMatrixDialog.h @@ -14,6 +14,8 @@ #ifndef QMATHMATRIXDIALOG_H #define QMATHMATRIXDIALOG_H +#include "QDialogView.h" + #include "ui/QMathMatrixUi.h" #include @@ -22,6 +24,8 @@ namespace lyx { namespace frontend { class QMathMatrix; +class ControlMath; + class QMathMatrixDialog : public QDialog, public Ui::QMathMatrixUi { Q_OBJECT @@ -38,6 +42,21 @@ private: QMathMatrix * form_; }; + +class QMathMatrix : public QController > { +public: + friend class QMathMatrixDialog; + + QMathMatrix(Dialog &); + +private: + virtual void apply() {} + virtual void update_contents() {} + /// Build the dialog. + virtual void build_dialog(); +}; + + } // namespace frontend } // namespace lyx diff --git a/src/frontends/qt4/ui/QMathUi.ui b/src/frontends/qt4/ui/QMathUi.ui deleted file mode 100644 index e5ab34aa47..0000000000 --- a/src/frontends/qt4/ui/QMathUi.ui +++ /dev/null @@ -1,475 +0,0 @@ - - QMathUi - - - - 0 - 0 - 403 - 368 - - - - - - - true - - - - 9 - - - 6 - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 171 - 28 - - - - - - - - Qt::Horizontal - - - - 153 - 51 - - - - - - - - &Close - - - - - - - Open this panel as a separate window - - - &Detach panel - - - - - - - Qt::Horizontal - - - - 95 - 22 - - - - - - - - - 3 - 0 - 0 - 0 - - - - Select a page of symbols - - - - Operators - - - - - Big operators - - - - - Relations - - - - - Greek - - - - - Arrows - - - - - Dots - - - - - Frame decorations - - - - - Miscellaneous - - - - - AMS operators - - - - - AMS relations - - - - - AMS negated relations - - - - - AMS arrows - - - - - AMS Miscellaneous - - - - - - - - - 70 - 0 - - - - - 60 - 500 - - - - true - - - - - - - - 100 - 16777215 - - - - &Functions - - - functionsLW - - - - - - - - 250 - 16 - - - - 1 - - - - - - - - - 0 - - - 6 - - - - - - 35 - 0 - - - - - 30 - 25 - - - - Insert root - - - - - - ../../../../lib/images/math/sqrt-square.xpm - - - - - - - - 35 - 0 - - - - - 30 - 25 - - - - Insert spacing - - - - - - ../../../../lib/images/math/space.xpm - - - - - - - - 35 - 0 - - - - - 30 - 25 - - - - Set limits style - - - - - - ../../../../lib/images/math/style.xpm - - - - - - - - 35 - 0 - - - - - 30 - 25 - - - - Set math font - - - - - - ../../../../lib/images/math/font.xpm - - - - - - - - 35 - 0 - - - - - 30 - 25 - - - - Insert fraction - - - - - - ../../../../lib/images/math/frac-square.xpm - - - - - - - - 1 - 1 - 0 - 0 - - - - - 25 - 25 - - - - Toggle between display and inline mode - - - - - - ../../../../lib/images/math/equation.xpm - - - - - - - - 25 - 25 - - - - Subscript - - - - - - ../../../../lib/images/math/sub.xpm - - - - - - - - 25 - 25 - - - - Superscript - - - - - - ../../../../lib/images/math/super.xpm - - - - - - - - 25 - 25 - - - - Insert matrix - - - - - - ../../../../lib/images/math/matrix.xpm - - - - - - - - 25 - 25 - - - - Show delimiter and bracket dialog - - - - - - ../../../../lib/images/math/delim.xpm - - - - - - - - - symbolsCO - sqrtPB - spacePB - stylePB - fontPB - fracPB - equationPB - subscriptPB - superscriptPB - matrixPB - delimitersPB - functionsLW - tearoffPB - closePB - - - qt_helpers.h - - - - diff --git a/src/frontends/qt4/ui/compile_uic.sh b/src/frontends/qt4/ui/compile_uic.sh index 5ab5521007..d50f1d0255 100644 --- a/src/frontends/qt4/ui/compile_uic.sh +++ b/src/frontends/qt4/ui/compile_uic.sh @@ -31,7 +31,6 @@ uic QDelimiterUi.ui -o QDelimiterUi.h uic QDocumentUi.ui -o QDocumentUi.h uic QExternalUi.ui -o QExternalUi.h uic QIncludeUi.ui -o QIncludeUi.h -uic QMathUi.ui -o QMathUi.h uic QParagraphUi.ui -o QParagraphUi.h uic QPrefConvertersUi.ui -o QPrefConvertersUi.h uic QPrefDateUi.ui -o QPrefDateUi.h diff --git a/src/lyxfunc.C b/src/lyxfunc.C index cabb451cdc..39029f274d 100644 --- a/src/lyxfunc.C +++ b/src/lyxfunc.C @@ -555,7 +555,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & cmd) const else if (name == "print") enable = Exporter::isExportable(*buf, "dvi") && lyxrc.print_command != "none"; - else if (name == "character" || name == "mathpanel") + else if (name == "character") enable = cur.inset().lyxCode() != InsetBase::ERT_CODE; else if (name == "latexlog") enable = isFileReadable(FileName(buf->getLogName().second)); diff --git a/src/mathed/InsetMathNest.C b/src/mathed/InsetMathNest.C index 549b56f70f..8701fad0c9 100644 --- a/src/mathed/InsetMathNest.C +++ b/src/mathed/InsetMathNest.C @@ -1202,12 +1202,6 @@ void InsetMathNest::lfunMouseRelease(LCursor & cur, FuncRequest & cmd) return; } - if (cmd.button() == mouse_button::button3) { - // try to dispatch to enclosed insets first - cur.bv().showDialog("mathpanel"); - return; - } - cur.undispatched(); }