Compare commits

..

No commits in common. "ab79a915ca82f63636a3ec69409979eea32398ef" and "1138b3875b3404c177acae19935d4132797fc41a" have entirely different histories.

4 changed files with 6 additions and 5 deletions

View File

@ -5628,8 +5628,7 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
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();

View File

@ -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);
} }

View File

@ -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);
} }

View File

@ -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