update other build systems, cleanup progress output

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@32611 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/development/scons/scons_manifest.py b/development/scons/scons_manifest.py
index c9541c43b92bd96fa26c7c2d013c7f2b6a396a1d..43bac3ec389824f523c1e2ece3142592d3b4e061 100644 (file)
--- a/development/scons/scons_manifest.py
+++ b/development/scons/scons_manifest.py
@@ -756,6 +756,7 @@ src_frontends_qt4_header_files = Split('''
     GuiPrintindex.h
     GuiPrintNomencl.h
     GuiProgress.h
+       GuiProgressView.h
     GuiRef.h
     GuiSearch.h
     GuiSelection.h
@@ -855,6 +856,7 @@ src_frontends_qt4_files = Split('''
     GuiPrintindex.cpp
     GuiPrintNomencl.cpp
     GuiProgress.cpp
+       GuiProgressView.cpp
     GuiRef.cpp
     GuiSearch.cpp
     GuiSelection.cpp

diff --git a/src/frontends/qt4/GuiProgress.cpp b/src/frontends/qt4/GuiProgress.cpp
index 7680e9a765f6977992e2f37a651b0581ba20c0b2..2d237522fb141300d8377f940854391fce2df5e2 100644 (file)
--- a/src/frontends/qt4/GuiProgress.cpp
+++ b/src/frontends/qt4/GuiProgress.cpp
@@ -77,13 +77,15 @@ void GuiProgress::doProcessFinished(QString const & cmd)
 
 void GuiProgress::doAppendMessage(QString const & msg)
 {
-       appendText(msg);
+       QString time = QTime::currentTime().toString();
+       appendText(time + " : " + msg);
 }
 
 
 void GuiProgress::doAppendError(QString const & msg)
 {
-       appendText(msg);
+       QString time = QTime::currentTime().toString();
+       appendText(time + " : " + msg);
 }
 
 

diff --git a/src/frontends/qt4/GuiProgressView.cpp b/src/frontends/qt4/GuiProgressView.cpp
index 377a3c5640b3ed0db50dc2d75e2432d7eed362ae..fcb4ad61a87fc0edab5b79c60cee902710668da6 100644 (file)
--- a/src/frontends/qt4/GuiProgressView.cpp
+++ b/src/frontends/qt4/GuiProgressView.cpp
@@ -15,6 +15,7 @@
 
 #include "qt_helpers.h"
 
+#include <QTime>
 
 
 namespace lyx {
@@ -34,10 +35,10 @@ GuiProgressView::GuiProgressView(GuiView & parent, Qt::DockWidgetArea area,
 
        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(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(clearMessages()), this, SLOT(clearText(QString const &)));
+               connect(progress, SIGNAL(clearMessages()), this, SLOT(clearText()));
        }
 }
 
@@ -50,14 +51,15 @@ void GuiProgressView::clearText()
 
 void GuiProgressView::appendText(QString const & text)
 {
-       text_edit.insertPlainText(text);
+       if (text.isEmpty())
+               return;
+       QString time = QTime::currentTime().toString();
+       text_edit.insertPlainText(time + ": " + text + "\n");
        text_edit.ensureCursorVisible();
 }
 
 
 
-
-
 Dialog * createGuiProgressView(GuiView & guiview)
 {
 #ifdef Q_WS_MACX

diff --git a/src/frontends/qt4/GuiView.cpp b/src/frontends/qt4/GuiView.cpp
index 4818722443297fba7f8121d692d926f238f20106..9e51f708ae913b67cdc2f635bed27b7a4dc6fe12 100644 (file)
--- a/src/frontends/qt4/GuiView.cpp
+++ b/src/frontends/qt4/GuiView.cpp
@@ -2707,8 +2707,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                                format = doc_buffer->getDefaultOutputFormat();
 #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
                        ProgressInterface::instance()->clearMessages();
-                       QString time = QTime::currentTime().toString();
-                       ProgressInterface::instance()->appendMessage(time + ": Exporting ...\n");
+                       ProgressInterface::instance()->appendMessage("Exporting ...");
                        QFuture<docstring> f = QtConcurrent::run(exportAndDestroy,
                                doc_buffer->clone(), format);
                        d.setPreviewFuture(f);
@@ -2725,8 +2724,7 @@ bool GuiView::dispatch(FuncRequest const & cmd)
                                format = doc_buffer->getDefaultOutputFormat();
 #if EXPORT_in_THREAD && (QT_VERSION >= 0x040400)
                        ProgressInterface::instance()->clearMessages();
-                       QString time = QTime::currentTime().toString();
-                       ProgressInterface::instance()->appendMessage(time + ": Previewing ...\n");
+                       ProgressInterface::instance()->appendMessage("Previewing ...");
                        QFuture<docstring> f = QtConcurrent::run(previewAndDestroy,
                                doc_buffer->clone(), format);
                        d.setPreviewFuture(f);

diff --git a/src/frontends/qt4/Makefile.am b/src/frontends/qt4/Makefile.am
index 68f091bcb0cbff5109a36ef88512ba5079d89cf9..df0bcb819c4c2f12c3c90e5abc09ff0abba3e2a6 100644 (file)
--- a/src/frontends/qt4/Makefile.am
+++ b/src/frontends/qt4/Makefile.am
@@ -109,6 +109,7 @@ SOURCEFILES = \
        GuiPrintindex.cpp \
        GuiPrintNomencl.cpp \
        GuiProgress.cpp \
+       GuiProgressView.cpp \
        GuiRef.cpp \
        GuiSearch.cpp \
        GuiSelection.cpp \
@@ -210,6 +211,7 @@ MOCHEADER = \
        GuiPrintindex.h \
        GuiPrintNomencl.h \
        GuiProgress.h \
+       GuiProgressView.h \
        GuiRef.h \
        GuiSearch.h \
        GuiSelection.h \