* fix spelling in comments to please John.

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

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index 0856e0d989a17e60e76baa6f37a7ee2cae4a748d..004c70e86a69b1348dd07b434bd23c2775caa846 100644 (file)
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -49,10 +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();
        widget_->setMinimumHeight(150);
+       widget_->debugMessagesTW->setSizePolicy(QSizePolicy::Ignored,
+                                               QSizePolicy::Expanding);
        widget_->adjustSize();
        setWidget(widget_);
 
@@ -77,7 +79,7 @@ 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);
@@ -86,6 +88,7 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
                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)));
@@ -162,6 +165,7 @@ void GuiProgressView::clearText()
 
 void GuiProgressView::appendLyXErrText(QString const & text)
 {
+       widget_->outTE->moveCursor(QTextCursor::End);
        widget_->outTE->insertPlainText(text);
        widget_->outTE->ensureCursorVisible();
 
@@ -169,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();
 }
@@ -183,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();
 }