From 0602d9cc969412b806bf42cbe7c4e28425a2400d Mon Sep 17 00:00:00 2001
From: Andrew Belt <andrewpbelt@gmail.com>
Date: Sat, 7 Aug 2021 05:23:12 -0400
Subject: [PATCH] Add edition name to TipWindow.

---
 adapters/standalone.cpp |  2 +-
 include/common.hpp      |  2 +-
 src/Window.cpp          |  2 +-
 src/app/MenuBar.cpp     |  2 +-
 src/app/TipWindow.cpp   | 10 +++++-----
 src/common.cpp          |  2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/adapters/standalone.cpp b/adapters/standalone.cpp
index e3ae3b45..f73bba66 100644
--- a/adapters/standalone.cpp
+++ b/adapters/standalone.cpp
@@ -125,7 +125,7 @@ int main(int argc, char* argv[]) {
 	}
 
 	// Log environment
-	INFO("%s %s v%s", APP_NAME.c_str(), APP_VARIANT.c_str(), APP_VERSION.c_str());
+	INFO("%s %s v%s", APP_NAME.c_str(), APP_EDITION.c_str(), APP_VERSION.c_str());
 	INFO("%s", system::getOperatingSystemInfo().c_str());
 	std::string argsList;
 	for (int i = 0; i < argc; i++) {
diff --git a/include/common.hpp b/include/common.hpp
index 818a0056..6cfdaacd 100644
--- a/include/common.hpp
+++ b/include/common.hpp
@@ -260,7 +260,7 @@ typename C::mapped_type get(const C& m, const typename C::key_type& key, const t
 // config
 
 extern const std::string APP_NAME;
-extern const std::string APP_VARIANT;
+extern const std::string APP_EDITION;
 extern const std::string APP_VERSION;
 extern const std::string APP_VERSION_MAJOR;
 extern const std::string APP_ARCH;
diff --git a/src/Window.cpp b/src/Window.cpp
index 506bcf0d..cd37d613 100644
--- a/src/Window.cpp
+++ b/src/Window.cpp
@@ -423,7 +423,7 @@ void Window::step() {
 	gamepad::step();
 
 	// Set window title
-	std::string windowTitle = APP_NAME + " " + APP_VARIANT + " " + APP_VERSION;
+	std::string windowTitle = APP_NAME + " " + APP_EDITION + " " + APP_VERSION;
 	if (APP->patch->path != "") {
 		windowTitle += " - ";
 		if (!APP->history->isSaved())
diff --git a/src/app/MenuBar.cpp b/src/app/MenuBar.cpp
index b4e11b6c..a2b0b089 100644
--- a/src/app/MenuBar.cpp
+++ b/src/app/MenuBar.cpp
@@ -957,7 +957,7 @@ struct HelpButton : MenuButton {
 
 		menu->addChild(new ui::MenuSeparator);
 
-		menu->addChild(createMenuLabel(APP_VARIANT));
+		menu->addChild(createMenuLabel(APP_EDITION));
 
 		menu->addChild(createMenuLabel(APP_VERSION));
 	}
diff --git a/src/app/TipWindow.cpp b/src/app/TipWindow.cpp
index c5d05d80..9ae70c3d 100644
--- a/src/app/TipWindow.cpp
+++ b/src/app/TipWindow.cpp
@@ -56,9 +56,9 @@ struct TipWindow : widget::OpaqueWidget {
 	UrlButton* linkButton;
 
 	TipWindow() {
-		box.size = math::Vec(500, 200);
+		box.size = math::Vec(550, 200);
 		const float margin = 10;
-		const float buttonWidth = 90;
+		const float buttonWidth = 100;
 
 		layout = new ui::SequentialLayout;
 		layout->box.pos = math::Vec(0, 10);
@@ -70,10 +70,10 @@ struct TipWindow : widget::OpaqueWidget {
 		addChild(layout);
 
 		ui::Label* header = new ui::Label;
-		header->box.size.x = box.size.x - 2*margin;
+		// header->box.size.x = box.size.x - 2*margin;
 		header->box.size.y = 20;
 		header->fontSize = 20;
-		header->text = "Welcome to VCV Rack " + APP_VERSION;
+		header->text = "Welcome to " + APP_NAME + " " + APP_EDITION + " " + APP_VERSION;
 		layout->addChild(header);
 
 		label = new ui::Label;
@@ -106,7 +106,7 @@ struct TipWindow : widget::OpaqueWidget {
 		static ShowQuantity showQuantity;
 
 		ui::OptionButton* showButton = new ui::OptionButton;
-		showButton->box.size.x = 180;
+		showButton->box.size.x = 200;
 		showButton->text = "Show tips at startup";
 		showButton->quantity = &showQuantity;
 		buttonLayout->addChild(showButton);
diff --git a/src/common.cpp b/src/common.cpp
index adc380a2..ac4acc81 100644
--- a/src/common.cpp
+++ b/src/common.cpp
@@ -16,7 +16,7 @@ namespace rack {
 
 
 const std::string APP_NAME = "VCV Rack";
-const std::string APP_VARIANT = "Community Edition";
+const std::string APP_EDITION = "Community Edition";
 const std::string APP_VERSION = TOSTRING(VERSION);
 const std::string APP_VERSION_MAJOR = "2";
 #if defined ARCH_WIN