More fixes to insettabular/text (and some missing features added).

[lyx.git] / src / LaTeXLog.C

diff --git a/src/LaTeXLog.C b/src/LaTeXLog.C
index ac215a71f6eb9b61dcf59af247b900faa8943601..349498dcf269347cf610ae718ac62f30d9e656ad 100644 (file)
--- a/src/LaTeXLog.C
+++ b/src/LaTeXLog.C
@@ -3,7 +3,7 @@
 #include <cstdlib>
 #include FORMS_H_LOCATION
 #include "buffer.h"
-#include "latexoptions.h"
+#include "log_form.h"
 #include "lyx_main.h"
 #include "LString.h"
 #include "support/FileInfo.h"
@@ -12,6 +12,7 @@
 #include "lyxrc.h"
 #include "BufferView.h"
 #include "gettext.h"
+#include "converter.h"
 
 extern FD_LaTeXLog *fd_latex_log;
 extern BufferView *current_view;
@@ -20,15 +21,16 @@ void ShowLatexLog()
 {
        string filename, fname, bname, path;
        bool use_build = false;
+       static int ow = -1, oh;
 
-       filename = current_view->currentBuffer()->getFileName();
+       filename = current_view->buffer()->getLatexName();
        if (!filename.empty()) {
-               fname = SpaceLess(ChangeExtension(filename, ".log", true));
-               bname = SpaceLess(ChangeExtension(filename,
-                                                 lyxrc->literate_extension + ".out", true));
+               fname = OnlyFilename(ChangeExtension(filename, ".log"));
+               bname = OnlyFilename(ChangeExtension(filename,
+                                    formats.Extension("literate") + ".out"));
                path = OnlyPath(filename);
-               if (lyxrc->use_tempdir || (IsDirWriteable(path) < 1)) {
-                       path = current_view->currentBuffer()->tmppath;
+               if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)) {
+                       path = current_view->buffer()->tmppath;
                }
                FileInfo f_fi(path + fname), b_fi(path + bname);
                if (b_fi.exist())
@@ -39,17 +41,22 @@ void ShowLatexLog()
                if (!fl_load_browser(fd_latex_log->browser_latexlog,
                                     use_build ? bname.c_str() : fname.c_str()))
                        fl_add_browser_line(fd_latex_log->browser_latexlog,
-                                           _("Unable to show log file!"));
+                                           _("No LaTeX log file found"));
        } else {
                fl_add_browser_line(fd_latex_log->browser_latexlog,
-                              _("NO LATEX LOG FILE!"));
+                              _("No LaTeX log file found"));
        }
        if (fd_latex_log->LaTeXLog->visible) {
                fl_raise_form(fd_latex_log->LaTeXLog);
        } else {
                fl_show_form(fd_latex_log->LaTeXLog,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE,FL_FULLBORDER,
+                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
                             use_build ? _("Build Program Log") : _("LaTeX Log"));
+               if (ow < 0) {
+                       ow = fd_latex_log->LaTeXLog->w;
+                       oh = fd_latex_log->LaTeXLog->h;
+               }
+               fl_set_form_minsize(fd_latex_log->LaTeXLog, ow, oh);
        }
 }