Re: [LyX/master] Unify graphics-groups inside marked block functionality.

[Pavel Sanda]

Pavel Sanda wrote:
> Jean-Marc Lasgouttes wrote:
> >> Would this patch make you happy?
> >> The routine itself could be used for different type of insets if you
> >> intend to make a crussade against useless items in context menu.
> >
> > Shouldn't it appear only if there are at least two graphics insets?
> 
> Like this. I can keep the first routine if there is an interest (count>0 is 
> slower). 
> Pavel

Caught typo, see new one. P

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index ed559b1524..b8bc705434 100644
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1154,7 +1154,7 @@ bool BufferView::getStatus(FuncRequest const & cmd, 
FuncStatus & flag)
                break;
 
        case LFUN_GRAPHICS_UNIFY:
-               flag.setEnabled(cur.selection());
+               flag.setEnabled(cur.countInsetsInSelection(GRAPHICS_CODE)>1);
                break;
 
        case LFUN_WORD_FINDADV: {
diff --git a/src/Cursor.cpp b/src/Cursor.cpp
index 07dc08dd73..b78c1f59d0 100644
--- a/src/Cursor.cpp
+++ b/src/Cursor.cpp
@@ -496,6 +496,56 @@ void CursorData::clearSelection()
 }
 
 
+int CursorData::countInsetsInSelection(InsetCode const & inset_code)
+{
+       if (!selection_)
+               return 0;
+
+       DocIterator from, to;
+       from = selectionBegin();
+       to = selectionEnd();
+
+       int count = 0;
+
+       if (!from.nextInset())      //move to closest inset
+               from.forwardInset();
+
+       while (!from.empty() && from < to) {
+               Inset * inset = from.nextInset();
+               if (!inset)
+                       break;
+               if (inset->lyxCode() == inset_code)
+                       count ++;
+               from.forwardInset();
+       }
+       return count;
+}
+
+
+bool CursorData::insetInSelection(InsetCode const & inset_code)
+{
+       if (!selection_)
+               return false;
+
+       DocIterator from, to;
+       from = selectionBegin();
+       to = selectionEnd();
+
+       if (!from.nextInset())      //move to closest inset
+               from.forwardInset();
+
+       while (!from.empty() && from < to) {
+               Inset * inset = from.nextInset();
+               if (!inset)
+                       break;
+               if (inset->lyxCode() == inset_code)
+                       return true;
+               from.forwardInset();
+       }
+       return false;
+}
+
+
 bool CursorData::fixIfBroken()
 {
        bool const broken_cursor = DocIterator::fixIfBroken();
diff --git a/src/Cursor.h b/src/Cursor.h
index efce063c50..3c132e0f29 100644
--- a/src/Cursor.h
+++ b/src/Cursor.h
@@ -129,6 +129,12 @@ public:
        void setSelection(DocIterator const & where, int n);
        ///
        void clearSelection();
+       /// check whether selection contains specific type of inset
+       /// returns 0 if no selection was made
+       bool insetInSelection(InsetCode const & inset);
+       /// count occurences of specific inset type in the selection
+       /// returns 0 if no selection was made
+       int countInsetsInSelection(InsetCode const & inset);
 
        /// access to normalized selection anchor
        CursorSlice normalAnchor() const;