From 3796da5d05ccff08f4c3bdedb54258e9cec01485 Mon Sep 17 00:00:00 2001 From: John Levon Date: Sat, 25 Aug 2001 20:04:15 +0000 Subject: [PATCH] various fixes git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2585 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 26 +++++ src/frontends/qt2/Dialogs.C | 5 +- src/frontends/qt2/QAbout.h | 2 +- src/frontends/qt2/QCitation.C | 4 +- src/frontends/qt2/QCitation.h | 2 +- src/frontends/qt2/QCitationDialog.C | 17 ++- src/frontends/qt2/QDocument.C | 2 +- src/frontends/qt2/QDocument.h | 2 +- src/frontends/qt2/QIndex.C | 9 +- src/frontends/qt2/QIndex.h | 5 +- src/frontends/qt2/QURL.C | 144 ++++++------------------ src/frontends/qt2/QURL.h | 69 +++--------- src/frontends/qt2/QURLDialog.C | 25 ++-- src/frontends/qt2/QURLDialog.h | 5 +- src/frontends/qt2/Qt2BC.C | 16 ++- src/frontends/qt2/Qt2Base.C | 13 +-- src/frontends/qt2/Qt2Base.h | 43 +++++-- src/frontends/qt2/README | 12 +- src/frontends/qt2/ui/QCitationDialog.ui | 60 +++++++++- src/frontends/qt2/ui/QIndexDialog.ui | 18 ++- src/frontends/qt2/ui/QURLDialog.ui | 23 ++-- 21 files changed, 273 insertions(+), 229 deletions(-) diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 75715f35cb..fc88887c01 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,29 @@ +2001-08-25 John Levon + + * Dialogs.C: add URL + + * QAbout.h: + * QCitation.h: + * QDocument.h: + * QIndex.C: + * Qt2Base.h: + * Qt2Base.C: add an updating_ variable to prevent + bc() breakage. + + * QURL.h: + * QURL.C: + * QURLDialog.h: + * QURLDialog.C: + * ui/QURLDialog.ui: make alive again + + * Qt2BC.C: make lineedits ReadOnly not disabled + + * README: update + + * ui/QCitationDialog.ui: small cleanups + + * ui/QIndexDialog.ui: add a what's this + 2001-08-24 John Levon * Dialogs.C: include the right files diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index 5f9bc03b93..9aeb6129f0 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -15,6 +15,7 @@ #include "QAboutDialog.h" #include "QCitationDialog.h" #include "QIndexDialog.h" +#include "QURLDialog.h" // the controller interface #include "QAbout.h" @@ -26,6 +27,7 @@ #include "QSearch.h" #include "QSplash.h" #include "QTabularCreate.h" +#include "QURL.h" #include "QtLyXView.h" #include "Dialogs.h" @@ -44,6 +46,7 @@ #include "controllers/ControlCitation.h" #include "controllers/ControlIndex.h" #include "controllers/ControlSplash.h" +#include "controllers/ControlUrl.h" #if 0 #include "controllers/ControlCopyright.h" #include "controllers/ControlCredits.h" @@ -70,7 +73,6 @@ #include "controllers/ControlTabularCreate.h" #include "controllers/ControlThesaurus.h" #include "controllers/ControlToc.h" -#include "controllers/ControlUrl.h" #include "controllers/ControlVCLog.h" #endif @@ -88,6 +90,7 @@ Dialogs::Dialogs(LyXView * lv) add(new GUICitation(*lv, *this)); add(new GUIAboutlyx(*lv, *this)); add(new GUIIndex(*lv, *this)); + add(new GUIUrl(*lv, *this)); // reduce the number of connections needed in // dialogs by a simple connection here. diff --git a/src/frontends/qt2/QAbout.h b/src/frontends/qt2/QAbout.h index 7d50c1e40e..eafe752b6c 100644 --- a/src/frontends/qt2/QAbout.h +++ b/src/frontends/qt2/QAbout.h @@ -28,7 +28,7 @@ private: /// not needed virtual void apply() {} /// not needed - virtual void update() {} + virtual void update_contents() {} // build the dialog virtual void build(); }; diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index ee29292827..cf15eba6d9 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -89,7 +89,7 @@ void QCitation::build() } -void QCitation::update() +void QCitation::update_contents() { // Make the list of all available bibliography keys bibkeys = biblio::getKeys(controller().bibkeysInfo()); @@ -105,8 +105,6 @@ void QCitation::update() setCiteButtons(OFF); dialog_->textAfterED->setText(controller().params().getOptions().c_str()); - - reset(); } diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h index d3126d7590..4713784fb8 100644 --- a/src/frontends/qt2/QCitation.h +++ b/src/frontends/qt2/QCitation.h @@ -46,7 +46,7 @@ private: /// Hide the dialog. virtual void hide(); /// Update dialog before/whilst showing it. - virtual void update(); + virtual void update_contents(); void updateBrowser(QListBox *, std::vector const &) const; /// diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index 3977b247c8..3e1a15b2a8 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -265,12 +265,23 @@ void QCitationDialog::doFind(biblio::Direction const dir) bool const caseSensitive = searchCaseCB->isChecked(); - vector::const_iterator const cit = + vector::const_iterator cit = biblio::searchKeys(theMap, form_->bibkeys, str, - start, type, dir, caseSensitive); + start, type, dir, caseSensitive); + // FIXME: should work ... if (cit == form_->bibkeys.end()) { - return; + // not found. let's loop round + if (dir == biblio::FORWARD) + start = form_->bibkeys.begin(); + else + start = form_->bibkeys.end(); + + cit = biblio::searchKeys(theMap, form_->bibkeys, str, + start, type, dir, caseSensitive); + + if (cit == form_->bibkeys.end()) + return; } int const found = int(cit - form_->bibkeys.begin()); diff --git a/src/frontends/qt2/QDocument.C b/src/frontends/qt2/QDocument.C index e5597afa8d..aeea3dc206 100644 --- a/src/frontends/qt2/QDocument.C +++ b/src/frontends/qt2/QDocument.C @@ -245,7 +245,7 @@ void QDocument::cancel() } -void QDocument::update() +void QDocument::update_contents() { if (!dialog_.get()) return; diff --git a/src/frontends/qt2/QDocument.h b/src/frontends/qt2/QDocument.h index 858aec385e..f8aa0265a7 100644 --- a/src/frontends/qt2/QDocument.h +++ b/src/frontends/qt2/QDocument.h @@ -75,7 +75,7 @@ private: // /// Filter the inputs // virtual bool input( FL_OBJECT *, long ); /// Update the dialog. - virtual void update(); + virtual void update_contents(); /// Apply from dialog virtual void apply(); /// Cancel from dialog diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index efe20ed2f5..e684e77225 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -41,10 +41,9 @@ void QIndex::build() } -void QIndex::update() +void QIndex::update_contents() { dialog_->keywordED->setText(controller().params().getContents().c_str()); - reset(); } @@ -52,3 +51,9 @@ void QIndex::apply() { controller().params().setContents(dialog_->keywordED->text().latin1()); } + + +bool QIndex::isValid() +{ + return !string(dialog_->keywordED->text()).empty(); +} diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt2/QIndex.h index 089bcdfa3c..d77b82bcf2 100644 --- a/src/frontends/qt2/QIndex.h +++ b/src/frontends/qt2/QIndex.h @@ -24,11 +24,14 @@ class QIndex : public: QIndex(ControlIndex &); +protected: + virtual bool isValid(); + private: /// Apply changes virtual void apply(); /// update - virtual void update(); + virtual void update_contents(); /// build the dialog virtual void build(); }; diff --git a/src/frontends/qt2/QURL.C b/src/frontends/qt2/QURL.C index 470a12220c..45c8eb4d95 100644 --- a/src/frontends/qt2/QURL.C +++ b/src/frontends/qt2/QURL.C @@ -9,142 +9,62 @@ #include #include "QURLDialog.h" -#include "QtLyXView.h" -#include "BufferView.h" - -#include "Dialogs.h" -#include "QURL.h" -#include "gettext.h" -#include "buffer.h" -#include "lyxfunc.h" - -#include #include #include +#include + +#include "ControlUrl.h" +#include "Qt2BC.h" +#include "QURL.h" +#include "debug.h" +#include "gettext.h" -QURL::QURL(LyXView *v, Dialogs *d) - : dialog_(0), lv_(v), d_(d), inset_(0), h_(0), u_(0), ih_(0) -{ - // let the dialog be shown - // This is a permanent connection so we won't bother - // storing a copy because we won't be disconnecting. - d->showUrl.connect(slot(this, &QURL::showUrl)); - d->createUrl.connect(slot(this, &QURL::createUrl)); -} - +typedef Qt2CB > base_class; -QURL::~QURL() +QURL::QURL(ControlUrl & c) + : base_class(c, _("URL")) { - delete dialog_; } -void QURL::showUrl(InsetCommand * const inset) +void QURL::build() { - // FIXME: when could inset be 0 here ? - if (inset==0) - return; + dialog_.reset(new QURLDialog(this)); - inset_ = inset; - readonly = lv_->buffer()->isReadonly(); - //ih_ = inset_->hide.connect(slot(this,&QURL::hide)); - params = inset->params(); - - show(); + bc().setOK(dialog_->okPB); + bc().setCancel(dialog_->closePB); + bc().addReadOnly(dialog_->urlED); + bc().addReadOnly(dialog_->nameED); + bc().addReadOnly(dialog_->hyperlinkCB); } -void QURL::createUrl(string const & arg) +void QURL::update_contents() { - // we could already be showing a URL, clear it out - if (inset_) - close(); - - readonly = lv_->buffer()->isReadonly(); - params.setFromString(arg); - show(); -} - - -void QURL::update() -{ - dialog_->urlED->setText(params.getContents().c_str()); - dialog_->nameED->setText(params.getOptions().c_str()); - - if (params.getCmdName()=="url") - dialog_->hyperlinkCB->setChecked(false); - else - dialog_->hyperlinkCB->setChecked(true); - - if (readonly) { - dialog_->nameED->setFocusPolicy(QWidget::NoFocus); - dialog_->urlED->setFocusPolicy(QWidget::NoFocus); - dialog_->okPB->setEnabled(false); - dialog_->cancelPB->setText(_("Close")); - dialog_->hyperlinkCB->setEnabled(false); - } else { - dialog_->nameED->setFocusPolicy(QWidget::StrongFocus); - dialog_->urlED->setFocusPolicy(QWidget::StrongFocus); - dialog_->urlED->setFocus(); - dialog_->okPB->setEnabled(true); - dialog_->cancelPB->setText(_("Cancel")); - dialog_->hyperlinkCB->setEnabled(true); - } + lyxerr << "update_contents URL" << std::endl; + lyxerr << dialog_->okPB << std::endl; + dialog_->urlED->setText(controller().params().getContents().c_str()); + dialog_->nameED->setText(controller().params().getOptions().c_str()); + dialog_->hyperlinkCB->setChecked(controller().params().getCmdName() != "url"); } void QURL::apply() { - if (readonly) - return; - - params.setContents(dialog_->urlED->text().latin1()); - params.setOptions(dialog_->nameED->text().latin1()); + controller().params().setContents(dialog_->urlED->text().latin1()); + controller().params().setOptions(dialog_->nameED->text().latin1()); if (dialog_->hyperlinkCB->isChecked()) - params.setCmdName("htmlurl"); + controller().params().setCmdName("htmlurl"); else - params.setCmdName("url"); - - if (inset_ != 0) { - if (params != inset_->params()) { - inset_->setParams(params); - lv_->view()->updateInset(inset_, true); - } - } else - lv_->getLyXFunc()->dispatch(LFUN_INSERT_URL, params.getAsString().c_str()); + controller().params().setCmdName("url"); } - - -void QURL::show() -{ - if (!dialog_) - dialog_ = new QURLDialog(this, 0, _("LyX: Url"), false); - - if (!dialog_->isVisible()) { - h_ = d_->hideBufferDependent.connect(slot(this, &QURL::hide)); - //u_ = d_->updateBufferDependent.connect(slot(this, &QURL::update)); - } - dialog_->raise(); - dialog_->setActiveWindow(); - - update(); - dialog_->show(); -} - -void QURL::close() +bool QURL::isValid() { - h_.disconnect(); - u_.disconnect(); - ih_.disconnect(); - inset_ = 0; -} + string const u(dialog_->urlED->text().latin1()); + string const n(dialog_->nameED->text().latin1()); - -void QURL::hide() -{ - dialog_->hide(); - close(); -} + return !u.empty() && !n.empty(); +} diff --git a/src/frontends/qt2/QURL.h b/src/frontends/qt2/QURL.h index 6c42099894..af6ab0727e 100644 --- a/src/frontends/qt2/QURL.h +++ b/src/frontends/qt2/QURL.h @@ -1,71 +1,36 @@ -// -*- C++ -*- /** * \file QURL.h * Copyright 2001 the LyX Team * Read the file COPYING * - * \author John Levon - * \author Kalle Dalheimer + * \author John Levon */ #ifndef QURL_H #define QURL_H -#include "DialogBase.h" -#include "LString.h" -#include "boost/utility.hpp" -#include "insets/inseturl.h" - -class Dialogs; -class LyXView; +#include "Qt2Base.h" + +class ControlUrl; class QURLDialog; -class QURL : public DialogBase { +class QURL : + public Qt2CB > +{ + friend class QURLDialog; public: - QURL(LyXView *, Dialogs *); - ~QURL(); + QURL(ControlUrl & c); - /// Apply changes - void apply(); - /// close the connections - void close(); +protected: + virtual bool isValid(); private: - /// Create the dialog if necessary, update it and display it. - void show(); - /// Hide the dialog. - void hide(); - /// Update the dialog. - void update(); - - /// create a URL inset - void createUrl(string const &); - /// edit a URL inset - void showUrl(InsetCommand * const); - - /// Real GUI implementation. - QURLDialog * dialog_; - - /// the LyXView we belong to - LyXView * lv_; - - /** Which Dialogs do we belong to? - Used so we can get at the signals we have to connect to. - */ - Dialogs * d_; - /// pointer to the inset if any - InsetCommand * inset_; - /// insets params - InsetCommandParams params; - /// is the inset we are reading from a readonly buffer - bool readonly; - - /// Hide connection. - SigC::Connection h_; - /// Update connection. - SigC::Connection u_; - /// Inset hide connection. - SigC::Connection ih_; + /// apply dialog + virtual void apply(); + /// build dialog + virtual void build(); + /// update dialog + virtual void update_contents(); }; #endif // QURL_H diff --git a/src/frontends/qt2/QURLDialog.C b/src/frontends/qt2/QURLDialog.C index 2512a9663d..af3694bf36 100644 --- a/src/frontends/qt2/QURLDialog.C +++ b/src/frontends/qt2/QURLDialog.C @@ -8,14 +8,20 @@ #include +#include + #include "QURLDialog.h" #include "Dialogs.h" #include "QURL.h" -QURLDialog::QURLDialog(QURL * form, QWidget * parent, const char * name, bool modal, WFlags fl) - : QURLDialogBase(parent, name, modal, fl), +QURLDialog::QURLDialog(QURL * form) + : QURLDialogBase(0, 0, false, 0), form_(form) { + connect(okPB, SIGNAL(clicked()), + form_, SLOT(slotOK())); + connect(closePB, SIGNAL(clicked()), + form_, SLOT(slotClose())); } @@ -24,23 +30,14 @@ QURLDialog::~QURLDialog() } -void QURLDialog::apply_adaptor() +void QURLDialog::changed_adaptor() { - form_->apply(); - form_->close(); - hide(); + form_->changed(); } -void QURLDialog::close_adaptor() -{ - form_->close(); - hide(); -} - - void QURLDialog::closeEvent(QCloseEvent * e) { - form_->close(); + form_->slotWMHide(); e->accept(); } diff --git a/src/frontends/qt2/QURLDialog.h b/src/frontends/qt2/QURLDialog.h index 2dba0875a6..b4c1bcba40 100644 --- a/src/frontends/qt2/QURLDialog.h +++ b/src/frontends/qt2/QURLDialog.h @@ -17,12 +17,11 @@ class QURLDialog : public QURLDialogBase { Q_OBJECT public: - QURLDialog(QURL * form, QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0); + QURLDialog(QURL * form); ~QURLDialog(); public slots: - void apply_adaptor(); - void close_adaptor(); + void changed_adaptor(); protected: void closeEvent(QCloseEvent *); diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index 51a7beb929..46b7b47524 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -17,6 +17,7 @@ #include "debug.h" #include +#include Qt2BC::Qt2BC(string const & cancel, string const & close) : GuiBC(cancel, close) @@ -25,13 +26,26 @@ Qt2BC::Qt2BC(string const & cancel, string const & close) void Qt2BC::setButtonEnabled(QButton * obj, bool enabled) { + lyxerr << "Qt2BC: setting button " + << obj << " to " << enabled << std::endl; + obj->setEnabled(enabled); } void Qt2BC::setWidgetEnabled(QWidget * obj, bool enabled) { - obj->setEnabled(enabled); + lyxerr << "Qt2BC: setting " + << obj << " to " << enabled << std::endl; + + // yuck, rtti, but the user comes first + if (obj->inherits("QLineEdit")) { + QLineEdit * le(static_cast(obj)); + le->setReadOnly(enabled); + } else { + obj->setEnabled(enabled); + } + QWidget::FocusPolicy const p = (enabled) ? QWidget::StrongFocus : QWidget::NoFocus; obj->setFocusPolicy(p); diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index 965623d49e..71bf92afd5 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -27,7 +27,7 @@ #include "support/LAssert.h" Qt2Base::Qt2Base(ControlButtons & c, QString const & t) - : ViewBC(c), title_(t) + : ViewBC(c), updating_(false), title_(t) {} @@ -50,12 +50,6 @@ void Qt2Base::show() } -void Qt2Base::reset() -{ - qApp->processEvents(); -} - - void Qt2Base::hide() { if (form() && form()->isVisible()) @@ -71,6 +65,11 @@ bool Qt2Base::isValid() void Qt2Base::changed() { + lyxerr << "got changed() during updating:" << updating_ << std::endl; + + if (updating_) + return; + if (isValid()) bc().valid(); else diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 360dc6e1e5..a6a660b425 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -14,12 +14,12 @@ #ifndef QT2BASE_H #define QT2BASE_H -class QDialog; - #include #include +#include #include +#include #ifdef __GNUG__ #pragma interface @@ -52,8 +52,8 @@ protected: virtual void hide(); /// Create the dialog if necessary, update it and display it. virtual void show(); - /// reset after an update - virtual void reset(); + /// update the dialog's contents + virtual void update_contents() = 0; /// the dialog has changed contents virtual void changed(); @@ -61,6 +61,9 @@ protected: /// is the dialog currently valid ? virtual bool isValid(); + /// are we updating ? + bool updating_; + protected slots: // dialog closed from WM void slotWMHide(); @@ -91,10 +94,13 @@ template class Qt2DB: public Qt2Base { protected: - Qt2DB(ControlButtons &, const QString&); + Qt2DB(ControlButtons &, const QString &); + + /// update the dialog + virtual void update(); /// Pointer to the actual instantiation of the Qt dialog - virtual QDialog* form() const; + virtual QDialog * form() const; /// Real GUI implementation. boost::scoped_ptr dialog_; @@ -102,18 +108,39 @@ protected: template -Qt2DB::Qt2DB(ControlButtons & c, const QString& t) +Qt2DB::Qt2DB(ControlButtons & c, const QString & t) : Qt2Base(c, t) {} template -QDialog* Qt2DB::form() const +QDialog * Qt2DB::form() const { return dialog_.get(); } +template +void Qt2DB::update() +{ + form()->setUpdatesEnabled(false); + + // this is tricky. First we process pending events + // as a result of the bc() state change (if any). + // then we lock out any bc() changes as a result of + // "innocent" updates during update_contents() + // then we enable normal behaviour again. + qApp->processEvents(); + updating_ = true; + update_contents(); + qApp->processEvents(); + updating_ = false; + + form()->setUpdatesEnabled(true); + form()->update(); +} + + template class Qt2CB: public Base { diff --git a/src/frontends/qt2/README b/src/frontends/qt2/README index 3ac3494117..c6e300a8ed 100644 --- a/src/frontends/qt2/README +++ b/src/frontends/qt2/README @@ -10,7 +10,8 @@ form_->changed(). If you are using a more complicated thing anyway, then remember to call form_->changed() at the end (if it has changed !) Every non-trivial widget should have a tooltip. If you don't know -what to write, write "FIXME", and it can fixed later. +what to write, write "FIXME", and it can fixed later. Don't be afraid +to use QWhatsThis too (e.g. the index dialog) If necessary, you should override Qt2Base::isValid() for determining the validity of the current dialog's contents. @@ -18,9 +19,12 @@ of the current dialog's contents. OK/Apply/Restore/Close should be connected in the derived class's constructor to call form_->slotOK() etc. Refer to close/cancel as close in the source. -Every overridden update() must call reset() to ensure the beginning state of the dialog -is correct ! - +Override update_contents() to update the dialog, not update() + +Never call buttoncontroller functions directly from dialogs. In general, you +should use Qt2Base::changed() in all circumstances. However, if you must call +the buttoncontroller, make sure to respect Qt2Base::updating_ + Don't #undef emit - #include "QtLyXView.h" instead Naming conventions diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui index eb9ee3c3ff..d9621de512 100644 --- a/src/frontends/qt2/ui/QCitationDialog.ui +++ b/src/frontends/qt2/ui/QCitationDialog.ui @@ -11,7 +11,7 @@ 0 0 - 439 + 427 585 @@ -79,6 +79,10 @@ pixmap image0 + + toolTip + Add the selected citation + QPushButton @@ -101,6 +105,10 @@ pixmap image1 + + toolTip + Remove the selected citation + QPushButton @@ -123,6 +131,10 @@ pixmap image2 + + toolTip + Move the selected citation up + QPushButton @@ -145,6 +157,10 @@ pixmap image3 + + toolTip + Move the selected citation down + @@ -184,7 +200,7 @@ toolTip - Reference keys available + Available citation keys @@ -205,7 +221,7 @@ toolTip - Keys currently selected + Citations currently selected @@ -262,7 +278,7 @@ toolTip - Reference entry text + Citation entry @@ -311,6 +327,10 @@ name searchED + + toolTip + Search the available citations + QLayoutWidget @@ -337,6 +357,10 @@ text Regular E&xpression + + toolTip + Interpret search entry as a regular expression + @@ -397,6 +421,10 @@ text &Case sensitive + + toolTip + Make the search case-sensitive + @@ -487,6 +515,10 @@ name citationStyleCO + + toolTip + FIXME + @@ -773,4 +805,24 @@ slotSearchTypeSelected(bool) slotUpClicked() + + addPB + delPB + upPB + downPB + citeLB + bibLB + searchED + searchTypeCB + searchCaseCB + previousPB + nextPB + citationStyleCO + textBeforeED + textAfterED + restorePB + okPB + applyPB + closePB + diff --git a/src/frontends/qt2/ui/QIndexDialog.ui b/src/frontends/qt2/ui/QIndexDialog.ui index d177c0a56a..112e1f141b 100644 --- a/src/frontends/qt2/ui/QIndexDialog.ui +++ b/src/frontends/qt2/ui/QIndexDialog.ui @@ -11,7 +11,7 @@ 0 0 - 204 + 197 82 @@ -72,6 +72,22 @@ toolTip Index entry + + whatsThis + The format of the entry in the index. + +An entry can be specified as a sub-entry of +another with "!" : + +cars!mileage + +You can cross-refer to another entry like so : + +cars!mileage|see{economy} + +For further details refer to the local LaTeX +documentation. + diff --git a/src/frontends/qt2/ui/QURLDialog.ui b/src/frontends/qt2/ui/QURLDialog.ui index 6d7cb119ed..9e80cb3649 100644 --- a/src/frontends/qt2/ui/QURLDialog.ui +++ b/src/frontends/qt2/ui/QURLDialog.ui @@ -171,11 +171,11 @@ QPushButton name - cancelPB + closePB text - &Cancel + &Close @@ -184,18 +184,23 @@ - okPB - clicked() + urlED + textChanged(const QString&) QURLDialogBase - apply_adaptor() + changed_adaptor() - cancelPB + hyperlinkCB clicked() QURLDialogBase - close_adaptor() + changed_adaptor() + + + nameED + textChanged(const QString&) + QURLDialogBase + changed_adaptor() - apply_adaptor() - close_adaptor() + changed_adaptor() -- 2.39.5