last Friday's text*.C -> text_func shuffle

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index f155dd9ad96c9cf0d4c2777707fae20492a56ab4..9036b814eef0d7f0879bb5a2b4a4902832c22764 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -16,6 +16,7 @@
 #include "lyxrow.h"
 #include "bufferlist.h"
 #include "buffer.h"
+#include "buffer_funcs.h"
 #include "BufferView.h"
 #include "lyxserver.h"
 #include "intl.h"
@@ -77,6 +78,8 @@
 #include <utility>
 #include <algorithm>
 
+using namespace lyx::support;
+
 using std::pair;
 using std::make_pair;
 using std::endl;
@@ -536,7 +539,7 @@ FuncStatus LyXFunc::getStatus(FuncRequest const & ev) const
                disable = !mathcursor;
                break;
 
-       case LFUN_DIALOG_SHOW: {
+       case LFUN_DIALOG_SHOW: {
                string const name = ev.getArg(0);
                if (!buf) {
                        disable = !(name == "aboutlyx" ||
@@ -947,7 +950,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                                        }
                                        goto exit_with_message;
                                case LFUN_DOWN:
-                                       if (boost::next(TEXT()->cursor.row()) != TEXT()->rows().end())
+                                       if (boost::next(TEXT()->cursorRow()) != TEXT()->rows().end())
                                                TEXT()->cursorDown(view());
                                        else
                                                TEXT()->cursorRight(view());
@@ -1093,25 +1096,31 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
 
        case LFUN_UPDATE:
                Exporter::Export(owner->buffer(), argument, true);
+               view()->showErrorList(BufferFormat(*owner->buffer()));
                break;
 
        case LFUN_PREVIEW:
                Exporter::Preview(owner->buffer(), argument);
+               view()->showErrorList(BufferFormat(*owner->buffer()));
                break;
 
        case LFUN_BUILDPROG:
                Exporter::Export(owner->buffer(), "program", true);
+               view()->showErrorList(_("Build"));
                break;
 
        case LFUN_RUNCHKTEX:
                owner->buffer()->runChktex();
+               view()->showErrorList(_("ChkTeX"));
                break;
 
        case LFUN_EXPORT:
                if (argument == "custom")
                        owner->getDialogs().showSendto();
-               else
+               else {
                        Exporter::Export(owner->buffer(), argument, false);
+                       view()->showErrorList(BufferFormat(*owner->buffer()));
+               }
                break;
 
        case LFUN_IMPORT:
@@ -1195,7 +1204,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                }
                owner->message(bformat(_("Opening help file %1$s..."),
                        MakeDisplayPath(fname)));
-               view()->buffer(bufferlist.loadLyXFile(fname, false));
+               view()->loadLyXFile(fname, false);
                break;
        }
 
@@ -1307,7 +1316,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                if (bufferlist.exists(s)) {
                        view()->buffer(bufferlist.getBuffer(s));
                } else {
-                       view()->buffer(bufferlist.loadLyXFile(s));
+                       view()->loadLyXFile(s);
                }
 
                view()->setCursorFromRow(row);
@@ -1455,7 +1464,7 @@ void LyXFunc::dispatch(FuncRequest const & ev, bool verbose)
                if (bufferlist.exists(filename))
                        view()->buffer(bufferlist.getBuffer(filename));
                else
-                       view()->buffer(bufferlist.loadLyXFile(filename));
+                       view()->loadLyXFile(filename);
        }
        break;
 
@@ -1714,7 +1723,7 @@ void LyXFunc::menuNew(string const & name, bool fromTemplate)
                templname = fname;
        }
 
-       view()->buffer(bufferlist.newFile(filename, templname, !name.empty()));
+       view()->buffer(newFile(filename, templname, !name.empty()));
 }
 
 
@@ -1769,17 +1778,15 @@ void LyXFunc::open(string const & fname)
        FileInfo const f(filename, true);
        if (!f.exist()) {
                // the user specifically chose this name. Believe them.
-               Buffer * buffer =  bufferlist.newFile(filename, "", true);
+               Buffer * buffer =  newFile(filename, "", true);
                view()->buffer(buffer);
                return;
        }
 
        owner->message(bformat(_("Opening document %1$s..."), disp_fn));
 
-       Buffer * openbuf = bufferlist.loadLyXFile(filename);
        string str2;
-       if (openbuf) {
-               view()->buffer(openbuf);
+       if (view()->loadLyXFile(filename)) {
                str2 = bformat(_("Document %1$s opened."), disp_fn);
        } else {
                str2 = bformat(_("Could not open document %1$s"), disp_fn);
@@ -1932,6 +1939,6 @@ string const LyXFunc::view_status_message()
 
 BufferView * LyXFunc::view() const
 {
-       lyx::Assert(owner);
+       Assert(owner);
        return owner->view().get();
 }