#include "Buffer.h"
-#include "support/FileName.h"
-
-#include <string>
-
#include <QObject>
#include <QThread>
+#include <QTimer>
#include <QWaitCondition>
namespace lyx {
-/**
+/**
* The options that are used by the Comparison algorithm
* and are set in the GuiCompare Dialog.
*/
CompareOptions()
: settings_from_new(0)
{}
-
+
/// Copy the settings from the new or old document
bool settings_from_new;
};
/// Sets the maximum value of the progress bar in the dialog.
void progressMax(int max) const;
+ /// A message describing the process
+ void statusMessage(QString msg) const;
+
+public Q_SLOTS:
+ /// Emits the status message signal
+ void doStatusMessage();
+
public:
- /// QThread inherited methods
+ /// \name QThread inherited methods
//@{
void run();
//@}
private:
/// Starts the comparison algorithm
int doCompare();
-
+
/// The new document's buffer
Buffer const * const new_buffer;
/// The old document's buffer
Buffer const * const old_buffer;
/// The buffer with the differences marked with track changes
Buffer * const dest_buffer;
-
+
/// The options that are set in the GuiCompare dialog
CompareOptions options_;
///
QWaitCondition condition_;
+ /// Emit a statusMessage signal from time to time
+ QTimer status_timer_;
+
/// Use the Pimpl idiom to hide the internals.
class Impl;
///