mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-22 01:59:02 +00:00
Compare commits
No commits in common. "ab79a915ca82f63636a3ec69409979eea32398ef" and "1138b3875b3404c177acae19935d4132797fc41a" have entirely different histories.
ab79a915ca
...
1138b3875b
@ -5625,11 +5625,10 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
|
|||||||
FileName const tabstyle = libFileSearch("tabletemplates",
|
FileName const tabstyle = libFileSearch("tabletemplates",
|
||||||
style + suffix + ".lyx", "lyx");
|
style + suffix + ".lyx", "lyx");
|
||||||
if (tabstyle.empty())
|
if (tabstyle.empty())
|
||||||
break;
|
break;
|
||||||
UndoGroupHelper ugh(cur.buffer());
|
UndoGroupHelper ugh(cur.buffer());
|
||||||
cur.recordUndo();
|
cur.recordUndo();
|
||||||
FuncRequest cmd2(LFUN_FILE_INSERT,
|
FuncRequest cmd2(LFUN_FILE_INSERT, tabstyle.absFileName() + " ignorelang");
|
||||||
quoteName(tabstyle.absFileName()) + " ignorelang");
|
|
||||||
lyx::dispatch(cmd2);
|
lyx::dispatch(cmd2);
|
||||||
// go into table
|
// go into table
|
||||||
cur.backwardPos();
|
cur.backwardPos();
|
||||||
|
@ -3571,6 +3571,8 @@ void GuiDocument::getTableStyles()
|
|||||||
QString data = fn.left(fn.lastIndexOf(".lyx"));
|
QString data = fn.left(fn.lastIndexOf(".lyx"));
|
||||||
QString guiname = data;
|
QString guiname = data;
|
||||||
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
|
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
|
||||||
|
QString relpath = toqstr(makeRelPath(qstring_to_ucs4(fn),
|
||||||
|
qstring_to_ucs4(dir)));
|
||||||
if (textLayoutModule->tableStyleCO->findData(data) == -1)
|
if (textLayoutModule->tableStyleCO->findData(data) == -1)
|
||||||
textLayoutModule->tableStyleCO->addItem(guiname, data);
|
textLayoutModule->tableStyleCO->addItem(guiname, data);
|
||||||
}
|
}
|
||||||
|
@ -63,6 +63,8 @@ void GuiTabularCreate::getFiles()
|
|||||||
QString data = fn.left(fn.lastIndexOf(".lyx"));
|
QString data = fn.left(fn.lastIndexOf(".lyx"));
|
||||||
QString guiname = data;
|
QString guiname = data;
|
||||||
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
|
guiname = toqstr(translateIfPossible(qstring_to_ucs4(guiname.replace('_', ' '))));
|
||||||
|
QString relpath = toqstr(makeRelPath(qstring_to_ucs4(fn),
|
||||||
|
qstring_to_ucs4(dir)));
|
||||||
if (styleCO->findData(data) == -1)
|
if (styleCO->findData(data) == -1)
|
||||||
styleCO->addItem(guiname, data);
|
styleCO->addItem(guiname, data);
|
||||||
}
|
}
|
||||||
|
@ -77,8 +77,6 @@ What's new
|
|||||||
- Fix spacing problems in previews with math macros under specific
|
- Fix spacing problems in previews with math macros under specific
|
||||||
circumstances (bug 13120).
|
circumstances (bug 13120).
|
||||||
|
|
||||||
- Fix tabular styles on systems with blanks in system directory path.
|
|
||||||
|
|
||||||
|
|
||||||
* USER INTERFACE
|
* USER INTERFACE
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user