X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyXSendto.C;h=5f672ac07bd0e4da087e725e2aaf06e06c7d0205;hb=5702f22ef0ea3d167fc5f327002d7006eef657b4;hp=80baa6b0319b45639b4db8b6fd927443ea285e12;hpb=1c9a8d27a26b5f76562914f0e81aa98334f8c06a;p=lyx.git

diff --git a/src/LyXSendto.C b/src/LyXSendto.C
index 80baa6b031..5f672ac07b 100644
--- a/src/LyXSendto.C
+++ b/src/LyXSendto.C
@@ -10,8 +10,11 @@
 #include "buffer.h"
 #include "lyx_gui_misc.h"
 #include "support/syscall.h"
+#include "support/lstrings.h"
 #include "gettext.h"
-#include "lyx_cb.h"
+#include "bufferview_funcs.h"
+#include "exporter.h"
+#include "BufferView.h"
 
 extern FD_form_sendto * fd_form_sendto;
 extern BufferView * current_view;
@@ -23,7 +26,8 @@ extern bool CreatePostscript(Buffer * buffer, bool wait);
 
 void MenuSendto()
 {
-    static int ow = -1, oh;
+    static int ow = -1;
+    static int oh;
 
     // do this only if the command is empty
     if (!fl_get_input(fd_form_sendto->input_cmd) &&
@@ -34,7 +38,7 @@ void MenuSendto()
         fl_raise_form(fd_form_sendto->form_sendto);
     } else {  
         fl_show_form(fd_form_sendto->form_sendto,
-                     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+		     FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
                      _("Send Document to Command"));
 	if (ow < 0) {
 		ow = fd_form_sendto->form_sendto->w;
@@ -54,16 +58,6 @@ void SendtoApplyCB(FL_OBJECT *, long)
     if (command.empty())
         return;
     Buffer * buffer = current_view->buffer();
-    if (fl_get_button(fd_form_sendto->radio_ftype_dvi) ||
-        fl_get_button(fd_form_sendto->radio_ftype_ps)) {
-        ProhibitInput();
-        // Generate dvi file and check if there are errors in the .lyx file
-        if (MakeLaTeXOutput(buffer) > 0) {
-            AllowInput();
-            return;
-        }
-        AllowInput();
-    }
     string ftypeext;
     if (fl_get_button(fd_form_sendto->radio_ftype_lyx))
         ftypeext = ".lyx";
@@ -74,20 +68,20 @@ void SendtoApplyCB(FL_OBJECT *, long)
     else if (fl_get_button(fd_form_sendto->radio_ftype_ascii))
         ftypeext = ".txt";
     else {
-        ftypeext = ".ps_tmp";
-        if (!CreatePostscript(buffer, true)) {
-	    return;
-	}
+	ftypeext = ".ps";
+	if (!Exporter::Export(buffer, "ps", true))
+		return;
     }
 
-    string fname = ChangeExtension(buffer->getLatexName(), ftypeext, true);
+    string const fname = OnlyFilename(ChangeExtension(buffer->getLatexName(),
+						      ftypeext));
     if (!contains(command, "$$FName"))
         command = "( " + command + " ) <$$FName";
     command = subst(command, "$$FName", fname);
     command += " &"; // execute in background
     // push directorypath, if necessary 
     string path = OnlyPath(buffer->fileName());
-    if (lyxrc.use_tempdir || (IsDirWriteable(path) < 1)){
+    if (lyxrc.use_tempdir || !IsDirWriteable(path)){
         path = buffer->tmppath;
     }
     Path p(path);