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

Start using QDialogButtonGroup rather than manual OK etc. buttons

Browse Source 
This assures the OK/Apply/Cancel/Restore buttons use the layout/style
of the OS (button order, icons).

The goal is to move all dialogs to this for 2.4.

See #11003
This commit is contained in:
Juergen Spitzmueller 2018-07-08 16:35:38 +02:00
parent a7f79e2e9f
commit 0570d16a3b
21 changed files with 521 additions and 621 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/GuiAbout.cpp
View File

@ -273,7 +273,7 @@ GuiAbout::GuiAbout(GuiView & lv)
}
void GuiAbout::on_closePB_clicked()
void GuiAbout::on_buttonBox_rejected()
{
close();
}

2
src/frontends/qt4/GuiAbout.h
View File

@ -26,7 +26,7 @@ public:
GuiAbout(GuiView & lv);
private Q_SLOTS:
void on_closePB_clicked();
void on_buttonBox_rejected();
private:
/// Controller stuff

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

@ -39,6 +39,7 @@
#include "support/gettext.h"
#include "support/lstrings.h"
#include <QDialogButtonBox>
#include <QPushButton>
#include <QListWidget>
#include <QCheckBox>
@ -60,12 +61,8 @@ GuiBibtex::GuiBibtex(GuiView & lv)
QDialog::setModal(true);
setWindowModality(Qt::WindowModal);
connect(okPB, SIGNAL(clicked()),
this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()),
this, SLOT(slotApply()));
connect(closePB, SIGNAL(clicked()),
this, SLOT(slotClose()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotButtonBox(QAbstractButton *)));
connect(stylePB, SIGNAL(clicked()),
this, SLOT(browsePressed()));
connect(deletePB, SIGNAL(clicked()),
@ -93,16 +90,14 @@ GuiBibtex::GuiBibtex(GuiView & lv)
add_ = new GuiBibtexAddDialog(this);
add_bc_.setPolicy(ButtonPolicy::OkCancelPolicy);
add_bc_.setOK(add_->addPB);
add_bc_.setCancel(add_->closePB);
add_bc_.setOK(add_->buttonBox->button(QDialogButtonBox::Ok));
add_bc_.setCancel(add_->buttonBox->button(QDialogButtonBox::Cancel));
add_bc_.addCheckedLineEdit(add_->bibED, 0);
connect(add_->bibED, SIGNAL(textChanged(QString)),
this, SLOT(bibEDChanged()));
connect(add_->addPB, SIGNAL(clicked()),
this, SLOT(addDatabase()));
connect(add_->addPB, SIGNAL(clicked()),
add_, SLOT(accept()));
connect(add_->buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(addBBClicked(QAbstractButton *)));
connect(add_->rescanPB, SIGNAL(clicked()),
this, SLOT(rescanClicked()));
connect(add_->bibLW, SIGNAL(itemActivated(QListWidgetItem *)),
@ -113,17 +108,15 @@ GuiBibtex::GuiBibtex(GuiView & lv)
this, SLOT(availableChanged()));
connect(add_->browsePB, SIGNAL(clicked()),
this, SLOT(browseBibPressed()));
connect(add_->closePB, SIGNAL(clicked()),
add_, SLOT(reject()));
add_->bibLW->setToolTip(formatToolTip(qt_("This list consists of all databases that are indexed by LaTeX and thus are found without a file path. "
"This is usually everything in the bib/ subdirectory of LaTeX's texmf tree. "
"If you want to reuse your own database, this is the place you should store it.")));
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setOK(okPB);
bc().setApply(applyPB);
bc().setCancel(closePB);
bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().addReadOnly(databaseLW);
bc().addReadOnly(stylePB);
bc().addReadOnly(styleCB);
@ -151,6 +144,22 @@ GuiBibtex::GuiBibtex(GuiView & lv)
}
void GuiBibtex::addBBClicked(QAbstractButton * button)
{
switch (add_->buttonBox->standardButton(button)) {
case QDialogButtonBox::Ok:
addDatabase();
add_->accept();
break;
case QDialogButtonBox::Cancel:
add_->reject();
break;
default:
break;
}
}
void GuiBibtex::bibEDChanged()
{
// Indicate to the button controller that the contents have

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

@ -44,6 +44,7 @@ public:
explicit GuiBibtex(GuiView & lv);
private Q_SLOTS:
void addBBClicked(QAbstractButton * button);
void change_adaptor();
void browsePressed();
void browseBibPressed();

5
src/frontends/qt4/GuiChanges.cpp
View File

@ -40,14 +40,15 @@ GuiChanges::GuiChanges(GuiView & lv)
{
setupUi(this);
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotButtonBox(QAbstractButton *)));
connect(nextPB, SIGNAL(clicked()), this, SLOT(nextChange()));
connect(previousPB, SIGNAL(clicked()), this, SLOT(previousChange()));
connect(rejectPB, SIGNAL(clicked()), this, SLOT(rejectChange()));
connect(acceptPB, SIGNAL(clicked()), this, SLOT(acceptChange()));
bc().setPolicy(ButtonPolicy::NoRepeatedApplyReadOnlyPolicy);
bc().setCancel(closePB);
bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().addReadOnly(acceptPB);
bc().addReadOnly(rejectPB);
}

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

@ -211,9 +211,8 @@ GuiCharacter::GuiCharacter(GuiView & lv)
{
setupUi(this);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(applyPB, SIGNAL(clicked()), this, SLOT(slotApply()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotClose()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotButtonBox(QAbstractButton *)));
connect(autoapplyCB, SIGNAL(stateChanged(int)), this,
SLOT(slotAutoApply()));
@ -249,9 +248,9 @@ GuiCharacter::GuiCharacter(GuiView & lv)
fillCombo(langCO, language);
bc().setPolicy(ButtonPolicy::OkApplyCancelAutoReadOnlyPolicy);
bc().setOK(okPB);
bc().setApply(applyPB);
bc().setCancel(closePB);
bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
bc().setApply(buttonBox->button(QDialogButtonBox::Apply));
bc().setCancel(buttonBox->button(QDialogButtonBox::Cancel));
bc().setAutoApply(autoapplyCB);
bc().addReadOnly(familyCO);
bc().addReadOnly(seriesCO);

41
src/frontends/qt4/GuiCitation.cpp
View File

@ -136,9 +136,9 @@ GuiCitation::GuiCitation(GuiView & lv)
connect(textAfterED, SIGNAL(textChanged(QString)),
this, SLOT(updateStyles()));
connect(textBeforeED, SIGNAL(returnPressed()),
this, SLOT(on_okPB_clicked()));
this, SLOT(on_buttonBox_accepted()));
connect(textAfterED, SIGNAL(returnPressed()),
this, SLOT(on_okPB_clicked()));
this, SLOT(on_buttonBox_accepted()));
selectionManager = new GuiSelectionManager(this, availableLV, selectedLV,
addPB, deletePB, upPB, downPB, &available_model_, &selected_model_, 1);
@ -147,7 +147,7 @@ GuiCitation::GuiCitation(GuiView & lv)
connect(selectionManager, SIGNAL(updateHook()),
this, SLOT(updateControls()));
connect(selectionManager, SIGNAL(okHook()),
this, SLOT(on_okPB_clicked()));
this, SLOT(on_buttonBox_accepted()));
connect(filter_, SIGNAL(rightButtonClicked()),
this, SLOT(resetFilter()));
@ -208,7 +208,7 @@ void GuiCitation::showEvent(QShowEvent * e)
}
void GuiCitation::on_okPB_clicked()
void GuiCitation::on_buttonBox_accepted()
{
applyView();
clearSelection();
@ -216,24 +216,27 @@ void GuiCitation::on_okPB_clicked()
}
void GuiCitation::on_cancelPB_clicked()
void GuiCitation::on_buttonBox_rejected()
{
clearSelection();
hide();
}
void GuiCitation::on_applyPB_clicked()
void GuiCitation::on_buttonBox_clicked(QAbstractButton * button)
{
applyView();
}
void GuiCitation::on_restorePB_clicked()
{
init();
updateFilterHint();
filterPressed();
switch (buttonBox->standardButton(button)) {
case QDialogButtonBox::Apply:
applyView();
break;
case QDialogButtonBox::Reset:
init();
updateFilterHint();
filterPressed();
break;
default:
break;
}
}
@ -452,8 +455,8 @@ bool GuiCitation::isSelected(QModelIndex const & idx)
void GuiCitation::setButtons()
{
int const srows = selectedLV->model()->rowCount();
applyPB->setEnabled(srows > 0);
okPB->setEnabled(srows > 0);
buttonBox->button(QDialogButtonBox::Apply)->setEnabled(srows > 0);
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(srows > 0);
}
@ -802,8 +805,8 @@ void GuiCitation::init()
} else
availableLV->setFocus();
applyPB->setEnabled(false);
okPB->setEnabled(false);
buttonBox->button(QDialogButtonBox::Apply)->setEnabled(false);
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
}

7
src/frontends/qt4/GuiCitation.h
View File

@ -47,10 +47,9 @@ public:
GuiCitation(GuiView & lv);
private Q_SLOTS:
void on_okPB_clicked();
void on_cancelPB_clicked();
void on_restorePB_clicked();
void on_applyPB_clicked();
void on_buttonBox_accepted();
void on_buttonBox_rejected();
void on_buttonBox_clicked(QAbstractButton *);
void on_literalCB_clicked();
void filterPressed();
void filterChanged(const QString & text);

30
src/frontends/qt4/GuiCompare.cpp
View File

@ -29,6 +29,7 @@
#include "support/FileName.h"
#include "support/gettext.h"
#include <QDialogButtonBox>
#include <QThread>
@ -46,8 +47,8 @@ GuiCompare::GuiCompare(GuiView & lv)
setupUi(this);
setModal(Qt::WindowModal);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(closePB, SIGNAL(clicked()), this, SLOT(slotCancel()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotButtonBox(QAbstractButton *)));
connect(newFilePB, SIGNAL(clicked()), this, SLOT(selectNewFile()));
connect(oldFilePB, SIGNAL(clicked()), this, SLOT(selectOldFile()));
@ -64,10 +65,10 @@ GuiCompare::GuiCompare(GuiView & lv)
newSettingsRB->setChecked(true);
trackingCB->setChecked(true);
closePB->setCursor(Qt::ArrowCursor);
buttonBox->button(QDialogButtonBox::Ok)->setCursor(Qt::ArrowCursor);
bc().setPolicy(ButtonPolicy::OkApplyCancelPolicy);
bc().setOK(okPB);
bc().setOK(buttonBox->button(QDialogButtonBox::Ok));
}
GuiCompare::~GuiCompare()
@ -182,14 +183,14 @@ void GuiCompare::enableControls(bool enable)
oldFileLA->setEnabled(enable);
oldFilePB->setEnabled(enable);
oldFileCB->setEnabled(enable);
okPB->setEnabled(enable);
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enable);
groupBox->setEnabled(enable);
progressBar->setEnabled(!enable);
if (enable)
closePB->setText(qt_("Close"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Close"));
else
closePB->setText(qt_("Cancel"));
buttonBox->button(QDialogButtonBox::Cancel)->setText(qt_("Cancel"));
}
@ -270,6 +271,21 @@ void GuiCompare::slotCancel()
}
void GuiCompare::slotButtonBox(QAbstractButton * button)
{
switch (buttonBox->standardButton(button)) {
case QDialogButtonBox::Ok:
slotOK();
break;
case QDialogButtonBox::Cancel:
slotCancel();
break;
default:
break;
}
}
Buffer const * GuiCompare::bufferFromFileName(string const & file) const
{
FileName fname;

2
src/frontends/qt4/GuiCompare.h
View File

@ -40,6 +40,8 @@ private Q_SLOTS:
///
void slotCancel();
///
void slotButtonBox(QAbstractButton *);
///
void changeAdaptor();
///
void selectNewFile();

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

@ -23,7 +23,8 @@
#include "support/convert.h"
#include "support/lstrings.h"
#include <QDialogButtonBox>
#include <QPushButton>
using namespace std;
using namespace lyx::support;
@ -39,8 +40,8 @@ GuiCompareHistory::GuiCompareHistory(GuiView & lv)
setupUi(this);
setModal(Qt::WindowModal);
connect(okPB, SIGNAL(clicked()), this, SLOT(slotOK()));
connect(cancelPB, SIGNAL(clicked()), this, SLOT(slotCancel()));
connect(buttonBox, SIGNAL(clicked(QAbstractButton *)),
this, SLOT(slotButtonBox(QAbstractButton *)));
connect(revbackRB, SIGNAL(clicked()), this, SLOT(selectRevback()));
connect(betweenrevRB, SIGNAL(clicked()), this, SLOT(selectBetweenrev()));
@ -49,7 +50,7 @@ GuiCompareHistory::GuiCompareHistory(GuiView & lv)
bool GuiCompareHistory::initialiseParams(std::string const &)
{
string revstring = lyxview().currentBufferView()->buffer().lyxvc().revisionInfo(LyXVC::File);
int rev=0;
int rev = 0;
string tmp;
bool enableBetween = true;
@ -69,7 +70,7 @@ bool GuiCompareHistory::initialiseParams(std::string const &)
// later we can provide comparison between two hashes
betweenrevRB->setEnabled(enableBetween);
okPB->setEnabled(rev);
buttonBox->button(QDialogButtonBox::Ok)->setEnabled(rev);
rev1SB->setMaximum(rev);
rev2SB->setMaximum(rev);
revbackSB->setMaximum(rev-1);

24
src/frontends/qt4/GuiDialog.cpp
View File

@ -18,6 +18,7 @@
#include "support/debug.h"
#include <QCloseEvent>
#include <QDialogButtonBox>
using namespace std;
@ -90,6 +91,29 @@ void GuiDialog::slotRestore()
}
void GuiDialog::slotButtonBox(QAbstractButton * button)
{
QDialogButtonBox * bbox = qobject_cast<QDialogButtonBox*>(sender());
switch (bbox->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 GuiDialog::changed()
{
if (updating_)

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

@ -15,6 +15,7 @@
#include "Dialog.h"
#include "ButtonController.h"
#include <QAbstractButton>
#include <QDialog>
@ -56,6 +57,8 @@ public Q_SLOTS:
void slotAutoApply();
// Close button clicked or closed from WindowManager
void slotClose();
// A collectiong slot for QDialogButtonBox
void slotButtonBox(QAbstractButton *);
///
void closeEvent(QCloseEvent * e);

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

@ -17,7 +17,16 @@
<bool>true</bool>
</property>
<layout class="QGridLayout">
<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>
</property>
<property name="spacing">
@ -36,7 +45,16 @@
<property name="spacing">
<number>6</number>
</property>
<property name="margin">
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item>
@ -68,7 +86,16 @@
<string>Credits</string>
</attribute>
<layout class="QGridLayout">
<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>
</property>
<property name="spacing">
@ -84,7 +111,16 @@
<string>Copyright</string>
</attribute>
<layout class="QGridLayout">
<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>
</property>
<property name="spacing">
@ -100,7 +136,16 @@
<string>Build Info</string>
</attribute>
<layout class="QGridLayout">
<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>
</property>
<property name="spacing">
@ -128,38 +173,22 @@
<property name="spacing">
<number>6</number>
</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>
</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="closePB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>&amp;Close</string>
</property>
<property name="default">
<bool>true</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Close</set>
</property>
</widget>
</item>

46
src/frontends/qt4/ui/BibtexAddUi.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>328</width>
<height>377</height>
<height>385</height>
</rect>
</property>
<property name="sizePolicy">
@ -28,7 +28,7 @@
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="bibLA">
<property name="text">
<string>&amp;Databases found by LaTeX:</string>
<string>Databases fou&amp;nd by LaTeX:</string>
</property>
<property name="buddy">
<cstring>bibLW</cstring>
@ -81,7 +81,7 @@
<string>Here you can enter a local BibTeX database name or browse your directory.</string>
</property>
<property name="text">
<string>&amp;Local databases:</string>
<string>Lo&amp;cal databases:</string>
</property>
<property name="buddy">
<cstring>bibED</cstring>
@ -141,41 +141,9 @@
<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="addPB">
<property name="text">
<string>&amp;Add</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="text">
<string>Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -187,8 +155,6 @@
<tabstop>bibLW</tabstop>
<tabstop>bibED</tabstop>
<tabstop>browsePB</tabstop>
<tabstop>addPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local">qt_i18n.h</include>

31
src/frontends/qt4/ui/BibtexUi.ui
View File

@ -299,32 +299,9 @@
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB">
<property name="text">
<string>&amp;OK</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyPB">
<property name="text">
<string>App&amp;ly</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="text">
<string>Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -339,8 +316,6 @@
<tabstop>stylePB</tabstop>
<tabstop>bibtocCB</tabstop>
<tabstop>btPrintCO</tabstop>
<tabstop>okPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local">qt_i18n.h</include>

149
src/frontends/qt4/ui/ChangesUi.ui
View File

@ -1,83 +1,106 @@
<ui version="4.0" >
<author></author>
<comment></comment>
<exportmacro></exportmacro>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>ChangesUi</class>
<widget class="QDialog" name="ChangesUi" >
<property name="geometry" >
<widget class="QDialog" name="ChangesUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>298</width>
<width>355</width>
<height>264</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string/>
</property>
<property name="sizeGripEnabled" >
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<layout class="QGridLayout">
<property name="leftMargin">
<number>9</number>
</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>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="changeLA" >
<property name="text" >
<item row="0" column="0">
<widget class="QLabel" name="changeLA">
<property name="text">
<string>Change:</string>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QTextBrowser" name="changeTB" />
<item row="1" column="0">
<widget class="QTextBrowser" name="changeTB"/>
</item>
<item row="3" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<item row="3" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</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>
<widget class="QPushButton" name="previousPB" >
<property name="toolTip" >
<widget class="QPushButton" name="previousPB">
<property name="toolTip">
<string>Go to previous change</string>
</property>
<property name="text" >
<property name="text">
<string>&amp;Previous change</string>
</property>
<property name="default" >
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="nextPB" >
<property name="toolTip" >
<widget class="QPushButton" name="nextPB">
<property name="toolTip">
<string>Go to next change</string>
</property>
<property name="text" >
<property name="text">
<string>&amp;Next change</string>
</property>
<property name="default" >
<property name="default">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel</set>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@ -85,58 +108,60 @@
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>Cancel</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<item row="2" column="0">
<layout class="QHBoxLayout">
<property name="spacing">
<number>6</number>
</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>
<widget class="QPushButton" name="acceptPB" >
<property name="toolTip" >
<widget class="QPushButton" name="acceptPB">
<property name="toolTip">
<string>Accept this change</string>
</property>
<property name="text" >
<property name="text">
<string>&amp;Accept</string>
</property>
<property name="autoDefault" >
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="rejectPB" >
<property name="toolTip" >
<widget class="QPushButton" name="rejectPB">
<property name="toolTip">
<string>Reject this change</string>
</property>
<property name="text" >
<property name="text">
<string>&amp;Reject</string>
</property>
<property name="autoDefault" >
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType" >
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" >
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
@ -148,17 +173,15 @@
</item>
</layout>
</widget>
<pixmapfunction></pixmapfunction>
<includes>
<include location="local" >qt_i18n.h</include>
</includes>
<tabstops>
<tabstop>changeTB</tabstop>
<tabstop>acceptPB</tabstop>
<tabstop>rejectPB</tabstop>
<tabstop>nextPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>
</ui>

37
src/frontends/qt4/ui/CharacterUi.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>523</width>
<height>412</height>
<height>372</height>
</rect>
</property>
<property name="windowTitle">
@ -61,35 +61,9 @@
</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="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="closePB">
<property name="text">
<string>Close</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
<property name="default">
<bool>false</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
@ -403,9 +377,6 @@
<tabstop>shapeCO</tabstop>
<tabstop>colorCO</tabstop>
<tabstop>langCO</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>
</tabstops>
<includes>
<include location="local">qt_i18n.h</include>

61
src/frontends/qt4/ui/CitationUi.ui
View File

@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>614</width>
<height>506</height>
<height>522</height>
</rect>
</property>
<property name="windowTitle">
@ -425,58 +425,9 @@
<number>0</number>
</property>
<item>
<widget class="QPushButton" name="restorePB">
<property name="text">
<string>&amp;Restore</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</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>false</bool>
</property>
<property name="default">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="applyPB">
<property name="text">
<string>App&amp;ly</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelPB">
<property name="text">
<string>&amp;Cancel</string>
</property>
<property name="autoDefault">
<bool>false</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Apply|QDialogButtonBox::Cancel|QDialogButtonBox::Ok|QDialogButtonBox::Reset</set>
</property>
</widget>
</item>
@ -498,10 +449,6 @@
<tabstop>textAfterED</tabstop>
<tabstop>forceuppercaseCB</tabstop>
<tabstop>starredCB</tabstop>
<tabstop>restorePB</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>cancelPB</tabstop>
<tabstop>infoML</tabstop>
</tabstops>
<includes>

161
src/frontends/qt4/ui/CompareHistoryUi.ui
View File

@ -1,64 +1,65 @@
<ui version="4.0" >
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CompareHistoryUi</class>
<widget class="QWidget" name="CompareHistoryUi" >
<property name="geometry" >
<widget class="QWidget" name="CompareHistoryUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>375</width>
<height>162</height>
<width>444</width>
<height>184</height>
</rect>
</property>
<property name="windowTitle" >
<property name="windowTitle">
<string/>
</property>
<property name="sizeGripEnabled" stdset="0" >
<property name="sizeGripEnabled" stdset="0">
<bool>true</bool>
</property>
<layout class="QVBoxLayout" name="verticalLayout" >
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>Compare Revisions</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" >
<layout class="QVBoxLayout" name="verticalLayout_2">
<item>
<layout class="QHBoxLayout" name="horizontalLayout_2" >
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QRadioButton" name="revbackRB" >
<property name="text" >
<string>&amp;Revisions back</string>
<widget class="QRadioButton" name="revbackRB">
<property name="text">
<string>Revisions ba&amp;ck</string>
</property>
<property name="checked" >
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="revbackSB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<widget class="QSpinBox" name="revbackSB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum" >
<property name="minimum">
<number>0</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer" >
<property name="orientation" >
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
@ -69,84 +70,84 @@
</layout>
</item>
<item>
<widget class="Line" name="line" >
<property name="orientation" >
<widget class="Line" name="line">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" >
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="betweenrevRB" >
<property name="text" >
<widget class="QRadioButton" name="betweenrevRB">
<property name="text">
<string>&amp;Between revisions</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="oldL" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<widget class="QLabel" name="oldL">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>Old:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="rev1SB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<widget class="QSpinBox" name="rev1SB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum" >
<property name="minimum">
<number>1</number>
</property>
<property name="maximum" >
<property name="maximum">
<number>1</number>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="newL" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Minimum" >
<widget class="QLabel" name="newL">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<property name="text">
<string>New:</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="rev2SB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<widget class="QSpinBox" name="rev2SB">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize" >
<property name="minimumSize">
<size>
<width>80</width>
<height>0</height>
</size>
</property>
<property name="minimum" >
<property name="minimum">
<number>1</number>
</property>
</widget>
@ -157,74 +158,20 @@
</widget>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<spacer name="horizontalSpacer_2" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item>
<widget class="QPushButton" name="okPB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>&amp;OK</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
<property name="default" >
<bool>true</bool>
</property>
<property name="flat" >
<bool>false</bool>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="cancelPB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>&amp;Cancel</string>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_3" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<includes>
<include location="local" >qt_i18n.h</include>
<include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>

378
src/frontends/qt4/ui/CompareUi.ui
View File

@ -1,200 +1,184 @@
<ui version="4.0" >
<class>CompareUi</class>
<widget class="QDialog" name="CompareUi" >
<property name="geometry" >
<rect>
<x>0</x>
<y>0</y>
<width>450</width>
<height>294</height>
</rect>
</property>
<property name="windowTitle" >
<string/>
</property>
<layout class="QVBoxLayout">
<property name="margin">
<number>0</number>
</property>
<item>
<layout class="QGridLayout" name="gridLayout" >
<property name="margin">
<number>10</number>
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>CompareUi</class>
<widget class="QDialog" name="CompareUi">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>450</width>
<height>354</height>
</rect>
</property>
<property name="windowTitle">
<string/>
</property>
<layout class="QVBoxLayout">
<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>
<layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<item row="0" column="0">
<widget class="QLabel" name="newFileLA">
<property name="text">
<string>&amp;New Document:</string>
</property>
<property name="buddy">
<cstring>newFileCB</cstring>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QComboBox" name="newFileCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="newFilePB">
<property name="text">
<string>&amp;Browse...</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="oldFileLA">
<property name="text">
<string>Old Do&amp;cument:</string>
</property>
<property name="buddy">
<cstring>oldFileCB</cstring>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QComboBox" name="oldFileCB">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable">
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QPushButton" name="oldFilePB">
<property name="text">
<string>Bro&amp;wse...</string>
</property>
<property name="autoDefault">
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QGroupBox" name="groupBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Copy Document Settings from:</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QRadioButton" name="newSettingsRB">
<property name="text">
<string>New Docu&amp;ment</string>
</property>
<item row="0" column="0" >
<widget class="QLabel" name="newFileLA" >
<property name="text" >
<string>&amp;New Document:</string>
</property>
<property name="buddy" >
<cstring>newFileCB</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="QComboBox" name="newFileCB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="1" column="1" >
<widget class="QPushButton" name="newFilePB" >
<property name="text" >
<string>&amp;Browse...</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="2" column="0" >
<widget class="QLabel" name="oldFileLA" >
<property name="text" >
<string>&amp;Old Document:</string>
</property>
<property name="buddy" >
<cstring>oldFileCB</cstring>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QComboBox" name="oldFileCB" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="editable" >
<bool>true</bool>
</property>
</widget>
</item>
<item row="3" column="1" >
<widget class="QPushButton" name="oldFilePB" >
<property name="text" >
<string>Bro&amp;wse...</string>
</property>
<property name="autoDefault" >
<bool>false</bool>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title" >
<string>Copy Document Settings from:</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout" >
<item>
<widget class="QRadioButton" name="newSettingsRB" >
<property name="text" >
<string>N&amp;ew Document</string>
</property>
</widget>
</item>
<item>
<widget class="QRadioButton" name="oldSettingsRB" >
<property name="text" >
<string>Ol&amp;d Document</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0" colspan="2" >
<widget class="QProgressBar" name="progressBar" >
<property name="value" >
<number>24</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2" >
<layout class="QHBoxLayout" >
<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="toolTip" >
<string/>
</property>
<property name="text" >
<string>&amp;OK</string>
</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>
<property name="default" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0" >
<widget class="QCheckBox" name="trackingCB" >
<property name="toolTip" >
<string>Turns on the change tracking and showing changes in LaTeX output for the resulting document</string>
</property>
<property name="text" >
<string>Enable &amp;change tracking features in the output</string>
</property>
<property name="checked" >
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QStatusBar" name="statusBar" />
</item>
</widget>
</item>
<item>
<widget class="QRadioButton" name="oldSettingsRB">
<property name="text">
<string>Ol&amp;d Document</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item row="6" column="0" colspan="2">
<widget class="QProgressBar" name="progressBar">
<property name="value">
<number>24</number>
</property>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="8" column="0" colspan="2">
<layout class="QHBoxLayout">
<item>
<widget class="QDialogButtonBox" name="buttonBox">
<property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
</property>
</widget>
</item>
</layout>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="trackingCB">
<property name="toolTip">
<string>Turns on the change tracking and showing changes in LaTeX output for the resulting document</string>
</property>
<property name="text">
<string>Enable &amp;change tracking features in the output</string>
</property>
<property name="checked">
<bool>false</bool>
</property>
</widget>
</item>
</layout>
</widget>
<includes>
<include location="local" >qt_i18n.h</include>
</includes>
<resources/>
<connections/>
</item>
<item>
<widget class="QStatusBar" name="statusBar"/>
</item>
</layout>
</widget>
<includes>
<include location="local">qt_i18n.h</include>
</includes>
<resources/>
<connections/>
</ui>