From 7ff515f8fef307a65dc5d3f41af7f1942b2e6833 Mon Sep 17 00:00:00 2001 From: Andrew Belt Date: Wed, 17 Nov 2021 03:16:47 -0500 Subject: [PATCH] Rename "Community Edition" to "Free". Remove edition name from TipWindow and Window title. --- Distribution.xml | 2 +- LICENSE.md | 2 +- installer.nsi | 2 +- src/app/TipWindow.cpp | 2 +- src/common.cpp | 4 ++-- src/window/Window.cpp | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Distribution.xml b/Distribution.xml index 10a8a0e0..3229d344 100644 --- a/Distribution.xml +++ b/Distribution.xml @@ -1,6 +1,6 @@ - VCV Rack Community 2 + VCV Rack 2 diff --git a/LICENSE.md b/LICENSE.md index c72ff6bc..eaec3847 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # VCV Rack licenses -VCV Rack Community Edition **source code and binaries** are copyright © 2016-2021 VCV. +VCV Rack Free **source code and binaries** are copyright © 2016-2021 VCV. This program is free software: you can redistribute it and/or modify it under the terms of the [GNU General Public License](https://www.gnu.org/licenses/gpl-3.0.en.html) as published by the [Free Software Foundation](https://www.fsf.org/), either version 3 of the License, or (at your option) any later version. In addition, you are granted the "VCV Rack Non-Commercial Plugin License Exception", allowed under section 7 of GPLv3, and a commercial licensing option. diff --git a/installer.nsi b/installer.nsi index fcd4fc06..30a9a016 100644 --- a/installer.nsi +++ b/installer.nsi @@ -1,6 +1,6 @@ !include "MUI2.nsh" -!define NAME_FULL "VCV Rack Community Edition ${VERSION}" +!define NAME_FULL "VCV Rack Free ${VERSION}" !define NAME "VCV Rack ${VERSION_MAJOR}" !define RACK_DIR "Rack${VERSION_MAJOR}" !define INSTALL_REG "Software\VCV\Rack${VERSION_MAJOR}" diff --git a/src/app/TipWindow.cpp b/src/app/TipWindow.cpp index 39f86f33..1057b32f 100644 --- a/src/app/TipWindow.cpp +++ b/src/app/TipWindow.cpp @@ -74,7 +74,7 @@ struct TipWindow : widget::OpaqueWidget { // header->box.size.x = box.size.x - 2*margin; header->box.size.y = 20; header->fontSize = 20; - header->text = "Welcome to " + APP_NAME + " " + APP_EDITION_NAME + " " + APP_VERSION; + header->text = "Welcome to " + APP_NAME + " " + APP_VERSION; layout->addChild(header); label = new ui::Label; diff --git a/src/common.cpp b/src/common.cpp index 5e8d4434..7fad3b15 100644 --- a/src/common.cpp +++ b/src/common.cpp @@ -16,8 +16,8 @@ namespace rack { const std::string APP_NAME = "VCV Rack"; -const std::string APP_EDITION = "CE"; -const std::string APP_EDITION_NAME = "Community Edition"; +const std::string APP_EDITION = "Free"; +const std::string APP_EDITION_NAME = "Free"; const std::string APP_VERSION_MAJOR = "2"; const std::string APP_VERSION = TOSTRING(_APP_VERSION); #if defined ARCH_WIN diff --git a/src/window/Window.cpp b/src/window/Window.cpp index b189cdce..389411b1 100644 --- a/src/window/Window.cpp +++ b/src/window/Window.cpp @@ -430,7 +430,7 @@ void Window::step() { gamepad::step(); // Set window title - std::string windowTitle = APP_NAME + " " + APP_EDITION_NAME + " " + APP_VERSION; + std::string windowTitle = APP_NAME + " " + APP_VERSION; if (APP->patch->path != "") { windowTitle += " - "; if (!APP->history->isSaved())