mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-09-19 22:40:26 +00:00
Fix bug #7308: Table settings dialog broken.
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37706 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
parent
21992716e5
commit
9bebb8945d
@ -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);
|
||||
|
@ -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) {
|
||||
|
Loading…
Reference in New Issue
Block a user