rename LFUN enum values according to their command (as used in th minibuffer/bind...

[lyx.git] / src / frontends / qt4 / QTocDialog.C

diff --git a/src/frontends/qt4/QTocDialog.C b/src/frontends/qt4/QTocDialog.C
index f027d643796c56859c7e84bbacfb9075a2e5054e..4a155bdfcee0fe7021947d901e34992262928505 100644 (file)
--- a/src/frontends/qt4/QTocDialog.C
+++ b/src/frontends/qt4/QTocDialog.C
@@ -43,7 +43,7 @@ QTocDialog::QTocDialog(Dialog & dialog, QToc * form)
 {
        setupUi(this);
 
-       update();
+       updateGui();
 
        connect(tocTV->selectionModel(),
                SIGNAL(currentChanged(const QModelIndex &,
@@ -58,6 +58,7 @@ QTocDialog::~QTocDialog()
        accept();
 }
 
+
 void QTocDialog::selectionChanged(const QModelIndex & current,
                                                                  const QModelIndex & previous)
 {
@@ -69,16 +70,6 @@ void QTocDialog::selectionChanged(const QModelIndex & current,
 }
 
 
-void QTocDialog::on_tocTV_clicked(const QModelIndex & index )
-{
-       lyxerr[Debug::GUI]
-               << "on_tocTV_clicked index " << index.row() << ", " << index.column()
-               << endl;
-
-       form_->goTo(index);
-}
-
-
 void QTocDialog::on_closePB_clicked()
 {
        accept();
@@ -87,7 +78,6 @@ void QTocDialog::on_closePB_clicked()
 
 void QTocDialog::on_updatePB_clicked()
 {
-       form_->update();
        update();
 }
 
@@ -102,9 +92,9 @@ void QTocDialog::on_depthSL_valueChanged(int depth)
 /*
        while (
        tocTv->setExpanded();
-                       if (iter->depth > depth_)
+                       if (iter->depth() > depth_)
                                tocTV->collapseItem(topLevelItem);
-                       else if (iter->depth <= depth_)
+                       else if (iter->depth() <= depth_)
                                tocTV->expandItem(topLevelItem);
 */
 }
@@ -119,47 +109,59 @@ void QTocDialog::on_typeCO_activated(int value)
 
 void QTocDialog::on_moveUpPB_clicked()
 {
-       move(toc::UP);
+       enableButtons(false);
+       QModelIndex index = tocTV->selectionModel()->selectedIndexes()[0];
+       form_->goTo(index);
+       form_->outlineUp();
+       update();
 }
 
 
 void QTocDialog::on_moveDownPB_clicked()
 {
-       move(toc::DOWN);
+       enableButtons(false);
+       QModelIndex index = tocTV->selectionModel()->selectedIndexes()[0];
+       form_->goTo(index);
+       form_->outlineDown();
+       update();
 }
 
 
 void QTocDialog::on_moveInPB_clicked()
 {
-       move(toc::IN);
+       enableButtons(false);
+       QModelIndex index = tocTV->selectionModel()->selectedIndexes()[0];
+       form_->goTo(index);
+       form_->outlineIn();
+       update();
 }
 
 
 void QTocDialog::on_moveOutPB_clicked()
-{
-       move(toc::OUT);
-}
-
-
-void QTocDialog::move(toc::OutlineOp const operation)
 {
        enableButtons(false);
        QModelIndex index = tocTV->selectionModel()->selectedIndexes()[0];
-       form_->move(operation, index);
-       select(index);
-       enableButtons();
+       form_->goTo(index);
+       form_->outlineOut();
+       update();
 }
 
+
 void QTocDialog::select(QModelIndex const & index)
 {
-       tocTV->setModel(form_->tocModel());
+//     tocTV->setModel(form_->tocModel());
 
-       if (index.isValid()) {
-               tocTV->scrollTo(index);
-               tocTV->selectionModel()->select(index, QItemSelectionModel::Select);
+       if (!index.isValid()) {
+               lyxerr[Debug::GUI]
+                       << "QTocDialog::select(): QModelIndex is invalid!" << endl;
+               return;
        }
+
+       tocTV->scrollTo(index);
+       tocTV->selectionModel()->select(index, QItemSelectionModel::Select);
 }
 
+
 void QTocDialog::enableButtons(bool enable)
 {
        updatePB->setEnabled(enable);
@@ -175,6 +177,13 @@ void QTocDialog::enableButtons(bool enable)
 
 
 void QTocDialog::update()
+{
+       form_->update();
+       updateGui();
+}
+
+
+void QTocDialog::updateGui()
 {
        typeCO->setModel(form_->typeModel());
        tocTV->setModel(form_->tocModel());
@@ -192,6 +201,8 @@ void QTocDialog::update()
                this, SLOT(selectionChanged(const QModelIndex &,
                        const QModelIndex &)));
 
+       select(form_->getCurrentIndex());
+
        lyxerr[Debug::GUI]
                << "form_->tocModel()->rowCount " << form_->tocModel()->rowCount()
                << "\nform_->tocModel()->columnCount " << form_->tocModel()->columnCount()
@@ -215,7 +226,6 @@ void QTocDialog::hide()
 
 void QTocDialog::show()
 {
-       form_->update();
        update();
        QDialog::show();
 }