From 9bebb8945d2a7638440c247b4bb3153a20e5fcce Mon Sep 17 00:00:00 2001 From: Vincent van Ravesteijn Date: Wed, 16 Feb 2011 23:09:29 +0000 Subject: [PATCH] Fix bug #7308: Table settings dialog broken. git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37706 a592a061-630c-0410-9148-cb99ea01b6c8 --- src/frontends/qt4/GuiTabular.cpp | 2 +- src/insets/InsetTabular.cpp | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiTabular.cpp b/src/frontends/qt4/GuiTabular.cpp index 87f351b611..8fe7961474 100644 --- a/src/frontends/qt4/GuiTabular.cpp +++ b/src/frontends/qt4/GuiTabular.cpp @@ -408,7 +408,7 @@ void GuiTabular::setTableAlignment(string & param_str) const docstring GuiTabular::dialogToParams() const { // FIXME: We should use Tabular directly. - string param_str = "tabular"; + string param_str = "tabular from-dialog"; // table width string tabwidth = widgetsToLength(tabularWidthED, tabularWidthUnitLC); diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp index 2f0a111fee..07fca23082 100644 --- a/src/insets/InsetTabular.cpp +++ b/src/insets/InsetTabular.cpp @@ -4278,8 +4278,16 @@ bool InsetTabular::getStatus(Cursor & cur, FuncRequest const & cmd, if (&cur.inset() != this || cmd.getArg(0) != "tabular") break; - string const s = cmd.getArg(1); // FIXME: We only check for the very first argument... + string const s = cmd.getArg(1); + // We always enable the lfun if it is coming from the dialog + // because the dialog makes sure all the settings are valid, + // even though the first argument might not be valid now. + if (s == "from-dialog") { + status.setEnabled(true); + return true; + } + int action = Tabular::LAST_ACTION; int i = 0; for (; tabularFeature[i].action != Tabular::LAST_ACTION; ++i) { -- 2.39.5