Traktor: Highlight status bar if there is an warning or error in the …

…output log.
apistol78 · Jun 3, 2024 · a778680 · a778680
1 parent b8d8e62
commit a778680
Show file tree

Hide file tree

Showing 5 changed files with 52 additions and 17 deletions.
diff --git a/code/Editor/App/EditorForm.cpp b/code/Editor/App/EditorForm.cpp
@@ -1913,19 +1913,23 @@ void EditorForm::buildWaitUntilFinished()
 	if (!m_threadBuild)
 		return;
 
-	if (ThreadManager::getInstance().getCurrentThread() == ThreadManager::getInstance().getMainThread())
+	const bool running = m_threadBuild->wait(0);
+	if (!running)
 	{
-		// Show a dialog if processing seems to take more than N second(s).
-		ui::BackgroundWorkerDialog dialog;
-		dialog.create(this, i18n::Text(L"EDITOR_WAIT_BUILDING_TITLE"), i18n::Text(L"EDITOR_WAIT_BUILDING_MESSAGE"), false);
-		dialog.execute(m_threadBuild, new BuildStatus(m_buildStep, m_buildStepMessage, m_buildStepMessageLock));
-		dialog.destroy();
-	}
-	else
-	{
-		// Since we cannot show a dialog from other than main thread we just wait for the
-		// build thread to finish.
-		m_threadBuild->wait();
+		if (ThreadManager::getInstance().getCurrentThread() == ThreadManager::getInstance().getMainThread())
+		{
+			// Show a dialog if processing seems to take more than N second(s).
+			ui::BackgroundWorkerDialog dialog;
+			dialog.create(this, i18n::Text(L"EDITOR_WAIT_BUILDING_TITLE"), i18n::Text(L"EDITOR_WAIT_BUILDING_MESSAGE"), false);
+			dialog.execute(m_threadBuild, new BuildStatus(m_buildStep, m_buildStepMessage, m_buildStepMessageLock));
+			dialog.destroy();
+		}
+		else
+		{
+			// Since we cannot show a dialog from other than main thread we just wait for the
+			// build thread to finish.
+			m_threadBuild->wait();
+		}
 	}
 
 	// As build thread is no longer in use we can safely release it's resources.
@@ -3064,6 +3068,11 @@ void EditorForm::eventTimer(ui::TimerEvent* /*event*/)
 	else
 		m_statusBar->setText(2, L"");
 
+	if (m_logView->haveWarnings() || m_logView->haveErrors())
+		m_statusBar->setAlert(true);
+	else
+		m_statusBar->setAlert(false);
+
 	if (m_pipelineCache)
 	{
 		StringOutputStream ss;

diff --git a/code/Editor/LogView.cpp b/code/Editor/LogView.cpp
@@ -130,9 +130,14 @@ bool LogView::create(ui::Widget* parent)
 	return true;
 }
 
-void LogView::destroy()
+bool LogView::haveWarnings() const
 {
-	ui::Container::destroy();
+	return m_log->countLog(ui::LogList::LvWarning) != 0;
+}
+
+bool LogView::haveErrors() const
+{
+	return m_log->countLog(ui::LogList::LvError) != 0;
 }
 
 void LogView::eventToolClick(ui::ToolBarButtonClickEvent* event)

diff --git a/code/Editor/LogView.h b/code/Editor/LogView.h
@@ -54,7 +54,9 @@ class T_DLLCLASS LogView
 
 	bool create(ui::Widget* parent);
 
-	virtual void destroy() override final;
+	bool haveWarnings() const;
+
+	bool haveErrors() const;
 
 	ILogTarget* getLogTarget() const { return m_logTarget; }
 

diff --git a/code/Ui/LogList/LogList.cpp b/code/Ui/LogList/LogList.cpp
@@ -76,11 +76,11 @@ void LogList::add(uint32_t threadId, LogLevel level, const std::wstring& text)
 		size_t i = 0;
 		for (;;)
 		{
-			size_t j = e.text.find(L'{', i);
+			const size_t j = e.text.find(L'{', i);
 			if (j == std::wstring::npos)
 				break;
 
-			Guid id(e.text.substr(j));
+			const Guid id(e.text.substr(j));
 			if (id.isValid())
 			{
 				e.symbolId = id;
@@ -178,6 +178,23 @@ bool LogList::copyLog(uint8_t filter)
 	return Application::getInstance()->getClipboard()->setText(ss.str());
 }
 
+uint32_t LogList::countLog(uint8_t level) const
+{
+	switch (level)
+	{
+	case LvInfo:
+		return m_logCount[0];
+	case LvWarning:
+		return m_logCount[1];
+	case LvError:
+		return m_logCount[2];
+	case LvDebug:
+		return m_logCount[3];
+	default:
+		return 0;
+	}
+}
+
 void LogList::forEachLine(const std::function< void(int32_t line, const std::wstring& text) >& fn) const
 {
 	for (int32_t line = 0; line < (int32_t)m_logFull.size(); ++line)

diff --git a/code/Ui/LogList/LogList.h b/code/Ui/LogList/LogList.h
@@ -66,6 +66,8 @@ class T_DLLCLASS LogList : public Widget
 
 	bool copyLog(uint8_t filter = ~0);
 
+	uint32_t countLog(uint8_t level) const;
+
 	void forEachLine(const std::function< void(int32_t line, const std::wstring& text) >& fn) const;
 
 	void forEachFilteredLine(const std::function< void(int32_t line, const std::wstring& text) >& fn) const;