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

get rid of convenience classes in the following dialogs (and associated implementation files):

Browse Source 
Index: src/frontends/qt4/ui/QErrorListUi.ui
Index: src/frontends/qt4/ui/QExternalUi.ui
Index: src/frontends/qt4/ui/QSendtoUi.ui
Index: src/frontends/qt4/ui/QSpellcheckerUi.ui
Index: src/frontends/qt4/ui/QThesaurusUi.ui
Index: src/frontends/qt4/ui/QTexinfoUi.ui
Index: src/frontends/qt4/ui/QRefUi.ui



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13794 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Edwin Leuven 2006-05-03 19:51:15 +00:00
parent 14b3dc43ed
commit 3c4e073313
27 changed files with 1109 additions and 1278 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/frontends/qt4/QErrorList.C
View File

@ -17,9 +17,9 @@
#include "controllers/ControlErrorList.h"
#include <q3listbox.h>
#include <q3textbrowser.h>
#include <qpushbutton.h>
#include <QListWidget>
#include <QTextBrowser>
#include <QPushButton>
namespace lyx {
namespace frontend {
@ -38,26 +38,28 @@ void QErrorList::build_dialog()
}
void QErrorList::select(int item)
void QErrorList::select(QListWidgetItem * wi)
{
int const item = dialog_->errorsLW->row(wi);
controller().goTo(item);
dialog_->descriptionTB->setText(toqstr(controller().errorList()[item].description));
dialog_->descriptionTB->setPlainText(toqstr(controller().errorList()[item].description));
}
void QErrorList::update_contents()
{
setTitle(controller().name());
dialog_->errorsLB->clear();
dialog_->descriptionTB->setText(QString());
dialog_->errorsLW->clear();
dialog_->descriptionTB->setPlainText(QString());
ErrorList::const_iterator it = controller().errorList().begin();
ErrorList::const_iterator end = controller().errorList().end();
for(; it != end; ++it) {
new Q3ListBoxText(dialog_->errorsLB, toqstr(it->error));
dialog_->errorsLW->addItem(toqstr(it->error));
}
dialog_->errorsLB->setSelected(0, true);
dialog_->errorsLW->setCurrentRow(0);
select(dialog_->errorsLW->item(0));
}
} // namespace frontend

4
src/frontends/qt4/QErrorList.h
View File

@ -14,6 +14,8 @@
#include "QDialogView.h"
class QListWidgetItem;
namespace lyx {
namespace frontend {
@ -29,7 +31,7 @@ public:
QErrorList(Dialog &);
private:
/// select an entry
void select(int item);
void select(QListWidgetItem *);
/// required apply
virtual void apply() {}
/// build dialog

13
src/frontends/qt4/QErrorListDialog.C
View File

@ -13,9 +13,8 @@
#include "QErrorListDialog.h"
#include "QErrorList.h"
#include <q3listbox.h>
#include <qpushbutton.h>
//Added by qt3to4:
#include <QListWidget>
#include <QPushButton>
#include <QCloseEvent>
namespace lyx {
@ -27,10 +26,10 @@ QErrorListDialog::QErrorListDialog(QErrorList * form)
setupUi(this);
connect(closePB, SIGNAL(clicked()),
form, SLOT(slotClose()));
connect(errorsLB, SIGNAL(returnPressed(Q3ListBoxItem *)),
connect(errorsLW, SIGNAL( itemActivated(QListWidgetItem *)),
form, SLOT(slotClose()));
connect( errorsLB, SIGNAL( highlighted(int) ), this, SLOT( select_adaptor(int) ) );
connect( errorsLW, SIGNAL( itemClicked(QListWidgetItem *) ),
this, SLOT( select_adaptor(QListWidgetItem *) ) );
}
@ -38,7 +37,7 @@ QErrorListDialog::~QErrorListDialog()
{}
void QErrorListDialog::select_adaptor(int item)
void QErrorListDialog::select_adaptor(QListWidgetItem * item)
{
form_->select(item);
}

4
src/frontends/qt4/QErrorListDialog.h
View File

@ -17,6 +17,8 @@
#include <QDialog>
#include <QCloseEvent>
class QListWidgetItem;
namespace lyx {
namespace frontend {
@ -28,7 +30,7 @@ public:
QErrorListDialog(QErrorList * form);
~QErrorListDialog();
public slots:
void select_adaptor(int);
void select_adaptor(QListWidgetItem *);
protected:
void closeEvent(QCloseEvent * e);
private:

12
src/frontends/qt4/QExternal.C
View File

@ -33,11 +33,11 @@
#include "qt_helpers.h"
#include "validators.h"
#include <qlineedit.h>
#include <qpushbutton.h>
#include <qcheckbox.h>
#include <qtabwidget.h>
#include <q3textview.h>
#include <QLineEdit>
#include <QPushButton>
#include <QCheckBox>
#include <QTabWidget>
#include <QTextBrowser>
namespace external = lyx::external;
@ -386,7 +386,7 @@ void QExternal::updateTemplate()
{
external::Template templ =
controller().getTemplate(dialog_->externalCO->currentItem());
dialog_->externalTV->setText(toqstr(templ.helpText));
dialog_->externalTB->setPlainText(toqstr(templ.helpText));
// Ascertain which (if any) transformations the template supports
// and disable tabs hosting unsupported transforms.

62
src/frontends/qt4/QExternalDialog.C
View File

@ -23,19 +23,17 @@
#include "support/lyxlib.h"
#include "QExternalDialog.h"
//Added by qt3to4:
#include <QCloseEvent>
#include "lengthcombo.h"
#include "validators.h"
#include "qt_helpers.h"
#include "QExternal.h"
#include <qcheckbox.h>
#include <qpushbutton.h>
#include <q3filedialog.h>
#include <q3textview.h>
#include <qlineedit.h>
#include <QCloseEvent>
#include <QCheckBox>
#include <QPushButton>
#include <QTextBrowser>
#include <QLineEdit>
using lyx::support::float_equal;
@ -56,31 +54,31 @@ QExternalDialog::QExternalDialog(QExternal * form)
connect(closePB, SIGNAL(clicked()),
form, SLOT(slotClose()));
connect( displayCB, SIGNAL( toggled(bool) ), showCO, SLOT( setEnabled(bool) ) );
connect( displayCB, SIGNAL( toggled(bool) ), displayscaleED, SLOT( setEnabled(bool) ) );
connect( showCO, SIGNAL( activated(const QString&) ), this, SLOT( change_adaptor() ) );
connect( originCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
connect( aspectratioCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( browsePB, SIGNAL( clicked() ), this, SLOT( browseClicked() ) );
connect( editPB, SIGNAL( clicked() ), this, SLOT( editClicked() ) );
connect( externalCO, SIGNAL( activated(const QString&) ), this, SLOT( templateChanged() ) );
connect( extraED, SIGNAL( textChanged(const QString&) ), this, SLOT( extraChanged(const QString&) ) );
connect( extraFormatCO, SIGNAL( activated(const QString&) ), this, SLOT( formatChanged(const QString&) ) );
connect( widthUnitCO, SIGNAL( activated(int) ), this, SLOT( widthUnitChanged() ) );
connect( heightUnitCO, SIGNAL( selectionChanged(LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
connect( displayCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( displayscaleED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( angleED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( widthED, SIGNAL( textChanged(const QString&) ), this, SLOT( sizeChanged() ) );
connect( heightED, SIGNAL( textChanged(const QString&) ), this, SLOT( sizeChanged() ) );
connect( fileED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( clipCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( getbbPB, SIGNAL( clicked() ), this, SLOT( getbbClicked() ) );
connect( xrED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( ytED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( xlED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( ybED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( draftCB, SIGNAL( clicked() ), this, SLOT( change_adaptor() ) );
connect( displayCB, SIGNAL( toggled(bool) ), showCO, SLOT( setEnabled(bool) ) );
connect( displayCB, SIGNAL( toggled(bool) ), displayscaleED, SLOT( setEnabled(bool) ) );
connect( showCO, SIGNAL( activated(const QString&) ), this, SLOT( change_adaptor() ) );
connect( originCO, SIGNAL( activated(int) ), this, SLOT( change_adaptor() ) );
connect( aspectratioCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( browsePB, SIGNAL( clicked() ), this, SLOT( browseClicked() ) );
connect( editPB, SIGNAL( clicked() ), this, SLOT( editClicked() ) );
connect( externalCO, SIGNAL( activated(const QString&) ), this, SLOT( templateChanged() ) );
connect( extraED, SIGNAL( textChanged(const QString&) ), this, SLOT( extraChanged(const QString&) ) );
connect( extraFormatCO, SIGNAL( activated(const QString&) ), this, SLOT( formatChanged(const QString&) ) );
connect( widthUnitCO, SIGNAL( activated(int) ), this, SLOT( widthUnitChanged() ) );
connect( heightUnitCO, SIGNAL( selectionChanged(LyXLength::UNIT) ), this, SLOT( change_adaptor() ) );
connect( displayCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( displayscaleED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( angleED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( widthED, SIGNAL( textChanged(const QString&) ), this, SLOT( sizeChanged() ) );
connect( heightED, SIGNAL( textChanged(const QString&) ), this, SLOT( sizeChanged() ) );
connect( fileED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( clipCB, SIGNAL( stateChanged(int) ), this, SLOT( change_adaptor() ) );
connect( getbbPB, SIGNAL( clicked() ), this, SLOT( getbbClicked() ) );
connect( xrED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( ytED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( xlED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( ybED, SIGNAL( textChanged(const QString&) ), this, SLOT( bbChanged() ) );
connect( draftCB, SIGNAL( clicked() ), this, SLOT( change_adaptor() ) );
QIntValidator * validator = new QIntValidator(displayscaleED);
validator->setBottom(1);

48
src/frontends/qt4/QRef.C
View File

@ -21,11 +21,12 @@
#include "insets/insetref.h"
#include <qlineedit.h>
#include <qcheckbox.h>
#include <q3listbox.h>
#include <qpushbutton.h>
#include <qtooltip.h>
#include <QLineEdit>
#include <QCheckBox>
#include <QListWidget>
#include <QListWidgetItem>
#include <QPushButton>
#include <QToolTip>
using std::vector;
@ -51,7 +52,7 @@ void QRef::build_dialog()
bcview().setOK(dialog_->okPB);
bcview().setApply(dialog_->applyPB);
bcview().setCancel(dialog_->closePB);
bcview().addReadOnly(dialog_->refsLB);
bcview().addReadOnly(dialog_->refsLW);
bcview().addReadOnly(dialog_->sortCB);
bcview().addReadOnly(dialog_->nameED);
bcview().addReadOnly(dialog_->referenceED);
@ -168,13 +169,13 @@ void QRef::redoRefs()
{
// Prevent these widgets from emitting any signals whilst
// we modify their state.
dialog_->refsLB->blockSignals(true);
dialog_->refsLW->blockSignals(true);
dialog_->referenceED->blockSignals(true);
int lastref = dialog_->refsLB->currentItem();
int lastref = dialog_->refsLW->currentRow();
dialog_->refsLB->setAutoUpdate(false);
dialog_->refsLB->clear();
dialog_->refsLW->setUpdatesEnabled(false);
dialog_->refsLW->clear();
// need this because Qt will send a highlight() here for
// the first item inserted
@ -182,30 +183,33 @@ void QRef::redoRefs()
for (std::vector<string>::const_iterator iter = refs_.begin();
iter != refs_.end(); ++iter) {
dialog_->refsLB->insertItem(toqstr(*iter));
dialog_->refsLW->addItem(toqstr(*iter));
}
if (sort_)
dialog_->refsLB->sort();
dialog_->refsLW->sortItems();
dialog_->referenceED->setText(tmp);
// restore the last selection for new insets
if (tmp.isEmpty() && lastref != -1
&& lastref < int(dialog_->refsLB->count())) {
dialog_->refsLB->setCurrentItem(lastref);
dialog_->refsLB->clearSelection();
&& lastref < int(dialog_->refsLW->count())) {
dialog_->refsLW->setCurrentRow(lastref);
dialog_->refsLW->clearSelection();
} else
for (unsigned int i = 0; i < dialog_->refsLB->count(); ++i) {
if (tmp == dialog_->refsLB->text(i))
dialog_->refsLB->setSelected(i, true);
for (unsigned int i = 0; i < dialog_->refsLW->count(); ++i) {
if (tmp == dialog_->refsLW->item(i)->text()) {
QListWidgetItem * const item = dialog_->refsLW->item(i);
dialog_->refsLW->setItemSelected(item, true);
}
}
dialog_->refsLB->setAutoUpdate(true);
dialog_->refsLB->update();
dialog_->refsLW->setUpdatesEnabled(true);
dialog_->refsLW->update();
// Re-activate the emission of signals by these widgets.
dialog_->refsLB->blockSignals(false);
dialog_->refsLW->blockSignals(false);
dialog_->referenceED->blockSignals(false);
}
@ -218,7 +222,7 @@ void QRef::updateRefs()
string const name = controller().getBufferName(dialog_->bufferCO->currentItem());
refs_ = controller().getLabelList(name);
dialog_->sortCB->setEnabled(!refs_.empty());
dialog_->refsLB->setEnabled(!refs_.empty());
dialog_->refsLW->setEnabled(!refs_.empty());
dialog_->gotoPB->setEnabled(!refs_.empty());
redoRefs();
}

54
src/frontends/qt4/QRefDialog.C
View File

@ -14,10 +14,9 @@
#include "QRefDialog.h"
#include "QRef.h"
#include <qlineedit.h>
#include <q3listbox.h>
#include <qpushbutton.h>
//Added by qt3to4:
#include <QLineEdit>
#include <QListWidget>
#include <QPushButton>
#include <QCloseEvent>
namespace lyx {
@ -35,22 +34,31 @@ QRefDialog::QRefDialog(QRef * form)
connect(closePB, SIGNAL(clicked()),
form_, SLOT(slotClose()));
connect( typeCO, SIGNAL( activated(int) ), this, SLOT( changed_adaptor() ) );
connect( referenceED, SIGNAL( textChanged(const QString&) ), this, SLOT( changed_adaptor() ) );
connect( nameED, SIGNAL( textChanged(const QString&) ), this, SLOT( changed_adaptor() ) );
connect( refsLB, SIGNAL( highlighted(const QString&) ), this, SLOT( refHighlighted(const QString&) ) );
connect( refsLB, SIGNAL( selected(const QString&) ), this, SLOT( refSelected(const QString&) ) );
connect( sortCB, SIGNAL( toggled(bool) ), this, SLOT( sortToggled(bool) ) );
connect( gotoPB, SIGNAL( clicked() ), this, SLOT( gotoClicked() ) );
connect( updatePB, SIGNAL( clicked() ), this, SLOT( updateClicked() ) );
connect( bufferCO, SIGNAL( activated(int) ), this, SLOT( updateClicked() ) );
connect( typeCO, SIGNAL( activated(int) ),
this, SLOT( changed_adaptor() ) );
connect( referenceED, SIGNAL( textChanged(const QString&) ),
this, SLOT( changed_adaptor() ) );
connect( nameED, SIGNAL( textChanged(const QString&) ),
this, SLOT( changed_adaptor() ) );
connect( refsLW, SIGNAL( itemClicked(QListWidgetItem *) ),
this, SLOT( refHighlighted(QListWidgetItem *) ) );
connect( refsLW, SIGNAL( itemActivated(QListWidgetItem *) ),
this, SLOT( refSelected(QListWidgetItem *) ) );
connect( sortCB, SIGNAL( toggled(bool) ),
this, SLOT( sortToggled(bool) ) );
connect( gotoPB, SIGNAL( clicked() ),
this, SLOT( gotoClicked() ) );
connect( updatePB, SIGNAL( clicked() ),
this, SLOT( updateClicked() ) );
connect( bufferCO, SIGNAL( activated(int) ),
this, SLOT( updateClicked() ) );
}
void QRefDialog::show()
{
QDialog::show();
refsLB->setFocus();
refsLW->setFocus();
}
@ -66,17 +74,18 @@ void QRefDialog::gotoClicked()
}
void QRefDialog::refHighlighted(const QString & sel)
void QRefDialog::refHighlighted(QListWidgetItem * sel)
{
if (form_->readOnly())
return;
int const cur_item = refsLB->currentItem();
/* int const cur_item = refsLW->currentRow();
bool const cur_item_selected = cur_item >= 0 ?
refsLB->isSelected(cur_item) : false;
refsLB->isSelected(cur_item) : false;*/
bool const cur_item_selected = refsLW->isItemSelected(sel);
if (cur_item_selected)
referenceED->setText(sel);
referenceED->setText(sel->text());
if (form_->at_ref_)
form_->gotoRef();
@ -88,17 +97,18 @@ void QRefDialog::refHighlighted(const QString & sel)
}
void QRefDialog::refSelected(const QString & sel)
void QRefDialog::refSelected(QListWidgetItem * sel)
{
if (form_->readOnly())
return;
int const cur_item = refsLB->currentItem();
/* int const cur_item = refsLW->currentRow();
bool const cur_item_selected = cur_item >= 0 ?
refsLB->isSelected(cur_item) : false;
refsLB->isSelected(cur_item) : false;*/
bool const cur_item_selected = refsLW->isItemSelected(sel);
if (cur_item_selected)
referenceED->setText(sel);
referenceED->setText(sel->text());
// <enter> or double click, inserts ref and closes dialog
form_->slotOK();
}

6
src/frontends/qt4/QRefDialog.h
View File

@ -18,6 +18,8 @@
#include <QDialog>
#include <QCloseEvent>
class QListWidgetItem;
namespace lyx {
namespace frontend {
@ -33,8 +35,8 @@ public:
public slots:
void changed_adaptor();
void gotoClicked();
void refHighlighted(const QString &);
void refSelected(const QString &);
void refHighlighted(QListWidgetItem *);
void refSelected(QListWidgetItem *);
void sortToggled(bool);
void updateClicked();

18
src/frontends/qt4/QSendto.C
View File

@ -19,8 +19,8 @@
#include "controllers/ControlSendto.h"
#include <q3listbox.h>
#include <qpushbutton.h>
#include <QListWidget>
#include <QPushButton>
using std::vector;
using std::string;
@ -65,11 +65,11 @@ void QSendto::update_contents()
}
// Reload the browser
dialog_->formatLB->clear();
dialog_->formatLW->clear();
for (vector<string>::const_iterator it = keys.begin();
it < keys.end(); ++it) {
dialog_->formatLB->insertItem(toqstr(*it));
dialog_->formatLW->addItem(toqstr(*it));
}
dialog_->commandCO->insertItem(toqstr(controller().getCommand()));
@ -78,9 +78,9 @@ void QSendto::update_contents()
void QSendto::apply()
{
int const line(dialog_->formatLB->currentItem());
int const line(dialog_->formatLW->currentRow());
if (line < 0 || line > int(dialog_->formatLB->count()))
if (line < 0 || line > int(dialog_->formatLW->count()))
return;
string const cmd(fromqstr(dialog_->commandCO->currentText()));
@ -92,12 +92,12 @@ void QSendto::apply()
bool QSendto::isValid()
{
int const line(dialog_->formatLB->currentItem());
int const line(dialog_->formatLW->currentRow());
if (line < 0 || line > int(dialog_->formatLB->count()))
if (line < 0 || line > int(dialog_->formatLW->count()))
return false;
else return dialog_->formatLB->count() != 0 &&
else return dialog_->formatLW->count() != 0 &&
!dialog_->commandCO->currentText().isEmpty();
}

15
src/frontends/qt4/QSendtoDialog.C
View File

@ -13,8 +13,7 @@
#include "QSendtoDialog.h"
#include "QSendto.h"
#include <qpushbutton.h>
//Added by qt3to4:
#include <QPushButton>
#include <QCloseEvent>
@ -33,10 +32,14 @@ QSendtoDialog::QSendtoDialog(QSendto * form)
connect(closePB, SIGNAL(clicked()),
form, SLOT(slotClose()));
connect( formatLB, SIGNAL( highlighted(const QString&) ), this, SLOT( slotFormatHighlighted(const QString&) ) );
connect( formatLB, SIGNAL( selected(const QString&) ), this, SLOT( slotFormatSelected(const QString&) ) );
connect( formatLB, SIGNAL( highlighted(const QString&) ), this, SLOT( changed_adaptor() ) );
connect( commandCO, SIGNAL( textChanged(const QString&) ), this, SLOT( changed_adaptor() ) );
connect( formatLW, SIGNAL( itemClicked(QListWidgetItem *) ),
this, SLOT( slotFormatHighlighted(QListWidgetItem *) ) );
connect( formatLW, SIGNAL( itemActivated(QListWidgetItem *) ),
this, SLOT( slotFormatSelected(QListWidgetItem *) ) );
connect( formatLW, SIGNAL( itemClicked(QListWidgetItem *) ),
this, SLOT( changed_adaptor() ) );
connect( commandCO, SIGNAL( textChanged(const QString&) ),
this, SLOT( changed_adaptor() ) );
}

6
src/frontends/qt4/QSendtoDialog.h
View File

@ -17,6 +17,8 @@
#include <QDialog>
#include <QCloseEvent>
class QListWidgetItem;
namespace lyx {
namespace frontend {
@ -28,8 +30,8 @@ public:
QSendtoDialog(QSendto * form);
protected slots:
virtual void changed_adaptor();
virtual void slotFormatHighlighted(const QString&) {}
virtual void slotFormatSelected(const QString&) {}
virtual void slotFormatHighlighted(QListWidgetItem *) {}
virtual void slotFormatSelected(QListWidgetItem *) {}
protected:
virtual void closeEvent(QCloseEvent * e);
private:

23
src/frontends/qt4/QSpellchecker.C
View File

@ -17,10 +17,11 @@
#include "controllers/ControlSpellchecker.h"
#include <q3progressbar.h>
#include <qlineedit.h>
#include <qpushbutton.h>
#include <q3listbox.h>
#include <QProgressBar>
#include <QLineEdit>
#include <QPushButton>
#include <QListWidget>
#include <QListWidgetItem>
using std::string;
@ -81,23 +82,25 @@ void QSpellchecker::partialUpdate(int s)
switch (state) {
case ControlSpellchecker::SPELL_PROGRESSED:
dialog_->spellcheckPR->setProgress(controller().getProgress());
dialog_->spellcheckPR->setValue(controller().getProgress());
break;
case ControlSpellchecker::SPELL_FOUND_WORD: {
dialog_->wordED->setText(toqstr(controller().getWord()));
dialog_->suggestionsLB->clear();
dialog_->suggestionsLW->clear();
string w;
while (!(w = controller().getSuggestion()).empty()) {
dialog_->suggestionsLB->insertItem(toqstr(w));
dialog_->suggestionsLW->addItem(toqstr(w));
}
if (dialog_->suggestionsLB->count() == 0) {
dialog_->suggestionChanged(dialog_->wordED->text());
if (dialog_->suggestionsLW->count() == 0) {
dialog_->suggestionChanged(new QListWidgetItem(dialog_->wordED->text()));
} else {
dialog_->suggestionChanged(dialog_->suggestionsLB->text(0));
dialog_->suggestionChanged(dialog_->suggestionsLW->item(0));
}
dialog_->suggestionsLW->setCurrentRow(0);
}
break;

40
src/frontends/qt4/QSpellcheckerDialog.C
View File

@ -13,9 +13,8 @@
#include "QSpellcheckerDialog.h"
#include "QSpellchecker.h"
#include <Q3ListBox>
#include <QListWidget>
#include <QPushButton>
//Added by qt3to4:
#include <QCloseEvent>
namespace lyx {
@ -29,13 +28,20 @@ QSpellcheckerDialog::QSpellcheckerDialog(QSpellchecker * form)
connect(closePB, SIGNAL(clicked()),
form, SLOT(slotClose()));
connect( replaceCO, SIGNAL( highlighted(const QString&) ), this, SLOT( replaceChanged(const QString &) ) );
connect( replacePB, SIGNAL( clicked() ), this, SLOT( replaceClicked() ) );
connect( ignorePB, SIGNAL( clicked() ), this, SLOT( ignoreClicked() ) );
connect( replacePB_3, SIGNAL( clicked() ), this, SLOT( acceptClicked() ) );
connect( addPB, SIGNAL( clicked() ), this, SLOT( addClicked() ) );
connect( suggestionsLB, SIGNAL( doubleClicked(QListBoxItem*) ), this, SLOT( replaceClicked() ) );
connect( suggestionsLB, SIGNAL( highlighted(const QString&) ), this, SLOT( suggestionChanged(const QString &) ) );
connect( replaceCO, SIGNAL( highlighted(const QString&) ),
this, SLOT( replaceChanged(const QString &) ) );
connect( replacePB, SIGNAL( clicked() ),
this, SLOT( replaceClicked() ) );
connect( ignorePB, SIGNAL( clicked() ),
this, SLOT( ignoreClicked() ) );
connect( replacePB_3, SIGNAL( clicked() ),
this, SLOT( acceptClicked() ) );
connect( addPB, SIGNAL( clicked() ),
this, SLOT( addClicked() ) );
connect( suggestionsLW, SIGNAL( itemDoubleClicked(QListWidgetItem*) ),
this, SLOT( replaceClicked() ) );
connect( suggestionsLW, SIGNAL( itemClicked(QListWidgetItem*) ),
this, SLOT( suggestionChanged(QListWidgetItem*) ) );
}
@ -59,29 +65,29 @@ void QSpellcheckerDialog::ignoreClicked()
form_->ignore();
}
void QSpellcheckerDialog::suggestionChanged(const QString & str)
void QSpellcheckerDialog::suggestionChanged(QListWidgetItem * item)
{
if (replaceCO->count() != 0)
replaceCO->changeItem(str, 0);
replaceCO->changeItem(item->text(), 0);
else
replaceCO->insertItem(str);
replaceCO->insertItem(item->text());
replaceCO->setCurrentItem(0);
}
void QSpellcheckerDialog::replaceChanged(const QString & str)
{
if (suggestionsLB->currentText() == str)
if (suggestionsLW->currentItem()->text() == str)
return;
unsigned int i = 0;
for (; i < suggestionsLB->count(); ++i) {
if (suggestionsLB->text(i) == str)
for (; i < suggestionsLW->count(); ++i) {
if (suggestionsLW->item(i)->text() == str)
break;
}
if (i != suggestionsLB->count())
suggestionsLB->setCurrentItem(i);
if (i != suggestionsLW->count())
suggestionsLW->setCurrentRow(i);
}

4
src/frontends/qt4/QSpellcheckerDialog.h
View File

@ -17,6 +17,8 @@
#include <QDialog>
#include <QCloseEvent>
class QListWidgetItem;
namespace lyx {
namespace frontend {
@ -27,7 +29,7 @@ class QSpellcheckerDialog: public QDialog, public Ui::QSpellcheckerUi {
public:
QSpellcheckerDialog(QSpellchecker * form);
public slots:
virtual void suggestionChanged(const QString &);
virtual void suggestionChanged(QListWidgetItem *);
protected slots:
virtual void acceptClicked();

8
src/frontends/qt4/QTexinfo.C
View File

@ -17,9 +17,9 @@
#include "support/filetools.h"
#include <qcheckbox.h>
#include <q3listbox.h>
#include <qpushbutton.h>
#include <QCheckBox>
#include <QListWidget>
#include <QPushButton>
using std::string;
@ -56,7 +56,7 @@ void QTexinfo::updateStyles(ControlTexinfo::texFileSuffix whichStyle)
ContentsType::const_iterator it = data.begin();
ContentsType::const_iterator end = data.end();
for (; it != end; ++it)
dialog_->fileList->insertItem(toqstr(*it));
dialog_->fileList->addItem(toqstr(*it));
activeStyle = whichStyle;
}

13
src/frontends/qt4/QTexinfoDialog.C
View File

@ -13,10 +13,9 @@
#include "QTexinfoDialog.h"
#include "QTexinfo.h"
#include <qcheckbox.h>
#include <q3listbox.h>
#include <qpushbutton.h>
//Added by qt3to4:
#include <QCheckBox>
#include <QListWidget>
#include <QPushButton>
#include <QCloseEvent>
using std::vector;
@ -40,7 +39,7 @@ QTexinfoDialog::QTexinfoDialog(QTexinfo * form)
connect( path, SIGNAL( stateChanged(int) ), this, SLOT( update() ) );
connect( rescanPB, SIGNAL( clicked() ), this, SLOT( enableViewPB() ) );
connect( rescanPB, SIGNAL( clicked() ), this, SLOT( rescanClicked() ) );
connect( fileList, SIGNAL( highlighted(QListBoxItem*) ), this, SLOT( enableViewPB() ) );
connect( fileList, SIGNAL( itemClicked(QListWidgetItem*) ), this, SLOT( enableViewPB() ) );
}
@ -68,7 +67,7 @@ void QTexinfoDialog::rescanClicked()
void QTexinfoDialog::viewClicked()
{
vector<string>::size_type const fitem = fileList->currentItem();
vector<string>::size_type const fitem = fileList->currentRow();
vector<string> const & data = form_->texdata_[form_->activeStyle];
string file = data[fitem];
if (!path->isChecked())
@ -100,7 +99,7 @@ void QTexinfoDialog::update()
void QTexinfoDialog::enableViewPB()
{
viewPB->setEnabled(fileList->currentItem() > -1);
viewPB->setEnabled(fileList->currentRow() > -1);
}
} // namespace frontend

4
src/frontends/qt4/QThesaurus.C
View File

@ -17,8 +17,8 @@
#include "controllers/ControlThesaurus.h"
#include <qlineedit.h>
#include <qpushbutton.h>
#include <QLineEdit>
#include <QPushButton>
namespace lyx {
namespace frontend {

77
src/frontends/qt4/QThesaurusDialog.C
View File

@ -13,14 +13,16 @@
#include "QThesaurusDialog.h"
#include "QThesaurus.h"
#include "qt_helpers.h"
//Added by qt3to4:
#include <QCloseEvent>
#include "debug.h"
#include "controllers/ControlThesaurus.h"
#include <qpushbutton.h>
#include <q3listview.h>
#include <qlineedit.h>
#include <QCloseEvent>
#include <QPushButton>
#include <QTreeWidget>
#include <QTreeWidgetItem>
#include <QLineEdit>
#include <QHeaderView>
using std::string;
@ -33,20 +35,25 @@ QThesaurusDialog::QThesaurusDialog(QThesaurus * form)
{
setupUi(this);
// hide the pointless QHeader
QWidget * w = static_cast<QWidget*>(meaningsLV->child("list view header"));
if (w)
w->hide();
meaningsTV->setColumnCount(1);
meaningsTV->header()->hide();
connect(closePB, SIGNAL(clicked()),
form, SLOT(slotClose()));
connect( replaceED, SIGNAL( returnPressed() ), this, SLOT( replaceClicked() ) );
connect( replaceED, SIGNAL( textChanged(const QString&) ), this, SLOT( change_adaptor() ) );
connect( entryED, SIGNAL( returnPressed() ), this, SLOT( entryChanged() ) );
connect( replacePB, SIGNAL( clicked() ), this, SLOT( replaceClicked() ) );
connect( meaningsLV, SIGNAL( currentChanged(QListViewItem*) ), this, SLOT( selectionChanged(QListViewItem *) ) );
connect( meaningsLV, SIGNAL( doubleClicked(QListViewItem*) ), this, SLOT( selectionClicked(QListViewItem *) ) );
connect( replaceED, SIGNAL( returnPressed() ),
this, SLOT( replaceClicked() ) );
connect( replaceED, SIGNAL( textChanged(const QString&) ),
this, SLOT( change_adaptor() ) );
connect( entryED, SIGNAL( returnPressed() ),
this, SLOT( entryChanged() ) );
connect( replacePB, SIGNAL( clicked() ),
this, SLOT( replaceClicked() ) );
connect( meaningsTV, SIGNAL( itemClicked(QTreeWidgetItem * , int) ),
this, SLOT( itemClicked(QTreeWidgetItem * , int) ) );
connect( meaningsTV, SIGNAL( itemSelectionChanged() ),
this, SLOT( selectionChanged() ) );
connect( meaningsTV, SIGNAL( itemActivated(QTreeWidgetItem * , int) ),
this, SLOT( selectionClicked(QTreeWidgetItem *, int) ) );
}
@ -75,51 +82,53 @@ void QThesaurusDialog::replaceClicked()
}
void QThesaurusDialog::selectionChanged(Q3ListViewItem * item)
void QThesaurusDialog::selectionChanged()
{
if (form_->readOnly())
int const col = meaningsTV->currentColumn();
if (col<0 || form_->readOnly())
return;
string const entry(fromqstr(item->text(0)));
replaceED->setText(toqstr(entry));
replaceED->setText(meaningsTV->currentItem()->text(col));
replacePB->setEnabled(true);
form_->changed();
}
void QThesaurusDialog::selectionClicked(Q3ListViewItem * item)
void QThesaurusDialog::itemClicked(QTreeWidgetItem * item, int col)
{
entryED->setText(item->text(0));
selectionChanged(item);
selectionChanged();
}
void QThesaurusDialog::selectionClicked(QTreeWidgetItem * item, int col)
{
entryED->setText(item->text(col));
selectionChanged();
updateLists();
}
void QThesaurusDialog::updateLists()
{
meaningsLV->clear();
std::vector<string> matches;
meaningsLV->setUpdatesEnabled(false);
meaningsTV->clear();
meaningsTV->setUpdatesEnabled(false);
Thesaurus::Meanings meanings = form_->controller().getMeanings(fromqstr(entryED->text()));
for (Thesaurus::Meanings::const_iterator cit = meanings.begin();
cit != meanings.end(); ++cit) {
Q3ListViewItem * i = new Q3ListViewItem(meaningsLV);
QTreeWidgetItem * i = new QTreeWidgetItem(meaningsTV);
i->setText(0, toqstr(cit->first));
i->setOpen(true);
meaningsTV->expandItem(i);
for (std::vector<string>::const_iterator cit2 = cit->second.begin();
cit2 != cit->second.end(); ++cit2) {
Q3ListViewItem * i2 = new Q3ListViewItem(i);
QTreeWidgetItem * i2 = new QTreeWidgetItem(i);
i2->setText(0, toqstr(*cit2));
i2->setOpen(true);
}
}
meaningsLV->setUpdatesEnabled(true);
meaningsLV->update();
meaningsTV->setUpdatesEnabled(true);
meaningsTV->update();
}
} // namespace frontend

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

@ -17,7 +17,7 @@
#include <QDialog>
#include <QCloseEvent>
class Q3ListViewItem;
class QTreeWidgetItem;
namespace lyx {
namespace frontend {
@ -34,8 +34,9 @@ protected slots:
virtual void change_adaptor();
virtual void entryChanged();
virtual void replaceClicked();
virtual void selectionChanged(Q3ListViewItem *);
virtual void selectionClicked(Q3ListViewItem *);
virtual void selectionChanged();
virtual void selectionClicked(QTreeWidgetItem *, int);
virtual void itemClicked(QTreeWidgetItem *, int);
protected:
virtual void closeEvent(QCloseEvent * e);
private:

49
src/frontends/qt4/ui/QErrorListUi.ui
View File

@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>349</width>
<height>367</height>
<width>367</width>
<height>459</height>
</rect>
</property>
<property name="windowTitle" >
@ -20,21 +20,26 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" colspan="2" >
<widget class="Q3ListBox" name="errorsLB" />
</item>
<item row="2" column="1" >
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Close</string>
<item row="1" column="0" colspan="2" >
<widget class="QTextBrowser" name="descriptionTB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QListWidget" name="errorsLW" />
</item>
<item row="2" column="0" >
<spacer>
<property name="orientation" >
@ -51,28 +56,16 @@
</property>
</spacer>
</item>
<item row="1" column="0" colspan="2" >
<widget class="Q3TextBrowser" name="descriptionTB" />
<item row="2" column="1" >
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Close</string>
</property>
</widget>
</item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
<header>q3listbox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
<customwidget>
<class>Q3TextBrowser</class>
<extends>QWidget</extends>
<header>q3textbrowser.h</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<resources/>
<connections/>
</ui>

1144
src/frontends/qt4/ui/QExternalUi.ui
View File

File diff suppressed because it is too large Load Diff

313
src/frontends/qt4/ui/QRefUi.ui
View File

@ -20,161 +20,33 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="1" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="updatePB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Update the label list</string>
</property>
<property name="text" >
<string>&amp;Update</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="gotoPB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Jump to the label</string>
</property>
<property name="text" >
<string>&amp;Go to Label</string>
</property>
</widget>
</item>
</layout>
<item row="1" column="0" colspan="3" >
<widget class="QListWidget" name="refsLW" />
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="sortCB" >
<property name="toolTip" >
<string>Sort labels in alphabetical order</string>
</property>
<property name="text" >
<string>&amp;Sort</string>
</property>
</widget>
</item>
<item row="3" column="1" colspan="2" >
<widget class="QLineEdit" name="referenceED" />
</item>
<item row="4" column="1" colspan="2" >
<widget class="QComboBox" name="typeCO" >
<item row="0" column="2" >
<widget class="QComboBox" name="bufferCO" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>1</hsizetype>
<hsizetype>7</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Cross-reference as it appears in output</string>
</property>
<item>
<property name="text" >
<string>&lt;reference></string>
</property>
</item>
<item>
<property name="text" >
<string>(&lt;reference>)</string>
</property>
</item>
<item>
<property name="text" >
<string>&lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>on page &lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>&lt;reference> on page &lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>Formatted reference</string>
</property>
</item>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="referenceL" >
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="refsL" >
<property name="text" >
<string>&amp;Label:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
<string>La&amp;bels in:</string>
</property>
<property name="buddy" >
<cstring>referenceED</cstring>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="typeLA" >
<property name="text" >
<string>&amp;Format:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>typeLA</cstring>
</property>
</widget>
</item>
<item row="5" column="0" >
<widget class="QLabel" name="nameL" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>&amp;Name:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>nameED</cstring>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2" >
<widget class="QLineEdit" name="nameED" >
<property name="enabled" >
<bool>false</bool>
<cstring>bufferCO</cstring>
</property>
</widget>
</item>
@ -231,61 +103,164 @@
</item>
</layout>
</item>
<item row="1" column="0" colspan="3" >
<widget class="Q3ListBox" name="refsLB" >
<item row="5" column="1" colspan="2" >
<widget class="QLineEdit" name="nameED" >
<property name="enabled" >
<bool>true</bool>
</property>
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<vsizetype>3</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Available labels</string>
<bool>false</bool>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2" >
<widget class="QLabel" name="refsL" >
<item row="5" column="0" >
<widget class="QLabel" name="nameL" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="text" >
<string>La&amp;bels in:</string>
<string>&amp;Name:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>bufferCO</cstring>
<cstring>nameED</cstring>
</property>
</widget>
</item>
<item row="0" column="2" >
<widget class="QComboBox" name="bufferCO" >
<item row="4" column="0" >
<widget class="QLabel" name="typeLA" >
<property name="text" >
<string>&amp;Format:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>typeLA</cstring>
</property>
</widget>
</item>
<item row="3" column="0" >
<widget class="QLabel" name="referenceL" >
<property name="text" >
<string>&amp;Label:</string>
</property>
<property name="alignment" >
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
</property>
<property name="buddy" >
<cstring>referenceED</cstring>
</property>
</widget>
</item>
<item row="4" column="1" colspan="2" >
<widget class="QComboBox" name="typeCO" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>7</hsizetype>
<hsizetype>1</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Cross-reference as it appears in output</string>
</property>
<item>
<property name="text" >
<string>&lt;reference></string>
</property>
</item>
<item>
<property name="text" >
<string>(&lt;reference>)</string>
</property>
</item>
<item>
<property name="text" >
<string>&lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>on page &lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>&lt;reference> on page &lt;page></string>
</property>
</item>
<item>
<property name="text" >
<string>Formatted reference</string>
</property>
</item>
</widget>
</item>
<item row="3" column="1" colspan="2" >
<widget class="QLineEdit" name="referenceED" />
</item>
<item row="2" column="0" >
<widget class="QCheckBox" name="sortCB" >
<property name="toolTip" >
<string>Sort labels in alphabetical order</string>
</property>
<property name="text" >
<string>&amp;Sort</string>
</property>
</widget>
</item>
<item row="2" column="1" colspan="2" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QPushButton" name="updatePB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Update the label list</string>
</property>
<property name="text" >
<string>&amp;Update</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="gotoPB" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="toolTip" >
<string>Jump to the label</string>
</property>
<property name="text" >
<string>&amp;Go to Label</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
<header>q3listbox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>bufferCO</tabstop>
<tabstop>refsLB</tabstop>
<tabstop>sortCB</tabstop>
<tabstop>updatePB</tabstop>
<tabstop>gotoPB</tabstop>

108
src/frontends/qt4/ui/QSendtoUi.ui
View File

@ -20,28 +20,44 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="2" column="0" >
<widget class="QLabel" name="commandLA" >
<property name="text" >
<string>&amp;Command:</string>
</property>
<property name="buddy" >
<cstring>commandCO</cstring>
</property>
</widget>
<item row="1" column="0" >
<widget class="QListWidget" name="formatLW" />
</item>
<item row="0" column="0" >
<widget class="QLabel" name="formatLA" >
<property name="text" >
<string>&amp;Export formats:</string>
<item row="3" column="0" >
<widget class="QComboBox" name="commandCO" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="buddy" >
<cstring>formatLB</cstring>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip" >
<string>Process the converted file with this command ($$FName = file name)</string>
</property>
<property name="editable" >
<bool>true</bool>
</property>
<property name="maxCount" >
<number>666</number>
</property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAtTop</enum>
</property>
<property name="autoCompletion" >
<bool>true</bool>
</property>
<property name="duplicatesEnabled" >
<bool>false</bool>
</property>
</widget>
</item>
@ -82,66 +98,30 @@
</item>
</layout>
</item>
<item row="3" column="0" >
<widget class="QComboBox" name="commandCO" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>3</hsizetype>
<vsizetype>0</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
<item row="0" column="0" >
<widget class="QLabel" name="formatLA" >
<property name="text" >
<string>&amp;Export formats:</string>
</property>
<property name="focusPolicy" >
<enum>Qt::StrongFocus</enum>
</property>
<property name="toolTip" >
<string>Process the converted file with this command ($$FName = file name)</string>
</property>
<property name="editable" >
<bool>true</bool>
</property>
<property name="maxCount" >
<number>666</number>
</property>
<property name="insertPolicy" >
<enum>QComboBox::InsertAtTop</enum>
</property>
<property name="autoCompletion" >
<bool>true</bool>
</property>
<property name="duplicatesEnabled" >
<bool>false</bool>
<property name="buddy" >
<cstring>formatLW</cstring>
</property>
</widget>
</item>
<item row="1" column="0" >
<widget class="Q3ListBox" name="formatLB" >
<property name="maximumSize" >
<size>
<width>32767</width>
<height>32767</height>
</size>
<item row="2" column="0" >
<widget class="QLabel" name="commandLA" >
<property name="text" >
<string>&amp;Command:</string>
</property>
<property name="toolTip" >
<string>Available export converters</string>
<property name="buddy" >
<cstring>commandCO</cstring>
</property>
</widget>
</item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
<header>q3listbox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>formatLB</tabstop>
<tabstop>okPB</tabstop>
<tabstop>applyPB</tabstop>
<tabstop>closePB</tabstop>

98
src/frontends/qt4/ui/QSpellcheckerUi.ui
View File

@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>323</width>
<height>389</height>
<height>359</height>
</rect>
</property>
<property name="windowTitle" >
@ -20,22 +20,29 @@
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="4" column="0" colspan="2" >
<item row="10" column="1" >
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Close</string>
</property>
</widget>
</item>
<item row="4" column="0" >
<widget class="QLabel" name="TextLabel2" >
<property name="text" >
<string>Suggestions:</string>
</property>
<property name="buddy" >
<cstring>suggestionsLB</cstring>
<cstring></cstring>
</property>
</widget>
</item>
<item row="3" column="2" >
<item row="3" column="1" >
<widget class="QPushButton" name="replacePB" >
<property name="toolTip" >
<string>Replace word with current choice</string>
@ -45,7 +52,7 @@
</property>
</widget>
</item>
<item row="7" column="2" >
<item row="7" column="1" >
<widget class="QPushButton" name="addPB" >
<property name="toolTip" >
<string>Add the word to your personal dictionary</string>
@ -55,7 +62,7 @@
</property>
</widget>
</item>
<item row="5" column="2" >
<item row="5" column="1" >
<widget class="QPushButton" name="ignorePB" >
<property name="toolTip" >
<string>Ignore this word</string>
@ -65,7 +72,7 @@
</property>
</widget>
</item>
<item row="6" column="2" >
<item row="6" column="1" >
<widget class="QPushButton" name="replacePB_3" >
<property name="toolTip" >
<string>Ignore this word throughout this session</string>
@ -75,44 +82,7 @@
</property>
</widget>
</item>
<item row="10" column="1" >
<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 row="10" column="2" >
<widget class="QPushButton" name="closePB" >
<property name="text" >
<string>&amp;Close</string>
</property>
</widget>
</item>
<item row="9" column="0" colspan="2" >
<widget class="Q3ProgressBar" name="spellcheckPR" >
<property name="toolTip" >
<string>Proportion of document checked</string>
</property>
</widget>
</item>
<item rowspan="4" row="5" column="0" colspan="2" >
<widget class="Q3ListBox" name="suggestionsLB" >
<property name="toolTip" >
<string>Suggestions</string>
</property>
</widget>
</item>
<item row="8" column="2" >
<item row="8" column="1" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
@ -128,7 +98,7 @@
</property>
</spacer>
</item>
<item row="2" column="0" colspan="2" >
<item row="2" column="0" >
<widget class="QLabel" name="TextLabel1" >
<property name="text" >
<string>Replacement:</string>
@ -138,7 +108,7 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2" >
<item row="1" column="0" >
<widget class="QLineEdit" name="wordED" >
<property name="toolTip" >
<string>Current word</string>
@ -155,7 +125,7 @@
</property>
</widget>
</item>
<item row="3" column="0" colspan="2" >
<item row="3" column="0" >
<widget class="QComboBox" name="replaceCO" >
<property name="sizePolicy" >
<sizepolicy>
@ -185,29 +155,25 @@
</property>
</widget>
</item>
<item rowspan="4" row="5" column="0" >
<widget class="QListWidget" name="suggestionsLW" />
</item>
<item row="9" column="0" >
<widget class="QProgressBar" name="spellcheckPR" >
<property name="value" >
<number>24</number>
</property>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
<header>q3listbox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
<customwidget>
<class>Q3ProgressBar</class>
<extends>QWidget</extends>
<header>q3progressbar.h</header>
<container>1</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>wordED</tabstop>
<tabstop>replaceCO</tabstop>
<tabstop>suggestionsLB</tabstop>
<tabstop>replacePB</tabstop>
<tabstop>ignorePB</tabstop>
<tabstop>replacePB_3</tabstop>

196
src/frontends/qt4/ui/QTexinfoUi.ui
View File

@ -18,14 +18,102 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<item row="1" column="0" >
<widget class="QListWidget" name="fileList" />
</item>
<item row="3" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<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="closePB" >
<property name="toolTip" >
<string>Close this dialog</string>
</property>
<property name="text" >
<string>&amp;Close</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<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="rescanPB" >
<property name="toolTip" >
<string>Rebuild the file lists</string>
</property>
<property name="text" >
<string>&amp;Rescan</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="viewPB" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="toolTip" >
<string>Show contents of marked file. Only possible when files are shown with path</string>
</property>
<property name="text" >
<string>&amp;View</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@ -83,114 +171,12 @@
</item>
</layout>
</item>
<item>
<widget class="Q3ListBox" name="fileList" >
<property name="toolTip" >
<string>Installed files</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<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="rescanPB" >
<property name="toolTip" >
<string>Rebuild the file lists</string>
</property>
<property name="text" >
<string>&amp;Rescan</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="viewPB" >
<property name="enabled" >
<bool>false</bool>
</property>
<property name="toolTip" >
<string>Show contents of marked file. Only possible when files are shown with path</string>
</property>
<property name="text" >
<string>&amp;View</string>
</property>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<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="closePB" >
<property name="toolTip" >
<string>Close this dialog</string>
</property>
<property name="text" >
<string>&amp;Close</string>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListBox</class>
<extends></extends>
<header>q3listbox.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>whatStyle</tabstop>
<tabstop>path</tabstop>
<tabstop>fileList</tabstop>
<tabstop>rescanPB</tabstop>
<tabstop>viewPB</tabstop>
<tabstop>closePB</tabstop>

41
src/frontends/qt4/ui/QThesaurusUi.ui
View File

@ -8,8 +8,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>462</width>
<height>442</height>
<width>310</width>
<height>414</height>
</rect>
</property>
<property name="windowTitle" >
@ -18,14 +18,17 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>11</number>
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<item row="1" column="0" >
<widget class="QTreeWidget" name="meaningsTV" />
</item>
<item row="0" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@ -71,22 +74,7 @@
</item>
</layout>
</item>
<item>
<widget class="Q3ListView" name="meaningsLV" >
<property name="toolTip" >
<string>Select a related word</string>
</property>
<property name="allColumnsShowFocus" >
<bool>true</bool>
</property>
<column>
<property name="text" >
<string>Thesaurus entries:</string>
</property>
</column>
</widget>
</item>
<item>
<item row="2" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@ -126,7 +114,7 @@
</item>
</layout>
</item>
<item>
<item row="3" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>
@ -162,15 +150,6 @@
</layout>
</widget>
<pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
<customwidgets>
<customwidget>
<class>Q3ListView</class>
<extends></extends>
<header>q3listview.h</header>
<container>0</container>
<pixmap></pixmap>
</customwidget>
</customwidgets>
<tabstops>
<tabstop>entryED</tabstop>
<tabstop>replaceED</tabstop>