reformat
This commit is contained in:
@@ -50,12 +50,12 @@ FeelPage::FeelPage()
|
||||
form->addRow("Links:",
|
||||
this->createCheckBox("Open links only on double click",
|
||||
getSettings()->linksDoubleClickOnly));
|
||||
form->addRow("",
|
||||
this->createCheckBox("Show link info in tooltips",
|
||||
getSettings()->enableLinkInfoTooltip));
|
||||
form->addRow("",
|
||||
this->createCheckBox("Auto unshort links (requires restart)",
|
||||
getSettings()->enableUnshortLinks));
|
||||
form->addRow(
|
||||
"", this->createCheckBox("Show link info in tooltips",
|
||||
getSettings()->enableLinkInfoTooltip));
|
||||
form->addRow(
|
||||
"", this->createCheckBox("Auto unshort links (requires restart)",
|
||||
getSettings()->enableUnshortLinks));
|
||||
}
|
||||
|
||||
layout->addSpacing(16);
|
||||
|
||||
@@ -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;
|
||||
});
|
||||
}
|
||||
|
||||
|
||||
@@ -107,7 +107,7 @@ Split::Split(QWidget *parent)
|
||||
|
||||
this->view_->joinToChannel.connect([this](QString twitchChannel) {
|
||||
this->container_->appendNewSplit(false)->setChannel(
|
||||
getApp()->twitch.server->getOrAddChannel(twitchChannel));
|
||||
getApp()->twitch.server->getOrAddChannel(twitchChannel));
|
||||
});
|
||||
|
||||
this->input_->textChanged.connect([=](const QString &newText) {
|
||||
@@ -490,10 +490,12 @@ 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));
|
||||
foreach (const QJsonValue &v, currentCategory)
|
||||
chattersList->addItem(v.toString());
|
||||
|
||||
@@ -101,7 +101,7 @@ void SplitContainer::resetMouseStatus()
|
||||
this->update();
|
||||
}
|
||||
|
||||
Split* SplitContainer::appendNewSplit(bool openChannelNameDialog)
|
||||
Split *SplitContainer::appendNewSplit(bool openChannelNameDialog)
|
||||
{
|
||||
assertInGuiThread();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user