anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-25 19:07:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Factor out the code that actually does the reading of UI files. This is

Browse Source 
preparatory to prefs2prefs conversion here, which will be the last piece
of that work.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@37235 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2011-01-16 20:38:08 +00:00
parent c8766b2e42
commit 00b35a8309
2 changed files with 82 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

128
src/frontends/qt4/GuiApplication.cpp
View File

@ -2306,6 +2306,74 @@ bool GuiApplication::searchMenu(FuncRequest const & func,
}
// Ensure that a file is read only once (prevents include loops)
static QStringList uifiles;
// store which ui files define Toolbars
static QStringList toolbar_uifiles;
GuiApplication::ReturnValues GuiApplication::readUIFile(FileName ui_path)
{
enum {
ui_menuset = 1,
ui_toolbars,
ui_toolbarset,
ui_include,
ui_last
};
LexerKeyword uitags[] = {
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
{ "toolbarset", ui_toolbarset }
};
Lexer lex(uitags);
lex.setFile(ui_path);
if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
bool error = false;
while (lex.isOK()) {
switch (lex.lex()) {
case ui_include: {
lex.next(true);
QString const file = toqstr(lex.getString());
if (!readUIFile(file, true))
return ReadError;
break;
}
case ui_menuset:
d->menus_.read(lex);
break;
case ui_toolbarset:
d->toolbars_.readToolbars(lex);
break;
case ui_toolbars:
d->toolbars_.readToolbarSettings(lex);
toolbar_uifiles.push_back(toqstr(ui_path.absFileName()));
break;
default:
if (!rtrim(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
"Unknown menu tag: `$$Token'");
error = true;
break;
}
}
return (error ? ReadError : ReadOK);
}
bool GuiApplication::readUIFile(QString const & name, bool include)
{
LYXERR(Debug::INIT, "About to read " << name << "...");
@ -2343,8 +2411,6 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
return readUIFile(defaultUIFile, false);
}
// Ensure that a file is read only once (prevents include loops)
static QStringList uifiles;
QString const uifile = toqstr(ui_path.absFileName());
if (uifiles.contains(uifile)) {
if (!include) {
@ -2362,63 +2428,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
LYXERR(Debug::INIT, "Found " << name << " in " << ui_path);
enum {
ui_menuset = 1,
ui_toolbars,
ui_toolbarset,
ui_include,
ui_last
};
LexerKeyword uitags[] = {
{ "include", ui_include },
{ "menuset", ui_menuset },
{ "toolbars", ui_toolbars },
{ "toolbarset", ui_toolbarset }
};
Lexer lex(uitags);
lex.setFile(ui_path);
if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
// store which ui files define Toolbars
static QStringList toolbar_uifiles;
while (lex.isOK()) {
switch (lex.lex()) {
case ui_include: {
lex.next(true);
QString const file = toqstr(lex.getString());
if (!readUIFile(file, true))
return false;
break;
}
case ui_menuset:
d->menus_.read(lex);
break;
case ui_toolbarset:
d->toolbars_.readToolbars(lex);
break;
case ui_toolbars:
d->toolbars_.readToolbarSettings(lex);
toolbar_uifiles.push_back(uifile);
break;
default:
if (!rtrim(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
"Unknown menu tag: `$$Token'");
break;
}
}
readUIFile(ui_path);
if (include)
return true;

14
src/frontends/qt4/GuiApplication.h
View File

@ -30,6 +30,10 @@ class BufferView;
class ColorCache;
class KeySymbol;
namespace support {
class FileName;
}
namespace frontend {
class GuiView;
@ -117,7 +121,7 @@ public:
void setCurrentView(GuiView * view) { current_view_ = view; }
///
QList<int> viewIds() const;
/// Clear all session information.
void clearSession();
@ -183,6 +187,14 @@ private:
/// read the given ui (menu/toolbar) file
bool readUIFile(QString const & name, bool include = false);
///
enum ReturnValues {
ReadOK,
ReadError,
FormatMismatch
};
///
ReturnValues readUIFile(support::FileName);
///
void setGuiLanguage();
///
void reconfigure(std::string const & option);