diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index c0a06bb679..9d97b83414 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,23 @@ +2002-07-22 Edwin Leuven + + * ui/QBibtexDialog.ui: style browser + * QBibtex.C: idem + * QBibtexDialog.C: idem + + * ui/QRefDialog.ui: document combo + * QRef.C: idem + + * QInclude.C: new layout + * ui/QIncludeDialog.ui: new layout + + * ui/QCitationDialog.ui: new layout + + * ui/QExternalDialog.ui: new layout + + * QGraphics.C: Compile fix + + * TODO: + 2002-07-22 John Levon * Menubar_pimpl.h: diff --git a/src/frontends/qt2/QBibtex.C b/src/frontends/qt2/QBibtex.C index 076c326fa4..884e10a0f5 100644 --- a/src/frontends/qt2/QBibtex.C +++ b/src/frontends/qt2/QBibtex.C @@ -13,7 +13,8 @@ #include "ControlBibtex.h" #include "gettext.h" #include "debug.h" - +#include "support/filetools.h" // ChangeExtension +#include "support/lstrings.h" // getVectorFromString #include #include #include @@ -40,9 +41,10 @@ void QBibtex::build_dialog() bc().setCancel(dialog_->closePB); bc().addReadOnly(dialog_->databaseLB); bc().addReadOnly(dialog_->databasePB); - bc().addReadOnly(dialog_->styleCO); bc().addReadOnly(dialog_->styleED); bc().addReadOnly(dialog_->stylePB); + bc().addReadOnly(dialog_->styleListLB); + bc().addReadOnly(dialog_->styleListPB); bc().addReadOnly(dialog_->bibtocCB); bc().addReadOnly(dialog_->databasePB); bc().addReadOnly(dialog_->deletePB); @@ -77,24 +79,14 @@ void QBibtex::update_contents() bibstyle = ""; } else dialog_->bibtocCB->setChecked(false); + + dialog_->styleED->setText(bibstyle.c_str()); - dialog_->deletePB->setEnabled(false); - dialog_->styleED->setEnabled(false); - dialog_->stylePB->setEnabled(false); - - if (bibstyle == "plain" || bibstyle.empty()) - dialog_->styleCO->setCurrentItem(0); - else if (bibstyle == "unsrt") - dialog_->styleCO->setCurrentItem(1); - else if (bibstyle == "alpha") - dialog_->styleCO->setCurrentItem(2); - else if (bibstyle == "abbrv") - dialog_->styleCO->setCurrentItem(3); - else { - dialog_->styleED->setEnabled(true); - dialog_->stylePB->setEnabled(true); - dialog_->styleED->setText(bibstyle.c_str()); - dialog_->styleCO->setCurrentItem(4); + vector const str = getVectorFromString( + controller().getBibStyles(),"\n"); + for (vector::const_iterator it = str.begin(); + it != str.end(); ++it) { + dialog_->styleListLB->insertItem(ChangeExtension(*it,"").c_str()); } } @@ -111,9 +103,7 @@ void QBibtex::apply() } controller().params().setContents(dbs); - string bibstyle(dialog_->styleCO->currentText().latin1()); - if (bibstyle == _("Other ...")) - bibstyle = dialog_->styleED->text().latin1(); + string bibstyle(dialog_->styleED->text().latin1()); bool const bibtotoc(dialog_->bibtocCB->isChecked()); @@ -133,5 +123,5 @@ void QBibtex::apply() bool QBibtex::isValid() { return dialog_->databaseLB->count() != 0 && - !(dialog_->styleCO->currentItem() == 4 && string(dialog_->styleED->text()).empty()); + !string(dialog_->styleED->text()).empty(); } diff --git a/src/frontends/qt2/QBibtexDialog.C b/src/frontends/qt2/QBibtexDialog.C index e461d8fe26..b201c34c7c 100644 --- a/src/frontends/qt2/QBibtexDialog.C +++ b/src/frontends/qt2/QBibtexDialog.C @@ -7,12 +7,13 @@ */ #include - +#include #include "ControlBibtex.h" #include "gettext.h" #include "debug.h" #include "support/filetools.h" +#include "support/lyxalgo.h" // eliminate_duplicates #include #include @@ -52,15 +53,22 @@ void QBibtexDialog::browsePressed() } } - void QBibtexDialog::addPressed() { QString file = QFileDialog::getOpenFileName(QString::null, _("BibTeX database files (*.bib)"), this, 0, _("Select a BibTeX database to add")); if (!file.isNull()) { - // FIXME: check duplicates - databaseLB->insertItem(ChangeExtension(file.latin1(), "").c_str()); - form_->changed(); + string const f = ChangeExtension(file.latin1(), ""); + bool present = false; + for(unsigned int i = 0; i!=databaseLB->count(); i++) { + if (databaseLB->text(i).latin1()==f) + present = true; + + } + if (!present) { + databaseLB->insertItem(f.c_str()); + form_->changed(); + } } } @@ -73,17 +81,7 @@ void QBibtexDialog::deletePressed() void QBibtexDialog::styleChanged(const QString & sel) { - if (form_->readOnly()) - return; - - if (string(_("Other ...")) == sel.latin1()) { - styleED->setEnabled(true); - stylePB->setEnabled(true); - } else { - styleED->setEnabled(false); - stylePB->setEnabled(false); - styleED->setText(""); - } + styleED->setText(sel); } diff --git a/src/frontends/qt2/QGraphics.C b/src/frontends/qt2/QGraphics.C index e7aa08e834..d4b7dfbe41 100644 --- a/src/frontends/qt2/QGraphics.C +++ b/src/frontends/qt2/QGraphics.C @@ -133,7 +133,7 @@ void QGraphics::update_contents() dialog_->widthUnit->setCurrentItem(igp.width.unit()); dialog_->heightUnit->setCurrentItem(igp.height.unit()); - switch (igp.size_type) { + switch (igp.lyxsize_kind) { case InsetGraphicsParams::DEFAULT_SIZE: { dialog_->defaultRB->setChecked(TRUE); break; @@ -224,11 +224,11 @@ void QGraphics::apply() } if (dialog_->defaultRB->isChecked()) - igp.size_type = InsetGraphicsParams::DEFAULT_SIZE; + igp.lyxsize_kind = InsetGraphicsParams::DEFAULT_SIZE; else if (dialog_->customRB->isChecked()) - igp.size_type = InsetGraphicsParams::WH; + igp.lyxsize_kind = InsetGraphicsParams::WH; else - igp.size_type = InsetGraphicsParams::SCALE; + igp.lyxsize_kind = InsetGraphicsParams::SCALE; string value(dialog_->width->text()); igp.width = LyXLength(strToDbl(value), dialog_->widthUnit->currentLengthItem()); diff --git a/src/frontends/qt2/QInclude.C b/src/frontends/qt2/QInclude.C index 6a087e4163..03b1d283b9 100644 --- a/src/frontends/qt2/QInclude.C +++ b/src/frontends/qt2/QInclude.C @@ -23,7 +23,7 @@ #include #include #include -#include +#include typedef Qt2CB > base_class; @@ -43,9 +43,7 @@ void QInclude::build_dialog() bc().addReadOnly(dialog_->browsePB); bc().addReadOnly(dialog_->typesetCB); bc().addReadOnly(dialog_->visiblespaceCB); - bc().addReadOnly(dialog_->includeRB); - bc().addReadOnly(dialog_->inputRB); - bc().addReadOnly(dialog_->verbatimRB); + bc().addReadOnly(dialog_->typeCO); } @@ -56,7 +54,7 @@ void QInclude::update_contents() dialog_->typesetCB->setChecked(false); dialog_->visiblespaceCB->setChecked(false); dialog_->visiblespaceCB->setEnabled(false); - dialog_->includeRB->setChecked(true); + //dialog_->typeCO->setEnabled(true); return; } @@ -71,17 +69,14 @@ void QInclude::update_contents() dialog_->visiblespaceCB->setEnabled(false); if (cmdname == "input") - dialog_->inputRB->setChecked(true); - else if (cmdname == "include") - dialog_->includeRB->setChecked(true); + dialog_->typeCO->setCurrentItem(1); else if (!cmdname.empty()) { - dialog_->verbatimRB->setChecked(true); + dialog_->typeCO->setCurrentItem(2); dialog_->visiblespaceCB->setChecked(cmdname == "verbatiminput*"); dialog_->visiblespaceCB->setEnabled(true); } + else dialog_->typeCO->setCurrentItem(0); - if (cmdname.empty()) - dialog_->includeRB->setChecked(true); } @@ -92,9 +87,10 @@ void QInclude::apply() controller().params().cparams. setContents(dialog_->filenameED->text().latin1()); - if (dialog_->inputRB->isChecked()) + int const item = dialog_->typeCO->currentItem(); + if (item==1) controller().params().flag = InsetInclude::INPUT; - else if (dialog_->includeRB->isChecked()) + else if (item==0) controller().params().flag = InsetInclude::INCLUDE; else { if (dialog_->visiblespaceCB->isChecked()) @@ -109,9 +105,10 @@ void QInclude::browse() { ControlInclude::Type type; - if (dialog_->includeRB->isChecked()) + int const item = dialog_->typeCO->currentItem(); + if (item==0) type = ControlInclude::INCLUDE; - else if (dialog_->inputRB->isChecked()) + else if (item==1) type = ControlInclude::INPUT; else type = ControlInclude::VERBATIM; diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index 3a64c2ed1c..9ecad81bd6 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -8,11 +8,7 @@ #include -#include "support/lstrings.h" #include "ControlRef.h" -#include "gettext.h" -#include "insets/insetref.h" - #include "QRef.h" #include "QRefDialog.h" #include "Qt2BC.h" @@ -24,6 +20,15 @@ #include #include +#include "helper_funcs.h" // getStringFromVector +#include "support/lstrings.h" // frontStrip, strip +#include "gettext.h" +#include "insets/insetref.h" + +using std::find; +using std::max; +using std::sort; +using std::vector; using std::endl; typedef Qt2CB > base_class; @@ -46,24 +51,33 @@ void QRef::build_dialog() bc().addReadOnly(dialog_->nameED); bc().addReadOnly(dialog_->referenceED); bc().addReadOnly(dialog_->typeCO); + bc().addReadOnly(dialog_->bufferCO); } void QRef::update_contents() { dialog_->referenceED->setText(controller().params().getContents().c_str()); + dialog_->nameED->setText(controller().params().getOptions().c_str()); - - dialog_->typeCO->setCurrentItem(InsetRef::getType(controller().params().getCmdName())); - dialog_->nameED->setReadOnly(!nameAllowed() && !readOnly()); + dialog_->typeCO->setCurrentItem(InsetRef::getType(controller().params().getCmdName())); dialog_->typeCO->setEnabled(!typeAllowed() && !readOnly()); if (!typeAllowed()) dialog_->typeCO->setCurrentItem(0); dialog_->sortCB->setChecked(sort_); + /* insert buffer list */ + dialog_->bufferCO->clear(); + vector const buffers = controller().getBufferList(); + for (vector::const_iterator it = buffers.begin(); + it != buffers.end(); ++it) { + dialog_->bufferCO->insertItem(it->c_str()); + } + dialog_->bufferCO->setCurrentItem(controller().getBufferNum()); + updateRefs(); } @@ -157,7 +171,8 @@ void QRef::updateRefs() if (at_ref_) gotoRef(); dialog_->refsLB->clear(); - refs_ = controller().getLabelList(string()); + string const name = controller().getBufferName(dialog_->bufferCO->currentItem()); + refs_ = controller().getLabelList(name); dialog_->sortCB->setEnabled(!refs_.empty()); dialog_->refsLB->setEnabled(!refs_.empty()); redoRefs(); diff --git a/src/frontends/qt2/TODO b/src/frontends/qt2/TODO index 6f258023d3..16304daa83 100644 --- a/src/frontends/qt2/TODO +++ b/src/frontends/qt2/TODO @@ -26,10 +26,6 @@ QAbout - give good default size -QBibtex - - - implement H. Voss's style browser facility, style tooltip, check for duplicates - QCitation - loop round searching not working perhaps ?? @@ -92,10 +88,6 @@ QPreferences - implement me (*) -QRef - - - need buffer combo - QSendTo - implement me diff --git a/src/frontends/qt2/ui/QBibtexDialog.ui b/src/frontends/qt2/ui/QBibtexDialog.ui index b115df40ae..92d773768c 100644 --- a/src/frontends/qt2/ui/QBibtexDialog.ui +++ b/src/frontends/qt2/ui/QBibtexDialog.ui @@ -13,15 +13,19 @@ 0 0 - 296 - 407 + 301 + 435 caption Bibtex - + + sizeGripEnabled + true + + margin 11 @@ -30,381 +34,12 @@ spacing 6 - - QLabel - - name - databaseLA - - - text - Databases - - - alignment - AlignTop|AlignLeft - - - buddy - databaseCO - - - toolTip - BibTeX database to use - - - vAlign - - - - QLayoutWidget - - name - Layout10 - - - - margin - 0 - - - spacing - 6 - - - QListBox - - - text - New Item - - - - name - databaseLB - - - enabled - true - - - toolTip - Available BibTeX databases - - - - QLayoutWidget - - name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - databasePB - - - text - &Add ... - - - autoDefault - false - - - toolTip - Add a BibTeX database file - - - - QPushButton - - name - deletePB - - - text - &Delete - - - toolTip - Remove the selected database - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - - QLayoutWidget - - name - Layout16 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - styleLA - - - text - &Style - - - buddy - styleCO - - - toolTip - The BibTeX style - - - - QLayoutWidget - - name - Layout14 - - - - margin - 0 - - - spacing - 6 - - - QComboBox - - - text - plain - - - - - text - unsrt - - - - - text - alpha - - - - - text - abbrv - - - - - text - Other ... - - - - name - styleCO - - - sizePolicy - - 7 - 0 - - - - toolTip - The BibTeX style - - - whatsThis - FIXME ! - - - - QLineEdit - - name - styleED - - - sizePolicy - - 7 - 0 - - - - toolTip - The name of the style to use - - - - - - QLayoutWidget - - name - Layout15 - - - - margin - 0 - - - spacing - 6 - - - - name - Spacer1_2 - - - orientation - Horizontal - - - sizeType - MinimumExpanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - stylePB - - - text - &Browse - - - autoDefault - false - - - toolTip - Choose a style file - - - - - - - + QLayoutWidget name Layout8 - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - bibtocCB - - - text - Add bibliography to &TOC - - - toolTip - Add bibliography to the table of contents - - - - - name - Spacer1_3 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout10 - margin @@ -463,7 +98,219 @@ - + + QLabel + + name + databaseLA + + + text + Databa&ses + + + alignment + AlignTop|AlignLeft + + + buddy + databaseLB + + + toolTip + BibTeX database to use + + + vAlign + + + + QListBox + + name + databaseLB + + + enabled + true + + + toolTip + Available BibTeX databases + + + + QPushButton + + name + databasePB + + + text + &Add... + + + autoDefault + false + + + toolTip + Add a BibTeX database file + + + + QPushButton + + name + deletePB + + + text + &Delete + + + toolTip + Remove the selected database + + + + QLabel + + name + styleLA + + + text + St&yle + + + buddy + styleED + + + toolTip + The BibTeX style + + + + QPushButton + + name + stylePB + + + text + &Browse... + + + autoDefault + false + + + toolTip + Choose a style file + + + + QCheckBox + + name + bibtocCB + + + text + Add bibliography to &TOC + + + toolTip + Add bibliography to the table of contents + + + + QPushButton + + name + styleListPB + + + text + &Update + + + autoDefault + false + + + toolTip + Update style list + + + + QLineEdit + + name + styleED + + + sizePolicy + + 7 + 0 + + + + toolTip + The name of the style to use + + + + QLabel + + name + styleListL + + + text + A&vailable styles + + + buddy + styleListLB + + + + QListBox + + name + styleListLB + + + toolTip + List of available styles + + + + + name + Spacer5 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + @@ -484,24 +331,6 @@ QBibtexDialogBase change_adaptor() - - styleCO - activated(int) - QBibtexDialogBase - change_adaptor() - - - styleCO - activated(const QString&) - QBibtexDialogBase - styleChanged(const QString &) - - - styleED - returnPressed() - QBibtexDialogBase - change_adaptor() - deletePB clicked() @@ -514,6 +343,24 @@ QBibtexDialogBase databaseChanged() + + styleED + returnPressed() + QBibtexDialogBase + change_adaptor() + + + styleED + textChanged(const QString&) + QBibtexDialogBase + change_adaptor() + + + styleListLB + highlighted(const QString&) + QBibtexDialogBase + styleChanged(const QString &) + addPressed() browsePressed() change_adaptor() @@ -521,4 +368,16 @@ databaseChanged() styleChanged(const QString &) + + databaseLB + databasePB + deletePB + styleED + stylePB + styleListLB + styleListPB + bibtocCB + okPB + closePB + diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui index a423d474a5..b4429b5e4d 100644 --- a/src/frontends/qt2/ui/QCitationDialog.ui +++ b/src/frontends/qt2/ui/QCitationDialog.ui @@ -13,14 +13,18 @@ 0 0 - 509 - 351 + 577 + 427 caption Citation + + sizeGripEnabled + true + margin @@ -30,13 +34,13 @@ spacing 6 - + QLayoutWidget name - Layout6 + Layout15 - + margin 0 @@ -45,25 +49,63 @@ spacing 6 - - QPushButton + + QLabel name - restorePB + insetKeysLA text - &Restore + Selected - + + QListBox + + + text + New Item + + + + name + citeLB + + + selectionMode + Single + + + toolTip + Citations currently selected + + + + QListBox + + + text + New Item + + + + name + bibLB + + + toolTip + Available citation keys + + + name - Spacer4 + Spacer5 orientation - Horizontal + Vertical sizeType @@ -77,343 +119,17 @@ - - QPushButton + + QLabel name - okPB + bibliographyKeysLA text - OK - - - autoDefault - true - - - default - false + Available - - QPushButton - - name - applyPB - - - text - &Apply - - - - QPushButton - - name - closePB - - - text - Cancel - - - - - - QLabel - - name - textAfterLA - - - text - Text after - - - - QLabel - - name - citationStyleLA - - - text - Citation style - - - - QComboBox - - name - citationStyleCO - - - sizePolicy - - 3 - 0 - - - - toolTip - Natbib citation style to use - - - - QLabel - - name - textBeforeLA - - - text - Text before - - - - QLayoutWidget - - name - Layout16 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout13 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - infoLA - - - text - Info - - - - QMultiLineEdit - - name - infoML - - - focusPolicy - NoFocus - - - wordWrap - WidgetWidth - - - readOnly - true - - - toolTip - Citation entry - - - - - - QGroupBox - - name - GroupBox4 - - - title - Search - - - - margin - 11 - - - spacing - 6 - - - QLineEdit - - name - searchED - - - toolTip - Search the available citations - - - - QLayoutWidget - - name - Layout37 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - searchTypeCB - - - text - Regular E&xpression - - - toolTip - Interpret search entry as a regular expression - - - - - name - Spacer2_2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - previousPB - - - text - &Previous - - - - - - QLayoutWidget - - name - Layout38 - - - - margin - 0 - - - spacing - 6 - - - QCheckBox - - name - searchCaseCB - - - text - &Case sensitive - - - toolTip - Make the search case-sensitive - - - - - name - Spacer3_2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QPushButton - - name - nextPB - - - text - &Next - - - - - - - - - - QLayoutWidget - - name - Layout24 - - - - margin - 0 - - - spacing - 6 - QLayoutWidget @@ -535,91 +251,13 @@ - - QLabel - - name - bibliographyKeysLA - - - text - Available - - - - QLabel - - name - insetKeysLA - - - text - Selected - - - - QListBox - - - text - New Item - - - - name - bibLB - - - toolTip - Available citation keys - - - - QListBox - - - text - New Item - - - - name - citeLB - - - selectionMode - Single - - - toolTip - Citations currently selected - - - - QLineEdit - - name - textAfterED - - - sizePolicy - - 7 - 0 - - - - toolTip - Text to place after citation - - - + QLayoutWidget name - Layout15 + Layout6 @@ -630,10 +268,21 @@ spacing 6 + + QPushButton + + name + restorePB + + + text + &Restore + + name - Spacer8 + Spacer4 orientation @@ -652,54 +301,405 @@ - QCheckBox + QPushButton name - fulllistCB + okPB text - &Full author list + OK - - toolTip - List all authors + + autoDefault + true + + + default + false - QCheckBox + QPushButton name - forceuppercaseCB + applyPB text - Force &upper case + &Apply - - toolTip - Force upper case in citation + + + QPushButton + + name + closePB + + + text + Cancel - - QLineEdit + + QLayoutWidget name - textBeforeED + Layout16 + + + + margin + 0 + + + spacing + 6 + + + QLabel + + name + infoLA + + + text + Info + + + + QMultiLineEdit + + name + infoML + + + focusPolicy + NoFocus + + + wordWrap + WidgetWidth + + + readOnly + true + + + toolTip + Citation entry + + + + + + QGroupBox + + name + GroupBox22 - sizePolicy - - 7 - 0 - + title + Search - - toolTip - Text to place before citation + + + margin + 11 + + + spacing + 6 + + + QCheckBox + + name + searchCaseCB + + + sizePolicy + + 3 + 0 + + + + text + &Case sensitive + + + toolTip + Make the search case-sensitive + + + + QCheckBox + + name + searchTypeCB + + + sizePolicy + + 3 + 0 + + + + text + Regular E&xpression + + + toolTip + Interpret search entry as a regular expression + + + + QLineEdit + + name + searchED + + + toolTip + Search the available citations + + + + + name + Spacer48 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + previousPB + + + text + &Previous + + + + QPushButton + + name + nextPB + + + text + &Next + + + + + + QGroupBox + + name + GroupBox21 + + title + Format + + + + margin + 11 + + + spacing + 6 + + + QLineEdit + + name + textBeforeED + + + enabled + false + + + sizePolicy + + 7 + 0 + + + + text + Not yet supported + + + toolTip + Text to place before citation + + + + QLineEdit + + name + textAfterED + + + sizePolicy + + 7 + 0 + + + + toolTip + Text to place after citation + + + + QLabel + + name + textBeforeLA + + + enabled + false + + + text + Text before: + + + + QLabel + + name + textAfterLA + + + text + Text after: + + + + QComboBox + + name + citationStyleCO + + + sizePolicy + + 3 + 0 + + + + toolTip + Natbib citation style to use + + + + QLayoutWidget + + name + Layout15 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer8 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QCheckBox + + name + fulllistCB + + + text + &Full author list + + + toolTip + List all authors + + + + QCheckBox + + name + forceuppercaseCB + + + text + Force &upper case + + + toolTip + Force upper case in citation + + + + + + QLabel + + name + citationStyleLA + + + text + Citation style: + + + @@ -812,6 +812,12 @@ QCitationDialogBase changed_adaptor() + + searchED + returnPressed() + QCitationDialogBase + slotNextClicked() + changed_adaptor() slotBibSelected(int) slotAddClicked() diff --git a/src/frontends/qt2/ui/QExternalDialog.ui b/src/frontends/qt2/ui/QExternalDialog.ui index d76f776cc1..67433d93c5 100644 --- a/src/frontends/qt2/ui/QExternalDialog.ui +++ b/src/frontends/qt2/ui/QExternalDialog.ui @@ -13,15 +13,15 @@ 0 0 - 432 - 417 + 392 + 340 caption External Material - + margin 11 @@ -30,460 +30,89 @@ spacing 6 - - QLayoutWidget + + QLabel name - Layout14 + templateLA + + + text + &Template: + + + buddy + externalCO + + + toolTip + Available templates - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout5 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - templateLA - - - text - &Template - - - buddy - externalCO - - - toolTip - Available templates - - - - QComboBox - - name - externalCO - - - toolTip - Available templates - - - - - - - name - Spacer3_2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - QLayoutWidget + + QTextView name - Layout11 + externalTV + + + toolTip + LaTeX error messages - - - margin - 0 - - - spacing - 6 - - - QTextView - - name - externalTV - - - toolTip - LaTeX error messages - - - - QLayoutWidget - - name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - editPB - - - text - &Edit file - - - toolTip - Edit the file externally - - - - QPushButton - - name - viewPB - - - text - &View file - - - toolTip - View the file - - - - QPushButton - - name - updatePB - - - text - &Update - - - toolTip - Update the material - - - - - name - Spacer2 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - - - QLayoutWidget + + QLabel name - Layout23 + paramsLA + + + text + &Parameters: + + + buddy + paramsED + + + toolTip + Parameters - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout21 - - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout6 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - fileLA - - - text - &File - - - buddy - fileED - - - toolTip - Filename - - - - QLineEdit - - name - fileED - - - toolTip - Filename - - - - - - - name - Spacer5 - - - orientation - Vertical - - - sizeType - Minimum - - - sizeHint - - 20 - 20 - - - - - - - QLayoutWidget - - name - Layout20 - - - - margin - 0 - - - spacing - 6 - - - QPushButton - - name - browsePB - - - text - &Browse ... - - - - - name - Spacer4 - - - orientation - Vertical - - - sizeType - Minimum - - - sizeHint - - 20 - 20 - - - - - - - - name - Spacer2_2 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - - QLayoutWidget + + QPushButton name - Layout16 + browsePB + + + text + &Browse... - - - margin - 0 - - - spacing - 6 - - - QLayoutWidget - - name - Layout12 - - - - margin - 0 - - - spacing - 6 - - - QLabel - - name - paramsLA - - - text - &Parameters - - - buddy - paramsED - - - toolTip - Parameters - - - - QLineEdit - - name - paramsED - - - toolTip - Parameters - - - - - - - name - Spacer1 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - + + QLineEdit + + name + paramsED + + + toolTip + Parameters + + + + QComboBox + + name + externalCO + + + toolTip + Available templates + + + QLayoutWidget name @@ -566,7 +195,120 @@ - + + QLabel + + name + fileLA + + + text + &File: + + + buddy + fileED + + + toolTip + Filename + + + + QLineEdit + + name + fileED + + + toolTip + Filename + + + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + QPushButton + + name + editPB + + + sizePolicy + + 7 + 0 + + + + text + &Edit file + + + toolTip + Edit the file externally + + + + QPushButton + + name + viewPB + + + sizePolicy + + 7 + 0 + + + + text + &View file + + + toolTip + View the file + + + + QPushButton + + name + updatePB + + + sizePolicy + + 7 + 0 + + + + text + &Update + + + toolTip + Update the material + + + + + diff --git a/src/frontends/qt2/ui/QIncludeDialog.ui b/src/frontends/qt2/ui/QIncludeDialog.ui index a8c875b1c0..bc93d35d1c 100644 --- a/src/frontends/qt2/ui/QIncludeDialog.ui +++ b/src/frontends/qt2/ui/QIncludeDialog.ui @@ -13,14 +13,18 @@ 0 0 - 348 - 209 + 416 + 225 caption Include File + + sizeGripEnabled + true + margin @@ -30,186 +34,35 @@ spacing 6 - - QButtonGroup - - name - includeBG - - - sizePolicy - - 5 - 7 - - - - title - Include type - - - - margin - 11 + + QComboBox + + + text + Include - - spacing - 6 + + + + text + Input - - QRadioButton - - name - includeRB - - - text - &Include - - - toolTip - FIXME - - - - QRadioButton - - name - inputRB - - - text - I&nput - - - toolTip - FIXME - - - - QRadioButton - - name - verbatimRB - - - text - &Verbatim - - - toolTip - FIXME - - - - - - QButtonGroup - - name - optionsBG - - - sizePolicy - - 5 - 7 - - - - title - Options - - - - margin - 11 + + + + text + Verbatim - - spacing - 6 - - - QCheckBox - - name - typesetCB - - - text - &Don't typeset - - - toolTip - FIXME - - - - QCheckBox - - name - visiblespaceCB - - - text - Visible &Space - - - toolTip - FIXME - - - - - - QLabel + name - filenameLA - - - text - &Filename: - - - buddy - filenameED - - - toolTip - + typeCO - - QLineEdit - - name - filenameED - - - toolTip - File name to include - - - - QPushButton - - name - browsePB - - - text - &Browse ... - - - toolTip - Select a file - - - + name - Spacer3 + Spacer27 orientation @@ -227,48 +80,26 @@ - - QPushButton + + QLabel name - okPB + filenameLA text - &OK + &File: - - default - true - - - - QPushButton - - name - closePB - - - text - &Close - - - - QPushButton - - name - loadPB - - - text - &Load + + buddy + filenameED toolTip - Load the file + - + name Spacer13 @@ -289,27 +120,194 @@ + + QCheckBox + + name + visiblespaceCB + + + sizePolicy + + 3 + 0 + + + + text + Visible &Space + + + toolTip + FIXME + + + + QCheckBox + + name + typesetCB + + + sizePolicy + + 3 + 0 + + + + text + &Don't typeset + + + toolTip + FIXME + + + + QPushButton + + name + loadPB + + + text + &Load + + + toolTip + Load the file + + + + QLayoutWidget + + name + Layout3 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer3 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + okPB + + + text + &OK + + + default + true + + + + QPushButton + + name + closePB + + + text + &Close + + + + + + + name + Spacer13_2 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QPushButton + + name + browsePB + + + text + &Browse... + + + toolTip + Select a file + + + + QLabel + + name + TextLabel1 + + + text + &Include Type: + + + buddy + typeCO + + + + QLineEdit + + name + filenameED + + + toolTip + File name to include + + - - includeRB - toggled(bool) - QIncludeDialogBase - change_adaptor() - - - inputRB - toggled(bool) - QIncludeDialogBase - change_adaptor() - - - verbatimRB - toggled(bool) - QIncludeDialogBase - change_adaptor() - typesetCB toggled(bool) @@ -340,15 +338,19 @@ QIncludeDialogBase browseClicked() - - includeBG - clicked(int) - QIncludeDialogBase - typeChanged(int) - browseClicked() change_adaptor() loadClicked() typeChanged(int) + + filenameED + browsePB + typeCO + typesetCB + visiblespaceCB + loadPB + okPB + closePB + diff --git a/src/frontends/qt2/ui/QRefDialog.ui b/src/frontends/qt2/ui/QRefDialog.ui index 6d169133b4..0ab699f9e3 100644 --- a/src/frontends/qt2/ui/QRefDialog.ui +++ b/src/frontends/qt2/ui/QRefDialog.ui @@ -13,14 +13,18 @@ 0 0 - 246 - 321 + 367 + 425 caption Reference + + sizeGripEnabled + true + margin @@ -30,51 +34,65 @@ spacing 6 - - QLineEdit - - name - nameED - - QLabel name - typeLA + referenceL text - &Type + &Reference: alignment - AlignVCenter|AlignRight + AlignVCenter|AlignLeft buddy - typeLA + referenceED hAlign - - QPushButton + + QLineEdit name - updatePB + referenceED + + + + QLabel + + name + bufferL text - &Update + &Document: - toolTip - Update the reference list + buddy + bufferCO - + + QComboBox + + name + bufferCO + + + sizePolicy + + 7 + 0 + + + + QCheckBox name @@ -89,33 +107,34 @@ Sort references in alphabetical order - - + + QPushButton + name - Spacer6 + updatePB - orientation - Horizontal - - - sizeType - Expanding + text + &Update - sizeHint - - 20 - 20 - + toolTip + Update the reference list - - + + QPushButton name gotoPB + + sizePolicy + + 3 + 0 + + text &Goto @@ -125,117 +144,7 @@ Move the document cursor to reference - - QComboBox - - - text - Reference - - - - - text - Page number - - - - - text - Ref on page xxx - - - - - text - On page xxx - - - - - text - Pretty reference - - - - name - typeCO - - - toolTip - Reference as it appears in output - - - - QLabel - - name - referenceL - - - text - &Reference: - - - alignment - AlignVCenter|AlignRight - - - buddy - referenceED - - - hAlign - - - - QLabel - - name - nameL - - - text - &Name: - - - alignment - AlignVCenter|AlignRight - - - buddy - nameED - - - hAlign - - - - QListBox - - name - refsLB - - - sizePolicy - - 7 - 3 - - - - toolTip - Available references - - - - QLineEdit - - name - referenceED - - - + QLayoutWidget name @@ -299,6 +208,146 @@ + + QListBox + + name + refsLB + + + enabled + true + + + sizePolicy + + 7 + 3 + + + + toolTip + Available references + + + + QLabel + + name + refsL + + + text + Available references in selected document: + + + + QComboBox + + + text + <reference> + + + + + text + <page> + + + + + text + on page <page> + + + + + text + <reference> on page <page> + + + + + text + Formatted reference + + + + name + typeCO + + + sizePolicy + + 1 + 0 + + + + toolTip + Reference as it appears in output + + + + QLineEdit + + name + nameED + + + enabled + false + + + + QLabel + + name + nameL + + + enabled + false + + + text + &Name: + + + alignment + AlignVCenter|AlignLeft + + + buddy + nameED + + + hAlign + + + + QLabel + + name + typeLA + + + text + &Format: + + + alignment + AlignVCenter|AlignLeft + + + buddy + typeLA + + + hAlign + + @@ -356,6 +405,12 @@ QRefDialogBase updateClicked() + + bufferCO + activated(int) + QRefDialogBase + updateClicked() + changed_adaptor() gotoClicked() refHighlighted(const QString&) @@ -364,9 +419,10 @@ updateClicked() + bufferCO refsLB - updatePB sortCB + updatePB gotoPB referenceED nameED