#include "ConverterCache.h"
#include "Converter.h"
#include "CutAndPaste.h"
+#include "DispatchResult.h"
#include "EnchantChecker.h"
#include "Encoding.h"
#include "ErrorList.h"
#include "Language.h"
#include "LaTeXFonts.h"
#include "LayoutFile.h"
-#include "Lexer.h"
-#include "LyX.h"
#include "LyXAction.h"
#include "LyXRC.h"
#include "ModuleList.h"
#include "Server.h"
#include "ServerSocket.h"
#include "Session.h"
-#include "WordList.h"
#include "frontends/alert.h"
#include "frontends/Application.h"
#include "support/ConsoleApplication.h"
-#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/environment.h"
#include "support/Package.h"
#include "support/unique_ptr.h"
-#include <algorithm>
#include <csignal>
#include <iostream>
#include <functional>
OverwriteFiles force_overwrite = UNSPECIFIED;
-// Scale the GUI by this factor. This works whether we have a HiDpi screen
-// or not and scales everything, also fonts. Can only be changed by setting
-// the QT_SCALE_FACTOR environment variable before launching LyX and only
-// works properly with Qt 5.6 or higher.
-
-double qt_scale_factor = 1.0;
-
-
namespace {
// Filled with the command line arguments "foo" of "-sysdir foo" or
// we need to parse for "-dbg" and "-help"
easyParse(argc, argv);
-#if QT_VERSION >= 0x050600
- // Check whether Qt will scale all GUI elements and accordingly
- // set the scale factor so that to avoid blurred images and text
- char const * const scale_factor = getenv("QT_SCALE_FACTOR");
- if (scale_factor) {
- qt_scale_factor = convert<double>(scale_factor);
- if (qt_scale_factor < 1.0)
- qt_scale_factor = 1.0;
- }
-#endif
-
try {
init_package(os::utf8_argv(0), cl_system_support, cl_user_support);
} catch (ExceptionMessage const & message) {
{
// The advantage of doing this here is that the event loop
// is already started. So any need for interaction will be
- // aknowledged.
+ // acknowledged.
// if reconfiguration is needed.
- if (LayoutFileList::get().empty()) {
+ const bool noLayouts = LayoutFileList::get().empty();
+ if (noLayouts && os::hasPython()) {
switch (Alert::prompt(
_("No textclass is found"),
_("LyX will only have minimal functionality because no textclasses "
0, 2,
_("&Reconfigure"),
_("&Without LaTeX"),
- _("&Continue")))
+ _("&Continue"),
+ _("&Exit LyX")))
{
case 0:
// regular reconfigure
lyx::dispatch(FuncRequest(LFUN_RECONFIGURE,
" --without-latex-config"));
break;
+ case 3:
+ lyx::dispatch(FuncRequest(LFUN_LYX_QUIT, ""));
+ return;
+ default:
+ break;
+ }
+ } else if (noLayouts) {
+ switch (Alert::prompt(
+ _("No python is found"),
+ _("LyX will only have minimal functionality because no python interpreter "
+ "has been found. Consider installing python with your software manager "
+ "or from the python.org website."),
+ 0, 1,
+ _("&Continue"),
+ _("&Exit LyX")))
+ {
+ case 1:
+ lyx::dispatch(FuncRequest(LFUN_LYX_QUIT, ""));
+ return;
default:
break;
}
// This one is edited through the preferences dialog.
if (!readRcFile("preferences", true))
return false;
+ pimpl_->application_->applyPrefs();
// The language may have been set to someting useful through prefs
setLocale();
if (!sup.createDirectory(0755)) {
// Failed, so let's exit.
- lyxerr << to_utf8(_("Failed to create directory. Exiting."))
+ lyxerr << to_utf8(_("Failed to create directory. Perhaps wrong -userdir command-line option?\nExiting."))
<< endl;
earlyExit(EXIT_FAILURE);
}
Debug::showTags(cout);
exit(0);
}
- lyxerr << to_utf8(bformat(_("Setting debug level to %1$s"), from_utf8(arg))) << endl;
-
- lyxerr.setLevel(Debug::value(arg));
- Debug::showLevel(lyxerr, lyxerr.level());
+ string bad = Debug::badValue(arg);
+ if (bad.empty()) {
+ lyxerr.setLevel(Debug::value(arg));
+ Debug::showLevel(lyxerr, lyxerr.level());
+ } else {
+ cout << to_utf8(bformat(_("Bad debug value `%1$s'. Exiting."),
+ from_utf8(bad))) << endl;
+ exit(1);
+ }
return 1;
}
int parse_geometry(string const & arg1, string const &, string &)
{
geometryArg = arg1;
+#if !defined(QPA_XCB)
// don't remove "-geometry", it will be pruned out later in the
// frontend if need be.
return -1;
+#else
+ // but that is only done if QPA_XCB is not defined.
+ return 1;
+#endif
}