Skip to content

Commit

Permalink
Added section with helpful Chatterino-related links to the About page (
Browse files Browse the repository at this point in the history
…#3068)

Co-authored-by: pajlada <rasmus.karlsson@pajlada.com>
  • Loading branch information
xHeaveny and pajlada committed Jul 25, 2021
1 parent 6052a0e commit 33d1837
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 0 deletions.
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 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: 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

0 comments on commit 33d1837

Please sign in to comment.