#include "support/debug.h"
#include "support/docstring.h"
#include "support/lstrings.h"
+#include "support/lassert.h"
#include "support/ProgressInterface.h"
#include <QApplication>
lyxerr << "Assuming answer is ";
switch (default_button) {
- case 0: lyxerr << b1 << endl;
- case 1: lyxerr << b2 << endl;
- case 2: lyxerr << b3 << endl;
+ case 0: lyxerr << b1 << endl; break;
+ case 1: lyxerr << b2 << endl; break;
+ case 2: lyxerr << b3 << endl; break;
case 3: lyxerr << b4 << endl;
}
if (!use_gui)
docstring const title = bformat(_("LyX: %1$s"), title0);
+ /// Long operation in progress prevents user from Ok-ing the error dialog
+ bool long_op = theApp()->longOperationStarted();
+ if (long_op)
+ theApp()->stopLongOperation();
+
// For some reason, sometimes Qt uses a hourglass or watch cursor when
// displaying the alert. Hence, we ask for the standard cursor shape.
qApp->setOverrideCursor(Qt::ArrowCursor);
qApp->restoreOverrideCursor();
+ if (long_op)
+ theApp()->startLongOperation();
+
// Qt bug: can return -1 on cancel or WM close, despite the docs.
if (res == -1)
res = cancel_button;
return;
}
+ /// Long operation in progress prevents user from Ok-ing the error dialog
+ bool long_op = theApp()->longOperationStarted();
+ if (long_op)
+ theApp()->stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp->setOverrideCursor(Qt::ArrowCursor);
}
qApp->restoreOverrideCursor();
+
+ if (long_op)
+ theApp()->startLongOperation();
}
void warning(docstring const & title0, docstring const & message,
title0, message, askshowagain);
}
-void doError(docstring const & title0, docstring const & message)
+void doError(docstring const & title0, docstring const & message, bool backtrace)
{
lyxerr << "Error: " << title0 << '\n'
<< "----------------------------------------\n"
<< message << endl;
+ QString details;
+ if (backtrace) {
+ details = QString::fromLocal8Bit(to_local8bit(printCallStack()).c_str());
+ }
+
if (!use_gui)
return;
return;
}
+ /// Long operation in progress prevents user from Ok-ing the error dialog
+ bool long_op = theApp()->longOperationStarted();
+ if (long_op)
+ theApp()->stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp->setOverrideCursor(Qt::ArrowCursor);
ProgressInterface::instance()->error(
toqstr(title),
- toqstr(message));
+ toqstr(message),
+ details);
qApp->restoreOverrideCursor();
+
+ if (long_op)
+ theApp()->startLongOperation();
}
-void error(docstring const & title0, docstring const & message)
+void error(docstring const & title0, docstring const & message, bool backtrace)
{
#ifdef EXPORT_in_THREAD
InGuiThread<void>().call(&doError,
#else
doError(
#endif
- title0, message);
+ title0, message, backtrace);
}
void doInformation(docstring const & title0, docstring const & message)
return;
}
+ /// Long operation in progress prevents user from Ok-ing the error dialog
+ bool long_op = theApp()->longOperationStarted();
+ if (long_op)
+ theApp()->stopLongOperation();
+
// Don't use a hourglass cursor while displaying the alert
qApp->setOverrideCursor(Qt::ArrowCursor);
toqstr(message));
qApp->restoreOverrideCursor();
+
+ if (long_op)
+ theApp()->startLongOperation();
}
void information(docstring const & title0, docstring const & message)
docstring const title = bformat(_("LyX: %1$s"), msg);
+ /// Long operation in progress prevents user from Ok-ing the error dialog
+ bool long_op = theApp()->longOperationStarted();
+ if (long_op)
+ theApp()->stopLongOperation();
+
bool ok;
QString text = QInputDialog::getText(qApp->focusWidget(),
toqstr(title),
QLineEdit::Normal,
toqstr(dflt), &ok);
+ if (long_op)
+ theApp()->startLongOperation();
+
if (ok) {
response = qstring_to_ucs4(text);
return true;