X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiProgressView.cpp;h=004c70e86a69b1348dd07b434bd23c2775caa846;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=0e137c89c480dc9a2f0312a1d9cf20d07494c205;hpb=8d0378b75db28281f9eadd8b218917801a15d132;p=lyx.git

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index 0e137c89c4..004c70e86a 100644
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -49,13 +49,12 @@ GuiProgressView::~GuiProgressView()
 
 GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area, 
 	Qt::WindowFlags flags)
-	: DockView(parent, "progress", "Debug/Progress window", area, flags)
+	: DockView(parent, "progress", qt_("Progress/Debug Messages"), area, flags)
 {
 	widget_ = new ProgressViewWidget();
-#if QT_VERSION < 0x040400
-	widget_->scrollArea->setWidget(widget_->scrollAreaWidgetContents);
-#endif
 	widget_->setMinimumHeight(150);
+	widget_->debugMessagesTW->setSizePolicy(QSizePolicy::Ignored,
+						QSizePolicy::Expanding);
 	widget_->adjustSize();
 	setWidget(widget_);
 
@@ -80,15 +79,16 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
 	QTreeWidgetItem * item = 0;
 	widget_->debugMessagesTW->setColumnCount(2);
 	widget_->debugMessagesTW->headerItem()->setText(0, qt_("Debug Level"));
-	widget_->debugMessagesTW->headerItem()->setText(1, qt_("Display"));
+	widget_->debugMessagesTW->headerItem()->setText(1, qt_("Set"));
 	for (int i = 1 ; i < level_count; i++) {
 		item = new QTreeWidgetItem(widget_->debugMessagesTW);
 		Debug::Type const level = Debug::value(i);
-		item->setText(0, toqstr(Debug::description(level)));
+		item->setText(0, qt_(Debug::description(level)));
 		item->setData(0, Qt::UserRole, int(level));
 		item->setText(1, qt_("No"));
 	}
 	widget_->debugMessagesTW->resizeColumnToContents(0);
+	widget_->debugMessagesTW->resizeColumnToContents(1);
 	connect(widget_->debugMessagesTW,
 		SIGNAL(itemActivated(QTreeWidgetItem *, int)),
 		this, SLOT(debugMessageActivated(QTreeWidgetItem *, int)));
@@ -165,6 +165,7 @@ void GuiProgressView::clearText()
 
 void GuiProgressView::appendLyXErrText(QString const & text)
 {
+	widget_->outTE->moveCursor(QTextCursor::End);
 	widget_->outTE->insertPlainText(text);
 	widget_->outTE->ensureCursorVisible();
 
@@ -172,6 +173,8 @@ void GuiProgressView::appendLyXErrText(QString const & text)
 	// showing Debug::ANY messages completely blocks the GUI.
 	// Text is not always send as the whole line, so we must be
 	// careful about eolns.
+	// WARNING: processing events could cause crashes!
+	// TODO: find a better solution
 	if (text.endsWith("\n"))
 		QApplication::processEvents();
 }
@@ -186,6 +189,7 @@ void GuiProgressView::appendText(QString const & text)
 	if (!text.endsWith("\n"))
 		str += "\n";
 
+	widget_->outTE->moveCursor(QTextCursor::End);
 	widget_->outTE->insertPlainText(str);
 	widget_->outTE->ensureCursorVisible();
 }