*
* \author Peter Kümmel
* \author Pavel Sanda
+ * \author Jürgen Spitzmüller
*
* Full author contact details are available in file CREDITS.
*/
#include <config.h>
#include "GuiProgressView.h"
-#include "GuiApplication.h"
+#include "GuiApplication.h"
#include "qt_helpers.h"
+
#include "FuncRequest.h"
-#include "support/debug.h"
#include "support/convert.h"
+#include "support/debug.h"
+#include <QCheckBox>
+#include <QDebug>
#include <QSettings>
#include <QTime>
-#include <QCheckBox>
-
+using namespace std;
+using namespace lyx::support;
namespace lyx {
namespace frontend {
-struct LevelButton : QCheckBox
-{
- LevelButton(const QString& name) : QCheckBox(name) {}
- Debug::Type level;
-};
-
-
ProgressViewWidget::ProgressViewWidget()
{
setupUi(this);
-
}
GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
- Qt::WindowFlags flags) : DockView(parent, "progress", "Debug/Progress window", area, flags)
+ Qt::WindowFlags flags)
+ : DockView(parent, "progress", "Debug/Progress window", area, flags)
{
widget_ = new ProgressViewWidget();
+ widget_->setMinimumHeight(150);
+ widget_->adjustSize();
setWidget(widget_);
QFont font(guiApp->typewriterFontName());
font.setFixedPitch(true);
font.setStyleHint(QFont::TypeWriter);
widget_->outTE->setFont(font);
-
-
- const int levelCount = Debug::levelCount();
- for (int i = 1; i <= levelCount; i++) {
- const Debug::Type level = Debug::value(i);
- LevelButton * box = new LevelButton(toqstr(Debug::description(level)));
- box->level = level;
- widget_->settingsLayout->addWidget(box,i%10,i/10);
- // TODO settings
- box->setChecked(false);
- level_buttons << box;
- connect(box, SIGNAL(stateChanged(int)), this, SLOT(levelChanged()));
+ widget_->tabWidget->widget(0)->setContentsMargins(-5, -7, 0, -7);
+
+ connect(widget_->debugNoneRB, SIGNAL(clicked()),
+ this, SLOT(debugSelectionChanged()));
+ connect(widget_->debugSelectedRB, SIGNAL(clicked()),
+ this, SLOT(debugSelectionChanged()));
+ connect(widget_->debugAnyRB, SIGNAL(clicked()),
+ this, SLOT(debugSelectionChanged()));
+ widget_->debugMessagesTW->setEnabled(false);
+ widget_->debugNoneRB->setChecked(true);
+
+ // ignore Debug::NONE and Debug::ANY
+ int const level_count = Debug::levelCount() - 1;
+ QTreeWidgetItem * item = 0;
+ widget_->debugMessagesTW->setColumnCount(2);
+ widget_->debugMessagesTW->headerItem()->setText(0, qt_("Debug Level"));
+ widget_->debugMessagesTW->headerItem()->setText(1, qt_("Display"));
+ for (int i = 1 ; i < level_count; i++) {
+ item = new QTreeWidgetItem(widget_->debugMessagesTW);
+ Debug::Type const level = Debug::value(i);
+ item->setText(0, qt_(Debug::description(level)));
+ item->setData(0, Qt::UserRole, int(level));
+ item->setText(1, qt_("No"));
}
-
-
- GuiProgress* progress = dynamic_cast<GuiProgress*>(support::ProgressInterface::instance());
+ widget_->debugMessagesTW->resizeColumnToContents(0);
+ connect(widget_->debugMessagesTW,
+ SIGNAL(itemActivated(QTreeWidgetItem *, int)),
+ this, SLOT(debugMessageActivated(QTreeWidgetItem *, int)));
+
+ GuiProgress * progress =
+ dynamic_cast<GuiProgress *>(ProgressInterface::instance());
if (progress) {
- connect(progress, SIGNAL(processStarted(QString const &)), this, SLOT(appendText(QString const &)));
- //connect(progress, SIGNAL(processFinished(QString const &)), this, SLOT(appendText(QString const &)));
- connect(progress, SIGNAL(appendMessage(QString const &)), this, SLOT(appendText(QString const &)));
- connect(progress, SIGNAL(appendError(QString const &)), this, SLOT(appendText(QString const &)));
+ connect(progress, SIGNAL(processStarted(QString const &)),
+ this, SLOT(appendText(QString const &)));
+ //connect(progress, SIGNAL(processFinished(QString const &)),
+ // this, SLOT(appendText(QString const &)));
+ connect(progress, SIGNAL(appendMessage(QString const &)),
+ this, SLOT(appendText(QString const &)));
+ connect(progress, SIGNAL(appendLyXErrMessage(QString const &)),
+ this, SLOT(appendLyXErrText(QString const &)));
+ connect(progress, SIGNAL(appendError(QString const &)),
+ this, SLOT(appendText(QString const &)));
connect(progress, SIGNAL(clearMessages()), this, SLOT(clearText()));
progress->lyxerrConnect();
}
}
+void GuiProgressView::debugMessageActivated(QTreeWidgetItem * item, int)
+{
+ if (item == 0)
+ return;
+
+ QString const no = qt_("No");
+ QString const yes = qt_("Yes");
+
+ bool selected = (item->text(1) == yes);
+ item->setText(1, selected ? no : yes);
+
+ levelChanged();
+}
+
+
void GuiProgressView::levelChanged()
{
int level = Debug::NONE;
- Q_FOREACH(const LevelButton* button, level_buttons) {
- if (button->isChecked()) {
- // Debug::NONE overwrites other levels
- if (button->level == Debug::NONE) {
- level = Debug::NONE;
- break;
- } else {
- level |= button->level;
- }
- }
+ QTreeWidgetItemIterator it(widget_->debugMessagesTW);
+ while (*it) {
+ if ((*it)->text(1) == qt_("Yes"))
+ level |= (*it)->data(0, Qt::UserRole).toInt();
+ ++it;
+ }
+ dispatch(FuncRequest(LFUN_DEBUG_LEVEL_SET, convert<string>(level)));
+}
+
+
+void GuiProgressView::debugSelectionChanged()
+{
+ int level = Debug::NONE;
+ if (widget_->debugAnyRB->isChecked())
+ level = Debug::ANY;
+ else if (widget_->debugSelectedRB->isChecked()) {
+ widget_->debugMessagesTW->setEnabled(true);
+ levelChanged();
+ return;
}
- dispatch(FuncRequest(LFUN_DEBUG_LEVEL_SET, convert<std::string>(level)));
+ widget_->debugMessagesTW->setEnabled(false);
+ dispatch(FuncRequest(LFUN_DEBUG_LEVEL_SET, convert<string>(level)));
}
}
+void GuiProgressView::appendLyXErrText(QString const & text)
+{
+ widget_->outTE->insertPlainText(text);
+ widget_->outTE->ensureCursorVisible();
+
+ // Give the user a chance to disable debug messages because
+ // showing Debug::ANY messages completely blocks the GUI.
+ // Text is not always send as the whole line, so we must be
+ // careful about eolns.
+ if (text.endsWith("\n"))
+ QApplication::processEvents();
+}
+
+
void GuiProgressView::appendText(QString const & text)
{
- if (text.isEmpty())
+ if (text.isEmpty() || !widget_->sbarCB->isChecked())
return;
- QString time = QTime::currentTime().toString();
- if (text.endsWith("\n"))
- widget_->outTE->insertPlainText(time + ": " + text);
- else
- widget_->outTE->insertPlainText(text);
+ QString str = QTime::currentTime().toString();
+ str += ": " + text;
+ if (!text.endsWith("\n"))
+ str += "\n";
+ widget_->outTE->insertPlainText(str);
widget_->outTE->ensureCursorVisible();
}
QSettings settings;
settings.setValue(
sessionKey() + "/autoclear", widget_->autoClearCB->isChecked());
+ settings.setValue(
+ sessionKey() + "/statusbarmsgs", widget_->sbarCB->isChecked());
}
QSettings settings;
widget_->autoClearCB->setChecked(
settings.value(sessionKey() + "/autoclear", true).toBool());
+ widget_->sbarCB->setChecked(
+ settings.value(sessionKey() + "/statusbarmsgs", true).toBool());
}
void GuiProgressView::showEvent(QShowEvent*)
{
- support::ProgressInterface::instance()->lyxerrConnect();
+ ProgressInterface::instance()->lyxerrConnect();
}
void GuiProgressView::hideEvent(QHideEvent*)
{
- support::ProgressInterface::instance()->lyxerrDisconnect();
+ ProgressInterface::instance()->lyxerrDisconnect();
}
-
-
Dialog * createGuiProgressView(GuiView & guiview)
{
#ifdef Q_WS_MACX
projects / lyx.git / blobdiff