* 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 47837b0396e2aa9d1f7f0f2106d319cb3ee7987a..37bb1ef54a6e19b0f9fd3974d3fa5a57883c125c 100644 (file)
--- 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 3b150ce63d0a29e15ab5c6976431e4fa6efff5c9..249ade6b87d4666f0dba282b3ef68ec16f0331ae 100644 (file)
--- 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 e67b2f05670381ba730d5552af89f7f2a4d6f50c..3b8cbcf1ba150bb711ba02be611d91d33b9edbeb 100644 (file)
--- a/src/frontends/qt4/ui/QTabularUi.ui
+++ b/src/frontends/qt4/ui/QTabularUi.ui
@@ -315,6 +315,9 @@
               <property name="text" >
                <string>Fo&amp;rmal</string>
               </property>
+              <property name="checked" >
+               <bool>true</bool>
+              </property>
              </widget>
             </item>
             <item row="0" column="0" >

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index c7c0980733500331f1c89ea18be698e08e1b3dd3..202ac6fa44bb8495781e2a56dd4919f2a87029ff 100644 (file)
--- 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);
 }