Complete the removal of the embedding stuff. Maybe. It's hard to be sure we got every...

[lyx.git] / src / frontends / qt4 / GuiSelectionManager.cpp

diff --git a/src/frontends/qt4/GuiSelectionManager.cpp b/src/frontends/qt4/GuiSelectionManager.cpp
index eea9d40edb0f492bd3eb23b040582f73186f29fb..b9e356d5665cb847e0ccf01ea84c91ead6204921 100644 (file)
--- a/src/frontends/qt4/GuiSelectionManager.cpp
+++ b/src/frontends/qt4/GuiSelectionManager.cpp
@@ -14,11 +14,16 @@
 
 #include <config.h>
 #include "GuiSelectionManager.h"
+#include "GuiDocument.h"
 
+#include "support/debug.h"
+
+using std::vector;
 
 namespace lyx {
 namespace frontend {
 
+
 GuiSelectionManager::GuiSelectionManager(
        QListView * avail, 
        QListView * sel,
@@ -26,8 +31,8 @@ GuiSelectionManager::GuiSelectionManager(
        QPushButton * del, 
        QPushButton * up, 
        QPushButton * down,
-       QStringListModel * amod,
-       QStringListModel * smod)
+       QAbstractListModel * amod,
+       QAbstractListModel * smod)
        {
        availableLV = avail;
        selectedLV = sel;
@@ -78,7 +83,7 @@ void GuiSelectionManager::update()
 
 void GuiSelectionManager::updateAddPB()
 {
-       int const arows = availableModel->stringList().size();
+       int const arows = availableModel->rowCount();
        QModelIndexList const availSels = 
                availableLV->selectionModel()->selectedIndexes();
        addPB->setEnabled(arows > 0 &&
@@ -89,7 +94,7 @@ void GuiSelectionManager::updateAddPB()
 
 void GuiSelectionManager::updateDelPB()
 {
-       int const srows = selectedModel->stringList().size();
+       int const srows = selectedModel->rowCount();
        if (srows == 0) {
                deletePB->setEnabled(false);
                return;
@@ -103,7 +108,7 @@ void GuiSelectionManager::updateDelPB()
 
 void GuiSelectionManager::updateUpPB()
 {
-       int const srows = selectedModel->stringList().size();
+       int const srows = selectedModel->rowCount();
        if (srows == 0) {
                upPB->setEnabled(false);
                return;
@@ -117,7 +122,7 @@ void GuiSelectionManager::updateUpPB()
 
 void GuiSelectionManager::updateDownPB()
 {
-       int const srows = selectedModel->stringList().size();
+       int const srows = selectedModel->rowCount();
        if (srows == 0) {
                downPB->setEnabled(false);
                return;
@@ -128,10 +133,17 @@ void GuiSelectionManager::updateDownPB()
        downPB->setEnabled(sel_nr >= 0 && sel_nr < srows - 1);
 }
 
+
 bool GuiSelectionManager::isSelected(const QModelIndex & idx)
 {
-       QString const str = idx.data().toString();
-       return selectedModel->stringList().contains(str);
+       if (selectedModel->rowCount() == 0)
+               return false;
+       QVariant const & str = availableModel->data(idx, Qt::DisplayRole);
+       QModelIndexList qmil = 
+                       selectedModel->match(selectedModel->index(0), 
+                                            Qt::DisplayRole, str, 
+                                            Qt::MatchExactly | Qt::MatchWrap);
+       return !qmil.empty();
 }
 
 
@@ -155,14 +167,14 @@ void GuiSelectionManager::selectedChanged(const QModelIndex & idx, const QModelI
 }
 
 
-static QModelIndex getSelectedIndex(QListView * lv)
+bool GuiSelectionManager::insertRowToSelected(int i, 
+               QMap<int, QVariant> const & itemData)
 {
-       QModelIndex retval = QModelIndex();
-       QModelIndexList selIdx = 
-                       lv->selectionModel()->selectedIndexes();
-       if (!selIdx.empty())
-               retval = selIdx.first();
-       return retval;
+       if (i <= -1 || i > selectedModel->rowCount())
+               return false;
+       if (!selectedModel->insertRow(i))
+               return false;
+       return selectedModel->setItemData(selectedModel->index(i), itemData);
 }
 
 
@@ -171,15 +183,17 @@ void GuiSelectionManager::addPB_clicked()
        QModelIndex const idxToAdd = getSelectedIndex(availableLV);
        if (!idxToAdd.isValid())
                return;
-       QModelIndex idx = selectedLV->currentIndex();
+       QModelIndex const idx = selectedLV->currentIndex();
+       int const srows = selectedModel->rowCount();
+       
+       QMap<int, QVariant> qm = availableModel->itemData(idxToAdd);
+       insertRowToSelected(srows, qm);
        
-       QStringList keys = selectedModel->stringList();
-       keys.append(idxToAdd.data().toString());
-       selectedModel->setStringList(keys);
        selectionChanged(); //signal
        
        if (idx.isValid())
                selectedLV->setCurrentIndex(idx);
+       
        updateHook();
 }
 
@@ -190,9 +204,7 @@ void GuiSelectionManager::deletePB_clicked()
        if (!idx.isValid())
                return;
        
-       QStringList keys = selectedModel->stringList();
-       keys.removeAt(idx.row());
-       selectedModel->setStringList(keys);
+       selectedModel->removeRow(idx.row());
        selectionChanged(); //signal
        
        int nrows = selectedLV->model()->rowCount();
@@ -211,13 +223,18 @@ void GuiSelectionManager::deletePB_clicked()
 void GuiSelectionManager::upPB_clicked()
 {
        QModelIndex idx = selectedLV->currentIndex();
-       
+
        int const pos = idx.row();
-       QStringList keys = selectedModel->stringList();
-       keys.swap(pos, pos - 1);
-       selectedModel->setStringList(keys);
-       selectionChanged(); //signal
+       if (pos <= 0)
+               return;
        
+       QMap<int, QVariant> qm = selectedModel->itemData(idx);
+
+       selectedModel->removeRow(pos);
+       insertRowToSelected(pos - 1, qm);
+
+       selectionChanged(); //signal
+
        selectedLV->setCurrentIndex(idx.sibling(idx.row() - 1, idx.column()));
        selectedHasFocus_ = true;
        updateHook();
@@ -227,11 +244,16 @@ void GuiSelectionManager::upPB_clicked()
 void GuiSelectionManager::downPB_clicked()
 {
        QModelIndex idx = selectedLV->currentIndex();
-       
+
        int const pos = idx.row();
-       QStringList keys = selectedModel->stringList();
-       keys.swap(pos, pos + 1);
-       selectedModel->setStringList(keys);
+       if (pos >= selectedModel->rowCount() - 1)
+               return;
+
+       QMap<int, QVariant> qm = selectedModel->itemData(idx);
+
+       selectedModel->removeRow(pos);
+       insertRowToSelected(pos + 1, qm);
+
        selectionChanged(); //signal
        
        selectedLV->setCurrentIndex(idx.sibling(idx.row() + 1, idx.column()));
@@ -311,9 +333,7 @@ bool GuiSelectionManager::eventFilter(QObject * obj, QEvent * event)
                        if (keyModifiers == Qt::NoModifier && deletePB->isEnabled())
                                deletePB_clicked();
                        else if (keyModifiers == Qt::ControlModifier) {
-                               QStringList list = selectedModel->stringList();
-                               list.clear();
-                               selectedModel->setStringList(list);
+                               selectedModel->removeRows(0, selectedModel->rowCount());
                                updateHook();
                        } else
                                //ignore it otherwise