anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-08 10:51:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix problem noted by Vincent.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30652 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-07-17 21:36:34 +00:00
parent f2fd22f132
commit 4f6f4cf7ab
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1493,26 +1493,25 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
LYXERR(Debug::INIT, "Could not find " << name);
if (include) {
Alert::warning(_("Could not find UI definition file"),
bformat(_("Error while reading the included file\n\%1$s.\n"
bformat(_("Error while reading the included file\n%1$s\n"
"Please check your installation."), qstring_to_ucs4(name)));
return false;
}
Alert::warning(_("Could not find UI definition file"),
bformat(_("Error while reading the configuration file\n%1$s.\n"
"Falling back to default.\n"
"Please look under Tools>Preferences>User Interface and\n"
"check which User Interface file you are using."), qstring_to_ucs4(name)));
ui_path = libFileSearch("ui", "default", "ui");
if (ui_path.empty()) {
if (name == "default") {
LYXERR(Debug::INIT, "Could not find default UI file!!");
Alert::warning(_("Could not find default UI file"),
_("LyX could not find the default UI file!\n"
"Please check your installation."));
"Please check your installation."));
return false;
}
Alert::warning(_("Could not find UI definition file"),
bformat(_("Error while reading the configuration file\n%1$s\n"
"Falling back to default.\n"
"Please look under Tools>Preferences>User Interface and\n"
"check which User Interface file you are using."), qstring_to_ucs4(name)));
return readUIFile("default", false);
}
// Ensure that a file is read only once (prevents include loops)
static QStringList uifiles;
QString const uifile = toqstr(ui_path.absFilename());