From 3c4e073313cc6ea7d445ddd6b4c3b28fd365262e Mon Sep 17 00:00:00 2001 From: Edwin Leuven Date: Wed, 3 May 2006 19:51:15 +0000 Subject: [PATCH] get rid of convenience classes in the following dialogs (and associated implementation files): 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 --- src/frontends/qt4/QErrorList.C | 20 +- src/frontends/qt4/QErrorList.h | 4 +- src/frontends/qt4/QErrorListDialog.C | 13 +- src/frontends/qt4/QErrorListDialog.h | 4 +- src/frontends/qt4/QExternal.C | 12 +- src/frontends/qt4/QExternalDialog.C | 62 +- src/frontends/qt4/QRef.C | 48 +- src/frontends/qt4/QRefDialog.C | 54 +- src/frontends/qt4/QRefDialog.h | 6 +- src/frontends/qt4/QSendto.C | 18 +- src/frontends/qt4/QSendtoDialog.C | 15 +- src/frontends/qt4/QSendtoDialog.h | 6 +- src/frontends/qt4/QSpellchecker.C | 23 +- src/frontends/qt4/QSpellcheckerDialog.C | 40 +- src/frontends/qt4/QSpellcheckerDialog.h | 4 +- src/frontends/qt4/QTexinfo.C | 8 +- src/frontends/qt4/QTexinfoDialog.C | 13 +- src/frontends/qt4/QThesaurus.C | 4 +- src/frontends/qt4/QThesaurusDialog.C | 77 +- src/frontends/qt4/QThesaurusDialog.h | 7 +- src/frontends/qt4/ui/QErrorListUi.ui | 49 +- src/frontends/qt4/ui/QExternalUi.ui | 1126 +++++++++++------------ src/frontends/qt4/ui/QRefUi.ui | 283 +++--- src/frontends/qt4/ui/QSendtoUi.ui | 106 +-- src/frontends/qt4/ui/QSpellcheckerUi.ui | 98 +- src/frontends/qt4/ui/QTexinfoUi.ui | 86 +- src/frontends/qt4/ui/QThesaurusUi.ui | 41 +- 27 files changed, 1029 insertions(+), 1198 deletions(-) diff --git a/src/frontends/qt4/QErrorList.C b/src/frontends/qt4/QErrorList.C index 908a96bfa4..6d0605ef39 100644 --- a/src/frontends/qt4/QErrorList.C +++ b/src/frontends/qt4/QErrorList.C @@ -17,9 +17,9 @@ #include "controllers/ControlErrorList.h" -#include -#include -#include +#include +#include +#include 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 diff --git a/src/frontends/qt4/QErrorList.h b/src/frontends/qt4/QErrorList.h index c41f55871c..afd3c78b52 100644 --- a/src/frontends/qt4/QErrorList.h +++ b/src/frontends/qt4/QErrorList.h @@ -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 diff --git a/src/frontends/qt4/QErrorListDialog.C b/src/frontends/qt4/QErrorListDialog.C index 0d423f2692..6392fab2d8 100644 --- a/src/frontends/qt4/QErrorListDialog.C +++ b/src/frontends/qt4/QErrorListDialog.C @@ -13,9 +13,8 @@ #include "QErrorListDialog.h" #include "QErrorList.h" -#include -#include -//Added by qt3to4: +#include +#include #include 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); } diff --git a/src/frontends/qt4/QErrorListDialog.h b/src/frontends/qt4/QErrorListDialog.h index 54ba856e19..0dfa88ca03 100644 --- a/src/frontends/qt4/QErrorListDialog.h +++ b/src/frontends/qt4/QErrorListDialog.h @@ -17,6 +17,8 @@ #include #include +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: diff --git a/src/frontends/qt4/QExternal.C b/src/frontends/qt4/QExternal.C index 54c44d21df..283981d192 100644 --- a/src/frontends/qt4/QExternal.C +++ b/src/frontends/qt4/QExternal.C @@ -33,11 +33,11 @@ #include "qt_helpers.h" #include "validators.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include 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. diff --git a/src/frontends/qt4/QExternalDialog.C b/src/frontends/qt4/QExternalDialog.C index 7fd4048734..15bd83bbf9 100644 --- a/src/frontends/qt4/QExternalDialog.C +++ b/src/frontends/qt4/QExternalDialog.C @@ -23,19 +23,17 @@ #include "support/lyxlib.h" #include "QExternalDialog.h" -//Added by qt3to4: -#include #include "lengthcombo.h" #include "validators.h" #include "qt_helpers.h" #include "QExternal.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include 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); diff --git a/src/frontends/qt4/QRef.C b/src/frontends/qt4/QRef.C index f560e1559d..79c50b3c72 100644 --- a/src/frontends/qt4/QRef.C +++ b/src/frontends/qt4/QRef.C @@ -21,11 +21,12 @@ #include "insets/insetref.h" -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include 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::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(); } diff --git a/src/frontends/qt4/QRefDialog.C b/src/frontends/qt4/QRefDialog.C index 5a1c070aef..d9537c2de4 100644 --- a/src/frontends/qt4/QRefDialog.C +++ b/src/frontends/qt4/QRefDialog.C @@ -14,10 +14,9 @@ #include "QRefDialog.h" #include "QRef.h" -#include -#include -#include -//Added by qt3to4: +#include +#include +#include #include 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()); // or double click, inserts ref and closes dialog form_->slotOK(); } diff --git a/src/frontends/qt4/QRefDialog.h b/src/frontends/qt4/QRefDialog.h index 860b2b5575..d01d78f874 100644 --- a/src/frontends/qt4/QRefDialog.h +++ b/src/frontends/qt4/QRefDialog.h @@ -18,6 +18,8 @@ #include #include +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(); diff --git a/src/frontends/qt4/QSendto.C b/src/frontends/qt4/QSendto.C index b77c6682c3..14257cd407 100644 --- a/src/frontends/qt4/QSendto.C +++ b/src/frontends/qt4/QSendto.C @@ -19,8 +19,8 @@ #include "controllers/ControlSendto.h" -#include -#include +#include +#include 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::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(); } diff --git a/src/frontends/qt4/QSendtoDialog.C b/src/frontends/qt4/QSendtoDialog.C index 7489483c25..82b4f44033 100644 --- a/src/frontends/qt4/QSendtoDialog.C +++ b/src/frontends/qt4/QSendtoDialog.C @@ -13,8 +13,7 @@ #include "QSendtoDialog.h" #include "QSendto.h" -#include -//Added by qt3to4: +#include #include @@ -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() ) ); } diff --git a/src/frontends/qt4/QSendtoDialog.h b/src/frontends/qt4/QSendtoDialog.h index a80104c0ae..312b232db2 100644 --- a/src/frontends/qt4/QSendtoDialog.h +++ b/src/frontends/qt4/QSendtoDialog.h @@ -17,6 +17,8 @@ #include #include +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: diff --git a/src/frontends/qt4/QSpellchecker.C b/src/frontends/qt4/QSpellchecker.C index 0a0bd479de..878469731f 100644 --- a/src/frontends/qt4/QSpellchecker.C +++ b/src/frontends/qt4/QSpellchecker.C @@ -17,10 +17,11 @@ #include "controllers/ControlSpellchecker.h" -#include -#include -#include -#include +#include +#include +#include +#include +#include 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; diff --git a/src/frontends/qt4/QSpellcheckerDialog.C b/src/frontends/qt4/QSpellcheckerDialog.C index 63138689d7..e831875cf0 100644 --- a/src/frontends/qt4/QSpellcheckerDialog.C +++ b/src/frontends/qt4/QSpellcheckerDialog.C @@ -13,9 +13,8 @@ #include "QSpellcheckerDialog.h" #include "QSpellchecker.h" -#include +#include #include -//Added by qt3to4: #include 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); } diff --git a/src/frontends/qt4/QSpellcheckerDialog.h b/src/frontends/qt4/QSpellcheckerDialog.h index e81edc5347..18ef0863a2 100644 --- a/src/frontends/qt4/QSpellcheckerDialog.h +++ b/src/frontends/qt4/QSpellcheckerDialog.h @@ -17,6 +17,8 @@ #include #include +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(); diff --git a/src/frontends/qt4/QTexinfo.C b/src/frontends/qt4/QTexinfo.C index 71d1f7b424..6556770173 100644 --- a/src/frontends/qt4/QTexinfo.C +++ b/src/frontends/qt4/QTexinfo.C @@ -17,9 +17,9 @@ #include "support/filetools.h" -#include -#include -#include +#include +#include +#include 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; } diff --git a/src/frontends/qt4/QTexinfoDialog.C b/src/frontends/qt4/QTexinfoDialog.C index 3f707caf85..d5cd63972e 100644 --- a/src/frontends/qt4/QTexinfoDialog.C +++ b/src/frontends/qt4/QTexinfoDialog.C @@ -13,10 +13,9 @@ #include "QTexinfoDialog.h" #include "QTexinfo.h" -#include -#include -#include -//Added by qt3to4: +#include +#include +#include #include 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::size_type const fitem = fileList->currentItem(); + vector::size_type const fitem = fileList->currentRow(); vector 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 diff --git a/src/frontends/qt4/QThesaurus.C b/src/frontends/qt4/QThesaurus.C index 9d08737ae4..ae324a1078 100644 --- a/src/frontends/qt4/QThesaurus.C +++ b/src/frontends/qt4/QThesaurus.C @@ -17,8 +17,8 @@ #include "controllers/ControlThesaurus.h" -#include -#include +#include +#include namespace lyx { namespace frontend { diff --git a/src/frontends/qt4/QThesaurusDialog.C b/src/frontends/qt4/QThesaurusDialog.C index df827c05a8..c24487325a 100644 --- a/src/frontends/qt4/QThesaurusDialog.C +++ b/src/frontends/qt4/QThesaurusDialog.C @@ -13,14 +13,16 @@ #include "QThesaurusDialog.h" #include "QThesaurus.h" #include "qt_helpers.h" -//Added by qt3to4: -#include +#include "debug.h" #include "controllers/ControlThesaurus.h" -#include -#include -#include +#include +#include +#include +#include +#include +#include using std::string; @@ -33,20 +35,25 @@ QThesaurusDialog::QThesaurusDialog(QThesaurus * form) { setupUi(this); - // hide the pointless QHeader - QWidget * w = static_cast(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); - updateLists(); + selectionChanged(); } -void QThesaurusDialog::updateLists() +void QThesaurusDialog::selectionClicked(QTreeWidgetItem * item, int col) { - meaningsLV->clear(); + entryED->setText(item->text(col)); + selectionChanged(); + updateLists(); +} - std::vector matches; - meaningsLV->setUpdatesEnabled(false); +void QThesaurusDialog::updateLists() +{ + 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::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 diff --git a/src/frontends/qt4/QThesaurusDialog.h b/src/frontends/qt4/QThesaurusDialog.h index a1f883de53..9f6af12f53 100644 --- a/src/frontends/qt4/QThesaurusDialog.h +++ b/src/frontends/qt4/QThesaurusDialog.h @@ -17,7 +17,7 @@ #include #include -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: diff --git a/src/frontends/qt4/ui/QErrorListUi.ui b/src/frontends/qt4/ui/QErrorListUi.ui index 4d0760630c..171dfa1f6e 100644 --- a/src/frontends/qt4/ui/QErrorListUi.ui +++ b/src/frontends/qt4/ui/QErrorListUi.ui @@ -8,8 +8,8 @@ 0 0 - 349 - 367 + 367 + 459 @@ -20,21 +20,26 @@ - 11 + 9 6 - - - - - - - &Close + + + + + 7 + 5 + 0 + 0 + + + + @@ -51,28 +56,16 @@ - - + + + + &Close + + qPixmapFromMimeSource - - - Q3ListBox - -
q3listbox.h
- 0 - - - - Q3TextBrowser - QWidget -
q3textbrowser.h
- 1 - - - diff --git a/src/frontends/qt4/ui/QExternalUi.ui b/src/frontends/qt4/ui/QExternalUi.ui index f354bb3f46..3401a65719 100644 --- a/src/frontends/qt4/ui/QExternalUi.ui +++ b/src/frontends/qt4/ui/QExternalUi.ui @@ -8,8 +8,8 @@ 0 0 - 427 - 419 + 390 + 367 @@ -20,11 +20,27 @@ - 11 + 9 6 + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + @@ -33,44 +49,88 @@ - 11 + 9 6 - + + + + &Draft + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + + + + + Edit the file externally + + + &Edit File... + + + + + + + Select a file + + + &Browse... + + + + + + + Filename + + + &File: + + + fileED + + + + + + + Filename + + + + Template - 11 + 9 6 - - - - - 3 - 0 - 0 - 0 - - - - Available templates - - - - - - - - + @@ -88,239 +148,172 @@ + + + + + 3 + 0 + 0 + 0 + + + + Available templates + + + + + + + + LyX View + + + + 9 + + + 6 + - - - &Draft + + + Screen display + + + Default + + + + + Monochrome + + + + + Grayscale + + + + + Color + + + + + Preview + + - - + + 0 6 - - - - Filename + + + + true - - - - - - Filename - - - &File: - - - fileED + + + 5 + 0 + 0 + 0 + - - - - - Select a file - - - &Browse... + Percentage to scale by in LyX - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - + + + + true - - - - - - Edit the file externally + + Qt::NoFocus - &Edit File... + % - - - - - LyX View - - - - 11 - - - 6 - - - - - + + + + Screen display + + + &Display: + + + showCO - - - 11 - - - 6 - - - - - 0 - - - 6 - - - - - Percentage to scale by in LyX - - - Sca&le: - - - displayscaleED - - - - - - - 0 - - - 6 - - - - - true - - - - 5 - 0 - 0 - 0 - - - - Percentage to scale by in LyX - - - - - - - true - - - Qt::NoFocus - - - % - - - - - - - - - - - 0 - - - 6 - - - - - Screen display - - - &Display: - - - showCO - - - - - - - Screen display - - - - Default - - - - - Monochrome - - - - - Grayscale - - - - - Color - - - - - Preview - - - - - - - - - - Display image in LyX - - - &Show in LyX - - - - + + + + Percentage to scale by in LyX + + + Sca&le: + + + displayscaleED + + + + + + + Qt::Horizontal + + + + 87 + 20 + + + + + + + + Display image in LyX + + + &Show in LyX + + + + + + + Qt::Vertical + + + + 81 + 196 + + + + @@ -329,102 +322,100 @@ - 11 + 9 6 + + + + Qt::Vertical + + + + 20 + 222 + + + + + + + + Qt::Horizontal + + + QSizePolicy::Expanding + + + + 20 + 20 + + + + - - - + + + 0 - - - 11 - - - 6 - - - - - 0 - - - 6 - - - - - - 3 - 0 - 0 - 0 - - - - Angle to rotate image by - - - - - - - - - - The origin of the rotation - - - &Origin: - - - originCO - - - - - - - The origin of the rotation - - - - - - - Angle to rotate image by - - - A&ngle: - - - angleED - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - + + 6 + + + + + + 3 + 0 + 0 + 0 + + + + Angle to rotate image by + + + + + + + + + + The origin of the rotation + + + &Origin: + + + originCO + + + + + + + The origin of the rotation + + + + + + + Angle to rotate image by + + + A&ngle: + + + angleED + + + + @@ -434,89 +425,87 @@ - 11 + 9 6 + + + + + + + + + + true + + + Height of image in output + + + + + + + true + + + Maintain aspect ratio with largest dimension + + + &Maintain aspect ratio + + + + + + + Qt::Vertical + + + + 20 + 165 + + + + - - - + + + true + + + &Width: + + + widthED + + + + + + + true + + + Width of image in output + + + + + + + true + + + &Height: + + + heightED - - - 11 - - - 6 - - - - - true - - - Width of image in output - - - - - - - - - - true - - - &Height: - - - heightED - - - - - - - true - - - &Width: - - - widthED - - - - - - - true - - - Height of image in output - - - - - - - - - - true - - - Maintain aspect ratio with largest dimension - - - &Maintain aspect ratio - - - - @@ -527,141 +516,105 @@ - 11 + 9 6 - - - + + + + Get bounding box from the (EPS) file + + + &Get from File + + + + + + + Qt::Horizontal + + + + 43 + 18 + + + + + + + + Clip to bounding box values + + + Clip to &bounding box + + + + + + + + + - - - 11 - - - 6 - - - - - 0 - - - 6 - - - - - 0 - - - 6 - - - - - - - - - - - - Right &top: - - - xrED - - - - - - - &Left bottom: - - - xlED - - - - - - - - - 0 - - - 6 - - - - - x - - - - - - - - - - - - - - - - - - - 0 - - - 6 - - - - - y - - - - - - - - - - - - - - - - - Clip to bounding box values - - - Clip to &bounding box - - - - - - - Get bounding box from the (EPS) file - - - &Get from File - - - - + + + + + + &Left bottom: + + + xlED + + + + + + + + + + Right &top: + + + xrED + + + + + + + + + + Qt::Vertical + + + + 20 + 158 + + + + + + + + x + + + + + + + y + @@ -672,95 +625,57 @@ - 11 + 9 6 + + + + Qt::Vertical + + + + 20 + 229 + + + + + + + + + + + O&ption: + + + extraED + + + + + + - - - + + + Forma&t: + + + Qt::AutoText + + + extraFormatCO - - - 11 - - - 6 - - - - - 0 - - - 6 - - - - - Forma&t: - - - Qt::AutoText - - - extraFormatCO - - - - - - - - - - - - 0 - - - 6 - - - - - O&ption: - - - extraED - - - - - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - @@ -805,13 +720,6 @@ 0 - - Q3TextView - QWidget -
q3textview.h
- 1 - - okPB diff --git a/src/frontends/qt4/ui/QRefUi.ui b/src/frontends/qt4/ui/QRefUi.ui index 5ed900db42..181ed81023 100644 --- a/src/frontends/qt4/ui/QRefUi.ui +++ b/src/frontends/qt4/ui/QRefUi.ui @@ -20,12 +20,37 @@ - 11 + 9 6 - + + + + + + + + 7 + 0 + 0 + 0 + + + + + + + + La&bels in: + + + bufferCO + + + + 0 @@ -34,55 +59,98 @@ 6 - - - - 3 - 0 - 0 - 0 - + + + Qt::Horizontal - - Update the label list + + QSizePolicy::Expanding + + + 20 + 20 + + + + + + - &Update + &OK + + + true - - - - 3 - 0 - 0 - 0 - + + + &Apply - - Jump to the label + + true + + + + - &Go to Label + &Close - - - - Sort labels in alphabetical order + + + + false + + + + + + + false - &Sort + &Name: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + nameED - - + + + + &Format: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + typeLA + + + + + + + &Label: + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + referenceED + + @@ -129,56 +197,20 @@ - - - - &Label: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - referenceED - - - - - - - &Format: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - typeLA - - + + - - - - false + + + + Sort labels in alphabetical order - &Name: - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - nameED - - - - - - - false + &Sort - + 0 @@ -187,105 +219,48 @@ 6 - - - Qt::Horizontal - - - QSizePolicy::Expanding + + + + 3 + 0 + 0 + 0 + - - - 20 - 20 - + + Update the label list - - - - - &OK - - - true + &Update - - - &Apply + + + + 3 + 0 + 0 + 0 + - - true + + Jump to the label - - - - - &Close + &Go to Label - - - - true - - - - 7 - 3 - 0 - 0 - - - - Available labels - - - - - - - La&bels in: - - - bufferCO - - - - - - - - 7 - 0 - 0 - 0 - - - - qPixmapFromMimeSource - - - Q3ListBox - -
q3listbox.h
- 0 - - - bufferCO - refsLB sortCB updatePB gotoPB diff --git a/src/frontends/qt4/ui/QSendtoUi.ui b/src/frontends/qt4/ui/QSendtoUi.ui index 1b4b23140e..93b0196b95 100644 --- a/src/frontends/qt4/ui/QSendtoUi.ui +++ b/src/frontends/qt4/ui/QSendtoUi.ui @@ -20,28 +20,44 @@ - 11 + 9 6 - - - - &Command: + + + + + + + + 3 + 0 + 0 + 0 + - - commandCO + + Qt::StrongFocus - - - - - - &Export formats: + + Process the converted file with this command ($$FName = file name) - - formatLB + + true + + + 666 + + + QComboBox::InsertAtTop + + + true + + + false @@ -82,66 +98,30 @@ - - - - - 3 - 0 - 0 - 0 - - - - Qt::StrongFocus - - - Process the converted file with this command ($$FName = file name) - - - true - - - 666 - - - QComboBox::InsertAtTop - - - true + + + + &Export formats: - - false + + formatLW - - - - - 32767 - 32767 - + + + + &Command: - - Available export converters + + commandCO qPixmapFromMimeSource - - - Q3ListBox - -
q3listbox.h
- 0 - - - - formatLB okPB applyPB closePB diff --git a/src/frontends/qt4/ui/QSpellcheckerUi.ui b/src/frontends/qt4/ui/QSpellcheckerUi.ui index bc85eee65c..5aeca093c1 100644 --- a/src/frontends/qt4/ui/QSpellcheckerUi.ui +++ b/src/frontends/qt4/ui/QSpellcheckerUi.ui @@ -9,7 +9,7 @@ 0 0 323 - 389 + 359 @@ -20,22 +20,29 @@ - 11 + 9 6 - + + + + &Close + + + + Suggestions: - suggestionsLB + - + Replace word with current choice @@ -45,7 +52,7 @@ - + Add the word to your personal dictionary @@ -55,7 +62,7 @@ - + Ignore this word @@ -65,7 +72,7 @@ - + Ignore this word throughout this session @@ -75,44 +82,7 @@ - - - - Qt::Horizontal - - - QSizePolicy::Expanding - - - - 20 - 20 - - - - - - - - &Close - - - - - - - Proportion of document checked - - - - - - - Suggestions - - - - + Qt::Vertical @@ -128,7 +98,7 @@ - + Replacement: @@ -138,7 +108,7 @@ - + Current word @@ -155,7 +125,7 @@ - + @@ -185,29 +155,25 @@ + + + + + + + 24 + + + Qt::Horizontal + + + qPixmapFromMimeSource - - - Q3ListBox - -
q3listbox.h
- 0 - - - - Q3ProgressBar - QWidget -
q3progressbar.h
- 1 - - - wordED replaceCO - suggestionsLB replacePB ignorePB replacePB_3 diff --git a/src/frontends/qt4/ui/QTexinfoUi.ui b/src/frontends/qt4/ui/QTexinfoUi.ui index d29bbe1379..ee5749d8be 100644 --- a/src/frontends/qt4/ui/QTexinfoUi.ui +++ b/src/frontends/qt4/ui/QTexinfoUi.ui @@ -18,14 +18,17 @@ true - + - 11 + 9 6 - + + + + 0 @@ -33,28 +36,6 @@ 6 - - - - Selected classes or styles - - - - LaTeX classes - - - - - LaTeX styles - - - - - BibTeX styles - - - - @@ -72,25 +53,18 @@ - + - Toggles view of the file list + Close this dialog - Show &path + &Close - - - - Installed files - - - - + 0 @@ -139,7 +113,7 @@ - + 0 @@ -147,6 +121,28 @@ 6 + + + + Selected classes or styles + + + + LaTeX classes + + + + + LaTeX styles + + + + + BibTeX styles + + + + @@ -164,12 +160,12 @@ - + - Close this dialog + Toggles view of the file list - &Close + Show &path @@ -178,19 +174,9 @@ qPixmapFromMimeSource - - - Q3ListBox - -
q3listbox.h
- 0 - - - whatStyle path - fileList rescanPB viewPB closePB diff --git a/src/frontends/qt4/ui/QThesaurusUi.ui b/src/frontends/qt4/ui/QThesaurusUi.ui index 144defcc4d..f83ca857cf 100644 --- a/src/frontends/qt4/ui/QThesaurusUi.ui +++ b/src/frontends/qt4/ui/QThesaurusUi.ui @@ -8,8 +8,8 @@ 0 0 - 462 - 442 + 310 + 414 @@ -18,14 +18,17 @@ true - + - 11 + 9 6 - + + + + 0 @@ -71,22 +74,7 @@ - - - - Select a related word - - - true - - - - Thesaurus entries: - - - - - + 0 @@ -126,7 +114,7 @@ - + 0 @@ -162,15 +150,6 @@ qPixmapFromMimeSource - - - Q3ListView - -
q3listview.h
- 0 - - - entryED replaceED -- 2.39.5