Color patch from Angus, KDE patch from Johnm menu patch from Rob, and the usual unint...

[lyx.git] / src / lyx_cb.C

diff --git a/src/lyx_cb.C b/src/lyx_cb.C
index 9787b712a6820711e5c30070d0db3fe6a83ab4ea..a31535504570b11336175ca9f51cdcb5366cd4f2 100644 (file)
--- a/src/lyx_cb.C
+++ b/src/lyx_cb.C
@@ -17,10 +17,10 @@
 #include FORMS_H_LOCATION
 #include "lyx.h"
 #include "layout_forms.h"
-#include "form1.h"
+//#include "form1.h"
 #include "lyx_main.h"
 #include "lyx_cb.h"
-#include "insets/insetref.h"
+//#include "insets/insetref.h"
 #include "insets/insetlabel.h"
 #include "insets/figinset.h"
 #include "lyxfunc.h"
@@ -30,18 +30,19 @@
 #include "filedlg.h"
 #include "lyx_gui_misc.h"
 #include "LyXView.h"
-#include "BufferView.h"
+//#include "BufferView.h"
 #include "lastfiles.h"
 #include "bufferview_funcs.h"
 #include "support/FileInfo.h"
 #include "support/syscall.h"
 #include "support/filetools.h"
 #include "support/path.h"
-#include "lyxserver.h"
+//#include "support/lyxlib.h"
+//#include "lyxserver.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "CutAndPaste.h"
-#include "exporter.h"
+//#include "CutAndPaste.h"
+//#include "exporter.h"
 
 using std::ifstream;
 using std::copy;
@@ -74,7 +75,7 @@ extern bool send_fax(string const & fname, string const & sendcmd);
 
 extern void MenuSendto();
 
-extern LyXServer * lyxserver;
+//extern LyXServer * lyxserver;
 
 // this should be static, but I need it in buffer.C
 bool quitting; // flag, that we are quitting the program
@@ -217,29 +218,23 @@ bool MenuWriteAs(Buffer * buffer)
        if (!IsLyXFilename(fname))
                fname += ".lyx";
 
-       if (buffer->isUnnamed()) {
-               fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
-                                      "",
-                                      "*.lyx", 
-                                      "");
-       } else {
-               fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
-                                      OnlyPath(fname),
-                                      "*.lyx", 
-                                      OnlyFilename(fname));
-       }
+       fname = fileDlg.Select(_("Enter Filename to Save Document as"), 
+                              OnlyPath(fname),
+                              "*.lyx", 
+                              OnlyFilename(fname));
+
        AllowInput(current_view);
 
-       if (fname.empty()) {
+       if (fname.empty())
                return false;
-       }
+
        // Make sure the absolute filename ends with appropriate suffix
        string s = MakeAbsPath(fname);
        if (!IsLyXFilename(s))
                s += ".lyx";
 
        // Same name as we have already?
-       if (s == oldname) {
+       if (!buffer->isUnnamed() && s == oldname) {
                if (!AskQuestion(_("Same name as document already has:"),
                                 MakeDisplayPath(s, 50),
                                 _("Save anyway?")))
@@ -247,7 +242,7 @@ bool MenuWriteAs(Buffer * buffer)
                // Falls through to name change and save
        } 
        // No, but do we have another file with this name open?
-       else if (bufferlist.exists(s)) {
+       else if (!buffer->isUnnamed() && bufferlist.exists(s)) {
                if (AskQuestion(_("Another document with same name open!"),
                                MakeDisplayPath(s, 50),
                                _("Replace with current document?")))
@@ -398,8 +393,6 @@ void AutoSave(BufferView * bv)
        
        // tmp_ret will be located (usually) in /tmp
        // will that be a problem?
-       string tmp_ret = tmpnam(0);
-       
        pid_t pid = fork(); // If you want to debug the autosave
        // you should set pid to -1, and comment out the
        // fork.
@@ -408,6 +401,8 @@ void AutoSave(BufferView * bv)
                // to fork. But we will do the save
                // anyway.
                bool failed = false;
+               
+               string tmp_ret = lyx::tempName();
                if (!tmp_ret.empty()) {
                        bv->buffer()->writeFile(tmp_ret, 1);
                        // assume successful write of tmp_ret
@@ -573,7 +568,7 @@ void MenuLayoutCharacter()
                fl_raise_form(fd_form_character->form_character);
        } else {
                fl_show_form(fd_form_character->form_character,
-                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_FULLBORDER,
+                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
                             _("Character Style"));
                if (ow < 0) {
                        ow = fd_form_character->form_character->w;
@@ -625,7 +620,7 @@ void MenuLayoutPreamble()
                } else {
                        fl_show_form(fd_form_preamble->form_preamble,
                                     FL_PLACE_MOUSE | FL_FREE_SIZE,
-                                    FL_FULLBORDER,
+                                    FL_TRANSIENT,
                                     _("LaTeX Preamble"));
                        if (ow < 0) {
                                ow = fd_form_preamble->form_preamble->w;
@@ -657,7 +652,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        LyXFont font(LyXFont::ALL_IGNORE);
 
        int pos = fl_get_choice(fd_form_character->choice_family);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setFamily(LyXFont::IGNORE_FAMILY); break;
        case 2: font.setFamily(LyXFont::ROMAN_FAMILY); break;
        case 3: font.setFamily(LyXFont::SANS_FAMILY); break;
@@ -666,7 +661,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        }
 
        pos = fl_get_choice(fd_form_character->choice_series);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setSeries(LyXFont::IGNORE_SERIES); break;
        case 2: font.setSeries(LyXFont::MEDIUM_SERIES); break;
        case 3: font.setSeries(LyXFont::BOLD_SERIES); break;
@@ -674,7 +669,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        }
 
        pos = fl_get_choice(fd_form_character->choice_shape);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setShape(LyXFont::IGNORE_SHAPE); break;
        case 2: font.setShape(LyXFont::UP_SHAPE); break;
        case 3: font.setShape(LyXFont::ITALIC_SHAPE); break;
@@ -684,7 +679,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        }
 
        pos = fl_get_choice(fd_form_character->choice_size);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setSize(LyXFont::IGNORE_SIZE); break;
        case 2: font.setSize(LyXFont::SIZE_TINY); break;
        case 3: font.setSize(LyXFont::SIZE_SCRIPT); break;
@@ -702,7 +697,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        }
 
        pos = fl_get_choice(fd_form_character->choice_bar);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setEmph(LyXFont::IGNORE);
                font.setUnderbar(LyXFont::IGNORE);
                font.setNoun(LyXFont::IGNORE);
@@ -720,7 +715,7 @@ LyXFont const UserFreeFont(BufferParams const & params)
        }
 
        pos = fl_get_choice(fd_form_character->choice_color);
-       switch(pos) {
+       switch (pos) {
        case 1: font.setColor(LColor::ignore); break;
        case 2: font.setColor(LColor::none); break;
        case 3: font.setColor(LColor::black); break;
@@ -821,7 +816,7 @@ void Figure()
                fl_raise_form(fd_form_figure->form_figure);
        } else {
                fl_show_form(fd_form_figure->form_figure,
-                            FL_PLACE_MOUSE, FL_FULLBORDER,
+                            FL_PLACE_MOUSE | FL_FREE_SIZE, FL_TRANSIENT,
                             _("Insert Figure"));
        }
 }
@@ -835,7 +830,7 @@ void FigureApplyCB(FL_OBJECT *, long)
                return;
 
        Buffer * buffer = current_view->buffer();
-       if(buffer->isReadonly()) // paranoia
+       if (buffer->isReadonly()) // paranoia
                return;
        
        current_view->owner()->getMiniBuffer()->Set(_("Inserting figure..."));