anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 19:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix some document dialog ui and add some FIXMEs

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@5620 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
John Levon 2002-11-13 00:52:15 +00:00
parent 2c3c30c8f2
commit eca7848597
8 changed files with 880 additions and 742 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontends/qt2/ChangeLog
View File

@ -1,3 +1,12 @@
2002-11-13 John Levon <levon@movementarian.org>
* QDocument.h:
* QDocument.C:
* QDocumentDialog.h:
* QDocumentDialog.C:
* ui/QDocumentDialog.ui:
* ui/BulletsModuleBase.ui: some UI fixes
2002-11-12 Edwin Leuven <leuven@fee.uva.nl>
* QDocumentDialog.C: enable apply on change

90
src/frontends/qt2/QDocument.C
View File

@ -285,6 +285,7 @@ void QDocument::apply()
}
default:
// DocumentDefskipCB assures that this never happens
// so Assert then !!! - jbl
params.setDefSkip(VSpace(VSpace::MEDSKIP));
break;
}
@ -334,46 +335,42 @@ void QDocument::apply()
}
params.paperpackage = char(margin);
MarginsModuleBase const * m(dialog_->marginsModule);
params.leftmargin =
LyXLength(dialog_->marginsModule->innerLE->text().toDouble(),
dialog_->marginsModule->innerUnit->currentLengthItem()
LyXLength(m->innerLE->text().toDouble(),
m->innerUnit->currentLengthItem()
).asString();
params.topmargin =
LyXLength(dialog_->marginsModule->topLE->text().toDouble(),
dialog_->marginsModule->topUnit->currentLengthItem()
LyXLength(m->topLE->text().toDouble(),
m->topUnit->currentLengthItem()
).asString();
params.rightmargin =
LyXLength(dialog_->marginsModule->outerLE->text().toDouble(),
dialog_->marginsModule->outerUnit->currentLengthItem()
LyXLength(m->outerLE->text().toDouble(),
m->outerUnit->currentLengthItem()
).asString();
params.bottommargin =
LyXLength(dialog_->marginsModule->bottomLE->text().toDouble(),
dialog_->marginsModule->bottomUnit->currentLengthItem()
LyXLength(m->bottomLE->text().toDouble(),
m->bottomUnit->currentLengthItem()
).asString();
params.headheight =
LyXLength(dialog_->marginsModule->headheightLE->text().toDouble(),
dialog_->marginsModule->headheightUnit->currentLengthItem()
LyXLength(m->headheightLE->text().toDouble(),
m->headheightUnit->currentLengthItem()
).asString();
params.headsep =
LyXLength(dialog_->marginsModule->headsepLE->text().toDouble(),
dialog_->marginsModule->headsepUnit->currentLengthItem()
LyXLength(m->headsepLE->text().toDouble(),
m->headsepUnit->currentLengthItem()
).asString();
params.footskip =
LyXLength(dialog_->marginsModule->footskipLE->text().toDouble(),
dialog_->marginsModule->footskipUnit->currentLengthItem()
LyXLength(m->footskipLE->text().toDouble(),
m->footskipUnit->currentLengthItem()
).asString();
}
@ -452,7 +449,6 @@ void QDocument::update_contents()
dialog_->bulletsModule->bulletsize4CO->setCurrentItem(
params.user_defined_bullets[3].getSize() + 1);
// packages
QStringList enc;
enc << "default" << "auto" << "latin1" << "latin2" << "latin3" <<
@ -481,6 +477,9 @@ void QDocument::update_contents()
dialog_->packagesModule->amsCB->setChecked(
params.use_amsmath);
// FIXME: this is wrong
// QComboBox::setCurrentItem: (lspacingCO) Index 4 out of range
dialog_->packagesModule->lspacingCO->
setCurrentItem(params.spacing.getSpace());
if (params.spacing.getSpace() == Spacing::Other) {
@ -581,49 +580,38 @@ void QDocument::update_contents()
tostr(LyXLength(params.paperheight).value()).c_str());
// margins
MarginsModuleBase * m(dialog_->marginsModule);
int item = params.paperpackage;
if (params.use_geometry) {
item = 1;
} else if (item > 0) {
item = item + 1;
}
dialog_->marginsModule->marginCO->setCurrentItem(item);
m->marginCO->setCurrentItem(item);
dialog_->setCustomMargins(item);
dialog_->marginsModule->topUnit->setCurrentItem(
LyXLength(params.topmargin).unit());
dialog_->marginsModule->topLE->setText(
tostr(LyXLength(params.topmargin).value()).c_str());
m->topUnit->setCurrentItem(LyXLength(params.topmargin).unit());
m->topLE->setText(tostr(LyXLength(params.topmargin).value()).c_str());
dialog_->marginsModule->bottomUnit->setCurrentItem(
LyXLength(params.bottommargin).unit());
dialog_->marginsModule->bottomLE->setText(
tostr(LyXLength(params.bottommargin).value()).c_str());
m->bottomUnit->setCurrentItem(LyXLength(params.bottommargin).unit());
m->bottomLE->setText(tostr(LyXLength(params.bottommargin).value()).c_str());
dialog_->marginsModule->innerUnit->setCurrentItem(
LyXLength(params.leftmargin).unit());
dialog_->marginsModule->innerLE->setText(
tostr(LyXLength(params.leftmargin).value()).c_str());
m->innerUnit->setCurrentItem(LyXLength(params.leftmargin).unit());
m->innerLE->setText(tostr(LyXLength(params.leftmargin).value()).c_str());
dialog_->marginsModule->outerUnit->setCurrentItem(
LyXLength(params.rightmargin).unit());
dialog_->marginsModule->outerLE->setText(
tostr(LyXLength(params.rightmargin).value()).c_str());
m->outerUnit->setCurrentItem(LyXLength(params.rightmargin).unit());
m->outerLE->setText(tostr(LyXLength(params.rightmargin).value()).c_str());
dialog_->marginsModule->headheightUnit->setCurrentItem(
LyXLength(params.headheight).unit());
dialog_->marginsModule->headheightLE->setText(
tostr(LyXLength(params.headheight).value()).c_str());
m->headheightUnit->setCurrentItem(LyXLength(params.headheight).unit());
m->headheightLE->setText(tostr(LyXLength(params.headheight).value()).c_str());
dialog_->marginsModule->headsepUnit->setCurrentItem(
LyXLength(params.headsep).unit());
dialog_->marginsModule->headsepLE->setText(
tostr(LyXLength(params.headsep).value()).c_str());
m->headsepUnit->setCurrentItem(LyXLength(params.headsep).unit());
m->headsepLE->setText(tostr(LyXLength(params.headsep).value()).c_str());
dialog_->marginsModule->footskipUnit->setCurrentItem(
LyXLength(params.footskip).unit());
dialog_->marginsModule->footskipLE->setText(
tostr(LyXLength(params.footskip).value()).c_str());
m->footskipUnit->setCurrentItem(LyXLength(params.footskip).unit());
m->footskipLE->setText(tostr(LyXLength(params.footskip).value()).c_str());
}
@ -634,6 +622,7 @@ void QDocument::saveDocDefault()
controller().saveAsDefault();
}
void QDocument::useClassDefaults()
{
BufferParams & params = controller().params();
@ -642,4 +631,3 @@ void QDocument::useClassDefaults()
params.useClassDefaults();
update_contents();
}

9
src/frontends/qt2/QDocument.h
View File

@ -19,7 +19,6 @@
#include "Qt2Base.h"
#include "Qt2BC.h"
//#include "QtLyXView.h"
#include <boost/scoped_ptr.hpp>
@ -30,9 +29,9 @@ class QDocument
: public Qt2CB<ControlDocument, Qt2DB<QDocumentDialog> >
{
public:
///
friend class QDocumentDialog;
///
QDocument();
private:
/// Apply changes
@ -45,9 +44,9 @@ private:
void saveDocDefault();
/// reset to default params
void useClassDefaults();
///
/// FIXME
std::vector<string> lang_;
};
#endif // QDOCUMENT_H

54
src/frontends/qt2/QDocumentDialog.C
View File

@ -31,14 +31,10 @@
#include "ui/MarginsModuleBase.h"
#include "ui/PreambleModuleBase.h"
#include "QBrowseBox.h"
#include "Spacing.h"
#include "support/filetools.h"
#include "support/lstrings.h"
#include "Alert.h"
#include "lyxrc.h"
#include "buffer.h"
#include "lyx_main.h" // for user_lyxdir
#include <qwidgetstack.h>
#include <qlistbox.h>
@ -53,13 +49,6 @@
#include "lengthcombo.h"
/*
* Constructs a DocumentDialog which is a child of 'parent', with the
* name 'name' and widget flags set to 'f'
*
* The dialog will by default be modeless, unless you set 'modal' to
* TRUE to construct a modal dialog.
*/
QDocumentDialog::QDocumentDialog(QDocument * form)
: QDocumentDialogBase(0, 0, false, 0), form_(form)
{
@ -83,6 +72,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
moduleLB->insertItem(_("Bibliography"), BIBLIOGRAPHY);
moduleLB->insertItem(_("Preamble"), PREAMBLE);
moduleLB->setCurrentItem(LAYOUT);
moduleLB->setMinimumSize(moduleLB->sizeHint());
layoutModule = new ClassModuleBase(this);
paperModule = new PaperModuleBase(this);
@ -107,24 +97,26 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
moduleStack->raiseWidget(LAYOUT);
//QPixmap image("standard.xpm");
//bulletsModule->bulletsBB->insertItem(image);
//bulletsModule->bulletsBB->resize(image.width(),image.height());
// take care of title
QFont f = titleL->font();
f.setWeight(QFont::Bold);
titleL->setFont(f);
setTitle(LAYOUT);
/* preamble */
// FIXME: Edwin, please change this by making each module have
// a change_adaptor(), and connecting inside designer; then
// connect each module's change_adaptor to the main form's
// one here.
// preamble
connect(preambleModule->preambleMLE, SIGNAL(textChanged()),
this , SLOT(change_adaptor()));
/* biblio */
// biblio
connect(biblioModule->natbibCB, SIGNAL(toggled(bool)),
this , SLOT(change_adaptor()));
connect(biblioModule->citeStyleCO, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
/* language & quote */
// language & quote
connect(langModule->singleQuoteRB, SIGNAL(toggled(bool)),
this , SLOT(change_adaptor()));
connect(langModule->doubleQuoteRB, SIGNAL(toggled(bool)),
@ -133,14 +125,14 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
this , SLOT(change_adaptor()));
connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
/* numbering */
// numbering
connect(numberingModule->sectionnrDepthSB,
SIGNAL(valueChanged(int)),
this , SLOT(change_adaptor()));
connect(numberingModule->tocDepthSB,
SIGNAL(valueChanged(int)),
this , SLOT(change_adaptor()));
/* packages */
// packages
connect(packagesModule->lspacingCO, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
connect(packagesModule->lspacingCO, SIGNAL(activated(int)),
@ -154,7 +146,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
this , SLOT(change_adaptor()));
connect(packagesModule->psdriverCO, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
/* layout */
// layout
connect(layoutModule->classCO, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
connect(layoutModule->optionsLE,
@ -188,7 +180,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
connect(layoutModule->skipRB, SIGNAL(toggled(bool)),
this , SLOT(enableSkip(bool)));
/* margins */
// margins
connect(marginsModule->marginCO, SIGNAL(activated(int)),
this , SLOT(setCustomMargins(int)));
@ -223,7 +215,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
connect(marginsModule->footskipUnit, SIGNAL(activated(int)),
this , SLOT(change_adaptor()));
/* paper */
// paper
connect(paperModule->papersizeCO, SIGNAL(activated(int)),
this , SLOT(setMargins(int)));
connect(paperModule->papersizeCO, SIGNAL(activated(int)),
@ -250,7 +242,7 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
connect(paperModule->facingPagesCB, SIGNAL(toggled(bool)),
this , SLOT(change_adaptor()));
/* bullets */
// bullets
connect(bulletsModule->bullet1LE, SIGNAL(textChanged(const QString&)),
this , SLOT(change_adaptor()));
connect(bulletsModule->bulletsize1CO, SIGNAL(activated(int)),
@ -271,19 +263,11 @@ QDocumentDialog::QDocumentDialog( QDocument * form)
}
/*
* Destroys the object and frees any allocated resources
*/
QDocumentDialog::~QDocumentDialog()
{
// no need to delete child widgets, Qt does it all for us
}
/*
* public slot
*/
void QDocumentDialog::setTitle(int item)
{
switch(item) {
@ -318,18 +302,12 @@ void QDocumentDialog::setTitle(int item)
}
/*
* public slot
*/
void QDocumentDialog::saveDefaultClicked()
{
form_->saveDocDefault();
}
/*
* public slot
*/
void QDocumentDialog::useDefaultsClicked()
{
form_->useClassDefaults();
@ -357,7 +335,7 @@ void QDocumentDialog::setLSpacing(int item)
void QDocumentDialog::setSkip(int item)
{
bool enable = (item == 3);
bool const enable = (item == 3);
layoutModule->skipLE->setEnabled(enable);
layoutModule->skipLengthCO->setEnabled(enable);
}

4
src/frontends/qt2/QDocumentDialog.h
View File

@ -43,11 +43,13 @@ public:
void updateFontsize(string const &, string const &);
void updatePagestyle(string const &, string const &);
public slots:
void setTitle(int);
void change_adaptor();
void saveDefaultClicked();
void useDefaultsClicked();
protected slots:
void setLSpacing(int);
void setMargins(int);
@ -56,8 +58,10 @@ protected slots:
void setSkip(int);
void enableSkip(bool);
void classChanged();
protected:
void closeEvent(QCloseEvent * e);
private:
enum Module {
LAYOUT,

889
src/frontends/qt2/ui/BulletsModuleBase.ui
View File

@ -13,8 +13,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>308</width>
<height>176</height>
<width>335</width>
<height>216</height>
</rect>
</property>
<property stdset="1">
@ -25,7 +25,7 @@
<name>mouseTracking</name>
<bool>true</bool>
</property>
<grid>
<vbox>
<property stdset="1">
<name>margin</name>
<number>11</number>
@ -34,361 +34,22 @@
<name>spacing</name>
<number>6</number>
</property>
<spacer row="5" column="0" >
<property>
<name>name</name>
<cstring>Spacer25</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</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 row="0" column="1" >
<class>QLabel</class>
<widget>
<class>QLayoutWidget</class>
<property stdset="1">
<name>name</name>
<cstring>latexL</cstring>
<cstring>Layout5</cstring>
</property>
<grid>
<property stdset="1">
<name>margin</name>
<number>0</number>
</property>
<property stdset="1">
<name>text</name>
<string>&amp;Bullet (LaTeX):</string>
<name>spacing</name>
<number>6</number>
</property>
<property>
<name>buddy</name>
<cstring>bullet1LE</cstring>
</property>
</widget>
<widget row="0" column="2" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>sizeL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Si&amp;ze:</string>
</property>
<property>
<name>buddy</name>
<cstring>bulletsize1CO</cstring>
</property>
</widget>
<widget row="1" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet1LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 1 bullet</string>
</property>
</widget>
<widget row="2" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet2LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 2 bullet</string>
</property>
</widget>
<widget row="3" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet3LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 3 bullet</string>
</property>
</widget>
<widget row="4" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet4LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 4 bullet</string>
</property>
</widget>
<widget row="1" column="2" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize1CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 1 bullet size</string>
</property>
</widget>
<widget row="2" column="2" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize2CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 2 bullet size</string>
</property>
</widget>
<widget row="3" column="2" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize3CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 3 bullet size</string>
</property>
</widget>
<widget row="4" column="2" >
<widget row="4" column="3" >
<class>QComboBox</class>
<item>
<property>
@ -465,34 +126,37 @@
<string>Level 4 bullet size</string>
</property>
</widget>
<widget row="1" column="0" >
<class>QToolButton</class>
<widget row="3" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet1TB</cstring>
<cstring>bullet3LE</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;1...</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
<string>Level 3 bullet</string>
</property>
</widget>
<widget row="2" column="0" >
<widget row="2" column="2" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet2TB</cstring>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>TabFocus</enum>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;2...</string>
<string>Choose</string>
</property>
<property stdset="1">
<name>popupDelay</name>
@ -503,15 +167,19 @@
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="3" column="0" >
<widget row="1" column="2" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet3TB</cstring>
<cstring>setbullet1TB</cstring>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>TabFocus</enum>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;3...</string>
<string>Choose</string>
</property>
<property stdset="1">
<name>popupDelay</name>
@ -522,15 +190,150 @@
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="4" column="0" >
<widget row="1" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet1LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 1 bullet</string>
</property>
</widget>
<widget row="1" column="3" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize1CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 1 bullet size</string>
</property>
</widget>
<spacer row="0" column="0" >
<property>
<name>name</name>
<cstring>Spacer3</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</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 row="0" column="3" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>sizeL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Si&amp;ze:</string>
</property>
<property>
<name>buddy</name>
<cstring>bulletsize1CO</cstring>
</property>
</widget>
<widget row="4" column="2" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet4TB</cstring>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>TabFocus</enum>
</property>
<property stdset="1">
<name>text</name>
<string>Set Level &amp;4...</string>
<string>Choose</string>
</property>
<property stdset="1">
<name>popupDelay</name>
@ -541,6 +344,352 @@
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="0" column="1" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>latexL</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Name</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet1LE</cstring>
</property>
</widget>
<widget row="3" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_3</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Level &amp;3 :</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet3LE</cstring>
</property>
</widget>
<widget row="1" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Level &amp;1 :</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet1LE</cstring>
</property>
</widget>
<spacer row="0" column="2" >
<property>
<name>name</name>
<cstring>Spacer2</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</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 row="4" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_4</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Level &amp;4 :</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet4LE</cstring>
</property>
</widget>
<widget row="2" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet2LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 2 bullet</string>
</property>
</widget>
<widget row="4" column="1" >
<class>QLineEdit</class>
<property stdset="1">
<name>name</name>
<cstring>bullet4LE</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property>
<name>toolTip</name>
<string>Level 4 bullet</string>
</property>
</widget>
<widget row="3" column="2" >
<class>QToolButton</class>
<property stdset="1">
<name>name</name>
<cstring>setbullet3TB</cstring>
</property>
<property stdset="1">
<name>focusPolicy</name>
<enum>TabFocus</enum>
</property>
<property stdset="1">
<name>text</name>
<string>Choose</string>
</property>
<property stdset="1">
<name>popupDelay</name>
<number>1</number>
</property>
<property>
<name>toolTip</name>
<string>Shows menu with bullet options</string>
</property>
</widget>
<widget row="3" column="3" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize3CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 3 bullet size</string>
</property>
</widget>
<widget row="2" column="3" >
<class>QComboBox</class>
<item>
<property>
<name>text</name>
<string>default</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>tiny</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>script</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>footnote</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>small</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>normal</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Large</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>LARGE</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>huge</string>
</property>
</item>
<item>
<property>
<name>text</name>
<string>Huge</string>
</property>
</item>
<property stdset="1">
<name>name</name>
<cstring>bulletsize2CO</cstring>
</property>
<property>
<name>toolTip</name>
<string>Level 2 bullet size</string>
</property>
</widget>
<widget row="2" column="0" >
<class>QLabel</class>
<property stdset="1">
<name>name</name>
<cstring>TextLabel1_2</cstring>
</property>
<property stdset="1">
<name>text</name>
<string>Level &amp;2 :</string>
</property>
<property>
<name>buddy</name>
<cstring>bullet2LE</cstring>
</property>
</widget>
</grid>
</widget>
<spacer>
<property>
<name>name</name>
<cstring>Spacer25</cstring>
</property>
<property stdset="1">
<name>orientation</name>
<enum>Vertical</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>
</vbox>
</widget>
<tabstops>
<tabstop>bullet1LE</tabstop>
<tabstop>setbullet1TB</tabstop>
<tabstop>bulletsize1CO</tabstop>
<tabstop>bullet2LE</tabstop>
<tabstop>setbullet2TB</tabstop>
<tabstop>bulletsize2CO</tabstop>
<tabstop>bullet3LE</tabstop>
<tabstop>setbullet3TB</tabstop>
<tabstop>bulletsize3CO</tabstop>
<tabstop>bullet4LE</tabstop>
<tabstop>setbullet4TB</tabstop>
<tabstop>bulletsize4CO</tabstop>
</tabstops>
</UI>

17
src/frontends/qt2/ui/QDocumentDialog.ui
View File

@ -21,6 +21,10 @@
<name>caption</name>
<string>Form1</string>
</property>
<property stdset="1">
<name>sizeGripEnabled</name>
<bool>true</bool>
</property>
<grid>
<property stdset="1">
<name>margin</name>
@ -186,7 +190,7 @@
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>1</hsizetype>
<hsizetype>5</hsizetype>
<vsizetype>7</vsizetype>
</sizepolicy>
</property>
@ -216,7 +220,7 @@
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>1</vsizetype>
<vsizetype>0</vsizetype>
</sizepolicy>
</property>
<property stdset="1">
@ -248,6 +252,13 @@
<name>name</name>
<cstring>moduleStack</cstring>
</property>
<property stdset="1">
<name>sizePolicy</name>
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>7</vsizetype>
</sizepolicy>
</property>
</widget>
</vbox>
</widget>
@ -258,7 +269,7 @@
<class>QWidgetStack</class>
<header location="global">qwidgetstack.h</header>
<sizehint>
<width>0</width>
<width>-1</width>
<height>-1</height>
</sizehint>
<container>0</container>

2
src/frontends/qt2/ui/QWrapDialog.ui
View File

@ -375,8 +375,8 @@
<tabstop>unitsLC</tabstop>
<tabstop>valignCO</tabstop>
<tabstop>restorePB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
</UI>