From eba069a4067c71b137dc93567163896b83a9fa18 Mon Sep 17 00:00:00 2001 From: Evgenii Zheltonozhskii Date: Mon, 4 Jun 2018 00:51:09 +0300 Subject: [PATCH] Branding changes, minor readme fix --- .github/CONTRIBUTING.md | 2 +- .github/ISSUE_TEMPLATE.md | 4 ++-- .gitignore | 2 ++ LICENSE | 2 +- README.md | 6 +++--- Telegram/SourceFiles/logs.cpp | 2 +- Telegram/SourceFiles/shortcuts.cpp | 4 ++-- 7 files changed, 12 insertions(+), 10 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 4c7d933de..36887c90e 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -95,7 +95,7 @@ Furthermore, the pixel shortage is over. We want to see: ### Test your changes! -Before you submit a pull request, please test your changes. Verify that Telegram Desktop still works and your changes don't cause other issue or crashes. +Before you submit a pull request, please test your changes. Verify that Kepka still works and your changes don't cause other issue or crashes. ### Write a good commit message diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md index 45aa8752f..799c0e54a 100644 --- a/.github/ISSUE_TEMPLATE.md +++ b/.github/ISSUE_TEMPLATE.md @@ -1,5 +1,5 @@ @@ -17,7 +17,7 @@ Tell us what happens instead ### Configuration **Operating system:** -**Version of Telegram Desktop:** +**Version of Kepka:** **Used theme**: diff --git a/.gitignore b/.gitignore index a48c050bb..ef96865d5 100644 --- a/.gitignore +++ b/.gitignore @@ -69,3 +69,5 @@ Session.vim _build_ _conan_build_ +.idea/ +cmake-build-debug/ diff --git a/LICENSE b/LICENSE index 77e1f6119..d03583d1f 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Telegram Desktop is licensed under the GNU General Public License +Kepka is licensed under the GNU General Public License version 3 with the addition of the following special exception: In addition, as a special exception, the copyright holders give diff --git a/README.md b/README.md index c01d5fb60..3b462fcba 100644 --- a/README.md +++ b/README.md @@ -21,16 +21,16 @@ What you need to have installed: * zlib * opus (libopus-dev) -Debian/Ubuntu: +#### Debian/Ubuntu: ```console -# apt-get install qtbase5-private-dev zlib1g-dev libopenal-dev libavcodec-dev libavresample-dev libswscale-dev libopenal-data libopenal1 libavutil-dev +# apt-get install libssl-dev libavformat-dev libavdevice-dev libswscale-dev libavutil-dev libpulse-dev libasound2-dev libswresample-dev libavresample-dev libopus-dev qtbase5-private-dev zlib1g-dev libopenal-dev libavcodec-dev libopenal-data libopenal1 ``` You most likely have to rebuild ffmpeg with `--enable-swresample --enable-swscale` After that, go to the [next section](#configuring-and-building). -Fedora: +#### Fedora: ```console # dnf install rpm-build rpmdevtools mock mock-rpmfusion-free ``` diff --git a/Telegram/SourceFiles/logs.cpp b/Telegram/SourceFiles/logs.cpp index ad198e0a2..37985ea29 100644 --- a/Telegram/SourceFiles/logs.cpp +++ b/Telegram/SourceFiles/logs.cpp @@ -1042,7 +1042,7 @@ namespace internal { Sandbox::SetLastCrashDump(lastdump); - LOG(("Opened '%1' for reading, the previous Telegram Desktop launch was not finished properly :( Crash log size: %2").arg(ReportPath).arg(lastdump.size())); + LOG(("Opened '%1' for reading, the previous Kepka launch was not finished properly :( Crash log size: %2").arg(ReportPath).arg(lastdump.size())); return LastCrashed; } diff --git a/Telegram/SourceFiles/shortcuts.cpp b/Telegram/SourceFiles/shortcuts.cpp index 0fed86f8d..1ea510f97 100644 --- a/Telegram/SourceFiles/shortcuts.cpp +++ b/Telegram/SourceFiles/shortcuts.cpp @@ -324,7 +324,7 @@ void start() { } if (!defaultValid && defaultFile.open(QIODevice::WriteOnly)) { const char *defaultHeader = "\ -// This is a list of default shortcuts for Telegram Desktop\n\ +// This is a list of default shortcuts for Kepka\n\ // Please don't modify it, its content is not used in any way\n\ // You can place your own shortcuts in the 'shortcuts-custom.json' file\n\n"; defaultFile.write(defaultHeader); @@ -398,7 +398,7 @@ void start() { } } else if (customFile.open(QIODevice::WriteOnly)) { const char *customContent = "\ -// This is a list of your own shortcuts for Telegram Desktop\n\ +// This is a list of your own shortcuts for Kepka\n\ // You can see full list of commands in the 'shortcuts-default.json' file\n\ // Place a null value instead of a command string to switch the shortcut off\n\n\ [\n\