Remove details

Author: mhoyer-streamlabs

Diff for: src/main.cc

@@ -170,7 +170,7 @@ struct callbacks_impl : public install_callbacks,
 	void update_finished(std::string &filename) final {}
 	void updater_complete() final {}
 
-	bool prompt_user(const char *pVersion, const char *pDetails);
+	bool prompt_user(const char *pVersion);
 };
 
 callbacks_impl::callbacks_impl(HINSTANCE hInstance, int nCmdShow)
@@ -775,57 +775,14 @@ void callbacks_impl::updater_start()
 	SetWindowTextW(progress_label, copying_label.c_str());
 }
 
-bool callbacks_impl::prompt_user(const char *pVersion, const char *pDetails)
+bool callbacks_impl::prompt_user(const char *pVersion)
 {
 	const wchar_t *wc_dash = L"-";
 	const wchar_t *wc_hash = L"#";
 	const wchar_t *wc_bullet = L"\r\n    \u2022 ";
 	const wchar_t *wc_break = L"\r\n  ";
 	std::wstring wc_version = ConvertToUtf16WS(boost::locale::translate(pVersion));
-	std::wstring wc_label = ConvertToUtf16WS(boost::locale::translate("There's an update available to install: "));
-	wc_label.insert(wc_label.size() - 1, wc_version); //account for null terminator
-	std::wstring wc_details = ConvertToUtf16WS(boost::locale::translate(pDetails));
-
-	//tag to heading conversion
-	std::list<std::pair<std::wstring, std::wstring>> tagsToHeadings;
-	tagsToHeadings.push_back(std::make_pair(L"#hotfixes", L"Hotfix Changes"));
-	tagsToHeadings.push_back(std::make_pair(L"#features", L"New Features"));
-	tagsToHeadings.push_back(std::make_pair(L"#generalfixes", L"General Fixes"));
-
-	//format detail string: insert 2 breaks at start -> 1 to have heading on its own line, 1 for spacing, one after heading for spacing
-	size_t replacePos = 0;
-	for (const auto &tagHeadingPair : tagsToHeadings) {
-		replacePos = wc_details.find(tagHeadingPair.first);
-		if (replacePos != std::wstring::npos) {
-			wc_details.replace(replacePos, tagHeadingPair.first.size(), tagHeadingPair.second);
-			if (replacePos != 0) {
-				wc_details.insert(replacePos, wc_break);
-				replacePos += +wcslen(wc_break);
-			}
-			wc_details.insert(replacePos, wc_break);
-			wc_details.insert(replacePos + wcslen(wc_break) + tagHeadingPair.second.size(), wc_break);
-		}
-	}
-	//if # isn't followed by a known heading, leave as-is to display custom heading
-	int endHeading = 0;
-	replacePos = wc_details.find(wc_hash);
-	while (replacePos != std::wstring::npos) {
-		wc_details.insert(replacePos, wc_break);
-		wc_details.replace(replacePos + wcslen(wc_break), wcslen(wc_hash), wc_break);
-		endHeading = wc_details.find(wc_dash, replacePos);
-		if (endHeading != std::wstring::npos) {
-			wc_details.insert(endHeading, wc_break);
-		}
-		replacePos = wc_details.find(wc_hash, replacePos + wcslen(wc_break));
-	}
-	//replace '-' with end line + spacing + bullet + spacing
-	replacePos = wc_details.find(wc_dash);
-	while (replacePos != std::wstring::npos) {
-		wc_details.replace(replacePos, wcslen(wc_dash), wc_bullet);
-		replacePos = wc_details.find(wc_dash, replacePos + wcslen(wc_bullet));
-	}
-	//line break at end to look nicer
-	wc_details.insert(wc_details.length(), wc_break);
+	std::wstring wc_label = ConvertToUtf16WS(boost::locale::translate("There's an update available. Would you like to install?"));
 
 	prompting = true;
 	ShowWindow(frame, SW_SHOWNORMAL);
@@ -836,7 +793,7 @@ bool callbacks_impl::prompt_user(const char *pVersion, const char *pDetails)
 	DrawText(hdc, wc_label.c_str(), -1, &progress_label_rect, DT_CALCRECT | DT_NOCLIP);
 	progress_label_rect.right -= progress_label_rect.left;
 	blockers_list_rect = {0};
-	DrawText(hdc, wc_details.c_str(), -1, &blockers_list_rect, DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL);
+	DrawText(hdc, wc_version.c_str(), -1, &blockers_list_rect, DT_CALCRECT | DT_NOCLIP | DT_EDITCONTROL);
 
 	ReleaseDC(frame, hdc);
 	SelectObject(hdc, hfontOld);
@@ -847,7 +804,7 @@ bool callbacks_impl::prompt_user(const char *pVersion, const char *pDetails)
 	repostionUI();
 
 	SetWindowTextW(progress_label, wc_label.c_str());
-	SetWindowTextW(blockers_list, wc_details.c_str());
+	SetWindowTextW(blockers_list, wc_version.c_str());
 	SetWindowTextW(continue_button, update_btn_label.c_str());
 	SetWindowTextW(cancel_button, remind_btn_label.c_str());
 
@@ -1075,7 +1032,7 @@ extern "C" int wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, LPWSTR lpC
 		return 0;
 	}
 
-	if (!cb_impl.prompt_user(params.version.c_str(), params.details.c_str())) {
+	if (!cb_impl.prompt_user(params.version.c_str())) {
 		handle_exit();
 		return 1;
 	}