#include <boost/bind.hpp>
#include <algorithm>
-#include "frontends/controllers/ControlMath.h"
-
namespace lyx {
using support::compare_ascii_no_case;
+++ /dev/null
-/**
- * \file ControlMath.cpp
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#include <config.h>
-
-#include "ControlMath.h"
-#include "debug.h"
-#include "FuncRequest.h"
-
-using std::string;
-using std::map;
-
-namespace lyx {
-namespace frontend {
-
-ControlMath::ControlMath(Dialog & dialog)
- : Controller(dialog)
-{
- // FIXME: Ideally, those unicode codepoints would be defined
- // in "lib/symbols". Unfortunately, some of those are already
- // defined with non-unicode ids for use within mathed.
- // FIXME 2: We should fill-in this map with the parsed "symbols"
- // file done in MathFactory.cpp.
- math_symbols_["("] = MathSymbol('(');
- math_symbols_[")"] = MathSymbol(')');
- math_symbols_["{"] = MathSymbol('{');
- math_symbols_["}"] = MathSymbol('}');
- math_symbols_["["] = MathSymbol('[');
- math_symbols_["]"] = MathSymbol(']');
- math_symbols_["|"] = MathSymbol('|');
- math_symbols_["/"] = MathSymbol('/', 54, Font::CMSY_FAMILY);
- math_symbols_["backslash"] = MathSymbol('\\', 110, Font::CMSY_FAMILY);
- math_symbols_["lceil"] = MathSymbol(0x2308, 100, Font::CMSY_FAMILY);
- math_symbols_["rceil"] = MathSymbol(0x2309, 101, Font::CMSY_FAMILY);
- math_symbols_["lfloor"] = MathSymbol(0x230A, 98, Font::CMSY_FAMILY);
- math_symbols_["rfloor"] = MathSymbol(0x230B, 99, Font::CMSY_FAMILY);
- math_symbols_["langle"] = MathSymbol(0x2329, 104, Font::CMSY_FAMILY);
- math_symbols_["rangle"] = MathSymbol(0x232A, 105, Font::CMSY_FAMILY);
- math_symbols_["uparrow"] = MathSymbol(0x2191, 34, Font::CMSY_FAMILY);
- math_symbols_["Uparrow"] = MathSymbol(0x21D1, 42, Font::CMSY_FAMILY);
- math_symbols_["updownarrow"] = MathSymbol(0x2195, 108, Font::CMSY_FAMILY);
- math_symbols_["Updownarrow"] = MathSymbol(0x21D5, 109, Font::CMSY_FAMILY);
- math_symbols_["downarrow"] = MathSymbol(0x2193, 35, Font::CMSY_FAMILY);
- math_symbols_["Downarrow"] = MathSymbol(0x21D3, 43, Font::CMSY_FAMILY);
- math_symbols_["downdownarrows"] = MathSymbol(0x21CA, 184, Font::MSA_FAMILY);
- math_symbols_["downharpoonleft"] = MathSymbol(0x21C3, 188, Font::MSA_FAMILY);
- math_symbols_["downharpoonright"] = MathSymbol(0x21C2, 186, Font::MSA_FAMILY);
- math_symbols_["vert"] = MathSymbol(0x007C, 106, Font::CMSY_FAMILY);
- math_symbols_["Vert"] = MathSymbol(0x2016, 107, Font::CMSY_FAMILY);
-
- std::map<string, MathSymbol>::const_iterator it = math_symbols_.begin();
- std::map<string, MathSymbol>::const_iterator end = math_symbols_.end();
- for (; it != end; ++it)
- tex_names_[it->second.unicode] = it->first;
-}
-
-
-void ControlMath::dispatchFunc(kb_action action, string const & arg) const
-{
- dispatch(FuncRequest(action, arg));
-}
-
-
-void ControlMath::dispatchInsert(string const & name) const
-{
- dispatchFunc(LFUN_MATH_INSERT, '\\' + name);
-}
-
-
-void ControlMath::dispatchSubscript() const
-{
- dispatchFunc(LFUN_MATH_INSERT, "_");
-}
-
-
-void ControlMath::dispatchSuperscript() const
-{
- dispatchFunc(LFUN_MATH_INSERT, "^");
-}
-
-
-void ControlMath::dispatchCubeRoot() const
-{
- dispatchFunc(LFUN_MATH_INSERT, "\\root");
- dispatchFunc(LFUN_SELF_INSERT, "3");
- dispatchFunc(LFUN_CHAR_FORWARD);
-}
-
-
-void ControlMath::dispatchMatrix(string const & str) const
-{
- dispatchFunc(LFUN_MATH_MATRIX, str);
-}
-
-
-void ControlMath::dispatchDelim(string const & str) const
-{
- dispatchFunc(LFUN_MATH_DELIM, str);
-}
-
-
-void ControlMath::dispatchBigDelim(string const & str) const
-{
- dispatchFunc(LFUN_MATH_BIGDELIM, str);
-}
-
-
-void ControlMath::dispatchToggleDisplay() const
-{
- dispatchFunc(LFUN_MATH_DISPLAY);
-}
-
-
-void ControlMath::showDialog(string const & name) const
-{
- dispatchFunc(LFUN_DIALOG_SHOW, name);
-}
-
-
-MathSymbol const & ControlMath::mathSymbol(string tex_name) const
-{
- map<string, MathSymbol>::const_iterator it =
- math_symbols_.find(tex_name);
-
- static MathSymbol unknown_symbol;
- if (it == math_symbols_.end())
- return unknown_symbol;
-
- return it->second;
-}
-
-
-std::string const & ControlMath::texName(char_type math_symbol) const
-{
- map<char_type, string>::const_iterator it =
- tex_names_.find(math_symbol);
-
- static string empty_string;
- if (it == tex_names_.end())
- return empty_string;
-
- return it->second;
-}
-
-
-} // namespace frontend
-} // namespace lyx
+++ /dev/null
-// -*- C++ -*-
-/**
- * \file ControlMath.h
- * This file is part of LyX, the document processor.
- * Licence details can be found in the file COPYING.
- *
- * \author Angus Leeming
- *
- * Full author contact details are available in file CREDITS.
- */
-
-#ifndef CONTROLMATH_H
-#define CONTROLMATH_H
-
-#include "Dialog.h"
-#include "lfuns.h" // for kb_action
-#include "Font.h"
-
-#include <map>
-
-
-namespace lyx {
-namespace frontend {
-
-struct MathSymbol {
- MathSymbol(char_type uc = '?', unsigned char fc = 0,
- Font::FONT_FAMILY ff = Font::SYMBOL_FAMILY)
- : unicode(uc), fontcode(fc), fontfamily(ff)
- {}
- char_type unicode;
- unsigned char fontcode;
- Font::FONT_FAMILY fontfamily;
-};
-
-
-class ControlMath : public Controller {
-public:
- ControlMath(Dialog &);
-
- /// Nothing to initialise in this case.
- virtual bool initialiseParams(std::string const &) { return true; }
- virtual void clearParams() {}
- virtual void dispatchParams() {}
- virtual bool isBufferDependent() const { return true; }
-
- /// dispatch an LFUN
- void dispatchFunc(kb_action action, std::string const & arg = std::string()) const;
- /// Insert a math symbol into the doc.
- void dispatchInsert(std::string const & name) const;
- /// Insert a subscript.
- void dispatchSubscript() const;
- /// Insert a superscript.
- void dispatchSuperscript() const;
- /// Insert a cube root
- void dispatchCubeRoot() const;
- /// Insert a matrix
- void dispatchMatrix(std::string const & str) const;
- /// Insert a variable size delimiter
- void dispatchDelim(std::string const & str) const;
- /// Insert a big delimiter
- void dispatchBigDelim(std::string const & str) const;
- /// Switch between display and inline
- void dispatchToggleDisplay() const;
- /** A request to the kernel to launch a dialog.
- * \param name the dialog identifier.
- */
- void showDialog(std::string const & name) const;
-
- /// \return the math unicode symbol associated to a TeX name.
- MathSymbol const & mathSymbol(std::string tex_name) const;
- /// \return the TeX name associated to a math unicode symbol.
- std::string const & texName(char_type math_symbol) const;
-
-private:
- /// TeX-name / Math-symbol map.
- std::map<std::string, MathSymbol> math_symbols_;
- /// Math-symbol / TeX-name map.
- /// This one is for fast search, it contains the same data as
- /// \c math_symbols_.
- std::map<char_type, std::string> tex_names_;
-};
-
-
-} // namespace frontend
-} // namespace lyx
-
-#endif // NOT CONTROLMATH
SOURCEFILES = \
Dialog.cpp \
ButtonPolicy.cpp \
- ControlMath.cpp \
frontend_helpers.cpp
HEADERFILES = \
Dialog.h \
ButtonPolicy.h \
- ControlMath.h \
frontend_helpers.h
if MONOLITHIC_CONTROLLERS
#include "Dialogs.h"
#include "GuiDialog.h"
-#include "ButtonController.h"
-#include "DialogView.h"
-#include "DockView.h"
-#include "GuiDelimiter.h"
-#include "GuiIndex.h"
-#include "GuiMathMatrix.h"
-#include "GuiView.h"
-
-// Uncomment this if you prefer dock widget
-//#define USE_DOCK_WIDGET
-
#include "qt_helpers.h"
#include <boost/assert.hpp>
Dialog * createGuiLabel(LyXView & lv);
Dialog * createGuiListings(LyXView & lv);
Dialog * createGuiLog(LyXView & lv);
-Dialog * createGuiMath(LyXView & lv);
+Dialog * createGuiMathMatrix(LyXView & lv);
Dialog * createGuiNomenclature(LyXView & lv);
Dialog * createGuiNote(LyXView & lv);
Dialog * createGuiParagraph(LyXView & lv);
if (name == "view-source")
return createGuiViewSource(lyxview_);
if (name == "mathdelimiter")
- return new GuiDelimiterDialog(lyxview_);
+ return createGuiDelimiter(lyxview_);
if (name == "mathmatrix")
- return new GuiMathMatrixDialog(lyxview_);
+ return createGuiMathMatrix(lyxview_);
if (name == "note")
return createGuiNote(lyxview_);
if (name == "paragraph")
namespace frontend {
-GuiDelimiterDialog::GuiDelimiterDialog(LyXView & lv)
- : GuiDialog(lv, "mathdelimiter")
+GuiDelimiter::GuiDelimiter(LyXView & lv)
+ : GuiMath(lv, "mathdelimiter")
{
setupUi(this);
setViewTitle(_("Math Delimiter"));
- setController(new ControlMath(*this));
+ setController(this, false);
connect(closePB, SIGNAL(clicked()), this, SLOT(accept()));
int const end = nr_latex_delimiters - 1;
for (int i = 0; i < end; ++i) {
string const delim = latex_delimiters[i];
- MathSymbol const & ms = controller().mathSymbol(delim);
+ MathSymbol const & ms = mathSymbol(delim);
QString symbol(ms.fontcode?
QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode)));
QListWidgetItem * lwi = new QListWidgetItem(symbol);
}
for (int i = 0; i != leftLW->count(); ++i) {
- MathSymbol const & ms = controller().mathSymbol(
+ MathSymbol const & ms = mathSymbol(
fromqstr(leftLW->item(i)->toolTip()));
rightLW->addItem(list_items[doMatch(ms.unicode)]->clone());
}
}
-ControlMath & GuiDelimiterDialog::controller()
+char_type GuiDelimiter::doMatch(char_type const symbol)
{
- return static_cast<ControlMath &>(GuiDialog::controller());
-}
-
-
-char_type GuiDelimiterDialog::doMatch(char_type const symbol)
-{
- string const & str = controller().texName(symbol);
+ string const & str = texName(symbol);
string match;
if (str == "(") match = ")";
else if (str == ")") match = "(";
else if (str == "/") match = "backslash";
else return symbol;
- return controller().mathSymbol(match).unicode;
+ return mathSymbol(match).unicode;
}
-void GuiDelimiterDialog::updateTeXCode(int size)
+void GuiDelimiter::updateTeXCode(int size)
{
bool const bigsize = size != 0;
}
-void GuiDelimiterDialog::on_insertPB_clicked()
+void GuiDelimiter::on_insertPB_clicked()
{
if (sizeCO->currentIndex() == 0)
- controller().dispatchDelim(fromqstr(tex_code_));
+ dispatchDelim(fromqstr(tex_code_));
else {
QString command = '"' + tex_code_ + '"';
command.replace(' ', "\" \"");
- controller().dispatchBigDelim(fromqstr(command));
+ dispatchBigDelim(fromqstr(command));
}
}
-void GuiDelimiterDialog::on_sizeCO_activated(int index)
+void GuiDelimiter::on_sizeCO_activated(int index)
{
updateTeXCode(index);
}
-void GuiDelimiterDialog::on_leftLW_itemActivated(QListWidgetItem *)
+void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *)
{
on_insertPB_clicked();
accept();
}
-void GuiDelimiterDialog::on_rightLW_itemActivated(QListWidgetItem *)
+void GuiDelimiter::on_rightLW_itemActivated(QListWidgetItem *)
{
on_insertPB_clicked();
accept();
}
-void GuiDelimiterDialog::on_leftLW_currentRowChanged(int item)
+void GuiDelimiter::on_leftLW_currentRowChanged(int item)
{
if (matchCB->isChecked())
rightLW->setCurrentRow(item);
}
-void GuiDelimiterDialog::on_rightLW_currentRowChanged(int item)
+void GuiDelimiter::on_rightLW_currentRowChanged(int item)
{
if (matchCB->isChecked())
leftLW->setCurrentRow(item);
}
-void GuiDelimiterDialog::on_matchCB_stateChanged(int state)
+void GuiDelimiter::on_matchCB_stateChanged(int state)
{
if (state == Qt::Checked)
on_leftLW_currentRowChanged(leftLW->currentRow());
}
+Dialog * createGuiDelimiter(LyXView & lv) { return new GuiDelimiter(lv); }
+
+
} // namespace frontend
} // namespace lyx
// -*- C++ -*-
/**
- * \file GuiDelimiterDialog.h
+ * \file GuiDelimiter.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
#ifndef GUIDELIMITERDIALOG_H
#define GUIDELIMITERDIALOG_H
-#include "GuiDialog.h"
-#include "ControlMath.h"
+#include "GuiMath.h"
#include "ui_DelimiterUi.h"
class QListWidgetItem;
namespace lyx {
namespace frontend {
-class GuiDelimiterDialog : public GuiDialog, public Ui::DelimiterUi
+class GuiDelimiter : public GuiMath, public Ui::DelimiterUi
{
Q_OBJECT
public:
- GuiDelimiterDialog(LyXView & lv);
+ GuiDelimiter(LyXView & lv);
public Q_SLOTS:
void on_leftLW_itemActivated(QListWidgetItem *);
char_type doMatch(char_type const symbol);
///
void updateTeXCode(int size);
- /// parent controller
- ControlMath & controller();
/// TeX code that will be inserted.
QString tex_code_;
--- /dev/null
+/**
+ * \file GuiMath.cpp
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#include <config.h>
+
+#include "GuiMath.h"
+#include "debug.h"
+#include "FuncRequest.h"
+
+using std::string;
+using std::map;
+
+namespace lyx {
+namespace frontend {
+
+GuiMath::GuiMath(LyXView & lv, std::string const & name)
+ : GuiDialog(lv, name), Controller(this)
+{
+ // FIXME: Ideally, those unicode codepoints would be defined
+ // in "lib/symbols". Unfortunately, some of those are already
+ // defined with non-unicode ids for use within mathed.
+ // FIXME 2: We should fill-in this map with the parsed "symbols"
+ // file done in MathFactory.cpp.
+ math_symbols_["("] = MathSymbol('(');
+ math_symbols_[")"] = MathSymbol(')');
+ math_symbols_["{"] = MathSymbol('{');
+ math_symbols_["}"] = MathSymbol('}');
+ math_symbols_["["] = MathSymbol('[');
+ math_symbols_["]"] = MathSymbol(']');
+ math_symbols_["|"] = MathSymbol('|');
+ math_symbols_["/"] = MathSymbol('/', 54, Font::CMSY_FAMILY);
+ math_symbols_["backslash"] = MathSymbol('\\', 110, Font::CMSY_FAMILY);
+ math_symbols_["lceil"] = MathSymbol(0x2308, 100, Font::CMSY_FAMILY);
+ math_symbols_["rceil"] = MathSymbol(0x2309, 101, Font::CMSY_FAMILY);
+ math_symbols_["lfloor"] = MathSymbol(0x230A, 98, Font::CMSY_FAMILY);
+ math_symbols_["rfloor"] = MathSymbol(0x230B, 99, Font::CMSY_FAMILY);
+ math_symbols_["langle"] = MathSymbol(0x2329, 104, Font::CMSY_FAMILY);
+ math_symbols_["rangle"] = MathSymbol(0x232A, 105, Font::CMSY_FAMILY);
+ math_symbols_["uparrow"] = MathSymbol(0x2191, 34, Font::CMSY_FAMILY);
+ math_symbols_["Uparrow"] = MathSymbol(0x21D1, 42, Font::CMSY_FAMILY);
+ math_symbols_["updownarrow"] = MathSymbol(0x2195, 108, Font::CMSY_FAMILY);
+ math_symbols_["Updownarrow"] = MathSymbol(0x21D5, 109, Font::CMSY_FAMILY);
+ math_symbols_["downarrow"] = MathSymbol(0x2193, 35, Font::CMSY_FAMILY);
+ math_symbols_["Downarrow"] = MathSymbol(0x21D3, 43, Font::CMSY_FAMILY);
+ math_symbols_["downdownarrows"] = MathSymbol(0x21CA, 184, Font::MSA_FAMILY);
+ math_symbols_["downharpoonleft"] = MathSymbol(0x21C3, 188, Font::MSA_FAMILY);
+ math_symbols_["downharpoonright"] = MathSymbol(0x21C2, 186, Font::MSA_FAMILY);
+ math_symbols_["vert"] = MathSymbol(0x007C, 106, Font::CMSY_FAMILY);
+ math_symbols_["Vert"] = MathSymbol(0x2016, 107, Font::CMSY_FAMILY);
+
+ std::map<string, MathSymbol>::const_iterator it = math_symbols_.begin();
+ std::map<string, MathSymbol>::const_iterator end = math_symbols_.end();
+ for (; it != end; ++it)
+ tex_names_[it->second.unicode] = it->first;
+}
+
+
+void GuiMath::dispatchFunc(kb_action action, string const & arg) const
+{
+ dispatch(FuncRequest(action, arg));
+}
+
+
+void GuiMath::dispatchInsert(string const & name) const
+{
+ dispatchFunc(LFUN_MATH_INSERT, '\\' + name);
+}
+
+
+void GuiMath::dispatchSubscript() const
+{
+ dispatchFunc(LFUN_MATH_INSERT, "_");
+}
+
+
+void GuiMath::dispatchSuperscript() const
+{
+ dispatchFunc(LFUN_MATH_INSERT, "^");
+}
+
+
+void GuiMath::dispatchCubeRoot() const
+{
+ dispatchFunc(LFUN_MATH_INSERT, "\\root");
+ dispatchFunc(LFUN_SELF_INSERT, "3");
+ dispatchFunc(LFUN_CHAR_FORWARD);
+}
+
+
+void GuiMath::dispatchMatrix(string const & str) const
+{
+ dispatchFunc(LFUN_MATH_MATRIX, str);
+}
+
+
+void GuiMath::dispatchDelim(string const & str) const
+{
+ dispatchFunc(LFUN_MATH_DELIM, str);
+}
+
+
+void GuiMath::dispatchBigDelim(string const & str) const
+{
+ dispatchFunc(LFUN_MATH_BIGDELIM, str);
+}
+
+
+void GuiMath::dispatchToggleDisplay() const
+{
+ dispatchFunc(LFUN_MATH_DISPLAY);
+}
+
+
+void GuiMath::showDialog(string const & name) const
+{
+ dispatchFunc(LFUN_DIALOG_SHOW, name);
+}
+
+
+MathSymbol const & GuiMath::mathSymbol(string tex_name) const
+{
+ map<string, MathSymbol>::const_iterator it =
+ math_symbols_.find(tex_name);
+
+ static MathSymbol unknown_symbol;
+ if (it == math_symbols_.end())
+ return unknown_symbol;
+
+ return it->second;
+}
+
+
+std::string const & GuiMath::texName(char_type math_symbol) const
+{
+ map<char_type, string>::const_iterator it =
+ tex_names_.find(math_symbol);
+
+ static string empty_string;
+ if (it == tex_names_.end())
+ return empty_string;
+
+ return it->second;
+}
+
+
+} // namespace frontend
+} // namespace lyx
--- /dev/null
+// -*- C++ -*-
+/**
+ * \file GuiMath.h
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
+ *
+ * \author Angus Leeming
+ *
+ * Full author contact details are available in file CREDITS.
+ */
+
+#ifndef GUIMATH_H
+#define GUIMATH_H
+
+#include "GuiDialog.h"
+#include "lfuns.h" // for kb_action
+#include "Font.h"
+
+#include <map>
+
+
+namespace lyx {
+namespace frontend {
+
+struct MathSymbol {
+ MathSymbol(char_type uc = '?', unsigned char fc = 0,
+ Font::FONT_FAMILY ff = Font::SYMBOL_FAMILY)
+ : unicode(uc), fontcode(fc), fontfamily(ff)
+ {}
+ char_type unicode;
+ unsigned char fontcode;
+ Font::FONT_FAMILY fontfamily;
+};
+
+
+class GuiMath : public GuiDialog, public Controller
+{
+public:
+ GuiMath(LyXView & lv, std::string const & name);
+
+ /// Nothing to initialise in this case.
+ bool initialiseParams(std::string const &) { return true; }
+ void clearParams() {}
+ void dispatchParams() {}
+ bool isBufferDependent() const { return true; }
+
+ Controller & controller() { return *this; }
+
+ /// dispatch an LFUN
+ void dispatchFunc(kb_action action,
+ std::string const & arg = std::string()) const;
+ /// Insert a math symbol into the doc.
+ void dispatchInsert(std::string const & name) const;
+ /// Insert a subscript.
+ void dispatchSubscript() const;
+ /// Insert a superscript.
+ void dispatchSuperscript() const;
+ /// Insert a cube root
+ void dispatchCubeRoot() const;
+ /// Insert a matrix
+ void dispatchMatrix(std::string const & str) const;
+ /// Insert a variable size delimiter
+ void dispatchDelim(std::string const & str) const;
+ /// Insert a big delimiter
+ void dispatchBigDelim(std::string const & str) const;
+ /// Switch between display and inline
+ void dispatchToggleDisplay() const;
+ /** A request to the kernel to launch a dialog.
+ * \param name the dialog identifier.
+ */
+ void showDialog(std::string const & name) const;
+
+ /// \return the math unicode symbol associated to a TeX name.
+ MathSymbol const & mathSymbol(std::string tex_name) const;
+ /// \return the TeX name associated to a math unicode symbol.
+ std::string const & texName(char_type math_symbol) const;
+
+private:
+ /// TeX-name / Math-symbol map.
+ std::map<std::string, MathSymbol> math_symbols_;
+ /// Math-symbol / TeX-name map.
+ /// This one is for fast search, it contains the same data as
+ /// \c math_symbols_.
+ std::map<char_type, std::string> tex_names_;
+};
+
+
+} // namespace frontend
+} // namespace lyx
+
+#endif // GUIMATH_H
#include "GuiMathMatrix.h"
-#include "ControlMath.h"
#include "EmptyTable.h"
#include "qt_helpers.h"
#include "gettext.h"
namespace lyx {
namespace frontend {
-GuiMathMatrixDialog::GuiMathMatrixDialog(LyXView & lv)
- : GuiDialog(lv, "mathmatrix")
+GuiMathMatrix::GuiMathMatrix(LyXView & lv)
+ : GuiMath(lv, "mathmatrix")
{
setupUi(this);
setViewTitle(_("Math Matrix"));
- setController(new ControlMath(*this));
+ setController(this, false);
table->setMinimumSize(100, 100);
rowsSB->setValue(5);
}
-ControlMath & GuiMathMatrixDialog::controller()
-{
- return static_cast<ControlMath &>(GuiDialog::controller());
-}
-
-
-void GuiMathMatrixDialog::columnsChanged(int)
+void GuiMathMatrix::columnsChanged(int)
{
char h_align_str[80] = "c";
int const nx = int(columnsSB->value());
}
-void GuiMathMatrixDialog::rowsChanged(int)
+void GuiMathMatrix::rowsChanged(int)
{
}
-void GuiMathMatrixDialog::change_adaptor()
+void GuiMathMatrix::change_adaptor()
{
// FIXME: We need a filter for the halign input
}
-void GuiMathMatrixDialog::slotOK()
+void GuiMathMatrix::slotOK()
{
char v_align_c[] = "tcb";
char const c = v_align_c[valignCO->currentIndex()];
ostringstream os;
os << nx << ' ' << ny << ' ' << c << ' ' << sh;
- controller().dispatchMatrix(os.str().c_str());
+ dispatchMatrix(os.str().c_str());
// close the dialog
close();
}
-void GuiMathMatrixDialog::slotClose()
+void GuiMathMatrix::slotClose()
{
close();
}
+
+Dialog * createGuiMathMatrix(LyXView & lv) { return new GuiMathMatrix(lv); }
+
+
} // namespace frontend
} // namespace lyx
// -*- C++ -*-
/**
- * \file GuiMathMatrixDialog.h
+ * \file GuiMathMatrix.h
* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
* Full author contact details are available in file CREDITS.
*/
-#ifndef GUIMATHMATRIXDIALOG_H
-#define GUIMATHMATRIXDIALOG_H
+#ifndef GUIMATHMATRIX_H
+#define GUIMATHMATRIX_H
-#include "GuiDialog.h"
-#include "ControlMath.h"
+#include "GuiMath.h"
#include "ui_MathMatrixUi.h"
#include <QDialog>
namespace lyx {
namespace frontend {
-class GuiMathMatrixDialog : public GuiDialog, public Ui::MathMatrixUi
+class GuiMathMatrix : public GuiMath, public Ui::MathMatrixUi
{
Q_OBJECT
public:
- GuiMathMatrixDialog(LyXView & lv);
+ GuiMathMatrix(LyXView & lv);
public Q_SLOTS:
void slotOK();
void columnsChanged(int);
void rowsChanged(int);
void change_adaptor();
-
- /// parent controller
- ControlMath & controller();
};
} // namespace frontend
#ifndef GUIPARAGRAPH_H
#define GUIPARAGRAPH_H
+// Uncomment this if you prefer dock widget
+//#define USE_DOCK_WIDGET
+
#include "Layout.h"
#include "ui_ParagraphUi.h"
#include "Dialog.h"
#include "support/lstrings.h"
#include "support/lyxalgo.h" // sorted
-#include "controllers/ControlMath.h"
-
#include <QComboBox>
#include <QToolBar>
#include <QToolButton>
GuiKeySymbol.cpp \
GuiListings.cpp \
GuiLog.cpp \
+ GuiMath.cpp \
GuiMathMatrix.cpp \
GuiMenubar.cpp \
GuiNomencl.cpp \
GuiKeySymbol.h \
GuiListings.h \
GuiLog.h \
+ GuiMath.h \
GuiMathMatrix.h \
GuiMenubar.h \
GuiNomencl.h \
projects / features.git / commitdiff