anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 18:08:10 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

More QDialogButtonBox transformation

Browse Source 
GuiDelimiter through GuiIndex

See #11003
This commit is contained in:
Juergen Spitzmueller 2018-07-09 09:46:39 +02:00
parent 4d9fa8a0d7
commit 1f5186b2a7
16 changed files with 618 additions and 708 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/frontends/qt4/GuiDelimiter.cpp
View File

@ -185,7 +185,7 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(closePB, SIGNAL(clicked()), this, SLOT(accept())); connect(buttonBox, SIGNAL(rejected()), this, SLOT(accept()));
setFocusProxy(leftLW); setFocusProxy(leftLW);
@ -333,7 +333,25 @@ void GuiDelimiter::updateTeXCode(int size)
} }
void GuiDelimiter::on_insertPB_clicked() void GuiDelimiter::on_buttonBox_clicked(QAbstractButton * button)
{
switch (buttonBox->standardButton(button)) {
case QDialogButtonBox::Apply:
insert();
break;
case QDialogButtonBox::Ok:
insert();
// fall through
case QDialogButtonBox::Cancel:
accept();
break;
default:
break;
}
}
void GuiDelimiter::insert()
{ {
if (sizeCO->currentIndex() == 0) if (sizeCO->currentIndex() == 0)
dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_)); dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_));
@ -342,6 +360,7 @@ void GuiDelimiter::on_insertPB_clicked()
command = support::subst(command, from_ascii(" "), from_ascii("\" \"")); command = support::subst(command, from_ascii(" "), from_ascii("\" \""));
dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command)); dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command));
} }
buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Close"));
} }
@ -356,7 +375,7 @@ void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *)
// do not auto-apply if !matchCB->isChecked() // do not auto-apply if !matchCB->isChecked()
if (!matchCB->isChecked()) if (!matchCB->isChecked())
return; return;
on_insertPB_clicked(); insert();
accept(); accept();
} }
@ -366,7 +385,7 @@ void GuiDelimiter::on_rightLW_itemActivated(QListWidgetItem *)
// do not auto-apply if !matchCB->isChecked() // do not auto-apply if !matchCB->isChecked()
if (!matchCB->isChecked()) if (!matchCB->isChecked())
return; return;
on_insertPB_clicked(); insert();
accept(); accept();
} }

3
src/frontends/qt4/GuiDelimiter.h
View File

@ -34,12 +34,13 @@ public:
bool isBufferDependent() const { return true; } bool isBufferDependent() const { return true; }
public Q_SLOTS: public Q_SLOTS:
void on_buttonBox_clicked(QAbstractButton * button);
void on_leftLW_itemActivated(QListWidgetItem *); void on_leftLW_itemActivated(QListWidgetItem *);
void on_rightLW_itemActivated(QListWidgetItem *); void on_rightLW_itemActivated(QListWidgetItem *);
void on_leftLW_currentRowChanged(int); void on_leftLW_currentRowChanged(int);
void on_rightLW_currentRowChanged(int); void on_rightLW_currentRowChanged(int);
void on_matchCB_stateChanged(int); void on_matchCB_stateChanged(int);
void on_insertPB_clicked(); void insert();
void on_swapPB_clicked(); void on_swapPB_clicked();
void on_sizeCO_activated(int); void on_sizeCO_activated(int);

43
src/frontends/qt4/GuiDocument.cpp
View File

@ -765,20 +765,18 @@ GuiDocument::GuiDocument(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
connect(savePB, SIGNAL(clicked()), this, SLOT(saveDefaultClicked())); connect(savePB, SIGNAL(clicked()), this, SLOT(saveDefaultClicked()));
connect(defaultPB, SIGNAL(clicked()), this, SLOT(useDefaultsClicked())); connect(defaultPB, SIGNAL(clicked()), this, SLOT(useDefaultsClicked()));
// Manage the restore, ok, apply, restore and cancel/close buttons // Manage the restore, ok, apply, restore and cancel/close buttons
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setOK(okPB); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setApply(applyPB); bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
bc().setCancel(closePB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().setRestore(restorePB); bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
// text layout // text layout
@ -1692,6 +1690,28 @@ void GuiDocument::slotOK()
} }
void GuiDocument::slotButtonBox(QAbstractButton * button)
{
switch (buttonBox->standardButton(button)) {
case QDialogButtonBox::Ok:
slotOK();
break;
case QDialogButtonBox::Apply:
slotApply();
break;
case QDialogButtonBox::Cancel:
slotClose();
break;
case QDialogButtonBox::Reset:
case QDialogButtonBox::RestoreDefaults:
slotRestore();
break;
default:
break;
}
}
void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int) void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
{ {
if (item == 0) if (item == 0)
@ -2521,7 +2541,7 @@ void GuiDocument::classChanged()
return; return;
string const classname = fromqstr(latexModule->classCO->getData(idx)); string const classname = fromqstr(latexModule->classCO->getData(idx));
if (applyPB->isEnabled()) { if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"), int const ret = Alert::prompt(_("Unapplied changes"),
_("Some changes in the dialog were not yet applied.\n" _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."), "If you do not apply now, they will be lost after this action."),
@ -2823,7 +2843,8 @@ void GuiDocument::modulesChanged()
{ {
modulesToParams(bp_); modulesToParams(bp_);
if (applyPB->isEnabled() && (nonModuleChanged_ || shellescapeChanged_)) { if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()
&& (nonModuleChanged_ || shellescapeChanged_)) {
int const ret = Alert::prompt(_("Unapplied changes"), int const ret = Alert::prompt(_("Unapplied changes"),
_("Some changes in the dialog were not yet applied.\n" _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."), "If you do not apply now, they will be lost after this action."),
@ -4294,7 +4315,7 @@ void GuiDocument::updateContents()
void GuiDocument::useClassDefaults() void GuiDocument::useClassDefaults()
{ {
if (applyPB->isEnabled()) { if (buttonBox->button(QDialogButtonBox::Apply)->isEnabled()) {
int const ret = Alert::prompt(_("Unapplied changes"), int const ret = Alert::prompt(_("Unapplied changes"),
_("Some changes in the dialog were not yet applied.\n" _("Some changes in the dialog were not yet applied.\n"
"If you do not apply now, they will be lost after this action."), "If you do not apply now, they will be lost after this action."),

1
src/frontends/qt4/GuiDocument.h
View File

@ -94,6 +94,7 @@ public Q_SLOTS:
void slotOK(); void slotOK();
// Apply button clicked // Apply button clicked
void slotApply(); void slotApply();
void slotButtonBox(QAbstractButton *);
private Q_SLOTS: private Q_SLOTS:
void updateNumbering(); void updateNumbering();

6
src/frontends/qt4/GuiErrorList.cpp
View File

@ -62,8 +62,8 @@ GuiErrorList::GuiErrorList(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(closePB, SIGNAL(clicked()), connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotClose())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(viewLogPB, SIGNAL(clicked()), connect(viewLogPB, SIGNAL(clicked()),
this, SLOT(viewLog())); this, SLOT(viewLog()));
connect(showAnywayPB, SIGNAL(clicked()), connect(showAnywayPB, SIGNAL(clicked()),
@ -72,7 +72,7 @@ GuiErrorList::GuiErrorList(GuiView & lv)
this, SLOT(select())); this, SLOT(select()));
bc().setPolicy(ButtonPolicy::OkCancelPolicy); bc().setPolicy(ButtonPolicy::OkCancelPolicy);
bc().setCancel(closePB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
} }

11
src/frontends/qt4/GuiExternal.cpp
View File

@ -88,9 +88,8 @@ GuiExternal::GuiExternal(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
/* /*
connect(displayGB, SIGNAL(toggled(bool)), connect(displayGB, SIGNAL(toggled(bool)),
@ -159,9 +158,9 @@ GuiExternal::GuiExternal(GuiView & lv)
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setOK(okPB); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setApply(applyPB); bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
bc().setCancel(closePB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().addReadOnly(fileED); bc().addReadOnly(fileED);
bc().addReadOnly(browsePB); bc().addReadOnly(browsePB);

14
src/frontends/qt4/GuiGraphics.cpp
View File

@ -115,10 +115,8 @@ GuiGraphics::GuiGraphics(GuiView & lv)
setupUi(this); setupUi(this);
//main buttons //main buttons
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(restorePB, SIGNAL(clicked()), this, SLOT(slotRestore()));
//graphics pane //graphics pane
connect(filename, SIGNAL(textChanged(const QString &)), connect(filename, SIGNAL(textChanged(const QString &)),
@ -212,10 +210,10 @@ GuiGraphics::GuiGraphics(GuiView & lv)
displayscale->setValidator(new QIntValidator(displayscale)); displayscale->setValidator(new QIntValidator(displayscale));
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setOK(okPB); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setApply(applyPB); bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
bc().setRestore(restorePB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().setCancel(closePB); bc().setRestore(buttonBox->button(QDialogButtonBox::Reset));
bc().addReadOnly(latexoptions); bc().addReadOnly(latexoptions);
bc().addReadOnly(filenameL); bc().addReadOnly(filenameL);

10
src/frontends/qt4/GuiInclude.cpp
View File

@ -51,8 +51,8 @@ GuiInclude::GuiInclude(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(visiblespaceCB, SIGNAL(clicked()), this, SLOT(change_adaptor())); connect(visiblespaceCB, SIGNAL(clicked()), this, SLOT(change_adaptor()));
connect(filenameED, SIGNAL(textChanged(const QString &)), connect(filenameED, SIGNAL(textChanged(const QString &)),
@ -73,8 +73,8 @@ GuiInclude::GuiInclude(GuiView & lv)
setFocusProxy(filenameED); setFocusProxy(filenameED);
bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy); bc().setPolicy(ButtonPolicy::OkApplyCancelReadOnlyPolicy);
bc().setOK(okPB); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setCancel(closePB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().addReadOnly(filenameED); bc().addReadOnly(filenameED);
bc().addReadOnly(browsePB); bc().addReadOnly(browsePB);
bc().addReadOnly(visiblespaceCB); bc().addReadOnly(visiblespaceCB);
@ -157,7 +157,7 @@ void GuiInclude::typeChanged(int v)
//see this thread //see this thread
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg118471.html
//for the reason this is here. //for the reason this is here.
okPB->setDefault(true); buttonBox->button(QDialogButtonBox::Ok)->setDefault(true);
} }

8
src/frontends/qt4/GuiIndex.cpp
View File

@ -35,13 +35,13 @@ GuiIndex::GuiIndex(GuiView & lv)
{ {
setupUi(this); setupUi(this);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK())); connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotClose())); this, SLOT(slotButtonBox(QAbstractButton *)));
connect(indicesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor())); connect(indicesCO, SIGNAL(activated(int)), this, SLOT(change_adaptor()));
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy); bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setOK(okPB); bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setCancel(cancelPB); bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
} }

30
src/frontends/qt4/ui/DelimiterUi.ui
View File

@ -56,31 +56,9 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QPushButton" name="insertPB"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="sizePolicy"> <property name="standardButtons">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip">
<string>Insert the delimiters</string>
</property>
<property name="text">
<string>&amp;Insert</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Close</string>
</property> </property>
</widget> </widget>
</item> </item>
@ -275,8 +253,6 @@
<layoutdefault spacing="6" margin="9"/> <layoutdefault spacing="6" margin="9"/>
<tabstops> <tabstops>
<tabstop>sizeCO</tabstop> <tabstop>sizeCO</tabstop>
<tabstop>insertPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local">qt_i18n.h</include> <include location="local">qt_i18n.h</include>

163
src/frontends/qt4/ui/DocumentUi.ui
View File

@ -1,7 +1,8 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>DocumentUi</class> <class>DocumentUi</class>
<widget class="QDialog" name="DocumentUi" > <widget class="QDialog" name="DocumentUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
@ -9,140 +10,118 @@
<height>169</height> <height>169</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
<hsizetype>1</hsizetype>
<vsizetype>1</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string/> <string/>
</property> </property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="2" column="0" > <item row="2" column="0">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QPushButton" name="restorePB" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="text" > <property name="standardButtons">
<string>&amp;Restore</string> <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyPB" >
<property name="text" >
<string>&amp;Apply</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Cancel</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="margin" > <property name="spacing">
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QPushButton" name="defaultPB" > <widget class="QPushButton" name="defaultPB">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Reset to the default settings for the document class</string> <string>Reset to the default settings for the document class</string>
</property> </property>
<property name="text" > <property name="text">
<string>Use Class Defaults</string> <string>Use Class Defaults</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QPushButton" name="savePB" > <widget class="QPushButton" name="savePB">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Save settings as LyX's default document settings</string> <string>Save settings as LyX's default document settings</string>
</property> </property>
<property name="text" > <property name="text">
<string>Save as Document Defaults</string> <string>Save as Document Defaults</string>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -152,8 +131,8 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="lyx::frontend::PanelStack" native="1" name="docPS" /> <widget class="lyx::frontend::PanelStack" name="docPS" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -169,13 +148,9 @@
<tabstop>docPS</tabstop> <tabstop>docPS</tabstop>
<tabstop>defaultPB</tabstop> <tabstop>defaultPB</tabstop>
<tabstop>savePB</tabstop> <tabstop>savePB</tabstop>
<tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>

123
src/frontends/qt4/ui/ErrorListUi.ui
View File

@ -1,75 +1,93 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ErrorListUi</class> <class>ErrorListUi</class>
<widget class="QDialog" name="ErrorListUi" > <widget class="QDialog" name="ErrorListUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>274</width> <width>447</width>
<height>422</height> <height>422</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string/> <string/>
</property> </property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="3" column="0" colspan="4" > <item row="1" column="0" colspan="5">
<widget class="QTextBrowser" name="descriptionTB" > <widget class="QListWidget" name="errorsLW">
<property name="sizePolicy" > <property name="toolTip">
<sizepolicy> <string>Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.</string>
<hsizetype>3</hsizetype> </property>
<vsizetype>0</vsizetype> </widget>
</item>
<item row="3" column="0" colspan="5">
<widget class="QTextBrowser" name="descriptionTB">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>For more information, refer to the complete log.</string> <string>For more information, refer to the complete log.</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2" > <item row="2" column="0" colspan="2">
<widget class="QLabel" name="errorsLabel" > <widget class="QLabel" name="descriptionLabel">
<property name="text" > <property name="text">
<string>&amp;Errors:</string>
</property>
<property name="buddy" >
<cstring>errorsLW</cstring>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2" >
<widget class="QLabel" name="descriptionLabel" >
<property name="text" >
<string>Description:</string> <string>Description:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="3" > <item row="0" column="0" colspan="2">
<widget class="QPushButton" name="closePB" > <widget class="QLabel" name="errorsLabel">
<property name="text" > <property name="text">
<string>&amp;Close</string> <string>&amp;Errors:</string>
</property>
<property name="buddy">
<cstring>errorsLW</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="2" > <item row="4" column="0">
<widget class="QPushButton" name="viewLogPB">
<property name="toolTip">
<string>Open the LaTeX Log File dialog</string>
</property>
<property name="text">
<string>View Complete &amp;Log...</string>
</property>
</widget>
</item>
<item row="4" column="2">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" > <property name="sizeHint" stdset="0">
<size> <size>
<width>121</width> <width>121</width>
<height>30</height> <height>30</height>
@ -77,30 +95,20 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="4" column="0" > <item row="4" column="1">
<widget class="QPushButton" name="viewLogPB" > <widget class="QPushButton" name="showAnywayPB">
<property name="toolTip" > <property name="toolTip">
<string>Open the LaTeX Log File dialog</string> <string>Attempt to show the output even if there were compilation errors</string>
</property> </property>
<property name="text" > <property name="text">
<string>View Complete &amp;Log...</string>
</property>
</widget>
</item>
<item row="4" column="1" >
<widget class="QPushButton" name="showAnywayPB" >
<property name="toolTip" >
<string>Attempt to show the output even if there were compilation errors</string>
</property>
<property name="text" >
<string>Show Output &amp;Anyway</string> <string>Show Output &amp;Anyway</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="4" > <item row="4" column="3">
<widget class="QListWidget" name="errorsLW" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="toolTip" > <property name="standardButtons">
<string>Selecting an error will show the error message in the panel below and the cursor will jump to the location in the document where the error occurred.</string> <set>QDialogButtonBox::Cancel</set>
</property> </property>
</widget> </widget>
</item> </item>
@ -109,10 +117,9 @@
<tabstops> <tabstops>
<tabstop>errorsLW</tabstop> <tabstop>errorsLW</tabstop>
<tabstop>descriptionTB</tabstop> <tabstop>descriptionTB</tabstop>
<tabstop>closePB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>

616
src/frontends/qt4/ui/ExternalUi.ui
View File

@ -1,107 +1,135 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ExternalUi</class> <class>ExternalUi</class>
<widget class="QDialog" name="ExternalUi" > <widget class="QDialog" name="ExternalUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>386</width> <width>574</width>
<height>453</height> <height>601</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string/> <string/>
</property> </property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QTabWidget" name="tab" > <widget class="QTabWidget" name="tab">
<property name="toolTip" > <property name="toolTip">
<string/> <string/>
</property> </property>
<property name="currentIndex" > <property name="currentIndex">
<number>0</number> <number>0</number>
</property> </property>
<widget class="QWidget" name="filetab" > <widget class="QWidget" name="filetab">
<attribute name="title" > <attribute name="title">
<string>F&amp;ile</string> <string>F&amp;ile</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="fileED" > <widget class="QLineEdit" name="fileED">
<property name="toolTip" > <property name="toolTip">
<string>Filename</string> <string>Filename</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="fileLA" > <widget class="QLabel" name="fileLA">
<property name="toolTip" > <property name="toolTip">
<string>Filename</string> <string>Filename</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;File:</string> <string>&amp;File:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>fileED</cstring> <cstring>fileED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="QPushButton" name="browsePB" > <widget class="QPushButton" name="browsePB">
<property name="toolTip" > <property name="toolTip">
<string>Select a file</string> <string>Select a file</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Browse...</string> <string>&amp;Browse...</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3" > <item row="2" column="0" colspan="3">
<widget class="QCheckBox" name="draftCB" > <widget class="QCheckBox" name="draftCB">
<property name="text" > <property name="text">
<string>&amp;Draft</string> <string>&amp;Draft</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="3" > <item row="1" column="0" colspan="3">
<widget class="QGroupBox" name="GroupBox3" > <widget class="QGroupBox" name="GroupBox3">
<property name="title" > <property name="title">
<string>&amp;Template</string> <string>&amp;Template</string>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" colspan="2" > <item row="1" column="0" colspan="2">
<widget class="QTextBrowser" name="externalTB" /> <widget class="QTextBrowser" name="externalTB"/>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Preferred</enum> <enum>QSizePolicy::Preferred</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -109,15 +137,15 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QComboBox" name="externalCO" > <widget class="QComboBox" name="externalCO">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Available templates</string> <string>Available templates</string>
</property> </property>
</widget> </widget>
@ -127,57 +155,75 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="lyxviewtab" > <widget class="QWidget" name="lyxviewtab">
<attribute name="title" > <attribute name="title">
<string>LaTe&amp;X and LyX options</string> <string>LaTe&amp;X and LyX options</string>
</attribute> </attribute>
<layout class="QVBoxLayout" > <layout class="QVBoxLayout">
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" > <property name="leftMargin">
<number>9</number>
</property>
<property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number> <number>9</number>
</property> </property>
<item> <item>
<widget class="QGroupBox" name="optionsGB" > <widget class="QGroupBox" name="optionsGB">
<property name="title" > <property name="title">
<string>LaTeX Options</string> <string>LaTeX Options</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLineEdit" name="extraED" /> <widget class="QLineEdit" name="extraED"/>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLabel" name="optionLA" > <widget class="QLabel" name="optionLA">
<property name="text" > <property name="text">
<string>O&amp;ption:</string> <string>O&amp;ption:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>extraED</cstring> <cstring>extraED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QComboBox" name="extraFormatCO" /> <widget class="QComboBox" name="extraFormatCO"/>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="formatLA" > <widget class="QLabel" name="formatLA">
<property name="text" > <property name="text">
<string>Forma&amp;t:</string> <string>For&amp;mat:</string>
</property> </property>
<property name="textFormat" > <property name="textFormat">
<enum>Qt::AutoText</enum> <enum>Qt::AutoText</enum>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>extraFormatCO</cstring> <cstring>extraFormatCO</cstring>
</property> </property>
</widget> </widget>
@ -186,61 +232,70 @@
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QGroupBox" name="displayGB" > <widget class="QGroupBox" name="displayGB">
<property name="toolTip" > <property name="toolTip">
<string>Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog).</string> <string>Enable LyX to preview this material; only if graphics previewing is not disabled at application level (see Preference dialog).</string>
</property> </property>
<property name="title" > <property name="title">
<string>&amp;Show in LyX</string> <string>&amp;Show in LyX</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="checkable" > <property name="checkable">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="scaleLA" > <widget class="QLabel" name="scaleLA">
<property name="toolTip" > <property name="toolTip">
<string>Percentage to scale by in LyX</string> <string>Percentage to scale by in LyX</string>
</property> </property>
<property name="text" > <property name="text">
<string>Sca&amp;le on Screen (%):</string> <string>Sca&amp;le on Screen (%):</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>displayscaleED</cstring> <cstring>displayscaleED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="displayscaleED" > <widget class="QLineEdit" name="displayscaleED">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Percentage to scale by in LyX</string> <string>Percentage to scale by in LyX</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>40</width>
<height>20</height> <height>20</height>
@ -253,10 +308,10 @@
</item> </item>
<item> <item>
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>81</width> <width>81</width>
<height>196</height> <height>196</height>
@ -266,41 +321,59 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<widget class="QWidget" name="sizetab" > <widget class="QWidget" name="sizetab">
<attribute name="title" > <attribute name="title">
<string>Si&amp;ze and Rotation</string> <string>Si&amp;ze and Rotation</string>
</attribute> </attribute>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QGroupBox" name="rotationGB" > <widget class="QGroupBox" name="rotationGB">
<property name="title" > <property name="title">
<string>Rotate</string> <string>Rotate</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeType" > <property name="sizeType">
<enum>QSizePolicy::Expanding</enum> <enum>QSizePolicy::Expanding</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>20</height>
@ -308,59 +381,68 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>0</number> <number>0</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="angleED" > <widget class="QLineEdit" name="angleED">
<property name="sizePolicy" > <property name="sizePolicy">
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" > <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Angle to rotate image by</string> <string>Angle to rotate image by</string>
</property> </property>
<property name="text" > <property name="text">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="originLA" > <widget class="QLabel" name="originLA">
<property name="toolTip" > <property name="toolTip">
<string>The origin of the rotation</string> <string>The origin of the rotation</string>
</property> </property>
<property name="text" > <property name="text">
<string>Ori&amp;gin:</string> <string>Ori&amp;gin:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>originCO</cstring> <cstring>originCO</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QComboBox" name="originCO" > <widget class="QComboBox" name="originCO">
<property name="toolTip" > <property name="toolTip">
<string>The origin of the rotation</string> <string>The origin of the rotation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="angleLA" > <widget class="QLabel" name="angleLA">
<property name="toolTip" > <property name="toolTip">
<string>Angle to rotate image by</string> <string>Angle to rotate image by</string>
</property> </property>
<property name="text" > <property name="text">
<string>A&amp;ngle:</string> <string>A&amp;ngle:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>angleED</cstring> <cstring>angleED</cstring>
</property> </property>
</widget> </widget>
@ -370,82 +452,91 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QGroupBox" name="scaleGB" > <widget class="QGroupBox" name="scaleGB">
<property name="title" > <property name="title">
<string>Scale</string> <string>Scale</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="1" column="2" > <item row="1" column="2">
<widget class="lyx::frontend::LengthCombo" name="heightUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="heightUnitCO"/>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<widget class="lyx::frontend::LengthCombo" name="widthUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="widthUnitCO"/>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLineEdit" name="heightED" > <widget class="QLineEdit" name="heightED">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Height of image in output</string> <string>Height of image in output</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1" > <item row="0" column="1">
<widget class="QLineEdit" name="widthED" > <widget class="QLineEdit" name="widthED">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Width of image in output</string> <string>Width of image in output</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" > <item row="0" column="0">
<widget class="QLabel" name="widthLA" > <widget class="QLabel" name="widthLA">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Width:</string> <string>&amp;Width:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>widthED</cstring> <cstring>widthED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" colspan="2" > <item row="2" column="1" colspan="2">
<widget class="QCheckBox" name="aspectratioCB" > <widget class="QCheckBox" name="aspectratioCB">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="toolTip" > <property name="toolTip">
<string>Maintain aspect ratio with largest dimension</string> <string>Maintain aspect ratio with largest dimension</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Maintain aspect ratio</string> <string>&amp;Maintain aspect ratio</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<widget class="QLabel" name="heightLA" > <widget class="QLabel" name="heightLA">
<property name="enabled" > <property name="enabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Height:</string> <string>&amp;Height:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>heightED</cstring> <cstring>heightED</cstring>
</property> </property>
</widget> </widget>
@ -453,84 +544,93 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QGroupBox" name="cropGB" > <widget class="QGroupBox" name="cropGB">
<property name="title" > <property name="title">
<string>Crop</string> <string>Crop</string>
</property> </property>
<property name="flat" > <property name="flat">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout">
<property name="margin" > <property name="leftMargin">
<number>9</number> <number>9</number>
</property> </property>
<property name="spacing" > <property name="topMargin">
<number>9</number>
</property>
<property name="rightMargin">
<number>9</number>
</property>
<property name="bottomMargin">
<number>9</number>
</property>
<property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<item row="0" column="0" colspan="2" > <item row="0" column="0" colspan="2">
<widget class="QCheckBox" name="clipCB" > <widget class="QCheckBox" name="clipCB">
<property name="toolTip" > <property name="toolTip">
<string>Clip to bounding box values</string> <string>Clip to bounding box values</string>
</property> </property>
<property name="text" > <property name="text">
<string>Clip to &amp;bounding box</string> <string>Clip to &amp;bounding box</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" > <item row="3" column="0">
<widget class="QLabel" name="lbLA" > <widget class="QLabel" name="lbLA">
<property name="text" > <property name="text">
<string>&amp;Left bottom:</string> <string>Left botto&amp;m:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>xlED</cstring> <cstring>xlED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="3" > <item row="2" column="3">
<widget class="QLineEdit" name="ytED" /> <widget class="QLineEdit" name="ytED"/>
</item> </item>
<item row="1" column="1" > <item row="1" column="1">
<widget class="QLabel" name="xLA" > <widget class="QLabel" name="xLA">
<property name="text" > <property name="text">
<string>x</string> <string>x</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="0" > <item row="2" column="0">
<widget class="QLabel" name="rtLA" > <widget class="QLabel" name="rtLA">
<property name="text" > <property name="text">
<string>Right &amp;top:</string> <string>Right &amp;top:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>xrED</cstring> <cstring>xrED</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="3" > <item row="0" column="3">
<widget class="QPushButton" name="getbbPB" > <widget class="QPushButton" name="getbbPB">
<property name="toolTip" > <property name="toolTip">
<string>Get bounding box from the (EPS) file</string> <string>Get bounding box from the (EPS) file</string>
</property> </property>
<property name="text" > <property name="text">
<string>&amp;Get from File</string> <string>&amp;Get from File</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1" > <item row="3" column="1">
<widget class="QLineEdit" name="xlED" > <widget class="QLineEdit" name="xlED">
<property name="toolTip" > <property name="toolTip">
<string/> <string/>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2" > <item row="0" column="2">
<spacer> <spacer>
<property name="orientation" > <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0" > <property name="sizeHint" stdset="0">
<size> <size>
<width>43</width> <width>43</width>
<height>18</height> <height>18</height>
@ -538,30 +638,30 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="3" column="3" > <item row="3" column="3">
<widget class="QLineEdit" name="ybED" /> <widget class="QLineEdit" name="ybED"/>
</item> </item>
<item row="1" column="3" > <item row="1" column="3">
<widget class="QLabel" name="yLA" > <widget class="QLabel" name="yLA">
<property name="text" > <property name="text">
<string>y</string> <string>y</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1" > <item row="2" column="1">
<widget class="QLineEdit" name="xrED" /> <widget class="QLineEdit" name="xrED"/>
</item> </item>
<item row="2" column="2" > <item row="2" column="2">
<widget class="lyx::frontend::LengthCombo" name="xrUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="xrUnitCO"/>
</item> </item>
<item row="2" column="4" > <item row="2" column="4">
<widget class="lyx::frontend::LengthCombo" name="ytUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="ytUnitCO"/>
</item> </item>
<item row="3" column="2" > <item row="3" column="2">
<widget class="lyx::frontend::LengthCombo" name="xlUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="xlUnitCO"/>
</item> </item>
<item row="3" column="4" > <item row="3" column="4">
<widget class="lyx::frontend::LengthCombo" name="ybUnitCO" /> <widget class="lyx::frontend::LengthCombo" name="ybUnitCO"/>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -570,60 +670,27 @@
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="1" column="0" > <item row="1" column="0">
<layout class="QHBoxLayout" > <layout class="QHBoxLayout">
<property name="spacing" > <property name="spacing">
<number>6</number> <number>6</number>
</property> </property>
<property name="margin" > <property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<spacer> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation" > <property name="standardButtons">
<enum>Qt::Horizontal</enum> <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="sizeType" >
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="default" >
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyPB" >
<property name="text" >
<string>&amp;Apply</string>
</property>
<property name="default" >
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Close</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
<property name="default" >
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -647,12 +714,9 @@
<tabstop>draftCB</tabstop> <tabstop>draftCB</tabstop>
<tabstop>angleED</tabstop> <tabstop>angleED</tabstop>
<tabstop>originCO</tabstop> <tabstop>originCO</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>

82
src/frontends/qt4/ui/GraphicsUi.ui
View File

@ -387,7 +387,7 @@
<item row="0" column="0" colspan="6"> <item row="0" column="0" colspan="6">
<widget class="QLabel" name="lbL"> <widget class="QLabel" name="lbL">
<property name="text"> <property name="text">
<string>&amp;Left bottom:</string> <string>Left botto&amp;m:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>lbX</cstring> <cstring>lbX</cstring>
@ -739,79 +739,9 @@
<number>0</number> <number>0</number>
</property> </property>
<item> <item>
<widget class="QPushButton" name="restorePB"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="text"> <property name="standardButtons">
<string>&amp;Restore</string> <set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyPB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Apply</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Close</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -842,10 +772,6 @@
<tabstop>angle</tabstop> <tabstop>angle</tabstop>
<tabstop>origin</tabstop> <tabstop>origin</tabstop>
<tabstop>rotateOrderCB</tabstop> <tabstop>rotateOrderCB</tabstop>
<tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>
<tabstop>clip</tabstop> <tabstop>clip</tabstop>
<tabstop>lbX</tabstop> <tabstop>lbX</tabstop>
<tabstop>lbXunit</tabstop> <tabstop>lbXunit</tabstop>

97
src/frontends/qt4/ui/IncludeUi.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>363</width> <width>369</width>
<height>470</height> <height>470</height>
</rect> </rect>
</property> </property>
@ -37,7 +37,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="4"> <item row="0" column="3">
<widget class="QPushButton" name="browsePB"> <widget class="QPushButton" name="browsePB">
<property name="toolTip"> <property name="toolTip">
<string>Select a file</string> <string>Select a file</string>
@ -47,17 +47,17 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="1" column="0" rowspan="2" colspan="2">
<widget class="QLabel" name="TextLabel1"> <widget class="QLabel" name="TextLabel1">
<property name="text"> <property name="text">
<string>&amp;Include Type:</string> <string>I&amp;nclude Type:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>typeCO</cstring> <cstring>typeCO</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="2"> <item row="1" column="2" rowspan="3">
<widget class="QComboBox" name="typeCO"> <widget class="QComboBox" name="typeCO">
<item> <item>
<property name="text"> <property name="text">
@ -82,6 +82,16 @@
</widget> </widget>
</item> </item>
<item row="1" column="3"> <item row="1" column="3">
<widget class="QPushButton" name="editPB">
<property name="toolTip">
<string>Edit the file</string>
</property>
<property name="text">
<string>&amp;Edit</string>
</property>
</widget>
</item>
<item row="2" column="3">
<spacer> <spacer>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
@ -97,17 +107,7 @@
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="1" column="4"> <item row="4" column="0" colspan="4">
<widget class="QPushButton" name="editPB">
<property name="toolTip">
<string>Edit the file</string>
</property>
<property name="text">
<string>&amp;Edit</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="5">
<layout class="QHBoxLayout"> <layout class="QHBoxLayout">
<property name="spacing"> <property name="spacing">
<number>6</number> <number>6</number>
@ -158,7 +158,7 @@
</item> </item>
</layout> </layout>
</item> </item>
<item row="3" column="0" colspan="5"> <item row="5" column="0" colspan="4">
<widget class="QGroupBox" name="listingsGB"> <widget class="QGroupBox" name="listingsGB">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@ -302,63 +302,12 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="6" column="2" colspan="2">
<layout class="QHBoxLayout"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="spacing"> <property name="standardButtons">
<number>6</number> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property> </property>
<property name="leftMargin"> </widget>
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="autoDefault">
<bool>true</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="text">
<string>&amp;Close</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item> </item>
</layout> </layout>
</widget> </widget>
@ -373,8 +322,6 @@
<tabstop>labelLE</tabstop> <tabstop>labelLE</tabstop>
<tabstop>listingsTB</tabstop> <tabstop>listingsTB</tabstop>
<tabstop>listingsED</tabstop> <tabstop>listingsED</tabstop>
<tabstop>okPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local">qt_i18n.h</include> <include location="local">qt_i18n.h</include>

92
src/frontends/qt4/ui/IndexUi.ui
View File

@ -1,84 +1,62 @@
<ui version="4.0" > <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>IndexUi</class> <class>IndexUi</class>
<widget class="QDialog" name="IndexUi" > <widget class="QDialog" name="IndexUi">
<property name="geometry" > <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>262</width> <width>262</width>
<height>108</height> <height>121</height>
</rect> </rect>
</property> </property>
<property name="windowTitle" > <property name="windowTitle">
<string/> <string/>
</property> </property>
<property name="sizeGripEnabled" > <property name="sizeGripEnabled">
<bool>true</bool> <bool>true</bool>
</property> </property>
<layout class="QGridLayout" > <layout class="QGridLayout" name="gridLayout">
<property name="margin" > <item row="0" column="0">
<number>9</number> <layout class="QVBoxLayout">
</property> <property name="spacing">
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>71</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="okPB" >
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="default" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="3" >
<layout class="QVBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number> <number>6</number>
</property> </property>
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item> <item>
<widget class="QLabel" name="indicesLA" > <widget class="QLabel" name="indicesLA">
<property name="text" > <property name="text">
<string>A&amp;vailable Indexes:</string> <string>Available I&amp;ndexes:</string>
</property> </property>
<property name="buddy" > <property name="buddy">
<cstring>indicesCO</cstring> <cstring>indicesCO</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item> <item>
<widget class="QComboBox" name="indicesCO" > <widget class="QComboBox" name="indicesCO">
<property name="toolTip" > <property name="toolTip">
<string>Select the index this entry should be listed in.</string> <string>Select the index this entry should be listed in.</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="2" > <item row="1" column="0">
<widget class="QPushButton" name="cancelPB" > <widget class="QDialogButtonBox" name="buttonBox">
<property name="text" > <property name="standardButtons">
<string>&amp;Cancel</string> <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
<property name="default" >
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
@ -86,11 +64,9 @@
</widget> </widget>
<tabstops> <tabstops>
<tabstop>indicesCO</tabstop> <tabstop>indicesCO</tabstop>
<tabstop>okPB</tabstop>
<tabstop>cancelPB</tabstop>
</tabstops> </tabstops>
<includes> <includes>
<include location="local" >qt_i18n.h</include> <include location="local">qt_i18n.h</include>
</includes> </includes>
<resources/> <resources/>
<connections/> <connections/>