Capitalize mentions of Twitch, Chatterino, and IRC in comments and text/settings (#3274)
This commit is contained in:
@@ -51,7 +51,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
|
||||
auto channel_btn = vbox.emplace<QRadioButton>("Channel").assign(
|
||||
&this->ui_.twitch.channel);
|
||||
auto channel_lbl =
|
||||
vbox.emplace<QLabel>("Join a twitch channel by its name.").hidden();
|
||||
vbox.emplace<QLabel>("Join a Twitch channel by its name.").hidden();
|
||||
channel_lbl->setWordWrap(true);
|
||||
auto channel_edit = vbox.emplace<QLineEdit>().hidden().assign(
|
||||
&this->ui_.twitch.channelName);
|
||||
@@ -77,7 +77,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
|
||||
.assign(&this->ui_.twitch.whispers);
|
||||
auto whispers_lbl =
|
||||
vbox.emplace<QLabel>("Shows the whispers that you receive while "
|
||||
"chatterino is running.")
|
||||
"Chatterino is running.")
|
||||
.hidden();
|
||||
|
||||
whispers_lbl->setWordWrap(true);
|
||||
@@ -108,7 +108,7 @@ SelectChannelDialog::SelectChannelDialog(QWidget *parent)
|
||||
auto watching_btn = vbox.emplace<QRadioButton>("Watching")
|
||||
.assign(&this->ui_.twitch.watching);
|
||||
auto watching_lbl =
|
||||
vbox.emplace<QLabel>("Requires the chatterino browser extension.")
|
||||
vbox.emplace<QLabel>("Requires the Chatterino browser extension.")
|
||||
.hidden();
|
||||
|
||||
watching_lbl->setWordWrap(true);
|
||||
|
||||
@@ -1927,7 +1927,7 @@ void ChannelView::addContextMenuItems(
|
||||
crossPlatformCopy(copyString);
|
||||
});
|
||||
|
||||
// If is a link to a twitch user/stream
|
||||
// If is a link to a Twitch user/stream
|
||||
if (hoveredElement->getLink().type == Link::Url)
|
||||
{
|
||||
static QRegularExpression twitchChannelRegex(
|
||||
|
||||
@@ -434,14 +434,14 @@ void GeneralPage::initLayout(GeneralPageView &layout)
|
||||
{
|
||||
layout.addDescription(
|
||||
"Your operating system is not officially supplied with builds. For "
|
||||
"updates, please rebuild chatterino from sources. Report "
|
||||
"updates, please rebuild Chatterino from sources. Report "
|
||||
"issues <a href='https://chatterino.com/link/issues'>here</a>.");
|
||||
}
|
||||
|
||||
#ifdef Q_OS_WIN
|
||||
layout.addTitle("Browser Integration");
|
||||
layout.addDescription("The browser extension replaces the default "
|
||||
"Twitch.tv chat with chatterino.");
|
||||
"Twitch.tv chat with Chatterino.");
|
||||
|
||||
{
|
||||
if (auto err = nmIpcError().get())
|
||||
@@ -651,7 +651,7 @@ void GeneralPage::initLayout(GeneralPageView &layout)
|
||||
layout.addCheckbox("Only search for username autocompletion with an @",
|
||||
s.userCompletionOnlyWithAt);
|
||||
|
||||
layout.addCheckbox("Show twitch whispers inline", s.inlineWhispers);
|
||||
layout.addCheckbox("Show Twitch whispers inline", s.inlineWhispers);
|
||||
layout.addCheckbox("Highlight received inline whispers",
|
||||
s.highlightInlineWhispers);
|
||||
layout.addCheckbox("Load message history on connect",
|
||||
|
||||
@@ -276,7 +276,7 @@ HighlightingPage::HighlightingPage()
|
||||
layout.append(createCheckBox(ALWAYS_PLAY,
|
||||
getSettings()->highlightAlwaysPlaySound));
|
||||
layout.append(createCheckBox(
|
||||
"Flash taskbar only stops highlighting when chatterino is focused",
|
||||
"Flash taskbar only stops highlighting when Chatterino is focused",
|
||||
getSettings()->longAlerts));
|
||||
}
|
||||
|
||||
|
||||
@@ -73,7 +73,7 @@ void addUsersTab(IgnoresPage &page, LayoutCreator<QVBoxLayout> users,
|
||||
{
|
||||
auto label = users.emplace<QLabel>(INFO);
|
||||
label->setWordWrap(true);
|
||||
users.append(page.createCheckBox("Enable twitch blocked users",
|
||||
users.append(page.createCheckBox("Enable Twitch blocked users",
|
||||
getSettings()->enableTwitchBlockedUsers));
|
||||
|
||||
auto anyways = users.emplace<QHBoxLayout>().withoutMargin();
|
||||
|
||||
@@ -116,15 +116,15 @@ private:
|
||||
void updateInputPlaceholder();
|
||||
|
||||
/**
|
||||
* @brief Opens twitch channel stream in a browser player (opens a formatted link)
|
||||
* @brief Opens Twitch channel stream in a browser player (opens a formatted link)
|
||||
*/
|
||||
void openChannelInBrowserPlayer(ChannelPtr channel);
|
||||
/**
|
||||
* @brief Opens twitch channel stream in streamlink app (if stream is live and streamlink is installed)
|
||||
* @brief Opens Twitch channel stream in streamlink app (if stream is live and streamlink is installed)
|
||||
*/
|
||||
void openChannelInStreamlink(QString channelName);
|
||||
/**
|
||||
* @brief Opens twitch channel chat in a new chatterino tab
|
||||
* @brief Opens Twitch channel chat in a new Chatterino tab
|
||||
*/
|
||||
void joinChannelInNewTab(ChannelPtr channel);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user