]> git.lyx.org Git - lyx.git/blobdiff - src/lyxfunc.C
Angus insetindex patch + protect patch from Dekel
[lyx.git] / src / lyxfunc.C
index 4d15da22df895cb183c4446854a1cf52443f3d2e..d01236b739da9216911a1ff169d21ce891e73903 100644 (file)
@@ -28,6 +28,7 @@ using std::istringstream;
 #pragma implementation
 #endif
 
+#include "version.h"
 #include "lyxlookup.h"
 #include "kbmap.h"
 #include "lyxfunc.h"
@@ -42,9 +43,6 @@ using std::istringstream;
 #include "insets/inseturl.h"
 #include "insets/insetlatexaccent.h"
 #include "insets/insettoc.h"
-#include "insets/insetlof.h"
-#include "insets/insetloa.h"
-#include "insets/insetlot.h"
 #include "insets/insetref.h"
 #include "insets/insetparent.h"
 #include "insets/insetindex.h"
@@ -64,7 +62,6 @@ using std::istringstream;
 #include "insets/insettheorem.h"
 #include "insets/insetcaption.h"
 #include "mathed/formulamacro.h"
-#include "toolbar.h"
 #include "spellchecker.h" // RVDK_PATCH_5
 #include "minibuffer.h"
 #include "vspace.h"
@@ -86,9 +83,14 @@ using std::istringstream;
 #include "layout.h"
 #include "WorkArea.h"
 #include "lyxfr1.h"
-#include "menus.h"
 #include "bufferview_funcs.h"
 #include "frontends/Dialogs.h"
+#include "frontends/Toolbar.h"
+#ifdef NEW_MENUBAR
+#include "frontends/Menubar.h"
+#else
+#include "menus.h"
+#endif
 #include "FloatList.h"
 
 using std::pair;
@@ -102,13 +104,12 @@ extern bool math_insert_greek(char);
 extern BufferList bufferlist;
 extern LyXServer * lyxserver;
 extern int greek_kb_flag;
-extern FD_form_toc * fd_form_toc;
 extern bool selection_possible;
 
 extern kb_keymap * toplevel_keymap;
 
 extern void MenuWrite(Buffer *);
-extern void MenuWriteAs(Buffer *);
+extern bool MenuWriteAs(Buffer *);
 extern int  MenuRunLaTeX(Buffer *);
 extern int  MenuBuildProg(Buffer *);
 extern int  MenuRunChktex(Buffer *);
@@ -118,6 +119,7 @@ extern void MenuSendto();
 extern void QuitLyX();
 extern void MenuFax(Buffer *);
 extern void MenuExport(Buffer *, string const &);
+extern void show_symbols_form(LyXFunc *);
 
 extern LyXAction lyxaction;
 // (alkis)
@@ -349,12 +351,10 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                        setErrorMessage(N_("Command not allowed with"
                                           "out any document open"));
                        flag |= LyXFunc::Disabled;
+                       return flag;
                }
        }
 
-       if (flag & LyXFunc::Disabled)
-               return flag;
-
        // I would really like to avoid having this switch and rather try to
        // encode this in the function itself.
         static bool noLaTeX = lyxrc.latex_command == "none";
@@ -377,20 +377,29 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                disable = noLaTeX || lyxrc.fax_command == "none";
                break;
        case LFUN_IMPORT:
-               if (argument == "latex")
+               if (argument == "latex" || argument == "noweb")
                        disable = lyxrc.relyx_command == "none";
-               if (argument == "linuxdoc")
+               else if (argument == "linuxdoc")
                        disable = lyxrc.linuxdoc_to_lyx_command == "none";
                break;
        case LFUN_EXPORT:
-               if (argument == "dvi" || argument == "postscript")
+               if (argument == "latex")
+                       disable = (! buf->isLatex() && ! buf->isLiterate()) ;
+               else if (argument == "linuxdoc")
+                       disable = ! buf->isLinuxDoc();
+               else if (argument == "docbook")
+                       disable = ! buf->isDocBook();
+               else if (argument == "dvi" || argument == "postscript")
                        disable = noLaTeX;
-               if (argument == "html")
-                       disable = lyxrc.html_command == "none";
-               if (argument == "html-linuxdoc")
-                       disable = lyxrc.linuxdoc_to_html_command == "none";
-               if (argument == "html-docbook")
-                       disable = lyxrc.docbook_to_html_command == "none";
+               else if (argument == "html")
+                       disable = (buf->isLinuxDoc() 
+                                  && lyxrc.linuxdoc_to_html_command == "none")
+                               || (buf->isDocBook() 
+                                   && lyxrc.docbook_to_html_command == "none")
+                               || (! buf->isLinuxDoc() && ! buf->isDocBook() 
+                                   && lyxrc.html_command == "none");
+               else if (argument == "custom")
+                       disable = (! buf->isLatex() && ! buf->isLiterate());
                break;
        case LFUN_UNDO:
                disable = buf->undostack.empty();
@@ -404,9 +413,70 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
        case LFUN_RUNCHKTEX:
                disable = lyxrc.chktex_command == "none";
                break;
+       case LFUN_BUILDPROG:
+               disable = (lyxrc.literate_command == "none" 
+                          || ! buf->isLiterate());
+               break;
+
+#ifndef NEW_TABULAR
        case LFUN_LAYOUT_TABLE:
                disable = ! owner->view()->text->cursor.par()->table;
                break;
+#endif
+       case LFUN_LAYOUT_TABULAR:
+               disable = true;
+               if (owner->view()->the_locking_inset) {
+                       disable = (owner->view()->the_locking_inset->LyxCode() != Inset::TABULAR_CODE) &&
+                               !owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE);
+               }
+               break;
+
+       case LFUN_TABULAR_FEATURE:
+               disable = true;
+               if (owner->view()->the_locking_inset) {
+                       int ret = 0;
+                       if (owner->view()->the_locking_inset->LyxCode() == Inset::TABULAR_CODE) {
+                               ret = static_cast<InsetTabular *>
+                                       (owner->view()->the_locking_inset)->
+                                       getStatus(argument);
+                       } else if (owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE)) {
+                               ret = static_cast<InsetTabular *>
+                                       (owner->view()->the_locking_inset->
+                                       GetFirstLockingInsetOfType(Inset::TABULAR_CODE))->
+                                       getStatus(argument);
+                       }
+                       switch(ret) {
+                       case 0:
+                               break;
+                       case 1:
+                               disable = false;
+                               break;
+                       case 2:
+                               disable = false;
+                               flag |= LyXFunc::ToggleOn;
+                               break;
+                       case 3:
+                               disable = false;
+                               flag |= LyXFunc::ToggleOff;
+                               break;
+                       }
+               }
+               break;
+
+       case LFUN_VC_REGISTER:
+               disable = buf->lyxvc.inUse();
+               break;
+       case LFUN_VC_CHECKIN:
+               disable = !buf->lyxvc.inUse() || buf->isReadonly();
+               break;
+       case LFUN_VC_CHECKOUT:
+               disable = !buf->lyxvc.inUse() || !buf->isReadonly();
+               break;
+       case LFUN_VC_REVERT:
+       case LFUN_VC_UNDO:
+       case LFUN_VC_HISTORY:
+               disable = !buf->lyxvc.inUse();
+               break;
        default:
                break;
         }
@@ -483,7 +553,7 @@ string LyXFunc::Dispatch(int ac,
                owner->view()->hideCursor();
 
        // We cannot use this function here
-       if (getStatus(action) & Disabled)
+       if (getStatus(ac) & Disabled)
                goto exit_with_message;
 
        commandshortcut.erase();
@@ -741,16 +811,20 @@ string LyXFunc::Dispatch(int ac,
                break;
                
        case LFUN_MENUWRITE:
-               owner->getMiniBuffer()->Set(_("Saving document"),
-                                           MakeDisplayPath(owner->buffer()->fileName()),
-                                           "...");
-               MenuWrite(owner->buffer());
-               //owner->getMiniBuffer()-> {
-               //      Set(_("Document saved as"),
-               //          MakeDisplayPath(owner->buffer()->fileName()));
-               //} else {
-               //owner->getMiniBuffer()->Set(_("Save failed!"));
-               //}
+               if (!owner->buffer()->isUnnamed()) {
+                       owner->getMiniBuffer()->Set(_("Saving document"),
+                                                   MakeDisplayPath(owner->buffer()->fileName()),
+                                                   "...");
+                       MenuWrite(owner->buffer());
+                       //owner->getMiniBuffer()-> {
+                       //      Set(_("Document saved as"),
+                       //          MakeDisplayPath(owner->buffer()->fileName()));
+                       //} else {
+                       //owner->getMiniBuffer()->Set(_("Save failed!"));
+                       //}
+               } else {
+                       MenuWriteAs(owner->buffer());
+               }
                break;
                
        case LFUN_MENUWRITEAS:
@@ -810,60 +884,40 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_LOTVIEW:
        case LFUN_LOAVIEW:
        {
-               Buffer::TocType type = Buffer::TOC_TOC;
-               if (action == LFUN_LOFVIEW)
-                       type = Buffer::TOC_LOF;
-               else if (action == LFUN_LOTVIEW)
-                       type = Buffer::TOC_LOT;
-               else if (action == LFUN_LOAVIEW)
-                       type = Buffer::TOC_LOA;
-               fl_set_choice(fd_form_toc->toctype,type + 1);
-               TocUpdateCB(0, 0);
-               if (fd_form_toc->form_toc->visible) {
-                       fl_raise_form(fd_form_toc->form_toc);
-               } else {
-                       static int ow = -1, oh;
-                       fl_show_form(fd_form_toc->form_toc,
-                                    FL_PLACE_MOUSE |
-                                    FL_FREE_SIZE, FL_FULLBORDER,
-                                    _("Table of Contents"));
-                       if (ow < 0) {
-                               ow = fd_form_toc->form_toc->w;
-                               oh = fd_form_toc->form_toc->h;
-                       }
-                       fl_set_form_minsize(fd_form_toc->form_toc, ow, oh);
-               }
+               InsetCommandParams p;
+               
+               if( action == LFUN_TOCVIEW )
+                       p.setCmdName( "tableofcontents" );
+               else if( action == LFUN_LOAVIEW )
+                       p.setCmdName( "listofalgorithms" );
+               else if( action == LFUN_LOFVIEW )
+                       p.setCmdName( "listoffigures" );
+               else
+                       p.setCmdName( "listoftables" );
+
+               owner->getDialogs()->createTOC( p.getAsString() );
                break;
        }       
+
        case LFUN_TOC_INSERT:
-       {
-               Inset * new_inset = new InsetTOC(owner->buffer());
-               if (!owner->view()->insertInset(new_inset, "Standard", true))
-                       delete new_inset;
-               break;
-       }
-       
-       case LFUN_LOF_INSERT:
-       {
-               Inset * new_inset = new InsetLOF(owner->buffer());
-               if (!owner->view()->insertInset(new_inset, "Standard", true))
-                       delete new_inset;
-               break;
-       }
-       
        case LFUN_LOA_INSERT:
-       {
-               Inset * new_inset = new InsetLOA(owner->buffer());
-               if (!owner->view()->insertInset(new_inset, "Standard", true))
-                       delete new_inset;
-               break;
-       }
-
+       case LFUN_LOF_INSERT:
        case LFUN_LOT_INSERT:
        {
-               Inset * new_inset = new InsetLOT(owner->buffer());
-               if (!owner->view()->insertInset(new_inset, "Standard", true))
-                       delete new_inset;
+               InsetCommandParams p;
+               
+               if( action == LFUN_TOC_INSERT )
+                       p.setCmdName( "tableofcontents" );
+               else if( action == LFUN_LOA_INSERT )
+                       p.setCmdName( "listofalgorithms" );
+               else if( action == LFUN_LOF_INSERT )
+                       p.setCmdName( "listoffigures" );
+               else
+                       p.setCmdName( "listoftables" );
+
+               Inset * inset = new InsetTOC( p );
+               if( !owner->view()->insertInset( inset, "Standard", true ) )
+                       delete inset;
                break;
        }
                
@@ -875,15 +929,25 @@ string LyXFunc::Dispatch(int ac,
 #endif
                break;
                
+       case LFUN_TABULAR_FEATURE:
+               // this is not handled here as this funktion is only aktive
+               // if we have a locking_inset and that one is (or contains)
+               // a tabular-inset
+               break;
+
        case LFUN_FIGURE:
                Figure();
                break;
 
-       case LFUN_INSERT_GRAPHICS:
+       case LFUN_INSET_GRAPHICS:
        {
                Inset * new_inset = new InsetGraphics;
-               if (!owner->view()->insertInset(new_inset))
+               if (!owner->view()->insertInset(new_inset)) {
                        delete new_inset;
+               } else {
+                   // this is need because you don't use a inset->Edit()
+                   owner->view()->updateInset(new_inset, true);
+               }
                break;
        }
        
@@ -1044,6 +1108,42 @@ string LyXFunc::Dispatch(int ac,
                owner->getDialogs()->showCopyright();
                break;
 
+       case LFUN_HELP_CREDITS:
+               owner->getDialogs()->showCredits();
+               break;
+
+        case LFUN_HELP_OPEN: {
+               string arg = argument;
+               if (arg.empty()) {
+                       setErrorMessage(N_("Missing argument"));
+                       break;
+               }
+               ProhibitInput(owner->view());
+               string fname = i18nLibFileSearch("doc", arg, "lyx");
+               if (fname.empty()) {
+                       lyxerr << "LyX: unable to find documentation file `"
+                              << arg << "'. Bad installation?" << endl;
+                       AllowInput(owner->view());
+                       break;
+               }
+               owner->getMiniBuffer()->Set(_("Opening help file"),
+                                           MakeDisplayPath(fname),"...");
+               owner->view()->buffer(bufferlist.loadLyXFile(fname,false));
+               AllowInput(owner->view());
+               break;
+        }
+
+       case LFUN_HELP_VERSION: 
+               ProhibitInput(owner->view());
+               fl_show_message((string(_("LyX Version ")) + LYX_VERSION 
+                                + _(" of ") + LYX_RELEASE).c_str(),
+                               (_("Library directory: ")
+                                + MakeDisplayPath(system_lyxdir)).c_str(),
+                               (_("User directory: ") 
+                                + MakeDisplayPath(user_lyxdir)).c_str());
+               AllowInput(owner->view());
+               break;
+
                // --- version control -------------------------------
        case LFUN_VC_REGISTER:
        {
@@ -1088,6 +1188,11 @@ string LyXFunc::Dispatch(int ac,
        
        // --- buffers ----------------------------------------
 
+        case LFUN_SWITCHBUFFER:
+                owner->view()->buffer(bufferlist.getBuffer(argument));
+               break;
+
+
        case LFUN_FILE_INSERT:
        {
                MenuInsertLyXFile(argument);
@@ -1172,10 +1277,7 @@ string LyXFunc::Dispatch(int ac,
                        owner->view()->update(BufferView::SELECT|BufferView::FITCUR);
                        owner->view()->text->
                                SetLayout(owner->view(), layout.second);
-                       owner->getToolbar()->combox->
-                               select(owner->view()->
-                                      text->cursor.par()->
-                                      GetLayout() + 1);
+                       owner->setLayout(layout.second);
                        owner->view()->update(BufferView::SELECT|BufferView::FITCUR|BufferView::CHANGE);
                        owner->view()->setState();
                }
@@ -1202,6 +1304,21 @@ string LyXFunc::Dispatch(int ac,
        }
        break;
                
+       case LFUN_LAYOUT_TABULAR:
+           if (owner->view()->the_locking_inset) {
+               if (owner->view()->the_locking_inset->LyxCode()==Inset::TABULAR_CODE) {
+                   InsetTabular * inset = static_cast<InsetTabular *>
+                       (owner->view()->the_locking_inset);
+                   inset->OpenLayoutDialog(owner->view());
+               } else if (owner->view()->the_locking_inset->
+                          GetFirstLockingInsetOfType(Inset::TABULAR_CODE)!=0) {
+                   InsetTabular * inset = static_cast<InsetTabular *>(
+                       owner->view()->the_locking_inset->GetFirstLockingInsetOfType(Inset::TABULAR_CODE));
+                   inset->OpenLayoutDialog(owner->view());
+               }
+           }
+           break;
+
        case LFUN_LAYOUT_PAPER:
                MenuLayoutPaper();
                break;
@@ -1219,7 +1336,7 @@ string LyXFunc::Dispatch(int ac,
                break;
                
        case LFUN_DROP_LAYOUTS_CHOICE:
-               owner->getToolbar()->combox->Show();
+               owner->getToolbar()->openLayoutList();
                break;
 
        case LFUN_LANGUAGE:
@@ -1346,7 +1463,11 @@ string LyXFunc::Dispatch(int ac,
        break;
                
        case LFUN_MENU_OPEN_BY_NAME:
+#ifdef NEW_MENUBAR
+               owner->getMenubar()->openByName(argument);
+#else
                owner->getMenus()->openByName(argument);
+#endif
                break; // RVDK_PATCH_5
                
        case LFUN_SPELLCHECK:
@@ -1993,18 +2114,28 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_HTMLURL:
        case LFUN_URL:
        {
-               InsetCommand * new_inset;
+               InsetCommandParams p;
                if (action == LFUN_HTMLURL)
-                       new_inset = new InsetUrl("htmlurl", "", "");
+                       p.setCmdName("htmlurl");
                else
-                       new_inset = new InsetUrl("url", "", "");
-               if (owner->view()->insertInset(new_inset))
-                       new_inset->Edit(owner->view(), 0, 0, 0);
+                       p.setCmdName("url");
+               owner->getDialogs()->createUrl( p.getAsString() );
+       }
+       break;
+                   
+       case LFUN_INSERT_URL:
+       {
+               InsetCommandParams p;
+               p.setFromString( argument );
+
+               InsetUrl * inset = new InsetUrl( p );
+               if (!owner->view()->insertInset(inset))
+                       delete inset;
                else
-                       delete new_inset;
+                       owner->view()->updateInset( inset, true );
        }
        break;
-       
+                   
        case LFUN_INSET_TEXT:
        {
                InsetText * new_inset = new InsetText;
@@ -2107,7 +2238,7 @@ string LyXFunc::Dispatch(int ac,
                // Do we have a locking inset...
                if (owner->view()->the_locking_inset) {
                        lyxerr << "Locking inset code: "
-                              << owner->view()->the_locking_inset->LyxCode();
+                              << static_cast<int>(owner->view()->the_locking_inset->LyxCode());
                        InsetCaption * new_inset = new InsetCaption;
                        new_inset->setOwner(owner->view()->the_locking_inset);
                        new_inset->SetAutoBreakRows(true);
@@ -2288,15 +2419,7 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_PUSH_TOOLBAR:
        {
                int nth = strToInt(argument);
-               if (lyxerr.debugging(Debug::TOOLBAR)) {
-                       lyxerr << "LFUN_PUSH_TOOLBAR: argument = `"
-                              << argument << "'\n"
-                              << "LFUN_PUSH_TOOLBAR: nth = `"
-                              << nth << "'" << endl;
-               }
-               
                if (nth <= 0) {
-                       LyXBell();
                        setErrorMessage(N_("Push-toolbar needs argument > 0"));
                } else {
                        owner->getToolbar()->push(nth);
@@ -2306,7 +2429,7 @@ string LyXFunc::Dispatch(int ac,
        
        case LFUN_ADD_TO_TOOLBAR:
        {
-               if (lyxerr.debugging(Debug::TOOLBAR)) {
+               if (lyxerr.debugging(Debug::GUI)) {
                        lyxerr << "LFUN_ADD_TO_TOOLBAR:"
                                "argument = `" << argument << '\'' << endl;
                }
@@ -2314,7 +2437,6 @@ string LyXFunc::Dispatch(int ac,
                //lyxerr <<string("Argument: ") + argument);
                //lyxerr <<string("Tmp     : ") + tmp);
                if (tmp.empty()) {
-                       LyXBell();
                        setErrorMessage(N_("Usage: toolbar-add-to <LyX command>"));
                } else {
                        owner->getToolbar()->add(argument, false);
@@ -2395,8 +2517,7 @@ string LyXFunc::Dispatch(int ac,
        break;
 
        case LFUN_MATH_MODE:   // Open or create a math inset
-       {
-               
+       {               
                if (owner->view()->available())
                        owner->view()->open_new_inset(new InsetFormula);
                setMessage(N_("Math editor mode"));
@@ -2407,21 +2528,38 @@ string LyXFunc::Dispatch(int ac,
        case LFUN_MATH_LIMITS:
        {
                setErrorMessage(N_("This is only allowed in math mode!"));
+       
+       }
+       break;
+
+       case LFUN_MATH_PANEL:
+       {
+               show_symbols_form(this);
        }
        break;
        
-       case LFUN_CREATE_CITATION:
+       case LFUN_CITATION_CREATE:
        {
-               owner->getDialogs()->createCitation( argument );
+               // Should do this "at source"
+               InsetCommandParams p( "cite" );
+               
+               if (contains(argument, "|")) {
+                       p.setContents( token(argument, '|', 0) );
+                       p.setOptions(  token(argument, '|', 1) );
+               } else {
+                       p.setContents( argument );
+               }
+
+               owner->getDialogs()->createCitation( p.getAsString() );
        }
        break;
                    
-       case LFUN_INSERT_CITATION:
+       case LFUN_CITATION_INSERT:
        {
-               string keys = token(argument, '|', 0);
-               string text = token(argument, '|', 1);
+               InsetCommandParams p;
+               p.setFromString( argument );
 
-               InsetCitation * inset = new InsetCitation( keys, text );
+               InsetCitation * inset = new InsetCitation( p );
                if (!owner->view()->insertInset(inset))
                        delete inset;
                else
@@ -2482,21 +2620,18 @@ string LyXFunc::Dispatch(int ac,
        }
        break;
                
-       case LFUN_INDEX_INSERT:
-       case LFUN_INDEX_INSERT_LAST:
+       case LFUN_INDEX_CREATE:
+       case LFUN_INDEX_CREATE_LAST:
        {
                // Can't do that at the beginning of a paragraph.
                if (owner->view()->text->cursor.pos() - 1 < 0)
                        break;
 
-               InsetIndex * new_inset = new InsetIndex();
+               InsetCommandParams p( "index" );
+               
                if (!argument.empty()) {
-                       string lsarg(argument);
-                       new_inset->setContents(lsarg);
-                       if (!owner->view()->insertInset(new_inset))
-                               delete new_inset;
+                       p.setContents( argument );
                } else {
-                       //reh 98/09/21
                        //get the current word for an argument
                        LyXParagraph::size_type lastpos = 
                                owner->view()->text->cursor.pos() - 1;
@@ -2507,36 +2642,32 @@ string LyXFunc::Dispatch(int ac,
                                         ->text->cursor.par()->GetWord(lastpos));
 
                        //make the new inset and write the current word into it
-                       InsetIndex * new_inset = new InsetIndex();
-
-                       new_inset->setContents(curstring);
-
-                       //don't edit it if the call was to INSERT_LAST
-                       if(action != LFUN_INDEX_INSERT_LAST) {
-                               new_inset->Edit(owner->view(), 0, 0, 0);
-                       } else {
-                               //it looks blank on the screen unless
-                               //we do  something.  put it here.
-
-                               // move the cursor to the returned value of lastpos
-                               // but only for the auto-insert
-                               owner->view()->text->cursor.pos(lastpos);
-                       }
-
-                       //put the new inset into the buffer.
-                       // there should be some way of knowing the user
-                       //cancelled & avoiding this, but i don't know how
-                       if (!owner->view()->insertInset(new_inset))
-                               delete new_inset;
+                       p.setContents( curstring );
                }
+
+               owner->getDialogs()->createIndex( p.getAsString() );
        }
        break;
+                   
+       case LFUN_INDEX_INSERT:
+       {
+               InsetCommandParams p;
+               p.setFromString( argument );
 
+               InsetIndex * inset = new InsetIndex( p );
+               if (!owner->view()->insertInset(inset))
+                       delete inset;
+               else
+                       owner->view()->updateInset( inset, true );
+       }
+       break;
+                   
        case LFUN_INDEX_PRINT:
        {
-               Inset * new_inset = new InsetPrintIndex(owner->buffer());
-               if (!owner->view()->insertInset(new_inset, "Standard", true))
-                       delete new_inset;
+               InsetCommandParams p("printindex");
+               Inset * inset = new InsetPrintIndex(p);
+               if (!owner->view()->insertInset(inset, "Standard", true))
+                       delete inset;
        }
        break;
 
@@ -2679,6 +2810,10 @@ string LyXFunc::Dispatch(int ac,
        }
        break;
 
+       case LFUN_DIALOG_PREFERENCES:
+               owner->getDialogs()->showPreferences();
+               break;
+               
        case LFUN_SAVEPREFERENCES:
        {
                Path p(user_lyxdir);
@@ -2810,6 +2945,7 @@ void LyXFunc::MenuNew(bool fromTemplate)
                        initpath = trypath;
        }
 
+#ifdef NEW_WITH_FILENAME
        ProhibitInput(owner->view());
        fileDlg.SetButton(0, _("Documents"), lyxrc.document_path);
        fileDlg.SetButton(1, _("Templates"), lyxrc.template_path);
@@ -2822,7 +2958,7 @@ void LyXFunc::MenuNew(bool fromTemplate)
                lyxerr.debug() << "New Document Cancelled." << endl;
                return;
        }
-        
+       
        // get absolute path of file and make sure the filename ends
        // with .lyx
        string s = MakeAbsPath(fname);
@@ -2830,7 +2966,7 @@ void LyXFunc::MenuNew(bool fromTemplate)
                s += ".lyx";
 
        // Check if the document already is open
-       if (bufferlist.exists(s)){
+       if (bufferlist.exists(s)) {
                switch(AskConfirmation(_("Document is already open:"), 
                                       MakeDisplayPath(s, 50),
                                       _("Do you want to close that document now?\n"
@@ -2849,7 +2985,7 @@ void LyXFunc::MenuNew(bool fromTemplate)
                                return;
                        }
        }
-        
+
        // Check whether the file already exists
        if (IsLyXFilename(s)) {
                FileInfo fi(s);
@@ -2869,6 +3005,16 @@ void LyXFunc::MenuNew(bool fromTemplate)
                        return;
                }
        }
+#else
+       static int newfile_number = 0;
+       string s = "/lyx/dummy/dirname/newfile ["+tostr(++newfile_number)+"]";
+       FileInfo fi(s);
+       while (bufferlist.exists(s) || fi.readable()) {
+               ++newfile_number;
+               s = "/lyx/dummy/dirname/newfile ["+tostr(newfile_number)+"]";
+               fi.newFile(s);
+       }
+#endif
 
        // The template stuff
        string templname;