UI Updates

Author: FiniteSingularity

data/locale/en-US.ini

@@ -79,8 +79,9 @@ SetupWizard.GetStartedButton="Set up"
 SetupWizard.NewCollection="Create new"
 SetupWizard.MergeCollection="Merge with current"
 SetupWizard.StartInstallation.Description="First, let's name the scene collection and select your input devices"
-SetupWizard.MissingPlugins.Title="You're missing something"
-SetupWizard.MissingPlugins.Text="To continue, download the following free plugins, then restart OBS and try again"
+SetupWizard.MissingPlugins.Title.Plural="plugins are needed for this scene collection"
+SetupWizard.MissingPlugins.Title.Single="1 plugin is needed for this scene collection"
+SetupWizard.MissingPlugins.Text="Download and install the required plugins, then restart OBS and try again"
 SetupWizard.MissingPlugins.DownloadButton="Get"
 SetupWizard.SelectInstall.Title="How do you want to install this?"
 SetupWizard.SelectInstall.NewInstallButton="New"
@@ -120,14 +121,14 @@ SetupWizard.MergeSelectScenes.NoCustomMergeAvailable="This scene collection only
 SetupWizard.ThirdParty.DownloadButton="Get"
 SetupWizard.ThirdParty.Title="Required third party downloads."
 SetupWizard.ThirdParty.SubTitle="This scene collection requires a few third party downloads. Please ensure you have installed each of the items below to ensure this scene collections works properly on your OBS."
-SetupWizard.MissingSourceClone.Title="Source Clone Required"
-SetupWizard.MissingSourceClone.Description="The Source Clone plugin is required for merging scene collections. Please click 'Get' below, install the plugin, restart OBS, and try again."
+SetupWizard.MissingSourceClone.Title="Source Clone plugin is required to merge scene collections"
+SetupWizard.MissingSourceClone.Description="Download and install the plugin, then restart OBS Studio and try again"
 UpdateModal.Title="Update available"
 UpdateModal.SkipVersionButton="No thanks"
 UpdateModal.LaterButton="Ask me later"
 UpdateModal.DownloadUpdateButton="Update now"
 UpdateModal.Description="Get the latest version of Elgato Marketplace Connect to access new features and improvements"
 SceneCollectionInfo.WindowTitle="Scene Collection Info"
-SceneCollectionInfo.Title="Required Assets"
-SceneCollectionInfo.Text="This scene collection requires the following third party assets. Please click on the 'Get' button for each and ensure you have installed them all."
+SceneCollectionInfo.Title="Third party assets are required for this scene collection"
+SceneCollectionInfo.Text="Download and install the required assets, then restart OBS Studio to use this collection"
 SceneCollectionInfo.CloseButton="Close"

src/downloader.cpp

@@ -419,7 +419,7 @@ void Downloader::fillEntry(Downloader::Entry &dst,
 				last.first - first.first)
 				.count();
 		auto bytesDownloaded = last.second - first.second;
-		dst.speedBps = bytesDownloaded / interval;
+		dst.speedBps = interval != 0 ? bytesDownloaded / interval : 0;
 	}
 }
 
@@ -434,6 +434,9 @@ void Downloader::Entry::Update()
 
 void Downloader::Entry::Stop()
 {
+	if (!parent) {
+		return;
+	}
 	std::unique_lock l(parent->lock);
 	auto dlentry = parent->queue.find(id);
 	if (dlentry != parent->queue.end()) {
@@ -474,6 +477,9 @@ void Downloader::tryDelete(decltype(Downloader::queue)::iterator iter)
 
 Downloader::Entry::~Entry()
 {
+	if (!parent) {
+		return;
+	}
 	std::unique_lock l(parent->lock);
 	auto dlentry = parent->queue.find(id);
 	if (dlentry != parent->queue.end()) {

src/downloader.h

@@ -132,7 +132,7 @@ class Downloader {
 public:
 	struct Entry {
 		size_t id;
-		Downloader *parent;
+		Downloader *parent = nullptr;
 
 		std::string fileName, url;
 		uint64_t fileSize, downloaded, speedBps; // bytes per second

src/elgato-cloud-config.cpp

@@ -443,7 +443,7 @@ void SimpleVolumeMeter::calculateDisplayPeak(uint64_t ts)
 		_displayPeak = _currentPeak;
 	} else {
 		float decay = deltaT * _decayRate;
-		_displayPeak = std::max(_displayPeak - decay, _minMag);
+		_displayPeak = (std::max)(_displayPeak - decay, _minMag);
 	}
 }
 
@@ -459,7 +459,7 @@ void SimpleVolumeMeter::paintEvent(QPaintEvent *event)
 	float fwidth = static_cast<float>(width) * (_displayPeak - _minMag) /
 		       (-_minMag);
 	int newWidth = static_cast<int>(fwidth);
-	widgetRect.setWidth(std::min(width, newWidth));
+	widgetRect.setWidth((std::min)(width, newWidth));
 
 	QPainter painter(this);
 
@@ -775,8 +775,8 @@ void ElgatoCloudConfig::DrawVideoPreview(void *data, uint32_t cx, uint32_t cy)
 		return;
 
 	uint32_t sourceCX =
-		std::max(obs_source_get_width(window->_videoCaptureSource), 1u);
-	uint32_t sourceCY = std::max(
+		(std::max)(obs_source_get_width(window->_videoCaptureSource), 1u);
+	uint32_t sourceCY = (std::max)(
 		obs_source_get_height(window->_videoCaptureSource), 1u);
 
 	int x, y;

src/elgato-cloud-window.cpp

@@ -904,6 +904,13 @@ void ProductThumbnail::setDownloading(bool downloading)
 	_downloading = downloading;
 }
 
+ProductThumbnail::~ProductThumbnail()
+{
+	if (_downloading) {
+		emit cancelDownloadClicked();
+	}
+}
+
 ElgatoProductItem::ElgatoProductItem(QWidget *parent, ElgatoProduct *product)
 	: QWidget(parent),
 	  _product(product)

src/elgato-cloud-window.hpp

@@ -130,6 +130,7 @@ class ProductThumbnail : public QWidget {
 
 public:
 	ProductThumbnail(QWidget* parent, const QPixmap& pixmap);
+	~ProductThumbnail();
 	void setPixmap(const QPixmap& pixmap);
 	inline void updateDownloadProgress(float progress) { _thumbnail->setProgress(progress); }
 	void disable(bool disable);

src/elgato-product.cpp

@@ -39,7 +39,7 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 #include "elgato-cloud-window.hpp"
 #include "util.h"
 #include "setup-wizard.hpp"
-#include "downloader.h"
+
 
 namespace elgatocloud {
 
@@ -119,13 +119,16 @@ bool ElgatoProduct::DownloadProduct()
 	os_mkdirs(savePath.c_str());
 
 	std::shared_ptr<Downloader> dl = Downloader::getInstance("");
-	dl->Enqueue(url, savePath, ElgatoProduct::DownloadProgress, nullptr, this);
+	auto download = dl->Enqueue(url, savePath, ElgatoProduct::DownloadProgress, nullptr, this);
+	downloadId_ = download.id;
 	return true;
 }
 
 void ElgatoProduct::StopProductDownload()
 {
-
+	std::shared_ptr<Downloader> dl = Downloader::getInstance("");
+	auto download = dl->Lookup(downloadId_);
+	download.Stop();
 }
 
 void ElgatoProduct::_downloadThumbnail()

src/elgato-product.hpp

@@ -22,6 +22,8 @@ with this program. If not, see <https://www.gnu.org/licenses/>
 
 #include <nlohmann/json.hpp>
 
+#include "downloader.h"
+
 namespace elgatocloud {
 
 class ElgatoProductItem;
@@ -61,6 +63,7 @@ class ElgatoProduct {
 	bool _thumbnailReady;
 	size_t _fileSize;
 	ElgatoProductItem *_productItem = nullptr;
+	size_t downloadId_;
 };
 
 } // namespace elgatocloud

src/elgato-styles.hpp

@@ -48,6 +48,7 @@ namespace elgatocloud {
 		"QListWidget::item {"
 		"border: none;"
 		"padding: 0px;"
+		"font-size: 16px;"
 		"background-color: #232323;"
 		"border-radius: 8px;"
 		"}"

src/scene-collection-info.cpp

@@ -34,6 +34,8 @@ ThirdPartyItem::ThirdPartyItem(std::string label,
 {
 	auto layout = new QHBoxLayout(this);
 	auto itemLabel = new QLabel(this);
+	setStyleSheet("background-color: #232323;");
+
 	itemLabel->setText(label.c_str());
 	itemLabel->setStyleSheet(EWizardFieldLabel);
 	layout->addWidget(itemLabel);
@@ -62,15 +64,13 @@ SceneCollectionInfo::SceneCollectionInfo(std::vector<SceneCollectionLineItem> co
 
 	QLabel* title = new QLabel(this);
 	title->setText(obs_module_text("SceneCollectionInfo.Title"));
-	title->setAlignment(Qt::AlignCenter);
-	title->setStyleSheet("QLabel {font-size: 14pt;}");
+	title->setStyleSheet(EWizardStepTitle);
 	layout->addWidget(title);
 
 	QLabel* subTitle = new QLabel(this);
 	subTitle->setText(obs_module_text("SceneCollectionInfo.Text"));
-	subTitle->setAlignment(Qt::AlignCenter);
 	subTitle->setWordWrap(true);
-	subTitle->setStyleSheet("QLabel {font-size: 12pt;}");
+	subTitle->setStyleSheet(EWizardStepSubTitle);
 	layout->addWidget(subTitle);
 
 	auto thirdPartyList = new QListWidget(this);