Fixed cut&paste bugs and added freespacing for ERT Insets.

[lyx.git] / src / lyx_main.C

diff --git a/src/lyx_main.C b/src/lyx_main.C
index b085903939e1c8531b2ff1ba4ce3a2e6610e3f79..1dfd3ced2ff7c763374806bf7bd9d935566efa1c 100644 (file)
--- a/src/lyx_main.C
+++ b/src/lyx_main.C
@@ -22,7 +22,8 @@
 #include "lyx_gui.h"
 #include "LyXView.h"
 #include "lyxfunc.h"
-#include "lyx_gui_misc.h"
+#include "frontends/Alert.h"
+#include "frontends/GUIRunTime.h"
 #include "lyxrc.h"
 #include "support/path.h"
 #include "support/filetools.h"
@@ -203,10 +204,10 @@ void error_handler(int err_sig)
        case SIGSEGV:
                lyxerr << "\nlyx: SIGSEGV signal caught" << endl;
                lyxerr <<
-                       "Sorry, you have found a bug in LyX."
-                       " If possible, please read 'Known bugs'\n"
-                       "under the Help menu and then send us "
-                       "a full bug report. Thanks!" << endl;
+                       "Sorry, you have found a bug in LyX. "
+                       "Please read the bug-reporting instructions " 
+                       "in Help->Introduction and send us a bug report, "
+                       "if necessary. Thanks !" << endl;
                break;
        case SIGTERM:
                // no comments
@@ -433,7 +434,7 @@ void LyX::init(bool gui)
  
         // Calculate screen dpi as average of x-DPI and y-DPI:
        if (lyxrc.use_gui) {
-               lyxrc.dpi = getScreenDPI();
+               lyxrc.dpi = GUIRunTime::getScreenDPI();
                lyxerr[Debug::INIT] << "DPI setting detected to be "
                                                 << lyxrc.dpi + 0.5 << endl;
        } else {
@@ -612,7 +613,7 @@ void LyX::queryUserLyXDir(bool explicit_userdir)
        // 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."),
+           !Alert::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;
@@ -651,7 +652,7 @@ bool LyX::readRcFile(string const & name)
                lyxerr[Debug::INIT] << "Found " << name
                                    << " in " << lyxrc_path << endl;
                if (lyxrc.read(lyxrc_path) < 0) { 
-                       WriteAlert(_("LyX Warning!"), 
+                       Alert::alert(_("LyX Warning!"), 
                                   _("Error while reading ") + lyxrc_path + ".",
                                   _("Using built-in defaults."));
                        return false;
@@ -910,5 +911,3 @@ bool LyX::easyParse(int * argc, char * argv[])
 
        return gui;
 }
-
-