move definition of variables to the main cmake file

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 0775b55d6a89b2e8b830caee56fbb5263a8d72db..4d108c860bc9d733b6da8d12b6ac089e563ec0e9 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -67,9 +67,7 @@ using lyx::support::makeAbsPath;
 using lyx::support::makeDisplayPath;
 using lyx::support::onlyFilename;
 using lyx::support::onlyPath;
-using lyx::support::Path;
 using lyx::support::package;
-using lyx::support::quoteName;
 using lyx::support::removeAutosaveFile;
 using lyx::support::rename;
 using lyx::support::split;
@@ -109,10 +107,10 @@ bool menuWrite(Buffer * buffer)
 
        // FIXME: we don't tell the user *WHY* the save failed !!
 
-       string const file = makeDisplayPath(buffer->fileName(), 30);
+       docstring const file = makeDisplayPath(buffer->fileName(), 30);
 
-       string text = bformat(_("The document %1$s could not be saved.\n\n"
-               "Do you want to rename the document and try again?"), file);
+       docstring text = bformat(_("The document %1$s could not be saved.\n\n"
+                                            "Do you want to rename the document and try again?"), file);
        int const ret = Alert::prompt(_("Rename and save?"),
                text, 0, 1, _("&Rename"), _("&Cancel"));
 
@@ -130,17 +128,17 @@ bool writeAs(Buffer * buffer, string const & filename)
 
        if (filename.empty()) {
 
-               FileDialog fileDlg(_("Choose a filename to save document as"),
+               FileDialog fileDlg(lyx::to_utf8(_("Choose a filename to save document as")),
                        LFUN_BUFFER_WRITE_AS,
-                       make_pair(string(_("Documents|#o#O")),
+                       make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
                                  string(lyxrc.document_path)),
-                       make_pair(string(_("Templates|#T#t")),
+                       make_pair(string(lyx::to_utf8(_("Templates|#T#t"))),
                                  string(lyxrc.template_path)));
 
                if (!isLyXFilename(fname))
                        fname += ".lyx";
 
-               FileFilterList const filter (_("LyX Documents (*.lyx)"));
+               FileFilterList const filter (lyx::to_utf8(_("LyX Documents (*.lyx)")));
 
                FileDialog::Result result =
                        fileDlg.save(onlyPath(fname),
@@ -163,9 +161,9 @@ bool writeAs(Buffer * buffer, string const & filename)
                fname = filename;
 
        if (fs::exists(fname)) {
-               string const file = makeDisplayPath(fname, 30);
-               string text = bformat(_("The document %1$s already exists.\n\n"
-                       "Do you want to over-write that document?"), file);
+               docstring const file = makeDisplayPath(fname, 30);
+               docstring text = bformat(_("The document %1$s already exists.\n\n"
+                                                    "Do you want to over-write that document?"), file);
                int const ret = Alert::prompt(_("Over-write document?"),
                        text, 0, 1, _("&Over-write"), _("&Cancel"));
 
@@ -212,9 +210,9 @@ void quitLyX(bool noask)
        lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
 
        if (!destroyDir(package().temp_dir())) {
-               string const msg =
+               docstring const msg =
                        bformat(_("Unable to remove the temporary directory %1$s"),
-                       package().temp_dir());
+                       lyx::from_utf8(package().temp_dir()));
                Alert::warning(_("Unable to remove temporary directory"), msg);
        }
 
@@ -247,7 +245,7 @@ private:
 
 int AutoSaveBuffer::start()
 {
-       command_ = bformat(_("Auto-saving %1$s"), fname_);
+       command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_)));
        return run(DontWait);
 }
 
@@ -304,7 +302,7 @@ void autoSave(BufferView * bv)
        // should probably be moved into BufferList (Lgb)
        // Perfect target for a thread...
 {
-       if (!bv->available())
+       if (!bv->buffer())
                return;
 
        if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
@@ -355,7 +353,7 @@ void newFile(BufferView * bv, string const & filename)
 // Insert ascii file (if filename is empty, prompt for one)
 void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
 {
-       if (!bv->available())
+       if (!bv->buffer())
                return;
 
        // FIXME: We don't know the encoding of the file
@@ -364,7 +362,8 @@ void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
                return;
 
        // clear the selection
-       if (bv->text() == bv->getLyXText())
+       LyXText const & text = bv->buffer()->text();
+       if (&text == bv->getLyXText())
                bv->cursor().clearSelection();
        if (asParagraph)
                bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
@@ -380,7 +379,7 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        string fname = f;
 
        if (fname.empty()) {
-               FileDialog fileDlg(_("Select file to insert"),
+               FileDialog fileDlg(lyx::to_utf8(_("Select file to insert")),
                        (asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
 
                FileDialog::Result result =
@@ -397,20 +396,20 @@ string getContentsOfAsciiFile(BufferView * bv, string const & f, bool asParagrap
        }
 
        if (!fs::is_readable(fname)) {
-               string const error = strerror(errno);
-               string const file = makeDisplayPath(fname, 50);
-               string const text = bformat(_("Could not read the specified document\n"
-                       "%1$s\ndue to the error: %2$s"), file, error);
+               docstring const error = lyx::from_ascii(strerror(errno));
+               docstring const file = makeDisplayPath(fname, 50);
+               docstring const text = bformat(_("Could not read the specified document\n"
+                                                          "%1$s\ndue to the error: %2$s"), file, error);
                Alert::error(_("Could not read file"), text);
                return string();
        }
 
        ifstream ifs(fname.c_str());
        if (!ifs) {
-               string const error = strerror(errno);
-               string const file = makeDisplayPath(fname, 50);
-               string const text = bformat(_("Could not open the specified document\n"
-                       "%1$s\ndue to the error: %2$s"), file, error);
+               docstring const error = lyx::from_ascii(strerror(errno));
+               docstring const file = makeDisplayPath(fname, 50);
+               docstring const text = bformat(_("Could not open the specified document\n"
+                                                          "%1$s\ndue to the error: %2$s"), file, error);
                Alert::error(_("Could not open file"), text);
                return string();
        }
@@ -444,7 +443,7 @@ void reconfigure(BufferView * bv)
        bv->buffer()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
-       Path p(package().user_support());
+       lyx::support::Path p(package().user_support());
        string const configure_command = package().configure_command();
        Systemcall one;
        one.startscript(Systemcall::Wait, configure_command);
@@ -456,7 +455,7 @@ void reconfigure(BufferView * bv)
        LaTeXFeatures::getAvailable();
 
        Alert::information(_("System reconfigured"),
-               _("The system has been reconfigured.\n"
-               "You need to restart LyX to make use of any\n"
-               "updated document class specifications."));
+                          _("The system has been reconfigured.\n"
+                                         "You need to restart LyX to make use of any\n"
+                                         "updated document class specifications."));
 }