From 3efb329cb0ce9b92f3b7e78b1c3252981d1bff36 Mon Sep 17 00:00:00 2001
From: Abdelrazak Younes <younes@lyx.org>
Date: Fri, 19 Feb 2010 11:04:15 +0000
Subject: [PATCH] InsetParamsDialog: don't update the inset widget if we are
 not un synchronised mode.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33509 a592a061-630c-0410-9148-cb99ea01b6c8
---
 src/frontends/qt4/GuiTabular.h          |  2 ++
 src/frontends/qt4/InsetParamsDialog.cpp | 23 ++++++++++++++++-------
 src/frontends/qt4/InsetParamsDialog.h   |  2 ++
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/frontends/qt4/GuiTabular.h b/src/frontends/qt4/GuiTabular.h
index ac5f353bdf..456d30cac2 100644
--- a/src/frontends/qt4/GuiTabular.h
+++ b/src/frontends/qt4/GuiTabular.h
@@ -48,6 +48,8 @@ private:
 	void setVAlign(std::string & param_str) const;
 	///
 	void setTableAlignment(std::string & param_str) const;
+	///
+	void setWidthAndAlignment();
 };
 
 } // namespace frontend
diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp
index 33344c7675..bc4a286b0f 100644
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -85,7 +85,8 @@ void InsetParamsDialog::setInsetParamsWidget(InsetParamsWidget * widget)
 
 void InsetParamsDialog::on_restorePB_clicked()
 {
-	updateView();
+	updateView(true);
+	restorePB->setEnabled(false);
 }
 
 
@@ -167,18 +168,26 @@ void InsetParamsDialog::applyView()
 }
 
 
-void InsetParamsDialog::updateView()
+void InsetParamsDialog::updateView(bool update_widget)
 {
-	Inset const * i = inset(d->widget_->insetCode());
-	if (i) {
-		d->widget_->blockSignals(true);
-		d->widget_->paramsToDialog(i);
-		d->widget_->blockSignals(false);
+	if (update_widget) {
+		Inset const * i = inset(d->widget_->insetCode());
+		if (i) {
+			d->widget_->blockSignals(true);
+			d->widget_->paramsToDialog(i);
+			d->widget_->blockSignals(false);
+		}
 	}
 	checkWidgets(synchronizedViewCB->isChecked());
 }
 
 
+void InsetParamsDialog::updateView()
+{
+	updateView(synchronizedViewCB->isChecked());
+}
+
+
 Dialog * createDialog(GuiView & lv, InsetCode code)
 {
 	InsetParamsWidget * widget;
diff --git a/src/frontends/qt4/InsetParamsDialog.h b/src/frontends/qt4/InsetParamsDialog.h
index 07168af604..d2e0121f98 100644
--- a/src/frontends/qt4/InsetParamsDialog.h
+++ b/src/frontends/qt4/InsetParamsDialog.h
@@ -55,6 +55,8 @@ private:
 	///
 	void newInset();
 	///
+	void updateView(bool update_widget);
+	///
 	docstring checkWidgets(bool synchronized_view);
 	/// pimpl
 	struct Private;
-- 
2.39.5