X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FTocWidget.cpp;h=538c04c177cb894dd2f4045301e7db29fb640087;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=badc34532393bd4e1ed075e03feed9a2b6c79275;hpb=cde33577dfac4cca8f3936e7b083b4c8dec232a5;p=lyx.git

diff --git a/src/frontends/qt4/TocWidget.cpp b/src/frontends/qt4/TocWidget.cpp
index badc345323..538c04c177 100644
--- a/src/frontends/qt4/TocWidget.cpp
+++ b/src/frontends/qt4/TocWidget.cpp
@@ -19,6 +19,7 @@
 #include "TocModel.h"
 
 #include "Buffer.h"
+#include "BufferView.h"
 #include "CutAndPaste.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
@@ -173,6 +174,9 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
 	TocItem const & item =
 		gui_view_.tocModels().currentItem(current_type_, index);
 
+	// Start an undo group.
+	cur.beginUndoGroup();
+
 	switch (cmd.action)
 	{
 	case LFUN_CHANGE_ACCEPT:
@@ -201,6 +205,7 @@ void TocWidget::doDispatch(Cursor & cur, FuncRequest const & cmd)
 		if (inset)
 			inset->dispatch(cur, tmpcmd);
 	}
+	cur.endUndoGroup();
 }
 
 
@@ -244,6 +249,7 @@ void TocWidget::on_sortCB_stateChanged(int state)
 	updateView();
 }
 
+
 void TocWidget::on_persistentCB_stateChanged(int state)
 {
 	persistent_ = state == Qt::Checked;
@@ -394,9 +400,16 @@ static bool canNavigate(QString const & type)
 }
 
 
+/// Test whether sorting is possible
+static bool isSortable(QString const & type)
+{
+	return type != "tableofcontents";
+}
+
+
 void TocWidget::updateView()
 {
-	if (!gui_view_.view()) {
+	if (!gui_view_.documentBufferView()) {
 		enableControls(false);
 		typeCO->setEnabled(false);
 		tocTV->setModel(0);
@@ -408,7 +421,7 @@ void TocWidget::updateView()
 		depthSL->setEnabled(false);
 		return;
 	}
-	sortCB->setEnabled(true);
+	sortCB->setEnabled(isSortable(current_type_));
 	depthSL->setEnabled(true);
 	typeCO->setEnabled(true);
 	tocTV->setEnabled(false);
@@ -423,7 +436,8 @@ void TocWidget::updateView()
 	}
 
 	sortCB->blockSignals(true);
-	sortCB->setChecked(gui_view_.tocModels().isSorted(current_type_));
+	sortCB->setChecked(isSortable(current_type_)
+		&& gui_view_.tocModels().isSorted(current_type_));
 	sortCB->blockSignals(false);
 
 	
@@ -431,7 +445,7 @@ void TocWidget::updateView()
 	persistentCB->setEnabled(can_navigate_);
 
 	bool controls_enabled = toc_model && toc_model->rowCount() > 0
-		&& !gui_view_.buffer()->isReadonly();
+		&& !gui_view_.documentBufferView()->buffer().isReadonly();
 	enableControls(controls_enabled);
 
 	depthSL->setMaximum(gui_view_.tocModels().depth(current_type_));