#include "support/convert.h"
#include "support/debug.h"
+#include <algorithm>
+
#include <QCheckBox>
#include <QDebug>
#include <QSettings>
{
return a.second < b.second;
}
-}
+} // namespace
-GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
+GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
Qt::WindowFlags flags)
: DockView(parent, "progress", qt_("Progress/Debug Messages"), area, flags)
{
widget_->adjustSize();
setWidget(widget_);
- QFont font(guiApp->typewriterFontName());
- font.setFixedPitch(true);
- font.setStyleHint(QFont::TypeWriter);
- widget_->outTE->setFont(font);
+ widget_->outTE->setFont(guiApp->typewriterSystemFont());
widget_->tabWidget->widget(0)->setContentsMargins(-5, -7, 0, -7);
connect(widget_->debugNoneRB, SIGNAL(clicked()),
DebugVector dmap;
for (int i = 1 ; i < level_count; i++) {
Debug::Type const level = Debug::value(i);
- QString const desc = qt_(Debug::description(level));
+ QString const desc =
+ toqstr(from_ascii(Debug::name(level) + " - "))
+ + qt_(Debug::description(level));
dmap.push_back(DebugMap(level, desc));
}
sort(dmap.begin(), dmap.end(), DebugSorter);
connect(widget_->debugMessagesTW,
SIGNAL(itemActivated(QTreeWidgetItem *, int)),
this, SLOT(debugMessageActivated(QTreeWidgetItem *, int)));
-
+
GuiProgress * progress =
dynamic_cast<GuiProgress *>(ProgressInterface::instance());
void GuiProgressView::levelChanged()
{
- int level = Debug::NONE;
+ unsigned int level = Debug::NONE;
QTreeWidgetItemIterator it(widget_->debugMessagesTW);
while (*it) {
if ((*it)->text(1) == qt_("Yes"))
void GuiProgressView::debugSelectionChanged()
{
- int level = Debug::NONE;
+ unsigned int level = Debug::NONE;
if (widget_->debugAnyRB->isChecked())
level = Debug::ANY;
else if (widget_->debugSelectedRB->isChecked()) {
void GuiProgressView::appendLyXErrText(QString const & text)
{
+ // Skip verbose messages meant for the terminal
+ if (text.startsWith("\nRunning:"))
+ return;
+
widget_->outTE->moveCursor(QTextCursor::End);
widget_->outTE->insertPlainText(text);
widget_->outTE->ensureCursorVisible();
}
-void GuiProgressView::saveSession() const
+void GuiProgressView::saveSession(QSettings & settings) const
{
- Dialog::saveSession();
- QSettings settings;
+ Dialog::saveSession(settings);
settings.setValue(
sessionKey() + "/autoclear", widget_->autoClearCB->isChecked());
settings.setValue(