chatterino2
Code Issues

removed functions from SettingsManager that shouldn't be there

Browse Source
This commit is contained in:
fourtf
2018-06-28 19:38:57 +02:00
parent b667183ca5
commit 5604ae6a67
75 changed files with 600 additions and 507 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/widgets/dialogs/EmotePopup.cpp
+6 -6
View File
@@ -58,7 +58,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
auto addEmotes = [&](EmoteMap &map, const QString &title, const QString &emoteDesc) {
// TITLE
chatterino::MessageBuilder builder1;
MessageBuilder builder1;
builder1.append(new TextElement(title, MessageElement::Text));
@@ -66,7 +66,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
emoteChannel->addMessage(builder1.getMessage());
// EMOTES
chatterino::MessageBuilder builder2;
MessageBuilder builder2;
builder2.getMessage()->flags |= Message::Centered;
builder2.getMessage()->flags |= Message::DisableCompactEmotes;
@@ -86,7 +86,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
// fix this pile of garbage
for (const auto &set : app->emotes->twitch.emotes[userID].emoteSets) {
// TITLE
chatterino::MessageBuilder builder1;
MessageBuilder builder1;
QString setText;
if (set->text.isEmpty()) {
@@ -105,7 +105,7 @@ void EmotePopup::loadChannel(ChannelPtr _channel)
emoteChannel->addMessage(builder1.getMessage());
// EMOTES
chatterino::MessageBuilder builder2;
MessageBuilder builder2;
builder2.getMessage()->flags |= Message::Centered;
builder2.getMessage()->flags |= Message::DisableCompactEmotes;
@@ -137,14 +137,14 @@ void EmotePopup::loadEmojis()
ChannelPtr emojiChannel(new Channel("", Channel::None));
// title
chatterino::MessageBuilder builder1;
MessageBuilder builder1;
builder1.append(new TextElement("emojis", MessageElement::Text));
builder1.getMessage()->flags |= Message::Centered;
emojiChannel->addMessage(builder1.getMessage());
// emojis
chatterino::MessageBuilder builder;
MessageBuilder builder;
builder.getMessage()->flags |= Message::Centered;
builder.getMessage()->flags |= Message::DisableCompactEmotes;
src/widgets/dialogs/EmotePopup.hpp
+1 -1
View File
@@ -16,7 +16,7 @@ public:
void loadChannel(ChannelPtr channel);
void loadEmojis();
pajlada::Signals::Signal<chatterino::Link> linkClicked;
pajlada::Signals::Signal<Link> linkClicked;
private:
ChannelView *viewEmotes;
src/widgets/dialogs/LastRunCrashDialog.cpp
+11 -11
View File
@@ -16,7 +16,7 @@ LastRunCrashDialog::LastRunCrashDialog()
this->setWindowFlag(Qt::WindowContextHelpButtonHint, false);
this->setWindowTitle("Chatterino");
auto &updateManager = chatterino::UpdateManager::getInstance();
auto &updateManager = UpdateManager::getInstance();
auto layout = LayoutCreator<LastRunCrashDialog>(this).setLayoutType<QVBoxLayout>();
@@ -31,7 +31,7 @@ LastRunCrashDialog::LastRunCrashDialog()
// auto *installUpdateButton = buttons->addButton("Install Update",
// QDialogButtonBox::NoRole); installUpdateButton->setEnabled(false);
// QObject::connect(installUpdateButton, &QPushButton::clicked, [this, update]() mutable {
// auto &updateManager = chatterino::UpdateManager::getInstance();
// auto &updateManager = UpdateManager::getInstance();
// updateManager.installUpdates();
// this->setEnabled(false);
@@ -43,36 +43,36 @@ LastRunCrashDialog::LastRunCrashDialog()
// Updates
// auto updateUpdateLabel = [update]() mutable {
// auto &updateManager = chatterino::UpdateManager::getInstance();
// auto &updateManager = UpdateManager::getInstance();
// switch (updateManager.getStatus()) {
// case chatterino::UpdateManager::None: {
// case UpdateManager::None: {
// update->setText("Not checking for updates.");
// } break;
// case chatterino::UpdateManager::Searching: {
// case UpdateManager::Searching: {
// update->setText("Checking for updates...");
// } break;
// case chatterino::UpdateManager::UpdateAvailable: {
// case UpdateManager::UpdateAvailable: {
// update->setText("Update available.");
// } break;
// case chatterino::UpdateManager::NoUpdateAvailable: {
// case UpdateManager::NoUpdateAvailable: {
// update->setText("No update abailable.");
// } break;
// case chatterino::UpdateManager::SearchFailed: {
// case UpdateManager::SearchFailed: {
// update->setText("Error while searching for update.\nEither the update service
// is "
// "temporarily down or there is an issue with your
// installation.");
// } break;
// case chatterino::UpdateManager::Downloading: {
// case UpdateManager::Downloading: {
// update->setText(
// "Downloading the update. Chatterino will close once the download is
// done.");
// } break;
// case chatterino::UpdateManager::DownloadFailed: {
// case UpdateManager::DownloadFailed: {
// update->setText("Download failed.");
// } break;
// case chatterino::UpdateManager::WriteFileFailed: {
// case UpdateManager::WriteFileFailed: {
// update->setText("Writing the update file to the hard drive failed.");
// } break;
// }
src/widgets/dialogs/NotificationPopup.cpp
+1 -1
View File
@@ -38,7 +38,7 @@ void NotificationPopup::updatePosition()
}
}
void NotificationPopup::addMessage(chatterino::MessagePtr msg)
void NotificationPopup::addMessage(MessagePtr msg)
{
this->channel->addMessage(msg);
src/widgets/dialogs/NotificationPopup.hpp
+1 -1
View File
@@ -14,7 +14,7 @@ public:
enum Location { TopLeft, TopRight, BottomLeft, BottomRight };
NotificationPopup();
void addMessage(chatterino::MessagePtr msg);
void addMessage(MessagePtr msg);
void updatePosition();
private:
src/widgets/dialogs/SettingsDialog.cpp
+1 -1
View File
@@ -218,7 +218,7 @@ void SettingsDialog::cancelButtonClicked()
tab->getSettingsPage()->cancel();
}
getApp()->settings->recallSnapshot();
getApp()->settings->restoreSnapshot();
this->close();
}