diff --git a/Telegram/SourceFiles/_other/updater_linux.cpp b/Telegram/SourceFiles/_other/updater_linux.cpp index d56478ba2..cef84d75d 100644 --- a/Telegram/SourceFiles/_other/updater_linux.cpp +++ b/Telegram/SourceFiles/_other/updater_linux.cpp @@ -372,7 +372,7 @@ int main(int argc, char *argv[]) { } } if (exeName.empty() || exeName.find('/') != string::npos) { - exeName = "Telegram"; + exeName = "Kotatogram"; } openLog(); @@ -403,19 +403,19 @@ int main(int argc, char *argv[]) { customWorkingDir = false; writeLog("No workdir, trying to figure it out"); - struct passwd *pw = getpwuid(getuid()); - if (pw && pw->pw_dir && strlen(pw->pw_dir)) { - string tryDir = pw->pw_dir + string("/.TelegramDesktop/"); - struct stat statbuf; - writeLog("Trying to use '%s' as workDir, getting stat() for tupdates/ready", tryDir.c_str()); - if (!stat((tryDir + "tupdates/ready").c_str(), &statbuf)) { - writeLog("Stat got"); - if (S_ISDIR(statbuf.st_mode)) { - writeLog("It is directory, using home work dir"); - workDir = tryDir; - } - } - } + // struct passwd *pw = getpwuid(getuid()); + // if (pw && pw->pw_dir && strlen(pw->pw_dir)) { + // string tryDir = pw->pw_dir + string("/.TelegramDesktop/"); + // struct stat statbuf; + // writeLog("Trying to use '%s' as workDir, getting stat() for tupdates/ready", tryDir.c_str()); + // if (!stat((tryDir + "tupdates/ready").c_str(), &statbuf)) { + // writeLog("Stat got"); + // if (S_ISDIR(statbuf.st_mode)) { + // writeLog("It is directory, using home work dir"); + // workDir = tryDir; + // } + // } + // } if (workDir.empty()) { workDir = exePath; diff --git a/Telegram/SourceFiles/_other/updater_osx.m b/Telegram/SourceFiles/_other/updater_osx.m index c93fba25a..f8bb4b14f 100644 --- a/Telegram/SourceFiles/_other/updater_osx.m +++ b/Telegram/SourceFiles/_other/updater_osx.m @@ -8,7 +8,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #import #include -NSString *appName = @"Telegram.app"; +NSString *appName = @"Kotatogram.app"; NSString *appDir = nil; NSString *workDir = nil; @@ -54,7 +54,7 @@ void RemoveQuarantineAttribute(NSString *path) { void RemoveQuarantineFromBundle(NSString *path) { RemoveQuarantineAttribute(path); - RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/MacOS/Telegram"]); + RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/MacOS/Kotatogram"]); RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/Helpers/crashpad_handler"]); RemoveQuarantineAttribute([path stringByAppendingString:@"/Contents/Frameworks/Updater"]); } @@ -167,7 +167,7 @@ int main(int argc, const char * argv[]) { // Take the Updater (this currently running binary) from the place where it was placed by Telegram // and copy it to the folder with the new version of the app (ready), - // so it won't be deleted when we will clear the "Telegram.app/Contents" folder. + // so it won't be deleted when we will clear the "Kotatogram.app/Contents" folder. NSString *oldVersionUpdaterPath = [appDirFull stringByAppendingString: @"/Contents/Frameworks/Updater" ]; NSString *newVersionUpdaterPath = [srcEnum stringByAppendingString:[[NSArray arrayWithObjects:@"/", appName, @"/Contents/Frameworks/Updater", nil] componentsJoinedByString:@""]]; writeLog([[NSArray arrayWithObjects: @"Copying Updater from old path ", oldVersionUpdaterPath, @" to new path ", newVersionUpdaterPath, nil] componentsJoinedByString:@""]); diff --git a/Telegram/SourceFiles/history/history_item.cpp b/Telegram/SourceFiles/history/history_item.cpp index 23dfc8c74..bb31a2075 100644 --- a/Telegram/SourceFiles/history/history_item.cpp +++ b/Telegram/SourceFiles/history/history_item.cpp @@ -65,7 +65,7 @@ not_null CreateUnsupportedMessage( UserId viaBotId, TimeId date, UserId from) { - const auto siteLink = qsl("https://desktop.telegram.org"); + const auto siteLink = qsl("https://kotatogram.github.io"); auto text = TextWithEntities{ tr::lng_message_unsupported(tr::now, lt_link, siteLink) }; diff --git a/Telegram/SourceFiles/platform/linux/specific_linux.cpp b/Telegram/SourceFiles/platform/linux/specific_linux.cpp index f15dc44aa..68d07a55b 100644 --- a/Telegram/SourceFiles/platform/linux/specific_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/specific_linux.cpp @@ -187,16 +187,16 @@ QString getHomeDir() { } // namespace QString psAppDataPath() { - // Previously we used ~/.TelegramDesktop, so look there first. - // If we find data there, we should still use it. - auto home = getHomeDir(); - if (!home.isEmpty()) { - auto oldPath = home + qsl(".TelegramDesktop/"); - auto oldSettingsBase = oldPath + qsl("tdata/settings"); - if (QFile(oldSettingsBase + '0').exists() || QFile(oldSettingsBase + '1').exists()) { - return oldPath; - } - } + // We should not use ~/.TelegramDesktop, since it's a fork. + + // auto home = getHomeDir(); + // if (!home.isEmpty()) { + // auto oldPath = home + qsl(".TelegramDesktop/"); + // auto oldSettingsBase = oldPath + qsl("tdata/settings"); + // if (QFile(oldSettingsBase + '0').exists() || QFile(oldSettingsBase + '1').exists()) { + // return oldPath; + // } + // } return QStandardPaths::writableLocation(QStandardPaths::AppLocalDataLocation) + '/'; } diff --git a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm index 8467d04a0..4e51679bb 100644 --- a/Telegram/SourceFiles/platform/mac/mac_touchbar.mm +++ b/Telegram/SourceFiles/platform/mac/mac_touchbar.mm @@ -95,8 +95,8 @@ NSString *const kTypePicker = @"picker"; NSString *const kTypeFormatter = @"formatter"; NSString *const kTypeFormatterSegment = @"formatterSegment"; -const NSString *kCustomizationIdPlayer = @"telegram.touchbar"; -const NSString *kCustomizationIdMain = @"telegram.touchbarMain"; +const NSString *kCustomizationIdPlayer = @"kotatogram.touchbar"; +const NSString *kCustomizationIdMain = @"kotatogram.touchbarMain"; const NSTouchBarItemIdentifier kSavedMessagesItemIdentifier = [NSString stringWithFormat:@"%@.savedMessages", kCustomizationIdMain]; const NSTouchBarItemIdentifier kArchiveFolderItemIdentifier = [NSString stringWithFormat:@"%@.archiveFolder", kCustomizationIdMain]; const NSTouchBarItemIdentifier kPinnedPanelItemIdentifier = [NSString stringWithFormat:@"%@.pinnedPanel", kCustomizationIdMain]; diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm index 83ff560bf..970873969 100644 --- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm +++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm @@ -664,8 +664,8 @@ void MainWindow::psFirstShow() { } void MainWindow::createGlobalMenu() { - auto main = psMainMenu.addMenu(qsl("Telegram")); - auto about = main->addAction(tr::lng_mac_menu_about_telegram(tr::now, lt_telegram, qsl("Telegram"))); + auto main = psMainMenu.addMenu(qsl("Kotatogram")); + auto about = main->addAction(tr::lng_mac_menu_about_telegram(tr::now, lt_telegram, qsl("Kotatogram"))); connect(about, &QAction::triggered, about, [] { if (App::wnd() && App::wnd()->isHidden()) App::wnd()->showFromTray(); Ui::show(Box()); diff --git a/Telegram/SourceFiles/platform/mac/window_title_mac.mm b/Telegram/SourceFiles/platform/mac/window_title_mac.mm index 6ce64034f..8eae95b8e 100644 --- a/Telegram/SourceFiles/platform/mac/window_title_mac.mm +++ b/Telegram/SourceFiles/platform/mac/window_title_mac.mm @@ -134,7 +134,7 @@ void PreviewWindowTitle(Painter &p, const style::palette &palette, QRect body, i p.setPen(st::titleFgActive[palette]); p.setFont(font); - p.drawText(titleRect, qsl("Telegram"), style::al_center); + p.drawText(titleRect, qsl("Kotatogram"), style::al_center); auto isGraphite = ([NSColor currentControlTint] == NSGraphiteControlTint); auto buttonSkip = 8; diff --git a/Telegram/SourceFiles/window/main_window.cpp b/Telegram/SourceFiles/window/main_window.cpp index b42d56a8a..38a62613e 100644 --- a/Telegram/SourceFiles/window/main_window.cpp +++ b/Telegram/SourceFiles/window/main_window.cpp @@ -116,7 +116,7 @@ QIcon CreateOfficialIcon(Main::Account *account) { QIcon CreateIcon(Main::Account *account) { auto result = CreateOfficialIcon(account); if (Platform::IsLinux()) { - return QIcon::fromTheme("telegram", result); + return QIcon::fromTheme("kotatogram", result); } return result; } diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png index 0a2c3b969..59e7e25b3 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png index 4a7bbb4e4..f4616cc30 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png index a3553a4bc..b753bbb18 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png index 32b6a5686..c19f3b6db 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png index 2e818f129..5ecf12d4a 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png index dc2da2b33..ef4fc7d25 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png index 231c1e335..66868915e 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png index c4e635afe..74697abfd 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png index 7dc492002..28c5b8685 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512.png differ diff --git a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png index 59ed2b9ab..d9ae73b8e 100644 Binary files a/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png and b/Telegram/Telegram/Images.xcassets/AppIcon.appiconset/icon512@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png index 0a2c3b969..59e7e25b3 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png index 4a7bbb4e4..f4616cc30 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_128x128@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png index a3553a4bc..b753bbb18 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png index 32b6a5686..c19f3b6db 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_16x16@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png index 2e818f129..5ecf12d4a 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png index dc2da2b33..ef4fc7d25 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_256x256@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png index 231c1e335..66868915e 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png index c4e635afe..74697abfd 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_32x32@2x.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png index 7dc492002..28c5b8685 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512.png differ diff --git a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png index 59ed2b9ab..d9ae73b8e 100644 Binary files a/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png and b/Telegram/Telegram/Images.xcassets/Icon.iconset/icon_512x512@2x.png differ diff --git a/Telegram/gyp/telegram/mac.gypi b/Telegram/gyp/telegram/mac.gypi index 50b99fefc..52a432da3 100644 --- a/Telegram/gyp/telegram/mac.gypi +++ b/Telegram/gyp/telegram/mac.gypi @@ -69,7 +69,7 @@ 'configurations': { 'Debug': { 'xcode_settings': { - 'PRODUCT_BUNDLE_IDENTIFIER': 'com.tdesktop.TelegramDebugOld', + 'PRODUCT_BUNDLE_IDENTIFIER': 'io.github.KotatogramDebugOld', }, 'library_dirs': [ '<(libs_loc)/macold/crashpad/out/Debug', @@ -77,7 +77,7 @@ }, 'Release': { 'xcode_settings': { - 'PRODUCT_BUNDLE_IDENTIFIER': 'com.tdesktop.Telegram', + 'PRODUCT_BUNDLE_IDENTIFIER': 'io.github.Kotatogram', }, 'library_dirs': [ '<(libs_loc)/macold/crashpad/out/Release', @@ -87,26 +87,26 @@ 'postbuilds': [{ 'postbuild_name': 'Force Frameworks path', 'action': [ - 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Frameworks/' + 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Frameworks/' ], }, { 'postbuild_name': 'Copy Updater to Frameworks', 'action': [ 'cp', '${BUILT_PRODUCTS_DIR}/Updater', - '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Frameworks/', + '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Frameworks/', ], }, { 'postbuild_name': 'Force Helpers path', 'action': [ - 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/' + 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Helpers/' ], }, { 'postbuild_name': 'Copy crashpad_handler to Helpers', 'action': [ 'cp', '<(libs_loc)/macold/crashpad/out/${CONFIGURATION}/crashpad_handler', - '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/', + '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Helpers/', ], }], }, { @@ -150,43 +150,43 @@ 'configurations': { 'Debug': { 'xcode_settings': { - 'PRODUCT_BUNDLE_IDENTIFIER': 'com.tdesktop.TelegramDebug', + 'PRODUCT_BUNDLE_IDENTIFIER': 'io.github.KotatogramDebug', }, }, 'Release': { 'xcode_settings': { - 'PRODUCT_BUNDLE_IDENTIFIER': 'com.tdesktop.Telegram', + 'PRODUCT_BUNDLE_IDENTIFIER': 'io.github.Kotatogram', }, }, }, 'postbuilds': [{ 'postbuild_name': 'Force Frameworks path', 'action': [ - 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Frameworks/' + 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Frameworks/' ], }, { 'postbuild_name': 'Copy Updater to Frameworks', 'action': [ 'cp', '${BUILT_PRODUCTS_DIR}/Updater', - '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Frameworks/', + '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Frameworks/', ], }, { 'postbuild_name': 'Force Helpers path', 'action': [ - 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/' + 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Helpers/' ], }, { 'postbuild_name': 'Copy crashpad_client to Helpers', 'action': [ 'cp', '<(libs_loc)/crashpad/out/${CONFIGURATION}/crashpad_handler', - '${BUILT_PRODUCTS_DIR}/Telegram.app/Contents/Helpers/', + '${BUILT_PRODUCTS_DIR}/Kotatogram.app/Contents/Helpers/', ], }], }], [ 'build_macstore', { 'xcode_settings': { - 'PRODUCT_BUNDLE_IDENTIFIER': 'org.telegram.desktop', + 'PRODUCT_BUNDLE_IDENTIFIER': 'io.github.kotatogram', 'OTHER_LDFLAGS': [ '-framework', 'Breakpad', ], @@ -201,19 +201,19 @@ 'postbuilds': [{ 'postbuild_name': 'Clear Frameworks path', 'action': [ - 'rm', '-rf', '${BUILT_PRODUCTS_DIR}/Telegram Desktop.app/Contents/Frameworks' + 'rm', '-rf', '${BUILT_PRODUCTS_DIR}/Kotatogram Desktop.app/Contents/Frameworks' ], }, { 'postbuild_name': 'Force Frameworks path', 'action': [ - 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Telegram Desktop.app/Contents/Frameworks/' + 'mkdir', '-p', '${BUILT_PRODUCTS_DIR}/Kotatogram Desktop.app/Contents/Frameworks/' ], }, { 'postbuild_name': 'Copy Breakpad.framework to Frameworks', 'action': [ 'cp', '-a', '<(libs_loc)/breakpad/src/client/mac/build/Release/Breakpad.framework', - '${BUILT_PRODUCTS_DIR}/Telegram Desktop.app/Contents/Frameworks/Breakpad.framework', + '${BUILT_PRODUCTS_DIR}/Kotatogram Desktop.app/Contents/Frameworks/Breakpad.framework', ], }] }]],