Release/1.0.0 rc7 (#19)

* Update text for Update modal.
* Fixes double checkbox in config screen.
* Updates utm parameters for outgoing marketplace web store link.
* Fixes camera selection of 'None' crashing setup wizard.
* Remove debug logging.

Author: FiniteSingularity

buildspec.json

@@ -42,7 +42,7 @@
     "versionMinor": 0,
     "versionPatch": 0,
     "buildNumber": 0,
-    "releaseType": "rc6",
+    "releaseType": "rc7",
     "author": "Elgato",
     "website": "https://elgato.com",
     "email": "support@elgato.com",

data/locale/en-US.ini

@@ -66,9 +66,8 @@ SetupWizard.Loading.Title="Loading Collection..."
 SetupWizard.Loading.Text="Note: this can take some time for scene collections with large files."
 SetupWizard.IncompatibleFile.Title="Incompatible file"
 SetupWizard.IncompatibleFile.Text="Error: This download did not contain a valid bundleInfo.json file and cannot be installed. (note: this is a problem with the submitted scene collection file on the server)"
-
 UpdateModal.Title="Update available"
-UpdateModal.SkipVersionButton="Skip this verison"
-UpdateModal.LaterButton="Remind me later"
-UpdateModal.DownloadUpdateButton="Download Update"
-UpdateModal.Description="A new version of the Marketplace Direct to OBS is available to download, please download to maintain functionality!
+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"

src/elgato-cloud-data.cpp

@@ -132,9 +132,7 @@ void ElgatoCloud::_TokenRefresh(bool loadData, bool loadUserDetails)
 		if (mainWindowOpen && window) {
 			QMetaObject::invokeMethod(
 				QCoreApplication::instance()->thread(),
-				[this]() {
-					window->setLoggedIn();
-				});
+				[this]() { window->setLoggedIn(); });
 		}
 	}
 }
@@ -198,14 +196,17 @@ void ElgatoCloud::_Listen()
 				auto response = fetch_string_from_post(
 					url, encodeddata);
 
-				auto responseJson = nlohmann::json::parse(response);
+				auto responseJson =
+					nlohmann::json::parse(response);
 
 				if (responseJson.contains("error")) {
 					if (mainWindowOpen && window) {
 						QMetaObject::invokeMethod(
-							QCoreApplication::instance()->thread(),
+							QCoreApplication::instance()
+								->thread(),
 							[this]() {
-								loginError = true;
+								loginError =
+									true;
 								window->setLoggedIn();
 							});
 					}
@@ -289,31 +290,32 @@ void ElgatoCloud::LogOut()
 void ElgatoCloud::CheckUpdates(bool forceCheck)
 {
 	try {
-		std::string updateUrl = "https://gc-updates.elgato.com/windows/marketplace-plugin-for-obs/final/app-version-check.json.php";
+		std::string updateUrl =
+			"https://gc-updates.elgato.com/windows/marketplace-plugin-for-obs/final/app-version-check.json.php";
 		auto response = fetch_string_from_get(updateUrl, "");
-		blog(LOG_INFO, response.c_str());
 		auto responseJson = nlohmann::json::parse(response);
 		if (responseJson.contains("Automatic")) {
 			auto details = responseJson["Automatic"];
 			std::string version = details["Version"];
 			std::string downloadUrl = details["downloadURL"];
-			auto updateVersion = QVersionNumber::fromString(version);
-			auto currentVersion = QVersionNumber::fromString(PLUGIN_VERSION);
-			std::string skip = _skipUpdate == "" ? "0.0.0" : _skipUpdate;
-			blog(LOG_INFO, "update: %s, current: %s, skip: %s", version.c_str(), PLUGIN_VERSION, skip.c_str());
+			auto updateVersion =
+				QVersionNumber::fromString(version);
+			auto currentVersion =
+				QVersionNumber::fromString(PLUGIN_VERSION);
+			std::string skip = _skipUpdate == "" ? "0.0.0"
+							     : _skipUpdate;
 			auto skipVersion = QVersionNumber::fromString(skip);
-			if ((forceCheck || skipVersion != updateVersion) && updateVersion > currentVersion) {
+			if ((forceCheck || skipVersion != updateVersion) &&
+			    updateVersion > currentVersion) {
 				// Reset the "skip this update" flag because we now have a
 				// new update.
-				_skipUpdate = !forceCheck ? "" : _skipUpdate;  
-				blog(LOG_INFO, "UPDATE FOUND.");
+				_skipUpdate = !forceCheck ? "" : _skipUpdate;
 				openUpdateModal(version, downloadUrl);
 			}
 		} else {
 			throw("Error");
 		}
-	}
-	catch (...) {
+	} catch (...) {
 		blog(LOG_INFO, "Unable to contact update server.");
 	}
 }
@@ -391,9 +393,6 @@ nlohmann::json ElgatoCloud::GetPurchaseDownloadLink(std::string variantId)
 	auto response = fetch_string_from_get(api_url, _accessToken);
 	// Todo- Error checking
 	try {
-		blog(LOG_INFO,
-		     "============= DOWNLOAD REQUEST API RESPONSE =============\nURL: %s\nResponse: %s",
-		     api_url.c_str(), response.c_str());
 		auto responseJson = nlohmann::json::parse(response);
 		return responseJson;
 	} catch (...) {
@@ -453,7 +452,6 @@ void ElgatoCloud::_LoadUserData(bool loadData)
 			fetch_string_from_get(api_url, _accessToken);
 		auto userData = nlohmann::json::parse(userResponse);
 		api->setUserDetails(userData);
-		blog(LOG_INFO, "User Response:\n%s", userResponse.c_str());
 		if (mainWindowOpen && window) {
 			QMetaObject::invokeMethod(
 				QCoreApplication::instance()->thread(),
@@ -494,6 +492,7 @@ void ElgatoCloud::_GetSavedState()
 	_refreshTokenExpiration =
 		obs_data_get_int(_config, "RefreshTokenExpiration");
 	_skipUpdate = obs_data_get_string(_config, "SkipUpdate");
+	_skipUpdate = "";
 }
 
 } // namespace elgatocloud

src/elgato-cloud-window.cpp

@@ -100,10 +100,10 @@ DownloadButton::DownloadButton(QWidget *parent) : QWidget(parent)
 				      QSizePolicy::Preferred);
 
 	_downloadButton = new QPushButton(this);
-	_downloadButton->setToolTip(obs_module_text("MarketplaceWindow.DownloadButton.Tooltip"));
+	_downloadButton->setToolTip(
+		obs_module_text("MarketplaceWindow.DownloadButton.Tooltip"));
 	std::string downloadIconPath = imageBaseDir + "download.svg";
 	std::string downloadIconHoverPath = imageBaseDir + "download_hover.svg";
-	blog(LOG_INFO, "download img: ", downloadIconPath.c_str());
 	std::string downloadIconDisabledPath =
 		imageBaseDir + "download_hover.svg";
 	QString buttonStyle = EIconHoverDisabledButtonStyle;
@@ -226,7 +226,9 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	imageBaseDir += "/images/";
 
 	auto api = MarketplaceApi::getInstance();
-	std::string storeUrl = api->storeUrl() + "/obs/scene-collections?utm_source=mp_connect";
+	std::string storeUrl =
+		api->storeUrl() +
+		"/obs/scene-collections?utm_source=mp_connect&utm_medium=direct_software&utm_campaign=v_1.0";
 
 	QPalette pal = QPalette();
 	pal.setColor(QPalette::Window, "#151515");
@@ -245,7 +247,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	_layout->addStretch();
 
 	_settingsButton = new QPushButton(this);
-	_settingsButton->setToolTip(obs_module_text("MarketplaceWindow.OpenSettingsButton.Tooltip"));
+	_settingsButton->setToolTip(obs_module_text(
+		"MarketplaceWindow.OpenSettingsButton.Tooltip"));
 	std::string settingsIconPath = imageBaseDir + "settings.svg";
 	std::string settingsIconHoverPath = imageBaseDir + "settings_hover.svg";
 	QString settingsButtonStyle = EIconHoverButtonStyle;
@@ -262,7 +265,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	_layout->addWidget(_settingsButton);
 
 	_storeButton = new QPushButton(this);
-	_storeButton->setToolTip(obs_module_text("MarketplaceWindow.StoreButton.Tooltip"));
+	_storeButton->setToolTip(
+		obs_module_text("MarketplaceWindow.StoreButton.Tooltip"));
 	std::string storeIconPath = imageBaseDir + "marketplace-logo.svg";
 	std::string storeIconHoverPath =
 		imageBaseDir + "marketplace-logo_hover.svg";
@@ -281,7 +285,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 	_layout->addWidget(_storeButton);
 
 	_logInButton = new QPushButton(this);
-	_logInButton->setText(obs_module_text("MarketplaceWindow.LoginButton.LogIn"));
+	_logInButton->setText(
+		obs_module_text("MarketplaceWindow.LoginButton.LogIn"));
 	_logInButton->setHidden(elgatoCloud->loggedIn);
 	_logInButton->setStyleSheet(
 		"QPushButton {font-size: 12pt; border-radius: 8px; padding: 8px; background-color: #232323; border: none; } "
@@ -291,7 +296,8 @@ WindowToolBar::WindowToolBar(QWidget *parent) : QWidget(parent)
 		[this]() { elgatoCloud->StartLogin(); });
 
 	_logOutButton = new QPushButton(this);
-	_logOutButton->setText(obs_module_text("MarketplaceWindow.LoginButton.LogOut"));
+	_logOutButton->setText(
+		obs_module_text("MarketplaceWindow.LoginButton.LogOut"));
 	_logOutButton->setHidden(!elgatoCloud->loggedIn);
 	_logOutButton->setStyleSheet(
 		"QPushButton {font-size: 12pt; border-radius: 8px; padding: 8px; background-color: #232323; border: none; } "
@@ -396,7 +402,8 @@ OwnedProducts::OwnedProducts(QWidget *parent) : QWidget(parent)
 	connect(_sideMenu, &QListWidget::itemPressed, this,
 		[this](QListWidgetItem *item) {
 			QString val = item->text();
-			if (val == obs_module_text("MarketplaceWindow.PurchasedTab")) {
+			if (val ==
+			    obs_module_text("MarketplaceWindow.PurchasedTab")) {
 				if (_numProducts > 0)
 					_content->setCurrentIndex(0);
 				else
@@ -422,12 +429,14 @@ OwnedProducts::OwnedProducts(QWidget *parent) : QWidget(parent)
 	auto npLayout = new QVBoxLayout(noProducts);
 	npLayout->addStretch();
 	auto npTitle = new QLabel(
-		obs_module_text("MarketplaceWindow.Purchased.NoPurchasesTitle"), noProducts);
+		obs_module_text("MarketplaceWindow.Purchased.NoPurchasesTitle"),
+		noProducts);
 	npTitle->setStyleSheet("QLabel {font-size: 18pt;}");
 	npTitle->setAlignment(Qt::AlignCenter);
 	npLayout->addWidget(npTitle);
 	auto npSubTitle = new QLabel(
-		obs_module_text("MarketplaceWindow.Purchased.NoPurchasesSubtitle"),
+		obs_module_text(
+			"MarketplaceWindow.Purchased.NoPurchasesSubtitle"),
 		noProducts);
 	npSubTitle->setStyleSheet("QLabel {font-size: 13pt;}");
 	npSubTitle->setAlignment(Qt::AlignCenter);
@@ -515,7 +524,8 @@ void ElgatoCloudWindow::initialize()
 	auto loadingWidget = new LoadingWidget(this); // Loading widget, id: 3
 	_stackedContent->addWidget(loadingWidget);
 
-	auto loginErrorWidget = new LoginError(this); // Login error widget, id: 4
+	auto loginErrorWidget =
+		new LoginError(this); // Login error widget, id: 4
 	_stackedContent->addWidget(loginErrorWidget);
 
 	mainLayout->addWidget(_stackedContent);
@@ -709,13 +719,15 @@ LoginNeeded::LoginNeeded(QWidget *parent) : QWidget(parent)
 	login->setAlignment(Qt::AlignCenter);
 
 	auto loginSub = new QLabel(this);
-	loginSub->setText(obs_module_text("MarketplaceWindow.LoginNeeded.Subtitle"));
+	loginSub->setText(
+		obs_module_text("MarketplaceWindow.LoginNeeded.Subtitle"));
 	loginSub->setWordWrap(true);
 	loginSub->setAlignment(Qt::AlignCenter);
 
 	auto hLayout = new QHBoxLayout();
 	auto loginButton = new QPushButton(this);
-	loginButton->setText(obs_module_text("MarketplaceWindow.LoginButton.LogIn"));
+	loginButton->setText(
+		obs_module_text("MarketplaceWindow.LoginButton.LogIn"));
 	loginButton->setHidden(elgatoCloud->loggedIn);
 	loginButton->setStyleSheet(
 		"QPushButton {font-size: 12pt; border-radius: 8px; padding: 8px; background-color: #232323; border: none; } "
@@ -732,7 +744,7 @@ LoginNeeded::LoginNeeded(QWidget *parent) : QWidget(parent)
 	layout->addStretch();
 }
 
-LoginError::LoginError(QWidget* parent) : QWidget(parent)
+LoginError::LoginError(QWidget *parent) : QWidget(parent)
 {
 	auto layout = new QVBoxLayout(this);
 
@@ -742,7 +754,8 @@ LoginError::LoginError(QWidget* parent) : QWidget(parent)
 	login->setAlignment(Qt::AlignCenter);
 
 	auto loginSub = new QLabel(this);
-	loginSub->setText(obs_module_text("MarketplaceWindow.LoginError.Subtitle"));
+	loginSub->setText(
+		obs_module_text("MarketplaceWindow.LoginError.Subtitle"));
 	loginSub->setWordWrap(true);
 	loginSub->setAlignment(Qt::AlignCenter);
 
@@ -878,10 +891,12 @@ extern void CheckForUpdates(bool forceCheck)
 	elgatoCloud->CheckUpdates(forceCheck);
 }
 
-extern void CheckForUpdatesOnLaunch(enum obs_frontend_event event, void* private_data)
+extern void CheckForUpdatesOnLaunch(enum obs_frontend_event event,
+				    void *private_data)
 {
 	if (event == OBS_FRONTEND_EVENT_FINISHED_LOADING) {
-		obs_frontend_remove_event_callback(CheckForUpdatesOnLaunch, nullptr);
+		obs_frontend_remove_event_callback(CheckForUpdatesOnLaunch,
+						   nullptr);
 		CheckForUpdates(false);
 	}
 }

src/elgato-styles.hpp

@@ -147,16 +147,12 @@ inline const QString ECheckBoxStyle =
 	"QCheckBox::indicator {"
 	"width: 20px;"
 	"height: 20px;"
-	"background-image: none;"
-	"border: none;"
 	"}"
 	"QCheckBox::indicator:checked {"
-	"border: none;"
-	"background-image: url('${checked-img}')"
+	"image: url('${checked-img}')"
 	"}"
 	"QCheckBox::indicator:unchecked {"
-	"border: none;"
-	"background-image: url('${unchecked-img}')"
+	"image: url('${unchecked-img}')"
 	"}";
 
 inline const QString EComboBoxStyle = "QComboBox {"

src/elgato-update-modal.cpp

@@ -21,6 +21,7 @@ ElgatoUpdateModal* updateModal = nullptr;
 ElgatoUpdateModal::ElgatoUpdateModal(QWidget* parent, std::string version, std::string downloadUrl)
 	: QDialog(parent)
 {
+	setWindowTitle(QString("Elgato Marketplace Connect Update Available"));
 	setFixedSize(QSize(680, 300));
 	setAttribute(Qt::WA_DeleteOnClose);
 

src/elgato-widgets.cpp

@@ -63,8 +63,8 @@ VideoCaptureSourceSelector::VideoCaptureSourceSelector(QWidget *parent,
 	_videoPreview->hide();
 
 	_blank = new QLabel(this);
-	_blank->setText(
-		obs_module_text("MarketplaceWindow.Settings.DefaultVideoDevice.NoneSelected"));
+	_blank->setText(obs_module_text(
+		"MarketplaceWindow.Settings.DefaultVideoDevice.NoneSelected"));
 	_blank->setAlignment(Qt::AlignCenter);
 	_blank->setFixedHeight(144);
 
@@ -97,8 +97,8 @@ VideoCaptureSourceSelector::VideoCaptureSourceSelector(QWidget *parent,
 				auto vSettings = obs_data_create();
 				std::string id = _videoSourceIds[index];
 				obs_data_set_string(vSettings,
-					"video_device_id",
-					id.c_str());
+						    "video_device_id",
+						    id.c_str());
 				_changeSource(vSettings);
 				obs_data_release(vSettings);
 			} else {
@@ -163,15 +163,14 @@ void VideoCaptureSourceSelector::_setupTempSource(obs_data_t *videoData)
 void VideoCaptureSourceSelector::_changeSource(obs_data_t *vSettings)
 {
 	if (vSettings != nullptr) {
-		blog(LOG_INFO, "_changeSource called.");
 		if (_videoCaptureSource) {
-			obs_source_t* tmp = _videoCaptureSource;
+			obs_source_t *tmp = _videoCaptureSource;
 			_videoCaptureSource = nullptr;
 			obs_source_release(tmp);
 		}
 
-		const char* videoSourceId = "dshow_input";
-		const char* vId = obs_get_latest_input_type_id(videoSourceId);
+		const char *videoSourceId = "dshow_input";
+		const char *vId = obs_get_latest_input_type_id(videoSourceId);
 		_videoCaptureSource = obs_source_create_private(
 			vId, "elgato-cloud-video-config", vSettings);
 
@@ -183,12 +182,11 @@ void VideoCaptureSourceSelector::_changeSource(obs_data_t *vSettings)
 		this->_videoPreview->hide();
 		this->_blank->show();
 		if (_videoCaptureSource) {
-			obs_source_t* tmp = _videoCaptureSource;
+			obs_source_t *tmp = _videoCaptureSource;
 			_videoCaptureSource = nullptr;
 			obs_source_release(tmp);
 		}
 	}
-
 }
 
 void VideoCaptureSourceSelector::DrawVideoPreview(void *data, uint32_t cx,
@@ -230,6 +228,9 @@ void VideoCaptureSourceSelector::DrawVideoPreview(void *data, uint32_t cx,
 
 std::string VideoCaptureSourceSelector::GetSettings() const
 {
+	if (!_videoCaptureSource) {
+		return "{}";
+	}
 	obs_data_t *vSettings = obs_source_get_settings(_videoCaptureSource);
 	std::string vJson = obs_data_get_json(vSettings);
 	obs_data_release(vSettings);