* For gcc to know about QStandardItemModel < QAbstractItemModel we need this header.

[lyx.git] / src / Text3.cpp

diff --git a/src/Text3.cpp b/src/Text3.cpp
index a38b5ab579b9da6d0118e67c1c1572666218f535..27bc623520259a0b50e06be4e7900a33a8896f1e 100644 (file)
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -57,6 +57,8 @@
 #include "insets/InsetSpecialChar.h"
 #include "insets/InsetText.h"
 #include "insets/InsetInfo.h"
+#include "insets/InsetGraphics.h"
+#include "insets/InsetGraphicsParams.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
@@ -873,17 +875,45 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
                break;
 
        case LFUN_INSET_SETTINGS: {
-               // if there is an inset at cursor, access this
-               Inset * inset = cur.nextInset();
-               if (inset) {
-                       inset->showInsetDialog(bv);
+               Inset & inset = cur.inset();
+               if (cmd.getArg(0) == insetName(inset.lyxCode())) {
+                       // This inset dialog has been explicitely requested.
+                       inset.showInsetDialog(bv);
+                       break;
+               }
+               // else, if there is an inset at the cursor, access this
+               Inset * next_inset = cur.nextInset();
+               if (next_inset) {
+                       next_inset->showInsetDialog(bv);
                        break;
                }
-               // if not work, access the underlying inset.
-               cur.inset().showInsetDialog(bv);
+               // if not then access the underlying inset.
+               inset.showInsetDialog(bv);
                break;
        }
 
+       case LFUN_SET_GRAPHICS_GROUP: {
+               InsetGraphics * ins = InsetGraphics::getCurrentGraphicsInset(cur);
+               if (!ins)
+                       break;
+
+               cur.recordUndoFullDocument();
+
+               string id = to_utf8(cmd.argument());
+               string grp = InsetGraphics::getGroupParams(bv->buffer(), id);
+               InsetGraphicsParams tmp, inspar = ins->getParams();
+
+               if (id.empty())
+                       inspar.groupId = to_utf8(cmd.argument());
+               else {
+                       InsetGraphics::string2params(grp, bv->buffer(), tmp);
+                       tmp.filename = inspar.filename;
+                       inspar = tmp;
+               }
+
+               ins->setParams(inspar);
+       }
+
        case LFUN_SPACE_INSERT:
                if (cur.paragraph().layout().free_spacing)
                        insertChar(cur, ' ');
@@ -1676,7 +1706,6 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_ACCENT_UNDERDOT:
        case LFUN_ACCENT_UNDERBAR:
        case LFUN_ACCENT_CARON:
-       case LFUN_ACCENT_SPECIAL_CARON:
        case LFUN_ACCENT_BREVE:
        case LFUN_ACCENT_TIE:
        case LFUN_ACCENT_HUNGARIAN_UMLAUT:
@@ -2230,7 +2259,6 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_ACCENT_UNDERDOT:
        case LFUN_ACCENT_UNDERBAR:
        case LFUN_ACCENT_CARON:
-       case LFUN_ACCENT_SPECIAL_CARON:
        case LFUN_ACCENT_BREVE:
        case LFUN_ACCENT_TIE:
        case LFUN_ACCENT_HUNGARIAN_UMLAUT:
@@ -2245,6 +2273,7 @@ bool Text::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_BUFFER_BEGIN_SELECT:
        case LFUN_BUFFER_END_SELECT:
        case LFUN_UNICODE_INSERT:
+       case LFUN_SET_GRAPHICS_GROUP:
                // these are handled in our dispatch()
                enable = true;
                break;