noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added section with helpful Chatterino-related links to the About page (#3068)

Browse source 
Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
This commit is contained in:
xHeaveny 2021-07-25 16:19:01 +02:00 committed by GitHub
parent 6052a0ede6
commit 33d1837f4f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -7,6 +7,7 @@
- Minor: Received Twitch messages now use the exact same timestamp (obtained from Twitch's server) for every Chatterino user instead of assuming message timestamp on client's side. (#3021) - Minor: Received Twitch messages now use the exact same timestamp (obtained from Twitch's server) for every Chatterino user instead of assuming message timestamp on client's side. (#3021)
- Minor: Received IRC messages use `time` message tag for timestamp if it's available. (#3021) - Minor: Received IRC messages use `time` message tag for timestamp if it's available. (#3021)
- Minor: Added informative messages for recent-messages API's errors. (#3029) - Minor: Added informative messages for recent-messages API's errors. (#3029)
- Minor: Added section with helpful Chatterino-related links to the About page. (#3068)
- Bugfix: Fixed "smiley" emotes being unable to be "Tabbed" with autocompletion, introduced in v2.3.3. (#3010) - Bugfix: Fixed "smiley" emotes being unable to be "Tabbed" with autocompletion, introduced in v2.3.3. (#3010)
- Bugfix: Copy buttons in usercard now show properly in light mode (#3057) - Bugfix: Copy buttons in usercard now show properly in light mode (#3057)
- Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060) - Bugfix: Fixed comma appended to username completion when not at the beginning of the message. (#3060)

21
src/widgets/settingspages/AboutPage.cpp
View file

@ -17,6 +17,11 @@
#define PIXMAP_WIDTH 500 #define PIXMAP_WIDTH 500
#define LINK_CHATTERINO_WIKI "https://wiki.chatterino.com"
#define LINK_DONATE "https://streamelements.com/fourtf/tip"
#define LINK_CHATTERINO_FEATURES "https://chatterino.com/#features"
#define LINK_CHATTERINO_DISCORD "https://discord.gg/7Y5AYhAK4z"
namespace chatterino { namespace chatterino {
AboutPage::AboutPage() AboutPage::AboutPage()
@ -76,6 +81,7 @@ AboutPage::AboutPage()
// } // }
}*/ }*/
// Version
auto versionInfo = layout.emplace<QGroupBox>("Version"); auto versionInfo = layout.emplace<QGroupBox>("Version");
{ {
auto version = Version::instance(); auto version = Version::instance();
@ -96,6 +102,20 @@ AboutPage::AboutPage()
Qt::LinksAccessibleByMouse); Qt::LinksAccessibleByMouse);
} }
// About Chatterino
auto aboutChatterino = layout.emplace<QGroupBox>("About Chatterino...");
{
auto l = aboutChatterino.emplace<QVBoxLayout>();
// clang-format off
l.emplace<QLabel>("Chatterino Wiki can be found <a href=\"" LINK_CHATTERINO_WIKI "\">here</a>")->setOpenExternalLinks(true);
l.emplace<QLabel>("Support <a href=\"" LINK_DONATE "\">Chatterino</a>")->setOpenExternalLinks(true);
l.emplace<QLabel>("All about Chatterino's <a href=\"" LINK_CHATTERINO_FEATURES "\">features</a>")->setOpenExternalLinks(true);
l.emplace<QLabel>("Join the official Chatterino <a href=\"" LINK_CHATTERINO_DISCORD "\">Discord</a>")->setOpenExternalLinks(true);
// clang-format on
}
// Licenses
auto licenses = auto licenses =
layout.emplace<QGroupBox>("Open source software used..."); layout.emplace<QGroupBox>("Open source software used...");
{ {
@ -129,6 +149,7 @@ AboutPage::AboutPage()
":/licenses/lrucache.txt"); ":/licenses/lrucache.txt");
} }
// Attributions
auto attributions = layout.emplace<QGroupBox>("Attributions..."); auto attributions = layout.emplace<QGroupBox>("Attributions...");
{ {
auto l = attributions.emplace<QVBoxLayout>(); auto l = attributions.emplace<QVBoxLayout>();