Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 14 commits into from
Jul 25, 2021
Merged
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 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 "About Chatterino" to About tab where The Chatterino Wiki and other Stuff can be found. (#2965, #3068)
pajlada marked this conversation as resolved.
Show resolved Hide resolved
- 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: Fixed comma appended to username completion when not at the beginning of the message. (#3060)
Expand Down
21 changes: 21 additions & 0 deletions src/widgets/settingspages/AboutPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@

#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 {

AboutPage::AboutPage()
Expand Down Expand Up @@ -76,6 +81,7 @@ AboutPage::AboutPage()
// }
}*/

// Version
auto versionInfo = layout.emplace<QGroupBox>("Version");
{
auto version = Version::instance();
Expand All @@ -96,6 +102,20 @@ AboutPage::AboutPage()
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 =
layout.emplace<QGroupBox>("Open source software used...");
{
Expand Down Expand Up @@ -129,6 +149,7 @@ AboutPage::AboutPage()
":/licenses/lrucache.txt");
}

// Attributions
auto attributions = layout.emplace<QGroupBox>("Attributions...");
{
auto l = attributions.emplace<QVBoxLayout>();
Expand Down