#include "lyxrc.h"
#include "support/path.h"
#include "support/filetools.h"
+#include "buffer.h"
#include "bufferlist.h"
#include "debug.h"
#include "support/FileInfo.h"
}
if (first_start) {
- string splash = i18nLibFileSearch("examples", "splash.lyx");
+ string const splash =
+ i18nLibFileSearch("examples", "splash.lyx");
lyxerr[Debug::INIT] << "Opening splash document "
<< splash << "..." << endl;
Buffer * loadb = bufferlist.loadLyXFile(splash);
// otherwise, let the GUI handle the batch command
lyxGUI->regBuf(last_loaded);
- lyxGUI->getLyXView()->getLyXFunc()->Dispatch(batch_command);
+ lyxGUI->getLyXView()->getLyXFunc()->dispatch(batch_command);
// fall through...
}
<< searchpath << endl;
string const filename = "chkconfig.ltx";
- string temp = FileOpenSearch(searchpath, filename, string());
+ string const temp = FileOpenSearch(searchpath, filename, string());
system_lyxdir = OnlyPath(temp);
// Reduce "path/../path" stuff out of system directory
<<_("set the environment variable LYX_DIR_11x to the "
"LyX system directory ")
<< _("containing the file `chkconfig.ltx'.") << endl;
- if (!path_shown)
+ if (!path_shown) {
+ FileInfo fi(LYX_DIR);
+ if (!fi.exist()) {
+ lyxerr << "Couldn't even find the default LYX_DIR." << endl
+ << "Giving up." << endl;
+ exit(1);
+ }
lyxerr << _("Using built-in default ")
<< LYX_DIR << _(" but expect problems.")
<< endl;
- else
+ } else {
lyxerr << _("Expect problems.") << endl;
+ }
system_lyxdir = LYX_DIR;
path_shown = true;
}
// Check that user LyX directory is ok. We don't do that if
// running in batch mode.
- if (gui)
+ if (gui) {
queryUserLyXDir(explicit_userdir);
- else
+ } else {
first_start = false;
-
+ }
+
//
// Shine up lyxrc defaults
//
first_start = false;
return;
} else {
- first_start = true;
+ first_start = !explicit_userdir;
}
- // Nope
- // Different wording if the user specifically requested a directory
- if (!AskQuestion( explicit_userdir
- ? _("You have specified an invalid LyX directory.")
- : _("You don't have a personal LyX directory.") ,
-
+ // If the user specified explicitely a directory, ask whether
+ // to create it (otherwise, always create it)
+ if (explicit_userdir &&
+ !AskQuestion(_("You have specified an invalid LyX directory."),
_("It is needed to keep your own configuration."),
_("Should I try to set it up for you (recommended)?"))) {
lyxerr << _("Running without personal LyX directory.") << endl;
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string lyxrc_path = LibFileSearch(string(), name);
+ string const lyxrc_path = LibFileSearch(string(), name);
if (!lyxrc_path.empty()){
lyxerr[Debug::INIT] << "Found " << name
<< " in " << lyxrc_path << endl;
return false;
}
return true;
- } else
+ } else {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
+ }
+
return false;
}
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string ui_path = LibFileSearch("ui", name, "ui");
+ string const ui_path = LibFileSearch("ui", name, "ui");
if (ui_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
<< " in " << ui_path << endl;
LyXLex lex(uitags, ui_last - 1);
lex.setFile(ui_path);
- if (!lex.IsOK()) {
+ if (!lex.isOK()) {
lyxerr << "Unable to set LyXLeX for ui file: " << ui_path
<< endl;
}
if (lyxerr.debugging(Debug::PARSER))
lex.printTable(lyxerr);
- while (lex.IsOK()) {
+ while (lex.isOK()) {
switch (lex.lex()) {
case ui_menuset:
menubackend.read(lex);
break;
default:
- if(!strip(lex.GetString()).empty())
+ if(!strip(lex.getString()).empty())
lex.printError("LyX::ReadUIFile: "
"Unknown menu tag: `$$Token'");
break;
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string lang_path = LibFileSearch(string(), name);
+ string const lang_path = LibFileSearch(string(), name);
if (lang_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
languages.setDefaults();
{
lyxerr[Debug::INIT] << "About to read " << name << "..." << endl;
- string enc_path = LibFileSearch(string(), name);
+ string const enc_path = LibFileSearch(string(), name);
if (enc_path.empty()) {
lyxerr[Debug::INIT] << "Could not find " << name << endl;
return;