X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt%2FGuiProgressView.cpp;h=9dc9263bf758a16545c881026c2c9758e14ec78d;hb=89394bcd0f3b5079a066d8c3f6f7a5e606073db3;hp=486fdaf54ecd7552281f0c41476864b27db213e1;hpb=c293be56bd12c5dc46e5cedd2828e33918fccef7;p=features.git

diff --git a/src/frontends/qt/GuiProgressView.cpp b/src/frontends/qt/GuiProgressView.cpp
index 486fdaf54e..9dc9263bf7 100644
--- a/src/frontends/qt/GuiProgressView.cpp
+++ b/src/frontends/qt/GuiProgressView.cpp
@@ -51,7 +51,7 @@ GuiProgressView::~GuiProgressView()
 
 
 namespace{
-typedef pair<int, QString> DebugMap;
+typedef pair<Debug::base_type, QString> DebugMap;
 typedef vector<DebugMap> DebugVector;
 
 bool DebugSorter(DebugMap const & a, DebugMap const & b)
@@ -85,13 +85,17 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
 	widget_->debugMessagesTW->setEnabled(false);
 	widget_->debugNoneRB->setChecked(true);
 
-	// ignore Debug::NONE and Debug::ANY
-	int const level_count = Debug::levelCount() - 1;
+	int const level_count = Debug::levelCount();
 	DebugVector dmap;
-	for (int i = 1 ; i < level_count; i++) {
+	for (int i = 0 ; i < level_count; i++) {
 		Debug::Type const level = Debug::value(i);
+		string const dbgname = Debug::realName(i);
+		// ignore these
+		if (dbgname == "any" || dbgname == "all"
+		    || dbgname == "none" || dbgname == "latex")
+			continue;
 		QString const desc =
-			toqstr(from_ascii(Debug::name(level) + " - "))
+			toqstr(from_ascii(dbgname + " - "))
 			+ qt_(Debug::description(level));
 		dmap.push_back(DebugMap(level, desc));
 	}
@@ -106,7 +110,7 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
 	for (; dit != den; ++dit) {
 		QTreeWidgetItem * item = new QTreeWidgetItem(widget_->debugMessagesTW);
 		item->setText(0, dit->second);
-		item->setData(0, Qt::UserRole, int(dit->first));
+		item->setData(0, Qt::UserRole, dit->first);
 		item->setText(1, qt_("No"));
 	}
 	widget_->debugMessagesTW->resizeColumnToContents(0);
@@ -152,11 +156,12 @@ void GuiProgressView::debugMessageActivated(QTreeWidgetItem * item, int)
 
 void GuiProgressView::levelChanged()
 {
-	unsigned int level = Debug::NONE;
+	Debug::base_type level = Debug::NONE;
 	QTreeWidgetItemIterator it(widget_->debugMessagesTW);
 	while (*it) {
-		if ((*it)->text(1) == qt_("Yes"))
-			level |= (*it)->data(0, Qt::UserRole).toInt();
+		if ((*it)->text(1) == qt_("Yes")) {
+			level |= (*it)->data(0, Qt::UserRole).toULongLong();
+		}
 		++it;
 	}
 	dispatch(FuncRequest(LFUN_DEBUG_LEVEL_SET, convert<string>(level)));
@@ -265,13 +270,6 @@ void GuiProgressView::hideEvent(QHideEvent*)
 }
 
 
-Dialog * createGuiProgressView(GuiView & guiview)
-{
-	return new GuiProgressView(guiview, Qt::BottomDockWidgetArea);
-}
-
-
-
 } // namespace frontend
 } // namespace lyx