anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 05:25:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make sure these are the same....

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

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

@ -1490,6 +1490,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
}
if (ui_path.empty()) {
static const QString defaultUIFile = "default";
LYXERR(Debug::INIT, "Could not find " << name);
if (include) {
Alert::warning(_("Could not find UI definition file"),
@ -1497,7 +1498,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
"Please check your installation."), qstring_to_ucs4(name)));
return false;
}
if (name == "default") {
if (name == defaultUIFile) {
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"
@ -1509,7 +1510,7 @@ bool GuiApplication::readUIFile(QString const & name, bool include)
"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);
return readUIFile(defaultUIFile, false);
}
// Ensure that a file is read only once (prevents include loops)