Adds immediate migration results in progress
This commit is contained in:
2102 files changed
+17482
-15071
No files matched your search
@@ -12,7 +12,8 @@
|
||||
#include <QMenuBar>
|
||||
|
||||
NGLMainWindow::NGLMainWindow(QWidget *parent)
|
||||
: QMainWindow(parent)
|
||||
: m_logger(NGL::NGLLoggerBootstrap::getNGLRootLogger())
|
||||
, QMainWindow(parent)
|
||||
, m_helpProcess(nullptr)
|
||||
, m_versionView(nullptr)
|
||||
, m_menuBar(new QMenuBar(this))
|
||||
@@ -45,7 +46,7 @@ void NGLMainWindow::onHelpIndex()
|
||||
void NGLMainWindow::onInvokeHelp(const QString &helpContext)
|
||||
{
|
||||
|
||||
DEBUG_LOG() << "onInvokeHelp " << helpContext ;
|
||||
DEBUG_LOG(m_logger) << "onInvokeHelp " << helpContext ;
|
||||
|
||||
if (!m_helpProcess)
|
||||
{
|
||||
@@ -60,11 +61,11 @@ void NGLMainWindow::onInvokeHelp(const QString &helpContext)
|
||||
args << QLatin1String("-collectionFile")
|
||||
<< QCoreApplication::applicationDirPath() + QLatin1String("/../help/scms/") + fn
|
||||
<< QLatin1String("-enableRemoteControl");
|
||||
DEBUG_LOG() << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
|
||||
DEBUG_LOG(m_logger) << "Attempting to invoke help at URL: " << args.join(QLatin1String(" ")) ;
|
||||
m_helpProcess->start(QLibraryInfo::path(QLibraryInfo::BinariesPath) + QLatin1String("/assistant"), args);
|
||||
if (!m_helpProcess->waitForStarted())
|
||||
{
|
||||
ERROR_LOG() << "Could not start help browser (error: "
|
||||
ERROR_LOG(m_logger) << "Could not start help browser (error: "
|
||||
<< m_helpProcess->error()
|
||||
<< " )" ;
|
||||
delete m_helpProcess;
|
||||
@@ -84,7 +85,7 @@ void NGLMainWindow::onHelpFinished(int exitCode, QProcess::ExitStatus exitStatus
|
||||
{
|
||||
if (exitStatus != QProcess::NormalExit)
|
||||
{
|
||||
WARNING_LOG() << "help browser exited with status "
|
||||
WARNING_LOG(m_logger) << "help browser exited with status "
|
||||
<< exitStatus << " code "
|
||||
<< exitCode << "!" ;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user