Small fix.

[lyx.git] / src / lyxfunc.C

diff --git a/src/lyxfunc.C b/src/lyxfunc.C
index 9e184257cb159e3ae977625027f5500e07f4fdb9..a35294065bba3271e257293f8bc5f7926a26ff8e 100644 (file)
--- a/src/lyxfunc.C
+++ b/src/lyxfunc.C
@@ -388,7 +388,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                break;
        case LFUN_EXPORT:
                if (argument == "latex")
-                       disable = ! buf->isLatex();
+                       disable = (! buf->isLatex() && ! buf->isLiterate()) ;
                else if (argument == "linuxdoc")
                        disable = ! buf->isLinuxDoc();
                else if (argument == "docbook")
@@ -403,7 +403,7 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
                                || (! buf->isLinuxDoc() && ! buf->isDocBook() 
                                    && lyxrc.html_command == "none");
                else if (argument == "custom")
-                       disable = ! buf->isLatex();
+                       disable = (! buf->isLatex() && ! buf->isLiterate());
                break;
        case LFUN_UNDO:
                disable = buf->undostack.empty();
@@ -420,11 +420,53 @@ LyXFunc::func_status LyXFunc::getStatus(int ac) const
        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;
@@ -515,7 +557,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();
@@ -911,6 +953,12 @@ 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;
@@ -918,8 +966,12 @@ string LyXFunc::Dispatch(int ac,
        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;
        }
        
@@ -1276,6 +1328,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;
@@ -2071,18 +2138,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;
@@ -2493,10 +2570,10 @@ string LyXFunc::Dispatch(int ac,
                    
        case LFUN_INSERT_CITATION:
        {
-               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
@@ -2754,6 +2831,10 @@ string LyXFunc::Dispatch(int ac,
        }
        break;
 
+       case LFUN_DIALOG_PREFERENCES:
+               owner->getDialogs()->showPreferences();
+               break;
+               
        case LFUN_SAVEPREFERENCES:
        {
                Path p(user_lyxdir);