Merge branch 'master' into qt6_cmake_joshua

sources/project/projectpropertieshandler.cpp

@@ -28,3 +28,8 @@ TerminalStripLayoutsHandler &ProjectPropertiesHandler::terminalStripLayoutHandle
 {
 	return m_terminal_strip_layout_handler;
 }
+
+ProjectUsageTracker &ProjectPropertiesHandler::usageTracker()
+{
+	return m_usage_tracker;
+}

sources/project/projectpropertieshandler.h

@@ -21,6 +21,7 @@
 #include <QPointer>
 
 #include "../TerminalStrip/GraphicsItem/properties/terminalstriplayoutshandler.h"
+#include "projectusagetracker.h"
 
 class QETProject;
 
@@ -43,11 +44,13 @@ class ProjectPropertiesHandler
 		ProjectPropertiesHandler(QETProject *project);
 
 		TerminalStripLayoutsHandler& terminalStripLayoutHandler();
+		ProjectUsageTracker& usageTracker();
 
 	private:
 		QPointer<QETProject> m_project;
 
 		TerminalStripLayoutsHandler m_terminal_strip_layout_handler;
+		ProjectUsageTracker m_usage_tracker;
 };
 
 #endif // PROJECTPROPERTIESHANDLER_H

sources/project/projectusagetracker.cpp

@@ -0,0 +1,121 @@
+/*
+	Copyright 2006-2026 The QElectroTech Team
+	This file is part of QElectroTech.
+
+	QElectroTech is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	QElectroTech is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "projectusagetracker.h"
+
+#include <QDomElement>
+
+/**
+	@brief ProjectUsageTracker::secondsSpent
+	@return the total accumulated time, in seconds, including the time
+	elapsed since the tracker was last made active (if it currently is).
+*/
+qint64 ProjectUsageTracker::secondsSpent() const
+{
+	qint64 total = m_seconds_spent;
+	if (m_elapsed_timer.isValid()) {
+		total += m_elapsed_timer.elapsed() / 1000;
+	}
+	return total;
+}
+
+/**
+	@brief ProjectUsageTracker::resetSecondsSpent
+	Zero the accumulated time. If the tracker is currently timing, it keeps
+	timing from this point on.
+*/
+void ProjectUsageTracker::resetSecondsSpent()
+{
+	m_seconds_spent = 0;
+	if (m_elapsed_timer.isValid()) {
+		m_elapsed_timer.restart();
+	}
+}
+
+/**
+	@brief ProjectUsageTracker::setEnabled
+	Enable or disable time tracking for this project. Disabling while
+	currently timing flushes the elapsed time first; re-enabling while
+	the project is the active tab resumes timing immediately.
+	@param enabled
+*/
+void ProjectUsageTracker::setEnabled(bool enabled)
+{
+	if (m_enabled == enabled) {
+		return;
+	}
+
+	if (!enabled && m_elapsed_timer.isValid()) {
+		m_seconds_spent += m_elapsed_timer.elapsed() / 1000;
+		m_elapsed_timer.invalidate();
+	} else if (enabled && m_active) {
+		m_elapsed_timer.start();
+	}
+	m_enabled = enabled;
+}
+
+/**
+	@brief ProjectUsageTracker::setActive
+	Tell the tracker whether this project's tab is currently the active
+	one. No-op if tracking is disabled or the state doesn't change.
+	@param active
+*/
+void ProjectUsageTracker::setActive(bool active)
+{
+	if (m_active == active) {
+		return;
+	}
+
+	if (!active && m_elapsed_timer.isValid()) {
+		m_seconds_spent += m_elapsed_timer.elapsed() / 1000;
+		m_elapsed_timer.invalidate();
+	} else if (active && m_enabled) {
+		m_elapsed_timer.start();
+	}
+	m_active = active;
+}
+
+/**
+	@brief ProjectUsageTracker::toXml
+	Append a <usage> child element to @p parent_element with the current
+	accumulated time and enabled state.
+	@param parent_element
+*/
+void ProjectUsageTracker::toXml(QDomElement &parent_element) const
+{
+	QDomElement usage_element =
+			parent_element.ownerDocument().createElement(QStringLiteral("usage"));
+	usage_element.setAttribute(QStringLiteral("time_spent"), QString::number(secondsSpent()));
+	usage_element.setAttribute(QStringLiteral("enabled"), m_enabled ? QStringLiteral("true") : QStringLiteral("false"));
+	parent_element.appendChild(usage_element);
+}
+
+/**
+	@brief ProjectUsageTracker::fromXml
+	Read the <usage> child element of @p parent_element, if any.
+	@param parent_element
+*/
+void ProjectUsageTracker::fromXml(const QDomElement &parent_element)
+{
+	const QDomElement usage_element = parent_element.firstChildElement(QStringLiteral("usage"));
+	if (usage_element.isNull()) {
+		return;
+	}
+
+	m_seconds_spent = usage_element.attribute(QStringLiteral("time_spent"), QStringLiteral("0")).toLongLong();
+	m_enabled = usage_element.attribute(QStringLiteral("enabled"), QStringLiteral("true")) != QStringLiteral("false");
+}

sources/project/projectusagetracker.h

@@ -0,0 +1,58 @@
+/*
+	Copyright 2006-2026 The QElectroTech Team
+	This file is part of QElectroTech.
+
+	QElectroTech is free software: you can redistribute it and/or modify
+	it under the terms of the GNU General Public License as published by
+	the Free Software Foundation, either version 2 of the License, or
+	(at your option) any later version.
+
+	QElectroTech is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU General Public License for more details.
+
+	You should have received a copy of the GNU General Public License
+	along with QElectroTech.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#ifndef PROJECTUSAGETRACKER_H
+#define PROJECTUSAGETRACKER_H
+
+#include <QElapsedTimer>
+
+class QDomElement;
+
+/**
+	@brief The ProjectUsageTracker class
+	Accumulates how long a project has been the active tab, purely locally:
+	the value lives only in the project's own file (a <usage> element next
+	to <properties>) and is never transmitted anywhere.
+
+	The owning code (QETDiagramEditor) is expected to call setActive(true)
+	when this project's tab becomes the current one, and setActive(false)
+	when it stops being current (tab switch, project closed, ...).
+*/
+class ProjectUsageTracker
+{
+	public:
+		ProjectUsageTracker() = default;
+
+		qint64 secondsSpent() const;
+		void resetSecondsSpent();
+
+		bool isEnabled() const {return m_enabled;}
+		void setEnabled(bool enabled);
+
+		void setActive(bool active);
+
+		void toXml(QDomElement &parent_element) const;
+		void fromXml(const QDomElement &parent_element);
+
+	private:
+		qint64 m_seconds_spent = 0;
+		bool m_enabled = true;
+		bool m_active = false;
+		QElapsedTimer m_elapsed_timer;
+};
+
+#endif // PROJECTUSAGETRACKER_H