From: Edwin Leuven Date: Tue, 16 Jan 2007 12:24:49 +0000 (+0000) Subject: * avoid signal triggered by setChecked(bool) X-Git-Tag: 1.6.10~11180 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=efdc3fee52fa7ba1a6aba2cb2e75253edb255dfb;p=lyx.git * avoid signal triggered by setChecked(bool) * get rid of suprefluous mailer updates should get rid of bugs: http://bugzilla.lyx.org/show_bug.cgi?id=3076 http://bugzilla.lyx.org/show_bug.cgi?id=3077 git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16705 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/src/frontends/qt4/QTabularDialog.C b/src/frontends/qt4/QTabularDialog.C index 47837b0396..37bb1ef54a 100644 --- a/src/frontends/qt4/QTabularDialog.C +++ b/src/frontends/qt4/QTabularDialog.C @@ -57,7 +57,8 @@ QTabularDialog::QTabularDialog(QTabular * form) connect(interlinespaceUnit, SIGNAL(selectionChanged(lyx::LyXLength::UNIT)), this, SLOT(interlinespace_changed())); connect(interlinespaceCO, SIGNAL(activated(int)), this, SLOT(interlinespace_changed())); - connect(booktabsRB, SIGNAL(clicked()), this, SLOT(on_booktabsRB_toggled())); + connect(booktabsRB, SIGNAL(clicked(bool)), this, SLOT(booktabsChanged(bool))); + connect(borderDefaultRB, SIGNAL(clicked(bool)), this, SLOT(booktabsChanged(bool))); connect(borderSetPB, SIGNAL(clicked()), this, SLOT(borderSet_clicked())); connect(borderUnsetPB, SIGNAL(clicked()), this, SLOT(borderUnset_clicked())); connect(longTabularCB, SIGNAL(toggled(bool)), longtableGB, SLOT(setEnabled(bool))); @@ -107,7 +108,7 @@ void QTabularDialog::closeEvent(QCloseEvent * e) } -void QTabularDialog::on_booktabsRB_toggled() +void QTabularDialog::booktabsChanged(bool) { form_->changed(); form_->controller().booktabs(booktabsRB->isChecked()); diff --git a/src/frontends/qt4/QTabularDialog.h b/src/frontends/qt4/QTabularDialog.h index 3b150ce63d..249ade6b87 100644 --- a/src/frontends/qt4/QTabularDialog.h +++ b/src/frontends/qt4/QTabularDialog.h @@ -35,7 +35,7 @@ protected Q_SLOTS: virtual void topspace_changed(); virtual void bottomspace_changed(); virtual void interlinespace_changed(); - virtual void on_booktabsRB_toggled(); + virtual void booktabsChanged(bool); virtual void close_clicked(); virtual void borderSet_clicked(); virtual void borderUnset_clicked(); diff --git a/src/frontends/qt4/ui/QTabularUi.ui b/src/frontends/qt4/ui/QTabularUi.ui index e67b2f0567..3b8cbcf1ba 100644 --- a/src/frontends/qt4/ui/QTabularUi.ui +++ b/src/frontends/qt4/ui/QTabularUi.ui @@ -315,6 +315,9 @@ Fo&rmal + + true + diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C index c7c0980733..202ac6fa44 100644 --- a/src/insets/insettabular.C +++ b/src/insets/insettabular.C @@ -1271,8 +1271,6 @@ void InsetTabular::resetPos(LCursor & cur) const } cur.updateFlags(Update::Force | Update::FitCursor); - - InsetTabularMailer(*this).updateDialog(&bv); } @@ -1760,8 +1758,6 @@ void InsetTabular::tabularFeatures(LCursor & cur, case LyXTabular::LAST_ACTION: break; } - - InsetTabularMailer(*this).updateDialog(&bv); }