src/mainwindow.cpp

changeset 1380
bc799b965418
parent 1379
35811339ea72
child 1381
191122e19b53
--- a/src/mainwindow.cpp	Wed Apr 04 11:24:37 2018 +0300
+++ b/src/mainwindow.cpp	Wed Apr 04 11:41:26 2018 +0300
@@ -27,7 +27,6 @@
 #include "canvas.h"
 #include "mainwindow.h"
 #include "lddocument.h"
-#include "messageLog.h"
 #include "ui_mainwindow.h"
 #include "primitives.h"
 #include "editmodes/abstractEditMode.h"
@@ -59,7 +58,15 @@
 	m_documents (new DocumentManager (this)),
 	m_currentDocument (nullptr)
 {
-	m_messageLog = new MessageManager {this};
+	connect(
+		&singleton<Printer>(),
+		&Printer::linePrinted,
+		[&](const QString& line)
+		{
+			this->statusBar()->showMessage(line, 5000);
+		}
+	);
+
 	ui.setupUi (this);
 	this->restoreGeometry(config::mainWindowGeometry());
 	this->restoreState(config::mainWindowState());
@@ -608,14 +615,6 @@
 	return false;
 }
 
-void MainWindow::addMessage(QString message)
-{
-	messageLog()->addLine(message);
-
-	// Also print it to stdout
-	fprint(stdout, "%1\n", message);
-}
-
 /*
  * Returns an icon from built-in resources.
  */
@@ -953,7 +952,7 @@
 		renderer = new Canvas {document, this};
 		m_renderers[document] = renderer;
 		ui.rendererStack->addWidget(renderer);
-		connect(m_messageLog, SIGNAL(changed()), renderer, SLOT(update()));
+		//connect(m_messageLog, SIGNAL(changed()), renderer, SLOT(update()));
 	}
 
 	return renderer;

mercurial