Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-20 00:05:41 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
WarmUpTill
2025-03-05 21:37:08 +01:00
committed by WarmUpTill
parent 9b609c118f
commit 88fcb57e9f
13 changed files with 56 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/twitch/category-selection.cpp
View File

@@ -139,7 +139,7 @@ void TwitchCategorySelection::SelectionChanged(int index)
{
TwitchCategory category{itemData(index).toInt(),
currentText().toStdString()};
emit CategoreyChanged(category);
emit CategoryChanged(category);
}
std::map<QString, int> CategoryGrabber::_categoryMap = {};
@@ -364,8 +364,8 @@ TwitchCategoryWidget::TwitchCategoryWidget(QWidget *parent)
_manualSearch(new TwitchCategorySearchButton(this))
{
QWidget::connect(_selection,
SIGNAL(CategoreyChanged(const TwitchCategory &)), this,
SIGNAL(CategoreyChanged(const TwitchCategory &)));
SIGNAL(CategoryChanged(const TwitchCategory &)), this,
SIGNAL(CategoryChanged(const TwitchCategory &)));
auto layout = new QHBoxLayout();
layout->setContentsMargins(0, 0, 0, 0);

4
plugins/twitch/category-selection.hpp
View File

@@ -78,7 +78,7 @@ private slots:
void UpdateCategoryList();
signals:
void CategoreyChanged(const TwitchCategory &);
void CategoryChanged(const TwitchCategory &);
protected:
void showPopup() override;
@@ -125,7 +125,7 @@ public:
void SetToken(const std::weak_ptr<TwitchToken> &);
signals:
void CategoreyChanged(const TwitchCategory &);
void CategoryChanged(const TwitchCategory &);
private:
TwitchCategorySelection *_selection;

1
plugins/twitch/channel-selection.cpp
View File

@@ -1,4 +1,5 @@
#include "channel-selection.hpp"
#include "log-helper.hpp"
#include "twitch-helpers.hpp"
#include "token.hpp"

68
plugins/twitch/macro-action-twitch.cpp
View File

@@ -58,7 +58,7 @@ const static std::map<MacroActionTwitch::Action, std::string> actionTypes = {
{MacroActionTwitch::Action::CHAT_EMOTE_ONLY_DISABLE,
"AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable"},
{MacroActionTwitch::Action::SEND_CHAT_MESSAGE,
"AdvSceneSwitcher.action.twitch.type.sendChatMessage"},
"AdvSceneSwitcher.action.twitch.type.chat.sendMessage"},
};
const static std::map<MacroActionTwitch::AnnouncementColor, std::string>
@@ -567,11 +567,7 @@ void MacroActionTwitchEdit::ActionChanged(int idx)
void MacroActionTwitchEdit::TwitchTokenChanged(const QString &token)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_token = GetWeakTwitchTokenByQString(token);
_category->SetToken(_entryData->_token);
_channel->SetToken(_entryData->_token);
@@ -619,62 +615,38 @@ void MacroActionTwitchEdit::CheckToken()
void MacroActionTwitchEdit::StreamTitleChanged()
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_streamTitle = _streamTitle->text().toStdString();
}
void MacroActionTwitchEdit::CategoreyChanged(const TwitchCategory &category)
void MacroActionTwitchEdit::CategoryChanged(const TwitchCategory &category)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_category = category;
}
void MacroActionTwitchEdit::MarkerDescriptionChanged()
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_markerDescription =
_markerDescription->text().toStdString();
}
void MacroActionTwitchEdit::ClipHasDelayChanged(int state)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_clipHasDelay = state;
}
void MacroActionTwitchEdit::DurationChanged(const Duration &duration)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_duration = duration;
}
void MacroActionTwitchEdit::AnnouncementMessageChanged()
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_announcementMessage =
_announcementMessage->toPlainText().toStdString();
@@ -684,11 +656,7 @@ void MacroActionTwitchEdit::AnnouncementMessageChanged()
void MacroActionTwitchEdit::AnnouncementColorChanged(int index)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_announcementColor =
static_cast<MacroActionTwitch::AnnouncementColor>(index);
}
@@ -722,8 +690,8 @@ void MacroActionTwitchEdit::SetWidgetSignalConnections()
QWidget::connect(_streamTitle, SIGNAL(editingFinished()), this,
SLOT(StreamTitleChanged()));
QWidget::connect(_category,
SIGNAL(CategoreyChanged(const TwitchCategory &)), this,
SLOT(CategoreyChanged(const TwitchCategory &)));
SIGNAL(CategoryChanged(const TwitchCategory &)), this,
SLOT(CategoryChanged(const TwitchCategory &)));
QWidget::connect(_markerDescription, SIGNAL(editingFinished()), this,
SLOT(MarkerDescriptionChanged()));
QObject::connect(_clipHasDelay, SIGNAL(stateChanged(int)), this,
@@ -789,22 +757,14 @@ void MacroActionTwitchEdit::SetWidgetVisibility()
void MacroActionTwitchEdit::ChannelChanged(const TwitchChannel &channel)
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_channel = channel;
_entryData->ResetChatConnection();
}
void MacroActionTwitchEdit::ChatMessageChanged()
{
if (_loading || !_entryData) {
return;
}
auto lock = LockContext();
GUARD_LOADING_AND_LOCK();
_entryData->_chatMessage = _chatMessage->toPlainText().toStdString();
adjustSize();

2
plugins/twitch/macro-action-twitch.hpp
View File

@@ -210,7 +210,7 @@ private slots:
void TwitchTokenChanged(const QString &);
void CheckToken();
void StreamTitleChanged();
void CategoreyChanged(const TwitchCategory &);
void CategoryChanged(const TwitchCategory &);
void MarkerDescriptionChanged();
void ClipHasDelayChanged(int state);
void DurationChanged(const Duration &);

6
plugins/twitch/macro-condition-twitch.cpp
View File

@@ -1425,8 +1425,8 @@ MacroConditionTwitchEdit::MacroConditionTwitchEdit(
this,
SLOT(ChatMessagePatternChanged(const ChatMessagePattern &)));
QWidget::connect(_category,
SIGNAL(CategoreyChanged(const TwitchCategory &)), this,
SLOT(CategoreyChanged(const TwitchCategory &)));
SIGNAL(CategoryChanged(const TwitchCategory &)), this,
SLOT(CategoryChanged(const TwitchCategory &)));
QWidget::connect(_clearBufferOnMatch, SIGNAL(stateChanged(int)), this,
SLOT(ClearBufferOnMatchChanged(int)));
@@ -1569,7 +1569,7 @@ void MacroConditionTwitchEdit::RegexTitleChanged(const RegexConfig &conf)
updateGeometry();
}
void MacroConditionTwitchEdit::CategoreyChanged(const TwitchCategory &category)
void MacroConditionTwitchEdit::CategoryChanged(const TwitchCategory &category)
{
GUARD_LOADING_AND_LOCK();
_entryData->_category = category;

2
plugins/twitch/macro-condition-twitch.hpp
View File

@@ -171,7 +171,7 @@ private slots:
void StreamTitleChanged();
void RegexTitleChanged(const RegexConfig &);
void ChatMessagePatternChanged(const ChatMessagePattern &);
void CategoreyChanged(const TwitchCategory &);
void CategoryChanged(const TwitchCategory &);
void ClearBufferOnMatchChanged(int);
signals: