diff --git a/.CI/build-installer.ps1 b/.CI/build-installer.ps1 index 0fdb565bf79..4b6175a8da8 100644 --- a/.CI/build-installer.ps1 +++ b/.CI/build-installer.ps1 @@ -16,12 +16,12 @@ if ($isTagged) { # Make sure, any existing `modes` file is overwritten for the user, # for example when updating from nightly to stable. Write-Output "" | Out-File Chatterino2/modes -Encoding ASCII; - $installerBaseName = "Chatterino7.Installer"; + $installerBaseName = "Chatterino7TV.Installer"; } else { Write-Output nightly | Out-File Chatterino2/modes -Encoding ASCII; $defines = "/DIS_NIGHTLY=1"; - $installerBaseName = "Chatterino7.Nightly.Installer"; + $installerBaseName = "Chatterino7TV.Nightly.Installer"; } $architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower() diff --git a/.CI/bundle-portable.ps1 b/.CI/bundle-portable.ps1 index fe55fcc1389..3c08c469106 100644 --- a/.CI/bundle-portable.ps1 +++ b/.CI/bundle-portable.ps1 @@ -31,11 +31,11 @@ if ($isTagged) { # This is a release. # Make sure, any existing `modes` file is overwritten for the user, # for example when updating from nightly to stable. - $bundleBaseName = "Chatterino7.Portable"; + $bundleBaseName = "Chatterino7TV.Portable"; } else { Write-Output nightly | Out-File Chatterino2/modes -Append -Encoding ASCII; - $bundleBaseName = "Chatterino7.Nightly.Portable"; + $bundleBaseName = "Chatterino7TV.Nightly.Portable"; } $architecture = [System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLower() diff --git a/.CI/chatterino-installer.iss b/.CI/chatterino-installer.iss index 9ca3941960a..fa05c3d6943 100644 --- a/.CI/chatterino-installer.iss +++ b/.CI/chatterino-installer.iss @@ -1,8 +1,8 @@ ; Script generated by the Inno Setup Script Wizard. ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES! -#define MyAppName "Chatterino7" -#define MyAppVersion "7.5.5" +#define MyAppName "Chatterino 7TV" +#define MyAppVersion "2.5.5" #define MyAppPublisher "7TV" #define MyAppURL "https://www.chatterino.com" #define MyAppExeName "chatterino.exe" @@ -53,7 +53,7 @@ OutputDir=out #ifdef INSTALLER_BASE_NAME OutputBaseFilename={#INSTALLER_BASE_NAME} #else -OutputBaseFilename=Chatterino7.Installer +OutputBaseFilename=Chatterino7TV.Installer #endif Compression=lzma SolidCompression=yes @@ -84,8 +84,8 @@ Source: "{#WORKING_DIR}vc_redist.{#VCRT_ARCH}.exe"; DestDir: "{tmp}"; Tasks: vcr ; NOTE: Don't use "Flags: ignoreversion" on any shared system files [Icons] -Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; AppUserModelID: "SevenTV.Chatterino7" -Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; AppUserModelID: "SevenTV.Chatterino7"; Tasks: desktopicon +Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; AppUserModelID: "SevenTV.Chatterino7TV" +Name: "{autodesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; AppUserModelID: "SevenTV.Chatterino7TV"; Tasks: desktopicon [Run] ; VC++ redistributable diff --git a/CMakeLists.txt b/CMakeLists.txt index 7edd945aac6..3c835ba72bf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -71,7 +71,7 @@ if(BUILD_BENCHMARKS) endif() project(chatterino - VERSION 7.5.5 + VERSION 2.5.5 DESCRIPTION "Chat client for twitch.tv" HOMEPAGE_URL "https://chatterino.com/" ) diff --git a/cmake/resources/windows.rc.in b/cmake/resources/windows.rc.in index a43cb8810e2..00ceb9b7b1e 100644 --- a/cmake/resources/windows.rc.in +++ b/cmake/resources/windows.rc.in @@ -15,14 +15,14 @@ BEGIN BEGIN BLOCK "040904b0" BEGIN - VALUE "ProductName", "Chatterino" + VALUE "ProductName", "Chatterino 7TV" VALUE "ProductVersion", "@PROJECT_VERSION@" VALUE "CompanyName", "Chatterino, @PROJECT_HOMEPAGE_URL@" - VALUE "FileDescription", "Chatterino" + VALUE "FileDescription", "Chatterino 7TV" VALUE "FileVersion", "@PROJECT_VERSION@" VALUE "SpecialBuild", "@GIT_COMMIT@" - VALUE "InternalName", "Chatterino" - VALUE "OriginalFilename", "Chatterino" + VALUE "InternalName", "Chatterino 7TV" + VALUE "OriginalFilename", "Chatterino 7TV" VALUE "LegalCopyright", "Project contributors 2016-@CURRENT_YEAR@" VALUE "Licence", "MIT" END @@ -31,4 +31,4 @@ BEGIN BEGIN VALUE "Translation", 0x409, 1200 END -END \ No newline at end of file +END diff --git a/resources/com.chatterino.chatterino.desktop b/resources/com.chatterino.chatterino.desktop index ece81f5c8a8..802883079ad 100644 --- a/resources/com.chatterino.chatterino.desktop +++ b/resources/com.chatterino.chatterino.desktop @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Version=1.0 -Name=Chatterino +Name=Chatterino 7TV Comment=Chat client for Twitch Exec=chatterino Icon=com.chatterino.chatterino diff --git a/src/Application.cpp b/src/Application.cpp index b444b0f5a2e..082b33d99cb 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -236,7 +236,7 @@ void Application::initialize(Settings &settings, const Paths &paths) getSettings()->currentVersion.getValue() != "" && getSettings()->currentVersion.getValue() != CHATTERINO_VERSION) { - auto *box = new QMessageBox(QMessageBox::Information, "Chatterino 7", + auto *box = new QMessageBox(QMessageBox::Information, "Chatterino 7TV", "Show changelog?", QMessageBox::Yes | QMessageBox::No); box->setAttribute(Qt::WA_DeleteOnClose); diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8cd4f86147b..a03d0541ba2 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1273,7 +1273,8 @@ if (APPLE AND BUILD_APP) set_target_properties(${EXECUTABLE_PROJECT} PROPERTIES MACOSX_BUNDLE TRUE) set_target_properties(${EXECUTABLE_PROJECT} PROPERTIES - MACOSX_BUNDLE_BUNDLE_NAME "Chatterino" + MACOSX_BUNDLE_BUNDLE_NAME "Chatterino 7TV" + # Keep this for backwards compatibility MACOSX_BUNDLE_GUI_IDENTIFIER "app.7tv.chatterino7" MACOSX_BUNDLE_LONG_VERSION_STRING "${PROJECT_VERSION}" MACOSX_BUNDLE_SHORT_VERSION_STRING "${PROJECT_VERSION}" diff --git a/src/common/Args.cpp b/src/common/Args.cpp index dc47db95252..426ddffae82 100644 --- a/src/common/Args.cpp +++ b/src/common/Args.cpp @@ -98,7 +98,7 @@ namespace chatterino { Args::Args(const QApplication &app, const Paths &paths) { QCommandLineParser parser; - parser.setApplicationDescription("Chatterino 2 Client for Twitch Chat"); + parser.setApplicationDescription("Chatterino 7TV Client for Twitch Chat"); parser.addHelpOption(); // Used internally by app to restart after unexpected crashes diff --git a/src/common/Version.cpp b/src/common/Version.cpp index caedc1286bf..7962edd8019 100644 --- a/src/common/Version.cpp +++ b/src/common/Version.cpp @@ -18,7 +18,7 @@ Version::Version() , dateOfBuild_(QStringLiteral(CHATTERINO_CMAKE_GEN_DATE)) , isNightly_(CHATTERINO_NIGHTLY_BUILD == 1) { - this->fullVersion_ = "Chatterino "; + this->fullVersion_ = "Chatterino 7TV "; if (this->isNightly()) { this->fullVersion_ += "Nightly "; @@ -42,7 +42,7 @@ Version::Version() #ifdef Q_OS_WIN // keep in sync with .CI/chatterino-installer.iss - this->appUserModelID_ = L"SevenTV.Chatterino7"; + this->appUserModelID_ = L"SevenTV.Chatterino7TV"; #endif } diff --git a/src/common/Version.hpp b/src/common/Version.hpp index 8530baecb57..8ea224c3e34 100644 --- a/src/common/Version.hpp +++ b/src/common/Version.hpp @@ -33,7 +33,7 @@ namespace chatterino { * - 2.4.0-alpha.2 * - 2.4.0-alpha **/ -inline const QString CHATTERINO_VERSION = QStringLiteral("7.5.5"); +inline const QString CHATTERINO_VERSION = QStringLiteral("2.5.5"); class Version { diff --git a/src/singletons/Toasts.cpp b/src/singletons/Toasts.cpp index 9a6c01be102..3d5e0da0f12 100644 --- a/src/singletons/Toasts.cpp +++ b/src/singletons/Toasts.cpp @@ -288,7 +288,7 @@ void Toasts::ensureInitialized() this->initialized_ = true; auto *instance = WinToast::instance(); - instance->setAppName(L"Chatterino7"); + instance->setAppName(L"Chatterino7TV"); instance->setAppUserModelId(Version::instance().appUserModelID()); if (!getSettings()->createShortcutForToasts) { @@ -350,7 +350,7 @@ void Toasts::ensureInitialized() { return; } - auto result = notify_init("Chatterino"); + auto result = notify_init("Chatterino 7TV"); if (result == 0) {