mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
reformat
This commit is contained in:
parent
d79a8b81b1
commit
a2fb4ca104
9 changed files with 31 additions and 31 deletions
|
@ -18,9 +18,10 @@ IgnorePhrase IgnoreModel::getItemFromRow(std::vector<QStandardItem *> &row,
|
|||
{
|
||||
// key, regex
|
||||
|
||||
return IgnorePhrase{
|
||||
row[0]->data(Qt::DisplayRole).toString(), row[1]->data(Qt::CheckStateRole).toBool(),
|
||||
row[3]->data(Qt::CheckStateRole).toBool(), row[4]->data(Qt::DisplayRole).toString(),
|
||||
return IgnorePhrase{row[0]->data(Qt::DisplayRole).toString(),
|
||||
row[1]->data(Qt::CheckStateRole).toBool(),
|
||||
row[3]->data(Qt::CheckStateRole).toBool(),
|
||||
row[4]->data(Qt::DisplayRole).toString(),
|
||||
row[2]->data(Qt::CheckStateRole).toBool()};
|
||||
}
|
||||
|
||||
|
|
|
@ -163,9 +163,7 @@ void TextElement::addToContainer(MessageLayoutContainer &container,
|
|||
// Should update it in MessageLayoutElement too!
|
||||
if (this->getLink().type == Link::Url) {
|
||||
this->linkChanged.connect(
|
||||
[this, e]() {
|
||||
e->setLink(this->getLink());
|
||||
});
|
||||
[this, e]() { e->setLink(this->getLink()); });
|
||||
}
|
||||
return e;
|
||||
};
|
||||
|
|
|
@ -78,7 +78,8 @@ ImageLayoutElement::ImageLayoutElement(MessageElement &creator, ImagePtr image,
|
|||
void ImageLayoutElement::addCopyTextToString(QString &str, int from,
|
||||
int to) const
|
||||
{
|
||||
const auto *emoteElement = dynamic_cast<EmoteElement *>(&this->getCreator());
|
||||
const auto *emoteElement =
|
||||
dynamic_cast<EmoteElement *>(&this->getCreator());
|
||||
if (emoteElement) {
|
||||
str += emoteElement->getEmote()->getCopyString();
|
||||
if (this->hasTrailingSpace()) {
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
namespace chatterino {
|
||||
|
||||
void LinkResolver::getLinkInfo(const QString url,
|
||||
std::function<void(QString, Link)> successCallback)
|
||||
void LinkResolver::getLinkInfo(
|
||||
const QString url, std::function<void(QString, Link)> successCallback)
|
||||
{
|
||||
QString requestUrl("https://braize.pajlada.com/chatterino/link_resolver/" +
|
||||
QUrl::toPercentEncoding(url, "", "/:"));
|
||||
|
@ -31,7 +31,8 @@ void LinkResolver::getLinkInfo(const QString url,
|
|||
} else {
|
||||
response = root.value("message").toString();
|
||||
}
|
||||
successCallback(QUrl::fromPercentEncoding(response.toUtf8()), Link(Link::Url, linkString));
|
||||
successCallback(QUrl::fromPercentEncoding(response.toUtf8()),
|
||||
Link(Link::Url, linkString));
|
||||
|
||||
return Success;
|
||||
});
|
||||
|
|
|
@ -50,11 +50,11 @@ FeelPage::FeelPage()
|
|||
form->addRow("Links:",
|
||||
this->createCheckBox("Open links only on double click",
|
||||
getSettings()->linksDoubleClickOnly));
|
||||
form->addRow("",
|
||||
this->createCheckBox("Show link info in tooltips",
|
||||
form->addRow(
|
||||
"", this->createCheckBox("Show link info in tooltips",
|
||||
getSettings()->enableLinkInfoTooltip));
|
||||
form->addRow("",
|
||||
this->createCheckBox("Auto unshort links (requires restart)",
|
||||
form->addRow(
|
||||
"", this->createCheckBox("Auto unshort links (requires restart)",
|
||||
getSettings()->enableUnshortLinks));
|
||||
}
|
||||
|
||||
|
|
|
@ -41,8 +41,7 @@ KeyboardSettingsPage::KeyboardSettingsPage()
|
|||
form->addRow(new QLabel("Ctrl + R"), new QLabel("Change channel"));
|
||||
form->addRow(new QLabel("Ctrl + F"),
|
||||
new QLabel("Search in current channel"));
|
||||
form->addRow(new QLabel("Ctrl + E"),
|
||||
new QLabel("Open Emote menu"));
|
||||
form->addRow(new QLabel("Ctrl + E"), new QLabel("Open Emote menu"));
|
||||
}
|
||||
|
||||
} // namespace chatterino
|
||||
|
|
|
@ -32,8 +32,7 @@ NotificationPage::NotificationPage()
|
|||
{
|
||||
settings.emplace<QLabel>("Enable for selected channels");
|
||||
settings.append(this->createCheckBox(
|
||||
"Flash taskbar",
|
||||
getSettings()->notificationFlashTaskbar));
|
||||
"Flash taskbar", getSettings()->notificationFlashTaskbar));
|
||||
settings.append(this->createCheckBox(
|
||||
"Playsound (doesn't mute the Windows 8.x sound of toasts)",
|
||||
getSettings()->notificationPlaySound));
|
||||
|
@ -56,8 +55,7 @@ NotificationPage::NotificationPage()
|
|||
auto fileName = QFileDialog::getOpenFileName(
|
||||
this, tr("Open Sound"), "",
|
||||
tr("Audio Files (*.mp3 *.wav)"));
|
||||
getSettings()->notificationPathSound =
|
||||
fileName;
|
||||
getSettings()->notificationPathSound = fileName;
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -490,8 +490,10 @@ void Split::showViewerList()
|
|||
|
||||
loadingLabel->hide();
|
||||
for (int i = 0; i < jsonLabels.size(); i++) {
|
||||
auto currentCategory = chattersObj.value(jsonLabels.at(i)).toArray();
|
||||
// If current category of chatters is empty, dont show this category.
|
||||
auto currentCategory =
|
||||
chattersObj.value(jsonLabels.at(i)).toArray();
|
||||
// If current category of chatters is empty, dont show this
|
||||
// category.
|
||||
if (currentCategory.empty()) continue;
|
||||
|
||||
chattersList->addItem(labelList.at(i));
|
||||
|
|
Loading…
Reference in a new issue