From a63c7ca2079b3296d94aaff80d207b59cc958e41 Mon Sep 17 00:00:00 2001 From: John Levon Date: Sat, 25 Aug 2001 03:00:19 +0000 Subject: [PATCH] some more random changes, added Timeout (make clean if LyX crashes !!) git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2584 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt2/ChangeLog | 25 +++++++++ src/frontends/qt2/Dialogs.C | 3 +- src/frontends/qt2/Makefile.am | 3 +- src/frontends/qt2/QAbout.C | 2 +- src/frontends/qt2/QCitation.C | 12 +++-- src/frontends/qt2/QCitation.h | 5 +- src/frontends/qt2/QCitationDialog.C | 71 +++++++++++++------------ src/frontends/qt2/QCitationDialog.h | 15 +++--- src/frontends/qt2/QIndex.C | 9 ++-- src/frontends/qt2/QIndex.h | 17 ++---- src/frontends/qt2/QIndexDialog.C | 21 +++----- src/frontends/qt2/QIndexDialog.h | 6 +-- src/frontends/qt2/QRef.C | 2 + src/frontends/qt2/Qt2BC.C | 1 + src/frontends/qt2/Qt2Base.C | 21 ++++---- src/frontends/qt2/Qt2Base.h | 25 +++++---- src/frontends/qt2/README | 31 +++++++++-- src/frontends/qt2/Timeout_pimpl.C | 51 ++++++++++++++++++ src/frontends/qt2/Timeout_pimpl.h | 50 +++++++++++++++++ src/frontends/qt2/moc/Makefile.am | 2 - src/frontends/qt2/ui/QCitationDialog.ui | 64 ++++++++++++---------- src/frontends/qt2/ui/QIndexDialog.ui | 18 +------ 22 files changed, 292 insertions(+), 162 deletions(-) create mode 100644 src/frontends/qt2/Timeout_pimpl.C create mode 100644 src/frontends/qt2/Timeout_pimpl.h diff --git a/src/frontends/qt2/ChangeLog b/src/frontends/qt2/ChangeLog index 6b8f750e4c..75715f35cb 100644 --- a/src/frontends/qt2/ChangeLog +++ b/src/frontends/qt2/ChangeLog @@ -1,3 +1,28 @@ +2001-08-24 John Levon + + * Dialogs.C: include the right files + + * QCitation.C: closePB not cancelPB + + * QCitationDialog.C: + * QCitationDialog.h: + * ui/QCitationDialog.ui: small fixes + + * QIndex.h: + * QIndex.C: + * QIndexDialog.C: + * QIndexDialog.h: + * ui/QIndexDialog.ui: more fixes + + * Qt2Base.h: + * Qt2Base.C: add reset() to workaround problem. + + * README: update + + * Makefile.am: + * Timeout_pimpl.h: + * Timeout_pimpl.C: add the timer + 2001-08-23 John Levon * Dialogs.C: diff --git a/src/frontends/qt2/Dialogs.C b/src/frontends/qt2/Dialogs.C index 9043dfd44e..5f9bc03b93 100644 --- a/src/frontends/qt2/Dialogs.C +++ b/src/frontends/qt2/Dialogs.C @@ -12,8 +12,9 @@ #endif // the dialog definitions -#include "QCitationDialog.h" #include "QAboutDialog.h" +#include "QCitationDialog.h" +#include "QIndexDialog.h" // the controller interface #include "QAbout.h" diff --git a/src/frontends/qt2/Makefile.am b/src/frontends/qt2/Makefile.am index 3bf86c4bc5..d5eea29361 100644 --- a/src/frontends/qt2/Makefile.am +++ b/src/frontends/qt2/Makefile.am @@ -46,7 +46,6 @@ libqt2_la_OBJADD = \ ../xforms/MathsSymbols.lo \ ../xforms/Menubar_pimpl.lo \ ../xforms/RadioButtonGroup.lo \ - ../xforms/Timeout_pimpl.lo \ ../xforms/Toolbar_pimpl.lo \ ../xforms/bmtable.lo \ ../xforms/form_bibitem.lo \ @@ -80,6 +79,8 @@ libqt2_la_SOURCES = \ GUIRunTime.C \ FileDialog.C \ FileDialog_private.C \ + Timeout_pimpl.h \ + Timeout_pimpl.C \ Qt2Base.C \ Qt2Base.h \ Qt2BC.C \ diff --git a/src/frontends/qt2/QAbout.C b/src/frontends/qt2/QAbout.C index f78f63f809..f5c2432b1d 100644 --- a/src/frontends/qt2/QAbout.C +++ b/src/frontends/qt2/QAbout.C @@ -36,7 +36,7 @@ void QAbout::build() { dialog_.reset(new QAboutDialog()); connect(dialog_.get()->closePB, SIGNAL(clicked()), - this, SLOT(slotCancel())); + this, SLOT(slotClose())); dialog_->copyrightLA->setText(controller().getCopyright().c_str()); dialog_->licenseLA->setText(controller().getLicense().c_str()); diff --git a/src/frontends/qt2/QCitation.C b/src/frontends/qt2/QCitation.C index 6be562f621..ee29292827 100644 --- a/src/frontends/qt2/QCitation.C +++ b/src/frontends/qt2/QCitation.C @@ -15,7 +15,7 @@ #include "QCitationDialog.h" #include "QCitation.h" - + #include #include #include @@ -26,6 +26,7 @@ #include "QtLyXView.h" #include "Qt2BC.h" #include "ControlCitation.h" +#include "debug.h" #include "gettext.h" #include "support/lstrings.h" #include "helper_funcs.h" @@ -74,7 +75,7 @@ void QCitation::build() // Manage the ok, apply, restore and cancel/close buttons bc().setOK(dialog_->okPB); bc().setApply(dialog_->applyPB); - bc().setCancel(dialog_->cancelPB); + bc().setCancel(dialog_->closePB); bc().setRestore(dialog_->restorePB); bc().addReadOnly(dialog_->addPB); @@ -82,7 +83,8 @@ void QCitation::build() bc().addReadOnly(dialog_->upPB); bc().addReadOnly(dialog_->downPB); bc().addReadOnly(dialog_->citationStyleCO); - bc().addReadOnly(dialog_->textBeforeED); + // add when enabled ! + //bc().addReadOnly(dialog_->textBeforeED); bc().addReadOnly(dialog_->textAfterED); } @@ -102,7 +104,9 @@ void QCitation::update() setBibButtons(OFF); setCiteButtons(OFF); - dialog_->textAfterED->setText( controller().params().getOptions().c_str()); + dialog_->textAfterED->setText(controller().params().getOptions().c_str()); + + reset(); } diff --git a/src/frontends/qt2/QCitation.h b/src/frontends/qt2/QCitation.h index a350cc41d6..d3126d7590 100644 --- a/src/frontends/qt2/QCitation.h +++ b/src/frontends/qt2/QCitation.h @@ -22,7 +22,8 @@ class QListBox; class ControlCitation; class QCitationDialog; -class QCitation : public Qt2CB > { +class QCitation : public Qt2CB > +{ friend class QCitationDialog; public: @@ -47,7 +48,7 @@ private: /// Update dialog before/whilst showing it. virtual void update(); - void updateBrowser(QListBox*, std::vector const &) const; + void updateBrowser(QListBox *, std::vector const &) const; /// void setBibButtons(State) const; /// diff --git a/src/frontends/qt2/QCitationDialog.C b/src/frontends/qt2/QCitationDialog.C index aeaaae23c4..3977b247c8 100644 --- a/src/frontends/qt2/QCitationDialog.C +++ b/src/frontends/qt2/QCitationDialog.C @@ -7,18 +7,20 @@ */ #include - + +#include "gettext.h" + #include "QCitationDialog.h" #include "Dialogs.h" -#include "QCitation.h" #include "controllers/ControlCitation.h" #include +#include #include #include #include #include - + #include "QtLyXView.h" #include @@ -28,29 +30,46 @@ using std::vector; using std::find; using std::max; -QCitationDialog::QCitationDialog(QCitation * form, QWidget * parent, const char * name, bool modal, WFlags fl) - : QCitationDialogBase(parent, name, modal, fl), +QCitationDialog::QCitationDialog(QCitation * form) + : QCitationDialogBase(0, 0, false, 0), form_(form) { - connect(okPB, SIGNAL(clicked()), - form, SLOT(slotOK())); - connect(cancelPB, SIGNAL(clicked()), - form, SLOT(slotCancel())); connect(restorePB, SIGNAL(clicked()), form, SLOT(slotRestore())); + connect(okPB, SIGNAL(clicked()), + form, SLOT(slotOK())); connect(applyPB, SIGNAL(clicked()), form, SLOT(slotApply())); + connect(closePB, SIGNAL(clicked()), + form, SLOT(slotClose())); connect(searchED, SIGNAL(returnPressed()), - form, SLOT(slotNextClicked())); + this, SLOT(slotNextClicked())); + + textBeforeED->setText(_("Not yet supported")); + textBeforeED->setReadOnly(true); + textBeforeED->setFocusPolicy(QWidget::NoFocus); + citationStyleCO->setEnabled(false); + citationStyleCO->setFocusPolicy(QWidget::NoFocus); } - + QCitationDialog::~QCitationDialog() { } -void QCitationDialog::slotBibSelected( int sel ) +void QCitationDialog::slotBibSelected(int sel) +{ + slotBibHighlighted(sel); + + if (form_->controller().isReadonly()) + return; + + slotAddClicked(); +} + + +void QCitationDialog::slotBibHighlighted(int sel) { biblio::InfoMap const & theMap = form_->controller().bibkeysInfo(); @@ -91,7 +110,7 @@ void QCitationDialog::slotBibSelected( int sel ) } -void QCitationDialog::slotCiteSelected(int sel) +void QCitationDialog::slotCiteHighlighted(int sel) { biblio::InfoMap const & theMap = form_->controller().bibkeysInfo(); @@ -107,7 +126,7 @@ void QCitationDialog::slotCiteSelected(int sel) // Highlight the selected browser_cite key in browser_bib vector::const_iterator cit = - std::find(form_->bibkeys.begin(), + std::find(form_->bibkeys.begin(), form_->bibkeys.end(), form_->citekeys[sel]); if (cit != form_->bibkeys.end()) { @@ -149,7 +168,7 @@ void QCitationDialog::slotDelClicked() { int const sel = citeLB->currentItem(); - // FIXME: why ? + // FIXME: why ? if (sel < 0 || sel >= (int)form_->citekeys.size()) { return; } @@ -192,7 +211,7 @@ void QCitationDialog::slotDownClicked() { int const sel = citeLB->currentItem(); - // FIXME: ? + // FIXME: ? if (sel < 0 || sel >= (int)form_->citekeys.size() - 1) { return; } @@ -263,23 +282,5 @@ void QCitationDialog::doFind(biblio::Direction const dir) int const top = max(found - 5, 1); bibLB->setTopItem(top); bibLB->setSelected(found, true); - slotBibSelected(0); -} - - -void QCitationDialog::slotCitationStyleSelected( int ) -{ - form_->changed(); -} - - -void QCitationDialog::slotTextBeforeReturn() -{ - form_->changed(); -} - - -void QCitationDialog::slotTextAfterReturn() -{ - form_->changed(); + slotBibHighlighted(0); } diff --git a/src/frontends/qt2/QCitationDialog.h b/src/frontends/qt2/QCitationDialog.h index 9201aa8af7..cafb378e68 100644 --- a/src/frontends/qt2/QCitationDialog.h +++ b/src/frontends/qt2/QCitationDialog.h @@ -9,34 +9,35 @@ #ifndef QCITATIONDIALOG_H #define QCITATIONDIALOG_H -class QCitation; - #include #include "support/lstrings.h" #include "ui/QCitationDialogBase.h" +#include "QCitation.h" #include "controllers/biblio.h" class QCitationDialog : public QCitationDialogBase { Q_OBJECT public: - QCitationDialog(QCitation * form, QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags fl = 0); + QCitationDialog(QCitation * form); ~QCitationDialog(); protected slots: + virtual void slotBibHighlighted(int sel); virtual void slotBibSelected(int sel); - virtual void slotCiteSelected(int sel); + virtual void slotCiteHighlighted(int sel); virtual void slotAddClicked(); virtual void slotDelClicked(); virtual void slotUpClicked(); virtual void slotDownClicked(); virtual void slotPreviousClicked(); virtual void slotNextClicked(); - virtual void slotCitationStyleSelected(int); - virtual void slotTextBeforeReturn(); - virtual void slotTextAfterReturn(); + virtual void changed_adaptor() { + form_->changed(); + } + private: void doFind(biblio::Direction dir); diff --git a/src/frontends/qt2/QIndex.C b/src/frontends/qt2/QIndex.C index fc27d181a0..efe20ed2f5 100644 --- a/src/frontends/qt2/QIndex.C +++ b/src/frontends/qt2/QIndex.C @@ -9,6 +9,7 @@ #include #include "QIndexDialog.h" +#include "ControlIndex.h" #include "QtLyXView.h" #include "BufferView.h" @@ -30,17 +31,12 @@ QIndex::QIndex(ControlIndex & c) } -QIndex::~QIndex() -{ -} - - void QIndex::build() { dialog_.reset(new QIndexDialog(this)); bc().setOK(dialog_->okPB); - bc().setCancel(dialog_->cancelPB); + bc().setCancel(dialog_->closePB); bc().addReadOnly(dialog_->keywordED); } @@ -48,6 +44,7 @@ void QIndex::build() void QIndex::update() { dialog_->keywordED->setText(controller().params().getContents().c_str()); + reset(); } diff --git a/src/frontends/qt2/QIndex.h b/src/frontends/qt2/QIndex.h index a65bebb1ac..089bcdfa3c 100644 --- a/src/frontends/qt2/QIndex.h +++ b/src/frontends/qt2/QIndex.h @@ -12,22 +12,18 @@ #define QINDEX_H #include "Qt2Base.h" -#include "ControlIndex.h" -#include "LString.h" -#include "boost/utility.hpp" -class Dialogs; -class LyXView; +class ControlIndex; class QIndexDialog; class QIndex : - public Qt2CB > { - + public Qt2CB > +{ friend class QIndexDialog; public: QIndex(ControlIndex &); - ~QIndex(); + private: /// Apply changes virtual void apply(); @@ -35,11 +31,6 @@ private: virtual void update(); /// build the dialog virtual void build(); - - /// create an Index inset - void createIndex(string const &); - /// edit an Index inset - void showIndex(InsetCommand * const); }; #endif // QINDEX_H diff --git a/src/frontends/qt2/QIndexDialog.C b/src/frontends/qt2/QIndexDialog.C index 636cec703d..bcfd25b6d4 100644 --- a/src/frontends/qt2/QIndexDialog.C +++ b/src/frontends/qt2/QIndexDialog.C @@ -10,10 +10,17 @@ #include "Dialogs.h" #include "QIndex.h" +#include +#include + QIndexDialog::QIndexDialog(QIndex * form) : QIndexDialogBase(0, 0, false, 0), form_(form) { + connect(okPB, SIGNAL(clicked()), + form, SLOT(slotOK())); + connect(closePB, SIGNAL(clicked()), + form, SLOT(slotClose())); } @@ -22,20 +29,6 @@ QIndexDialog::~QIndexDialog() } -void QIndexDialog::ok_adaptor() -{ - form_->slotOK(); - hide(); -} - - -void QIndexDialog::close_adaptor() -{ - form_->slotCancel(); - hide(); -} - - void QIndexDialog::change_adaptor() { form_->changed(); diff --git a/src/frontends/qt2/QIndexDialog.h b/src/frontends/qt2/QIndexDialog.h index c81c97ec97..64af848927 100644 --- a/src/frontends/qt2/QIndexDialog.h +++ b/src/frontends/qt2/QIndexDialog.h @@ -22,11 +22,9 @@ public: QIndexDialog(QIndex * form); ~QIndexDialog(); -public slots: - virtual void ok_adaptor(); - virtual void close_adaptor(); +protected slots: virtual void change_adaptor(); - + protected: virtual void closeEvent(QCloseEvent * e); diff --git a/src/frontends/qt2/QRef.C b/src/frontends/qt2/QRef.C index fc6e5ae331..2d04c8fc86 100644 --- a/src/frontends/qt2/QRef.C +++ b/src/frontends/qt2/QRef.C @@ -167,6 +167,8 @@ void QRef::do_ref_update() void QRef::update() { + // FIXME: needs updating + dialog_->referenceED->setText(params.getContents().c_str()); dialog_->nameED->setText(params.getOptions().c_str()); diff --git a/src/frontends/qt2/Qt2BC.C b/src/frontends/qt2/Qt2BC.C index 74b6ec80c8..51a7beb929 100644 --- a/src/frontends/qt2/Qt2BC.C +++ b/src/frontends/qt2/Qt2BC.C @@ -14,6 +14,7 @@ #endif #include "Qt2BC.h" +#include "debug.h" #include diff --git a/src/frontends/qt2/Qt2Base.C b/src/frontends/qt2/Qt2Base.C index 8d45b53462..965623d49e 100644 --- a/src/frontends/qt2/Qt2Base.C +++ b/src/frontends/qt2/Qt2Base.C @@ -17,16 +17,15 @@ #endif #include +#include +#include "debug.h" #include "QtLyXView.h" #include "Dialogs.h" #include "Qt2Base.h" #include "Qt2BC.h" #include "support/LAssert.h" -#include - - Qt2Base::Qt2Base(ControlButtons & c, QString const & t) : ViewBC(c), title_(t) {} @@ -51,6 +50,12 @@ void Qt2Base::show() } +void Qt2Base::reset() +{ + qApp->processEvents(); +} + + void Qt2Base::hide() { if (form() && form()->isVisible()) @@ -79,7 +84,6 @@ void Qt2Base::slotWMHide() } - void Qt2Base::slotApply() { ApplyButton(); @@ -92,7 +96,7 @@ void Qt2Base::slotOK() } -void Qt2Base::slotCancel() +void Qt2Base::slotClose() { CancelButton(); } @@ -102,10 +106,3 @@ void Qt2Base::slotRestore() { RestoreButton(); } - - -// PENDING(kalle) How to handle this? -// extern "C" void C_Qt2BaseInputCB(FL_OBJECT * ob, long d) -// { -// GetForm(ob)->InputCB(ob, d); -// } diff --git a/src/frontends/qt2/Qt2Base.h b/src/frontends/qt2/Qt2Base.h index 8ee56422db..360dc6e1e5 100644 --- a/src/frontends/qt2/Qt2Base.h +++ b/src/frontends/qt2/Qt2Base.h @@ -49,31 +49,33 @@ protected: /// Build the dialog virtual void build() = 0; /// Hide the dialog. - void hide(); + virtual void hide(); /// Create the dialog if necessary, update it and display it. - void show(); + virtual void show(); + /// reset after an update + virtual void reset(); /// the dialog has changed contents virtual void changed(); /// is the dialog currently valid ? virtual bool isValid(); - + protected slots: // dialog closed from WM void slotWMHide(); - // Apply button clicked - void slotApply(); - + // Restore button clicked + void slotRestore(); + // OK button clicked void slotOK(); - // Cancel button clicked - void slotCancel(); + // Apply button clicked + void slotApply(); - // Restore button clicked - void slotRestore(); + // Close button clicked + void slotClose(); private: /// Pointer to the actual instantiation of xform's form @@ -89,12 +91,13 @@ template class Qt2DB: public Qt2Base { protected: - /// Qt2DB(ControlButtons &, const QString&); + /// Pointer to the actual instantiation of the Qt dialog virtual QDialog* form() const; /// Real GUI implementation. boost::scoped_ptr dialog_; + }; diff --git a/src/frontends/qt2/README b/src/frontends/qt2/README index 5ae2da9d77..3ac3494117 100644 --- a/src/frontends/qt2/README +++ b/src/frontends/qt2/README @@ -1,5 +1,26 @@ This file contains some do's and dont's for the Qt2 frontend. +General rules +------------- + +Every editable field that affects the state of the dialog contents +from LyX's point of view should connect its xxxChanged() signal to +a the dialog's changed_adaptor() slot, which in turn should call +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. + +If necessary, you should override Qt2Base::isValid() for determining the validity +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 ! + Don't #undef emit - #include "QtLyXView.h" instead Naming conventions @@ -17,7 +38,7 @@ Widgets should be named like "fooXX", where XX is one of the following widget types : CB - check box -CO - +CO - combo box ED - line edit LA - label ML - @@ -28,15 +49,15 @@ PB - push button Dialog Maintainer MVC conversion ---------------------------------------------- Character Edwin -Citation Kalle Done ? -Document Kalle In progress (Not yet prepared) +Citation Kalle Done +Document Kalle Waiting for MVC Index Kalle Done -Paragraph Edwin Not yet prepared +Paragraph Edwin Waiting for MVC Print Edwin Ref Kalle Search Edwin Splash Edwin -Tabular Not yet prepared +Tabular Waiting for MVC TabularCreate Edwin Toc Kalle Url Kalle diff --git a/src/frontends/qt2/Timeout_pimpl.C b/src/frontends/qt2/Timeout_pimpl.C new file mode 100644 index 0000000000..d3a7de5114 --- /dev/null +++ b/src/frontends/qt2/Timeout_pimpl.C @@ -0,0 +1,51 @@ +/** + * \file Timeout_pimpl.C + * Copyright 2001 LyX Team + * Read COPYING + * + * \author John Levon + */ + +#ifdef __GNUG__ +#pragma implementation +#endif + +#include + +#include "Timeout_pimpl.h" +#include "debug.h" + +using std::endl; + +Timeout::Pimpl::Pimpl(Timeout * owner) + : owner_(owner), timeout_id(-1) +{ +} + + +void Timeout::Pimpl::timerEvent(QTimerEvent *) +{ + owner_->emit(); +} + + +void Timeout::Pimpl::reset() +{ + killTimers(); + timeout_id = -1; +} + + +void Timeout::Pimpl::start() +{ + if (timeout_id != -1) + lyxerr << "Timeout::start: already running!" << endl; + timeout_id = startTimer(owner_->timeout_ms); +} + + +void Timeout::Pimpl::stop() +{ + if (timeout_id != -1) + reset(); +} diff --git a/src/frontends/qt2/Timeout_pimpl.h b/src/frontends/qt2/Timeout_pimpl.h new file mode 100644 index 0000000000..612f2ad4bd --- /dev/null +++ b/src/frontends/qt2/Timeout_pimpl.h @@ -0,0 +1,50 @@ +/** + * \file Timeout_pimpl.h + * Copyright 2001 LyX Team + * Read COPYING + * + * \author John Levon + */ +#ifndef TIMEOUTPIMPL_H +#define TIMEOUTPIMPL_H + +#include + +#ifdef __GNUG__ +#pragma interface +#endif + +#include "frontends/Timeout.h" + +#include + +#include +// stupid Qt +#undef emit + +/** + * This class executes the callback when the timeout expires + * using Qt mechanisms + */ +struct Timeout::Pimpl : QObject { +public: + /// + Pimpl(Timeout * owner_); + /// start the timer + void start(); + /// stop the timer + void stop(); + /// reset + void reset(); + +protected: + /// slot + virtual void timerEvent(QTimerEvent *); +private: + /// the owning timer + Timeout * owner_; + /// xforms id + int timeout_id; +}; + +#endif diff --git a/src/frontends/qt2/moc/Makefile.am b/src/frontends/qt2/moc/Makefile.am index 4f1b3e2bc9..1aee70ccd0 100644 --- a/src/frontends/qt2/moc/Makefile.am +++ b/src/frontends/qt2/moc/Makefile.am @@ -15,7 +15,6 @@ libqt2moc_la_SOURCES := FileDialog_private_moc.C \ emptytable_moc.C \ Qt2Base_moc.C \ $(MOCDIALOGS) - #$(patsubst, %, %Dialog_moc.C, $(DIALOGS)) DISTCLEANFILES = $(libqt2moc_la_SOURCES) *.orig *.rej *~ *.bak core @@ -23,4 +22,3 @@ ETAGS_ARGS = --lang=c++ %_moc.C: ../%.h $(MOC) -o $@ $< - diff --git a/src/frontends/qt2/ui/QCitationDialog.ui b/src/frontends/qt2/ui/QCitationDialog.ui index 4ecabcd6b6..eb9ee3c3ff 100644 --- a/src/frontends/qt2/ui/QCitationDialog.ui +++ b/src/frontends/qt2/ui/QCitationDialog.ui @@ -11,7 +11,7 @@ 0 0 - 483 + 439 585 @@ -631,6 +631,10 @@ default + false + + + autoDefault true @@ -649,7 +653,7 @@ QPushButton name - cancelPB + closePB text @@ -697,12 +701,6 @@ QCitationDialogBase slotDownClicked() - - restorePB - clicked() - QCitationDialogBase - slotRestoreClicked() - previousPB clicked() @@ -716,53 +714,63 @@ slotNextClicked() - citationStyleCO - activated(int) + upPB + clicked() QCitationDialogBase - slotCitationStyleSelected(int) + slotUpClicked() textBeforeED - returnPressed() + textChanged(const QString&) QCitationDialogBase - slotTextBeforeReturn() + changed_adaptor() textAfterED - returnPressed() + textChanged(const QString&) QCitationDialogBase - slotTextAfterReturn() + changed_adaptor() - bibLB + citationStyleCO + textChanged(const QString&) + QCitationDialogBase + changed_adaptor() + + + citeLB highlighted(int) QCitationDialogBase - slotBibSelected(int) + slotCiteHighlighted(int) citeLB + selected(int) + QCitationDialogBase + slotBibHighlighted(int) + + + bibLB highlighted(int) QCitationDialogBase - slotCiteSelected(int) + slotBibHighlighted(int) - upPB - clicked() + bibLB + selected(int) QCitationDialogBase - slotUpClicked() + slotBibSelected(int) + changed_adaptor() + slotBibSelected(int) slotAddClicked() - slotBibSelected(int) - slotCitationStyleSelected(int) - slotCiteSelected(int) + slotBibHighlighted(int) + slotCiteHighlighted(int) slotDelClicked() slotDownClicked() - slotUpClicked() slotNextClicked() slotPreviousClicked() - slotRestoreClicked() slotSearchTypeSelected(bool) - slotTextAfterReturn() - slotTextBeforeReturn() + slotUpClicked() diff --git a/src/frontends/qt2/ui/QIndexDialog.ui b/src/frontends/qt2/ui/QIndexDialog.ui index bbdce920ea..d177c0a56a 100644 --- a/src/frontends/qt2/ui/QIndexDialog.ui +++ b/src/frontends/qt2/ui/QIndexDialog.ui @@ -11,7 +11,7 @@ 0 0 - 208 + 204 82 @@ -130,7 +130,7 @@ QPushButton name - cancelPB + closePB text @@ -142,26 +142,12 @@ - - okPB - clicked() - QIndexDialogBase - ok_adaptor() - - - cancelPB - clicked() - QIndexDialogBase - close_adaptor() - keywordED textChanged(const QString&) QIndexDialogBase change_adaptor() - close_adaptor() change_adaptor() - ok_adaptor() -- 2.39.2