Whitespace.

[lyx.git] / src / frontends / qt4 / InsetParamsDialog.cpp

diff --git a/src/frontends/qt4/InsetParamsDialog.cpp b/src/frontends/qt4/InsetParamsDialog.cpp
index 82d371e62923dcdc8de9cbaae2e40467505c953f..e6ee1d09ec8a19c339e5b715b52ff7550f9292ef 100644 (file)
--- a/src/frontends/qt4/InsetParamsDialog.cpp
+++ b/src/frontends/qt4/InsetParamsDialog.cpp
@@ -13,8 +13,12 @@
 #include "InsetParamsDialog.h"\r
 \r
 #include "GuiBox.h"\r
+#include "GuiBranch.h"\r
+#include "GuiBibitem.h"\r
 #include "GuiERT.h"\r
 #include "GuiInfo.h"\r
+#include "GuiLine.h"\r
+#include "GuiHSpace.h"\r
 #include "GuiTabular.h"\r
 #include "GuiVSpace.h"\r
 #include "FloatPlacement.h"\r
@@ -66,6 +70,7 @@ InsetParamsDialog::InsetParamsDialog(GuiView & lv, InsetParamsWidget * widget)
        setInsetParamsWidget(widget);\r
        synchronizedViewCB->setChecked(false);\r
        on_synchronizedViewCB_stateChanged(false);\r
+       setFocusProxy(widget);\r
 }\r
 \r
 InsetParamsDialog::~InsetParamsDialog()\r
@@ -74,6 +79,12 @@ InsetParamsDialog::~InsetParamsDialog()
 }\r
 \r
 \r
+bool InsetParamsDialog::initialiseParams(std::string const &)\r
+{\r
+       on_restorePB_clicked();\r
+       return true;\r
+}\r
+\r
 void InsetParamsDialog::setInsetParamsWidget(InsetParamsWidget * widget)\r
 {\r
        d->widget_ = widget;\r
@@ -85,7 +96,8 @@ void InsetParamsDialog::setInsetParamsWidget(InsetParamsWidget * widget)
 \r
 void InsetParamsDialog::on_restorePB_clicked()\r
 {\r
-       updateView();\r
+       updateView(true);\r
+       restorePB->setEnabled(false);\r
 }\r
 \r
 \r
@@ -107,12 +119,15 @@ void InsetParamsDialog::newInset()
 }\r
 \r
 \r
+void InsetParamsDialog::on_newPB_clicked()\r
+{\r
+       newInset();\r
+}\r
+\r
+\r
 void InsetParamsDialog::on_applyPB_clicked()\r
 {\r
-       if (synchronizedViewCB->isChecked())\r
-               newInset();\r
-       else\r
-               applyView();\r
+       applyView();\r
 }\r
 \r
 \r
@@ -124,10 +139,7 @@ void InsetParamsDialog::on_closePB_clicked()
 \r
 void InsetParamsDialog::on_synchronizedViewCB_stateChanged(int state)\r
 {\r
-       bool const sync = (state == Qt::Checked);\r
-       QString const label = sync ? qt_("&New") :  qt_("&Apply");\r
-       applyPB->setText(label);\r
-       checkWidgets(sync);\r
+       checkWidgets(state == Qt::Checked);\r
 }\r
 \r
 \r
@@ -167,18 +179,26 @@ void InsetParamsDialog::applyView()
 }\r
 \r
 \r
-void InsetParamsDialog::updateView()\r
+void InsetParamsDialog::updateView(bool update_widget)\r
 {\r
-       Inset const * i = inset(d->widget_->insetCode());\r
-       if (i) {\r
-               d->widget_->blockSignals(true);\r
-               d->widget_->paramsToDialog(i);\r
-               d->widget_->blockSignals(false);\r
+       if (update_widget) {\r
+               Inset const * i = inset(d->widget_->insetCode());\r
+               if (i) {\r
+                       d->widget_->blockSignals(true);\r
+                       d->widget_->paramsToDialog(i);\r
+                       d->widget_->blockSignals(false);\r
+               }\r
        }\r
        checkWidgets(synchronizedViewCB->isChecked());\r
 }\r
 \r
 \r
+void InsetParamsDialog::updateView()\r
+{\r
+       updateView(synchronizedViewCB->isChecked());\r
+}\r
+\r
+\r
 Dialog * createDialog(GuiView & lv, InsetCode code)\r
 {\r
        InsetParamsWidget * widget;\r
@@ -189,18 +209,30 @@ Dialog * createDialog(GuiView & lv, InsetCode code)
        case FLOAT_CODE:\r
                widget = new FloatPlacement(true);\r
                break;\r
+       case BIBITEM_CODE:\r
+               widget = new GuiBibitem;\r
+               break;\r
+       case BRANCH_CODE:\r
+               widget = new GuiBranch;\r
+               break;\r
        case BOX_CODE:\r
                widget = new GuiBox;\r
                break;\r
        case INFO_CODE:\r
                widget = new GuiInfo;\r
                break;\r
-       //FIXME: not ready yet.\r
-       /*\r
+       case LINE_CODE:\r
+               widget = new GuiLine;\r
+               break;\r
+       case MATH_SPACE_CODE:\r
+               widget = new GuiHSpace(true);\r
+               break;\r
+       case SPACE_CODE:\r
+               widget = new GuiHSpace(false);\r
+               break;\r
        case TABULAR_CODE:\r
                widget = new GuiTabular;\r
                break;\r
-       */\r
        case VSPACE_CODE:\r
                widget = new GuiVSpace;\r
                break;\r