Fix bug #6076. As said there, other configuration files probably need to be checked.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@30636 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2009-07-16 22:24:39 +00:00
parent c99d41c001
commit fd8c379545

View File

@ -1491,11 +1491,26 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
if (ui_path.empty()) { if (ui_path.empty()) {
LYXERR(Debug::INIT, "Could not find " << name); LYXERR(Debug::INIT, "Could not find " << name);
if (include) {
Alert::warning(_("Could not find UI definition file"), Alert::warning(_("Could not find UI definition file"),
bformat(_("Error while reading the configuration file\n%1$s.\n" bformat(_("Error while reading the included file\n\%1$s.\n"
"Please check your installation."), qstring_to_ucs4(name))); "Please check your installation."), qstring_to_ucs4(name)));
return false; 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()) {
LYXERR(Debug::INIT, "Could not find default UI file!!");
Alert::warning(_("Could not find default UI file"),
_("LyX coudl not find the default UI file!\n"
"Please check your installation."));
return false;
}
}
// Ensure that a file is read only once (prevents include loops) // Ensure that a file is read only once (prevents include loops)