Add basic bits of Qt's math panel. Hacked together (no MVC yet) but

good position to work on dialog contents.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5187 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-08-30 16:20:27 +00:00
parent 29f01faa17
commit a5d7d51b09
20 changed files with 1207 additions and 43 deletions

View File

@ -1,3 +1,8 @@
2002-08-30 John Levon <levon@movementarian.org>
* ControlMath.h:
* ControlMath.C: moved from MathsSymbols.C
2002-08-27 Jean-Marc Lasgouttes <lasgouttes@freesurf.fr>
* ControlFloat.C (applyParamsToInset): wide() now has two arguments

View File

@ -1,5 +1,5 @@
/**
* \file MathsSymbols.C
* \file ControlMath.C
* Copyright 2001 the LyX Team
* Read the file COPYING
*
@ -7,9 +7,7 @@
* \author John Levon, moz@compsoc.man.ac.uk
*/
#include "MathsSymbols.h"
/* Latex code for those bitmaps */
#include "ControlMath.h"
char const * function_names[] = {
"arccos", "arcsin", "arctan", "arg", "bmod",
@ -17,10 +15,10 @@ char const * function_names[] = {
"det", "dim", "exp", "gcd", "hom", "inf", "ker",
"lg", "lim", "liminf", "limsup", "ln", "log",
"max", "min", "sec", "sin", "sinh", "sup",
"tan", "tanh"
"tan", "tanh", ""
};
int const nr_function_names = sizeof(function_names) / sizeof(char const *);
int const nr_function_names = sizeof(function_names) / sizeof(char const *) - 1;
char const * latex_arrow[] = {
"downarrow", "leftarrow", "Downarrow", "Leftarrow",

View File

@ -1,6 +1,6 @@
// -*- C++ -*-
/**
* \file MathsSymbols.h
* \file ControlMath.h
* Copyright 2001 the LyX Team
* Read the file COPYING
*
@ -8,36 +8,8 @@
* \author John Levon, moz@compsoc.man.ac.uk
*/
#ifndef MATHS_SYMBOLS_H
#define MATHS_SYMBOLS_H
/// values used by the xforms callbacks
enum MathsCallbackValues {
MM_GREEK,
MM_ARROW,
MM_BOP,
MM_BRELATS,
MM_VARSIZE,
MM_MISC,
MM_FRAC,
MM_SQRT,
MM_DELIM,
MM_SUPER,
MM_SUB,
MM_SUBSUPER,
MM_MATRIX,
MM_EQU,
MM_DECO,
MM_SPACE,
MM_STYLE,
MM_DOTS,
MM_AMS_MISC,
MM_AMS_ARROWS,
MM_AMS_BREL,
MM_AMS_NREL,
MM_AMS_OPS,
MM_FUNC
};
#ifndef CONTROL_MATH_H
#define CONTROL_MATH_H
extern char const * function_names[];
extern int const nr_function_names;
@ -66,4 +38,4 @@ extern int const nr_latex_ams_nrel;
extern char const * latex_ams_ops[];
extern int const nr_latex_ams_ops;
#endif /* MATHS_SYMBOLS_H */
#endif /* CONTROL_MATH_H */

View File

@ -61,6 +61,8 @@ libcontrollers_la_SOURCES= \
ControlInset.h \
ControlLog.C \
ControlLog.h \
ControlMath.C \
ControlMath.h \
ControlMinipage.C \
ControlMinipage.h \
ControlParagraph.C \

View File

@ -1,3 +1,16 @@
2002-08-30 John Levon <levon@movementarian.org>
* Makefile.dialogs:
* moc/Makefile.am:
* QMath.h:
* QMath.C:
* QMathDialog.h:
* QMathDialog.C:
* ui/QMathDialog.ui: start math panel
* iconpalette.h:
* iconpalette.C: new widget used by above
2002-08-29 John Levon <levon@movementarian.org>
* Toolbar_pimpl.C: defocus layout combo on select

View File

@ -133,7 +133,12 @@ void Dialogs::showLogFile()
void Dialogs::showMathPanel()
{}
{
// FIXME FIXME FIXME
extern void createMathPanel();
createMathPanel();
}
void Dialogs::showMinipage(InsetMinipage * im)

View File

@ -56,6 +56,8 @@ libqt2_la_SOURCES = \
WorkAreaFactory.C \
emptytable.C \
emptytable.h \
iconpalette.h \
iconpalette.C \
io_callback.h \
lengthcombo.C \
lengthcombo.h \

View File

@ -15,6 +15,7 @@ DIALOGS = \
QInclude \
QIndex \
QLog \
QMath \
QMinipage \
QParagraph \
QPreamble \
@ -57,6 +58,8 @@ DIALOGSOURCES = \
QIndex.C QIndexDialog.C \
QLog.h QLogDialog.h \
QLog.C QLogDialog.C \
QMath.h QMathDialog.h \
QMath.C QMathDialog.C \
QMinipage.h QMinipageDialog.h \
QMinipage.C QMinipageDialog.C \
QParagraph.h QParagraphDialog.h \
@ -100,6 +103,7 @@ MOCDIALOGS = \
QIncludeDialog_moc.C \
QIndexDialog_moc.C \
QLogDialog_moc.C \
QMathDialog_moc.C \
QMinipageDialog_moc.C \
QParagraphDialog_moc.C \
QPreambleDialog_moc.C \
@ -144,6 +148,8 @@ UIDIALOGS = \
QIndexDialogBase.C \
QLogDialogBase.h \
QLogDialogBase.C \
QMathDialogBase.h \
QMathDialogBase.C \
QMinipageDialogBase.h \
QMinipageDialogBase.C \
QParagraphDialogBase.h \
@ -188,6 +194,7 @@ UIMOCDIALOGS = \
QIncludeDialogBase_moc.C \
QIndexDialogBase_moc.C \
QLogDialogBase_moc.C \
QMathDialogBase_moc.C \
QMinipageDialogBase_moc.C \
QParagraphDialogBase_moc.C \
QPreambleDialogBase_moc.C \

62
src/frontends/qt2/QMath.C Normal file
View File

@ -0,0 +1,62 @@
/**
* \file QMath.C
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon <moz@compsoc.man.ac.uk>
*/
#include <config.h>
#ifdef __GNUG__
#pragma implementation
#endif
#include "debug.h"
#include "commandtags.h"
#include "funcrequest.h"
#include "LyXView.h"
#include "BufferView.h"
#include "QMathDialog.h"
#include "QMath.h"
#include "iconpalette.h"
// FIXME temporary HACK !
void createMathPanel()
{
static QMath * dialog = 0;
if (!dialog) {
dialog = new QMath();
dialog->build_dialog();
}
dialog->do_show();
}
QMath::QMath()
{
}
void QMath::do_show()
{
dialog_->show();
}
void QMath::build_dialog()
{
dialog_ = new QMathDialog(this);
}
void QMath::insert_symbol(string const & name)
{
// needless to say, this can't last for long
extern BufferView * current_view;
current_view->owner()->dispatch(FuncRequest(LFUN_INSERT_MATH, '\\' + name));
}

47
src/frontends/qt2/QMath.h Normal file
View File

@ -0,0 +1,47 @@
// -*- C++ -*-
/**
* \file QMath.h
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon <moz@compsoc.man.ac.uk>
*/
#ifndef QMATH_H
#define QMATH_H
#include <config.h>
#include "LString.h"
#ifdef __GNUG__
#pragma interface
#endif
class QMath
{
public:
friend class QMathDialog;
QMath();
/// temporary
void do_show();
/// build the dialog (should be private)
virtual void build_dialog();
/// insert a math symbol into the doc
void insert_symbol(string const & name);
private:
/// Apply changes
virtual void apply() {};
/// update
virtual void update_contents() {};
// FIXME: temp
QMathDialog * dialog_;
};
#endif // QMATH_H

View File

@ -0,0 +1,130 @@
/**
* \file QMathDialog.C
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon <moz@compsoc.man.ac.uk>
*/
#include <config.h>
#include "support/filetools.h"
#include "QMathDialog.h"
#include "QMath.h"
#include "ControlMath.h"
#include "iconpalette.h"
#include <qwidgetstack.h>
#include <qcombobox.h>
#include <qlistbox.h>
#include <qpixmap.h>
QMathDialog::QMathDialog(QMath * form)
: QMathDialogBase(0, 0, false, 0),
form_(form)
{
connect(symbolsCO, SIGNAL(activated(int)), symbolsWS, SLOT(raiseWidget(int)));
for (int i = 0; *function_names[i]; ++i) {
functionsLB->insertItem(function_names[i]);
}
addPanel("operators", latex_bop);
addPanel("bigoperators", latex_varsz);
addPanel("relations", latex_brel);
addPanel("greek", latex_greek);
addPanel("arrows", latex_arrow);
addPanel("misc", latex_misc);
addPanel("amsoperators", latex_ams_ops);
addPanel("amsrelations", latex_ams_rel);
addPanel("amsnegrelations", latex_ams_nrel);
addPanel("amsarrows", latex_ams_arrows);
addPanel("amsmisc", latex_ams_misc);
symbolsWS->raiseWidget(0);
}
void QMathDialog::addPanel(string const & name, char const ** entries)
{
static int id = 0;
IconPalette * p = new IconPalette(this, name.c_str());
for (int i = 0; *entries[i]; ++i) {
string xpm_name = LibFileSearch("images/math/", entries[i], "xpm");
p->add(QPixmap(xpm_name.c_str()), entries[i], string("\\") + entries[i]);
}
connect(p, SIGNAL(button_clicked(string)), this, SLOT(symbol_clicked(string)));
symbolsWS->addWidget(p, id++);
}
void QMathDialog::symbol_clicked(string str)
{
form_->insert_symbol(str);
}
void QMathDialog::fracClicked()
{
form_->insert_symbol("frac");
}
void QMathDialog::sqrtClicked()
{
form_->insert_symbol("sqrt");
}
void QMathDialog::decoClicked()
{
}
void QMathDialog::delimiterClicked()
{
}
void QMathDialog::expandClicked()
{
}
void QMathDialog::functionSelected(const QString & str)
{
form_->insert_symbol(str.latin1());
}
void QMathDialog::matrixClicked()
{
}
void QMathDialog::equationClicked()
{
}
void QMathDialog::spaceClicked()
{
}
void QMathDialog::styleClicked()
{
}
void QMathDialog::subscriptClicked()
{
}
void QMathDialog::superscriptClicked()
{
}

View File

@ -0,0 +1,53 @@
/**
* \file QMathDialog.h
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon <moz@compsoc.man.ac.uk>
*/
#ifndef QMATHDIALOG_H
#define QMATHDIALOG_H
#include <config.h>
#include "LString.h"
#include "ui/QMathDialogBase.h"
class QMath;
class QMathDialog : public QMathDialogBase
{
Q_OBJECT
public:
QMathDialog(QMath * form);
public slots:
virtual void decoClicked();
virtual void delimiterClicked();
virtual void expandClicked();
virtual void fracClicked();
virtual void functionSelected(const QString &);
virtual void matrixClicked();
virtual void equationClicked();
virtual void spaceClicked();
virtual void sqrtClicked();
virtual void styleClicked();
virtual void subscriptClicked();
virtual void superscriptClicked();
void symbol_clicked(string str);
protected:
//needed ? virtual void closeEvent(QCloseEvent * e);
private:
/// add a symbol panel
void addPanel(string const & name, char const ** entries);
/// owning form
QMath * form_;
};
#endif // QMATHDIALOG_H

View File

@ -0,0 +1,51 @@
/**
* \file iconpalette.C
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon
*/
#include <config.h>
#include "iconpalette.h"
#include <qlayout.h>
#include <qpushbutton.h>
#include <qpixmap.h>
#include <qtooltip.h>
IconPalette::IconPalette(QWidget * parent, char const * name)
: QWidget(parent, name), crow_(0), ccol_(0)
{
QVBoxLayout * top = new QVBoxLayout(this);
QHBoxLayout * row = new QHBoxLayout(top);
layout_ = new QGridLayout(row);
//row->addLayout(layout_);
row->addStretch(0);
//top->addLayout(row);
top->addStretch(0);
}
void IconPalette::add(QPixmap const & pixmap, string name, string tooltip)
{
QPushButton * p = new QPushButton(this);
p->setFixedSize(35, 35);
p->setPixmap(pixmap);
QToolTip::add(p, tooltip.c_str());
layout_->addWidget(p, crow_, ccol_);
if (++ccol_ == 6) {
ccol_ = 0;
++crow_;
}
button_map_[p] = name;
connect(p, SIGNAL(clicked()), this, SLOT(clicked()));
}
void IconPalette::clicked()
{
string name = button_map_[(QPushButton*)(sender())];
emit button_clicked(name);
}

View File

@ -0,0 +1,52 @@
/**
* \file iconpalette.h
* Copyright 2001 the LyX Team
* Read the file COPYING
*
* \author John Levon
*/
#ifndef ICONPALETTE_H
#define ICONPALETTE_H
#include <config.h>
#include "LString.h"
#include <qwidget.h>
#include <map>
class QPixmap;
class QPushButton;
class QGridLayout;
/**
* For holding an arbitrary set of icons.
*/
class IconPalette : public QWidget {
Q_OBJECT
public:
IconPalette(QWidget * parent, char const * name);
/// add a button
void add(QPixmap const & pixmap, string name, string tooltip);
signals:
void button_clicked(string);
protected slots:
virtual void clicked();
private:
typedef std::map<QPushButton *, string> ButtonMap;
int crow_;
int ccol_;
QGridLayout * layout_;
ButtonMap button_map_;
};
#endif // ICONPALETTE_H

View File

@ -19,6 +19,7 @@ nodist_libqt2moc_la_SOURCES = \
$(MOCDIALOGS) \
FileDialog_private_moc.C \
emptytable_moc.C \
iconpalette_moc.C \
lengthcombo_moc.C \
qttableview_moc.C \
Toolbar_pimpl_moc.C \

View File

@ -0,0 +1,731 @@
<!DOCTYPE UI><UI>
<class>QMathDialogBase</class>
<include location="global">config.h</include>
<include location="local">gettext.h</include>
<widget>
<class>QDialog</class>
<property stdset="1">
<name>name</name>
<cstring>QMathDialogBase</cstring>
</property>
<property stdset="1">
<name>geometry</name>
<rect>
<x>0</x>
<y>0</y>
<width>356</width>
<height>357</height>
</rect>
</property>
<property stdset="1">
<name>caption</name>
<string>LyX: Math Panel</string>
</property>
<property stdset="1">
<name>sizeGripEnabled</name>
<bool>true</bool>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout12</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout11</cstring>
</property>
<grid>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget row="4" column="1" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>equationPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image0</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Switch between inline and display mode</string>
</property>
</widget>
<widget row="3" column="1" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>matrixPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image1</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Show math matrix dialog</string>
</property>
</widget>
<widget row="1" column="1" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>subscriptPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image2</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Subscript</string>
</property>
</widget>
<widget row="4" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>stylePB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image3</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Show text style dialog</string>
</property>
</widget>
<widget row="2" column="1" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>decoPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image4</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Show range decoration dialog</string>
</property>
</widget>
<widget row="1" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>superscriptPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image5</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Superscript</string>
</property>
</widget>
<widget row="3" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>spacePB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image6</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Show spacing dialog</string>
</property>
</widget>
<widget row="0" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>sqrtPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image7</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Insert square root (\sqrt)</string>
</property>
</widget>
<widget row="2" column="0" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>delimitersPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image8</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Show delimiter and bracket dialog</string>
</property>
</widget>
<widget row="0" column="1" >
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>fracPB</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>1</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image9</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Insert fraction (\frac)</string>
</property>
</widget>
</grid>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout2</cstring>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>functionsLA</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Functions</string>
</property>
<property>
<name>buddy</name>
<cstring>functionsLB</cstring>
</property>
</widget>
<widget>
<class>QListBox</class>
<property stdset="1">
<name>name</name>
<cstring>functionsLB</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
<vsizetype>7</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>100</width>
<height>100</height>
</size>
</property>
<property>
<name>toolTip</name>
<string>Selection a function or operator to insert</string>
</property>
</widget>
</vbox>
</widget>
</vbox>
</widget>
<widget>
<class>QGroupBox</class>
<property stdset="1">
<name>name</name>
<cstring>symbolsGB</cstring>
</property>
<property stdset="1">
<name>title</name>
<string>Symbols</string>
</property>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout10</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<widget>
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>Operators</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Big operators</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Relations</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Greek</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Arrows</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Miscellaneous</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>AMS operators</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>AMS relations</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>AMS negated relations</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>AMS arrows</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>AMS Miscellaneous</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>symbolsCO</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Select a page of symbols</string>
</property>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer1</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>MinimumExpanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget>
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>tearoffPB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string></string>
</property>
<property stdset="1">
<name>pixmap</name>
<pixmap>image10</pixmap>
</property>
<property>
<name>toolTip</name>
<string>Open symbols as a separate window</string>
</property>
</widget>
</hbox>
</widget>
<widget>
<class>QWidgetStack</class>
<property stdset="1">
<name>name</name>
<cstring>symbolsWS</cstring>
</property>
<property stdset="1">
<name>minimumSize</name>
<size>
<width>200</width>
<height>100</height>
</size>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>TabFocus</enum>
</property>
</widget>
</vbox>
</widget>
</hbox>
</widget>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>Layout6</cstring>
</property>
<hbox>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>spacing</name>
<number>6</number>
</property>
<spacer>
<property>
<name>name</name>
<cstring>Spacer2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Horizontal</enum>
</property>
<property stdset="1">
<name>sizeType</name>
<enum>Expanding</enum>
</property>
<property>
<name>sizeHint</name>
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
<widget>
<class>QPushButton</class>
<property stdset="1">
<name>name</name>
<cstring>closePB</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Close</string>
</property>
</widget>
</hbox>
</widget>
</vbox>
</widget>
<customwidgets>
<customwidget>
<class>QWidgetStack</class>
<header location="global">qwidgetstack.h</header>
<sizehint>
<width>-1</width>
<height>-1</height>
</sizehint>
<container>0</container>
<sizepolicy>
<hordata>7</hordata>
<verdata>7</verdata>
</sizepolicy>
<pixmap>image11</pixmap>
</customwidget>
</customwidgets>
<images>
<image>
<name>image0</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc402c814574601d4578f4f3c110cb088c30922c57198438a7b06321c50c56badb90087fe6771</data>
</image>
<image>
<name>image1</name>
<data format="XPM.GZ" length="554">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232325000210543251d2e253d856405bffcbc54105b19c856360082b434b0141640a6b832102011087110421084c57198336a2fa9e2b5d65c00168a5f43</data>
</image>
<image>
<name>image2</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc402a82cae0c0658c4f560c48088278200367120499c38c45f18e25040b238ba7b3000c9e2b5d65c00f2a86971</data>
</image>
<image>
<name>image3</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54103b11c856360003105719c64d4b03abc40220e2ca6000168032d1c5c1249238420442a0a95786b150c5117a50cdc1218e1026208ecb5f7a7a898958c51313a112300743c441826009685840c5216a4124ba3804a0fb17b77a32c5e1818adbbfb5d65c00748269b8</data>
</image>
<image>
<name>image4</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc4028817575656461657860314f568c230711817dd7ca0702214a0db8b5b1c410e6e71d2fc85357c8817afb5e60200bffe717f</data>
</image>
<image>
<name>image5</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc40250c59541009b381413144f04032ce27a6082647174f740c531dc4f737188bf30c431c08089d75a7301006ff86b61</data>
</image>
<image>
<name>image6</name>
<data format="XPM.GZ" length="554">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade65232325000210543251d2e253d856405bffcbc54105b19c8564e4b330002b014163052c59595952102500605e270408c38cdfc556bcd050072466219</data>
</image>
<image>
<name>image7</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc402c81757460022c5f5901858c431ccd7d34b0403c2e220bb20e2104c481ce24a6ce27ab8c47198439a3bc9096722c56badb90001e46d10</data>
</image>
<image>
<name>image8</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54105b19c856360003103711c64d4b03abc402c8135756564608813948e289608026ae8710d7c31087e0a12b8ec55fb8c2017bb851215e6aadb900c1776f11</data>
</image>
<image>
<name>image9</name>
<data format="XPM.GZ" length="569">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523232500022630543251d2e253d856405bffcbc54103b11c856360003105719c64d4b03abc40288105706032ce2708246e238ecc5eace4424408cf850f72f8678ad351700b4f269b9</data>
</image>
<image>
<name>image10</name>
<data format="XPM.GZ" length="394">789cd3d7528808f055d0d2e72a2e492cc94c5648ce482c52d04a29cdcdad8c8eb5ade6523234530022230543251d2e253d856405bffcbc54105b19c856360003b0141a40882943008a185c5019592f4c218a79d8c4f4b089e96113d3c326a6874d4c6f00c56aadb9004cd54631</data>
</image>
<image>
<name>image11</name>
<data format="XPM.GZ" length="646">789c6dd2c10ac2300c00d07bbf2234b7229d1be245fc04c5a3201e4615f430059d0711ff5ddb2e6bb236ec90eed134cb5a19d8ef36602af5ecdbfeeac05dda0798d3abebde87e3faa374d3807fa0d633a52d38d8de6f679fe33fc776e196f53cd010188256a3600a292882096246517815ca99884606e18044a3a40d91824820924265a7923a2e8bcd05f33db1173e002913175f2a6be6d3294871a2d95fa00e8a94ee017b69d339d90df1e77c57ea072ede6758</data>
</image>
</images>
<connections>
<connection>
<sender>tearoffPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>expandClicked()</slot>
</connection>
<connection>
<sender>closePB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>accept()</slot>
</connection>
<connection>
<sender>sqrtPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>sqrtClicked()</slot>
</connection>
<connection>
<sender>fracPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>fracClicked()</slot>
</connection>
<connection>
<sender>superscriptPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>superscriptClicked()</slot>
</connection>
<connection>
<sender>subscriptPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>subscriptClicked()</slot>
</connection>
<connection>
<sender>delimitersPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>delimiterClicked()</slot>
</connection>
<connection>
<sender>decoPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>decoClicked()</slot>
</connection>
<connection>
<sender>spacePB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>spaceClicked()</slot>
</connection>
<connection>
<sender>matrixPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>matrixClicked()</slot>
</connection>
<connection>
<sender>stylePB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>styleClicked()</slot>
</connection>
<connection>
<sender>equationPB</sender>
<signal>clicked()</signal>
<receiver>QMathDialogBase</receiver>
<slot>equationClicked()</slot>
</connection>
<connection>
<sender>functionsLB</sender>
<signal>selected(const QString&amp;)</signal>
<receiver>QMathDialogBase</receiver>
<slot>functionSelected(const QString &amp;)</slot>
</connection>
<slot access="public">decoClicked()</slot>
<slot access="public">delimiterClicked()</slot>
<slot access="public">equationClicked()</slot>
<slot access="public">expandClicked()</slot>
<slot access="public">fracClicked()</slot>
<slot access="public">functionSelected(const QString &amp;)</slot>
<slot access="public">matrixClicked()</slot>
<slot access="public">spaceClicked()</slot>
<slot access="public">sqrtClicked()</slot>
<slot access="public">styleClicked()</slot>
<slot access="public">subscriptClicked()</slot>
<slot access="public">superscriptClicked()</slot>
</connections>
</UI>

View File

@ -1,3 +1,10 @@
2002-08-30 John Levon <levon@movementarian.org>
* MathsSymbols.h:
* MathsSymbols.C:
* FormMathsPanel.h:
* FormMathsPanel.C: remove MathsSymbols to controllers/
2002-08-29 John Levon <levon@movementarian.org>
* MathsSymbols.h:

View File

@ -15,10 +15,11 @@
#pragma implementation
#endif
#include "ControlMath.h"
#include "frontends/LyXView.h"
#include "FormMathsPanel.h"
#include "forms/form_maths_panel.h"
#include "MathsSymbols.h"
#include "funcrequest.h"
#include "forms/form_maths_deco.h"

View File

@ -18,8 +18,35 @@
#pragma interface
#endif
/// values used by the xforms callbacks
enum MathsCallbackValues {
MM_GREEK,
MM_ARROW,
MM_BOP,
MM_BRELATS,
MM_VARSIZE,
MM_MISC,
MM_FRAC,
MM_SQRT,
MM_DELIM,
MM_SUPER,
MM_SUB,
MM_SUBSUPER,
MM_MATRIX,
MM_EQU,
MM_DECO,
MM_SPACE,
MM_STYLE,
MM_DOTS,
MM_AMS_MISC,
MM_AMS_ARROWS,
MM_AMS_BREL,
MM_AMS_NREL,
MM_AMS_OPS,
MM_FUNC
};
#include "FormBaseDeprecated.h"
#include "MathsSymbols.h"
#include <boost/scoped_ptr.hpp>

View File

@ -147,8 +147,6 @@ libxforms_la_SOURCES = \
FormVCLog.h \
LyXKeySymFactory.C \
LyXScreenFactory.C \
MathsSymbols.C \
MathsSymbols.h \
Menubar_pimpl.C \
Menubar_pimpl.h \
RadioButtonGroup.C \