#include "frontends/Application.h"
#include "support/ConsoleApplication.h"
-#include "support/convert.h"
#include "support/lassert.h"
#include "support/debug.h"
#include "support/environment.h"
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) {
switch (Alert::prompt(
_("No python is found"),
_("LyX will only have minimal functionality because no python interpreter "
- "has been found. Consider download and install of an python interpreter."),
+ "has been found. Consider installing python with your software manager "
+ "or from the python.org website."),
0, 1,
_("&Continue"),
_("&Exit LyX")))
// 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. Perhaps wrong -userdir option?\nExiting."))
+ lyxerr << to_utf8(_("Failed to create directory. Perhaps wrong -userdir command-line option?\nExiting."))
<< endl;
earlyExit(EXIT_FAILURE);
}
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
}