]> git.lyx.org Git - lyx.git/blobdiff - src/lyx_cb.C
Various fixes to Tabular, InsetTabular and InsetText. Fixed left border for
[lyx.git] / src / lyx_cb.C
index e79258f12c7ae6f7a9288d38e9e52422282cf647..b3335588950f62415c40cbce64ba68c366a64dc0 100644 (file)
 #include "LyXView.h"
 #include "lyxrc.h"
 #include "lyxtext.h"
-#include "minibuffer.h"
 #include "frontends/FileDialog.h"
 #include "insets/insetlabel.h"
 #include "support/FileInfo.h"
 #include "support/filetools.h"
 #include "support/path.h"
 #include "support/syscall.h"
+#include "gettext.h"
 
 using std::vector;
 using std::ifstream;
@@ -112,12 +112,12 @@ void ToggleLockedInsetCursor(int x, int y, int asc, int desc);
 void ShowMessage(Buffer const * buf,
                 string const & msg1,
                 string const & msg2,
-                string const & msg3, int delay)
+                string const & msg3)
 {
-       if (lyxrc.use_gui)
-               buf->getUser()->owner()->getMiniBuffer()->Set(msg1, msg2,
-                                                             msg3, delay);
-       else
+       if (lyxrc.use_gui) {
+               string const str = msg1 + ' ' + msg2 + ' ' + msg3;
+               buf->getUser()->owner()->message(str);
+       else
                lyxerr << msg1 << msg2 << msg3 << endl;
 }
 
@@ -315,7 +315,7 @@ void AutoSave(BufferView * bv)
                return;
        }
 
-       bv->owner()->getMiniBuffer()->Set(_("Autosaving current document..."));
+       bv->owner()->message(_("Autosaving current document..."));
        
        // create autosave filename
        string fname =  OnlyPath(bv->buffer()->fileName());
@@ -355,7 +355,7 @@ void AutoSave(BufferView * bv)
                                // It is dangerous to do this in the child,
                                // but safe in the parent, so...
                                if (pid == -1)
-                                       bv->owner()->getMiniBuffer()->Set(_("Autosave Failed!"));
+                                       bv->owner()->message(_("Autosave Failed!"));
                        }
                }
                if (pid == 0) { // we are the child so...
@@ -473,23 +473,13 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
        string label(arg);
        ProhibitInput(bv);
        if (label.empty()) {
-#ifndef NEW_INSETS
-               LyXParagraph * par =
-                       bv->text->cursor.par()->FirstPhysicalPar();
-#else
                LyXParagraph * par = bv->text->cursor.par();
-#endif
                LyXLayout const * layout =
                        &textclasslist.Style(bv->buffer()->params.textclass,
                                             par->GetLayout());
 
-#ifndef NEW_INSETS
-               if (layout->latextype == LATEX_PARAGRAPH && par->previous_) {
-                       LyXParagraph * par2 = par->previous_->FirstPhysicalPar();
-#else
                if (layout->latextype == LATEX_PARAGRAPH && par->previous()) {
                        LyXParagraph * par2 = par->previous();
-#endif
                        LyXLayout const * layout2 =
                                &textclasslist.Style(bv->buffer()->params.textclass,
                                                     par2->GetLayout());
@@ -501,25 +491,7 @@ void MenuInsertLabel(BufferView * bv, string const & arg)
                string text = layout->latexname().substr(0, 3);
                if (layout->latexname() == "theorem")
                        text = "thm"; // Create a correct prefix for prettyref
-#ifndef NEW_INSETS
-               if (par->footnoteflag==LyXParagraph::OPEN_FOOTNOTE)
-                       switch (par->footnotekind) {
-                       case LyXParagraph::FIG:
-                       case LyXParagraph::WIDE_FIG:
-                               text = "fig";
-                               break;
-                       case LyXParagraph::TAB:
-                       case LyXParagraph::WIDE_TAB:
-                               text = "tab";
-                               break;
-                       case LyXParagraph::ALGORITHM:
-                               text = "alg";
-                               break;
-                       case LyXParagraph::FOOTNOTE:    
-                       case LyXParagraph::MARGIN:
-                               break;
-                       }
-#endif
+
                text += ":";
                if (layout->latextype == LATEX_PARAGRAPH ||
                    lyxrc.label_init_length < 0)
@@ -567,14 +539,14 @@ void MenuLayoutSave(BufferView * bv)
 // reconfigure the automatic settings.
 void Reconfigure(BufferView * bv)
 {
-       bv->owner()->getMiniBuffer()->Set(_("Running configure..."));
+       bv->owner()->message(_("Running configure..."));
 
        // Run configure in user lyx directory
        Path p(user_lyxdir);
        Systemcalls one(Systemcalls::System, 
                        AddName(system_lyxdir, "configure"));
        p.pop();
-       bv->owner()->getMiniBuffer()->Set(_("Reloading configuration..."));
+       bv->owner()->message(_("Reloading configuration..."));
        lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
        WriteAlert(_("The system has been reconfigured."), 
                   _("You need to restart LyX to make use of any"),