diff --git a/data/locale/en-US.ini b/data/locale/en-US.ini index 9a611830..c6dc326b 100644 --- a/data/locale/en-US.ini +++ b/data/locale/en-US.ini @@ -1142,10 +1142,10 @@ AdvSceneSwitcher.action.twitch.type.clip.create="Create stream clip" AdvSceneSwitcher.action.twitch.type.chat.announcement.send="Send chat announcement" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Enable chat's emote-only mode" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Disable chat's emote-only mode" -AdvSceneSwitcher.action.twitch.type.sendChatMessage="Send chat message" +AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Send chat message" AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Cannot select category without selecting a Twitch account first!" AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}" -AdvSceneSwitcher.action.twitch.entry.chat="Using account{{account}}{{actions}}on{{channel}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}" +AdvSceneSwitcher.action.twitch.entry.chat="Using account{{account}}{{actions}}on{{channel}}" AdvSceneSwitcher.action.twitch.title.title="Enter title" AdvSceneSwitcher.action.twitch.marker.description="Describe marker" AdvSceneSwitcher.action.twitch.clip.hasDelay="Add a slight delay before capturing the clip" diff --git a/data/locale/ja-JP.ini b/data/locale/ja-JP.ini index 5bbf2f05..b68ed098 100644 --- a/data/locale/ja-JP.ini +++ b/data/locale/ja-JP.ini @@ -1089,10 +1089,10 @@ AdvSceneSwitcher.action.twitch.type.clip.create="ストリームクリップの AdvSceneSwitcher.action.twitch.type.chat.announcement.send="チャット通知の送信" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="チャットのエモート専用モードを有効にする" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="チャットのエモート専用モードを無効にする" -AdvSceneSwitcher.action.twitch.type.sendChatMessage="チャットメッセージを送る" +AdvSceneSwitcher.action.twitch.type.chat.sendMessage="チャットメッセージを送る" AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Twitchアカウントを選択しないとカテゴリを選択できません！" ; AdvSceneSwitcher.action.twitch.entry.default="On{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}" -AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}} でアカウント{{account}}{{actions}}を使用しています" +AdvSceneSwitcher.action.twitch.entry.chat="{{channel}}でアカウント{{account}}{{actions}}を使用しています" AdvSceneSwitcher.action.twitch.title.title="タイトルを入力してください" AdvSceneSwitcher.action.twitch.marker.description="マーカーの説明" AdvSceneSwitcher.action.twitch.clip.hasDelay="クリップをキャプチャする前にわずかな遅延を追加します" diff --git a/data/locale/pt-BR.ini b/data/locale/pt-BR.ini index c6cc3d28..1e4b446f 100644 --- a/data/locale/pt-BR.ini +++ b/data/locale/pt-BR.ini @@ -1070,10 +1070,10 @@ AdvSceneSwitcher.action.twitch.type.clip.create="Criar clipe da transmissão" AdvSceneSwitcher.action.twitch.type.chat.announcement.send="Enviar anúncio de chat" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.enable="Habilitar modo apenas emotes no chat" AdvSceneSwitcher.action.twitch.type.chat.emoteOnly.disable="Desabilitar modo apenas emotes no chat" -AdvSceneSwitcher.action.twitch.type.sendChatMessage="Enviar mensagem de chat" +AdvSceneSwitcher.action.twitch.type.chat.sendMessage="Enviar mensagem de chat" AdvSceneSwitcher.action.twitch.categorySelectionDisabled="Não é possível selecionar categoria sem selecionar uma conta Twitch primeiro!" AdvSceneSwitcher.action.twitch.entry.default="Em{{account}}{{actions}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}{{channel}}" -AdvSceneSwitcher.action.twitch.entry.chat="Usando conta{{account}}{{actions}}em{{channel}}{{streamTitle}}{{category}}{{markerDescription}}{{clipHasDelay}}{{duration}}{{announcementColor}}" +AdvSceneSwitcher.action.twitch.entry.chat="Usando conta{{account}}{{actions}}em{{channel}}" AdvSceneSwitcher.action.twitch.title.title="Digite o título" AdvSceneSwitcher.action.twitch.marker.description="Descreva o marcador" AdvSceneSwitcher.action.twitch.clip.hasDelay="Adicionar um leve atraso antes de capturar o clipe" diff --git a/lib/variables/variable-number.hpp b/lib/variables/variable-number.hpp index 3edd81db..17baf3c4 100644 --- a/lib/variables/variable-number.hpp +++ b/lib/variables/variable-number.hpp @@ -29,7 +29,7 @@ private: T _value = {}; std::weak_ptr _variable; - friend class GenericVaraiableSpinbox; + friend class GenericVariableSpinbox; friend class VariableSpinBox; friend class VariableDoubleSpinBox; }; diff --git a/lib/variables/variable-spinbox.cpp b/lib/variables/variable-spinbox.cpp index 3ab95480..2d9830b1 100644 --- a/lib/variables/variable-spinbox.cpp +++ b/lib/variables/variable-spinbox.cpp @@ -5,8 +5,8 @@ namespace advss { -GenericVaraiableSpinbox::GenericVaraiableSpinbox(QWidget *parent, - bool wholeNumber) +GenericVariableSpinbox::GenericVariableSpinbox(QWidget *parent, + bool wholeNumber) : QWidget(parent), _fixedValueInt(new QSpinBox()), _fixedValueDouble(new QDoubleSpinBox()), @@ -50,7 +50,7 @@ GenericVaraiableSpinbox::GenericVaraiableSpinbox(QWidget *parent, SetVisibility(); } -void GenericVaraiableSpinbox::SetValue(const NumberVariable &number) +void GenericVariableSpinbox::SetValue(const NumberVariable &number) { _numberInt = number; const QSignalBlocker b1(_toggleType); @@ -61,7 +61,7 @@ void GenericVaraiableSpinbox::SetValue(const NumberVariable &number) SetVisibility(); } -void GenericVaraiableSpinbox::SetValue(const NumberVariable &number) +void GenericVariableSpinbox::SetValue(const NumberVariable &number) { _numberDouble = number; const QSignalBlocker b1(_toggleType); @@ -72,44 +72,44 @@ void GenericVaraiableSpinbox::SetValue(const NumberVariable &number) SetVisibility(); } -void GenericVaraiableSpinbox::DisableVariableSelection() +void GenericVariableSpinbox::DisableVariableSelection() { _hideTypeToggle = true; _toggleType->hide(); ToggleTypeClicked(false); } -void GenericVaraiableSpinbox::setMinimum(double value) +void GenericVariableSpinbox::setMinimum(double value) { _fixedValueInt->setMinimum(value); _fixedValueDouble->setMinimum(value); } -void GenericVaraiableSpinbox::setMaximum(double value) +void GenericVariableSpinbox::setMaximum(double value) { _fixedValueInt->setMaximum(value); _fixedValueDouble->setMaximum(value); } -void GenericVaraiableSpinbox::setPrefix(const QString &prefix) +void GenericVariableSpinbox::setPrefix(const QString &prefix) { _fixedValueInt->setPrefix(prefix); _fixedValueDouble->setPrefix(prefix); } -void GenericVaraiableSpinbox::setSuffix(const QString &suffix) +void GenericVariableSpinbox::setSuffix(const QString &suffix) { _fixedValueInt->setSuffix(suffix); _fixedValueDouble->setSuffix(suffix); } -void GenericVaraiableSpinbox::setSpecialValueText(const QString &text) +void GenericVariableSpinbox::setSpecialValueText(const QString &text) { _fixedValueInt->setSpecialValueText(text); _fixedValueDouble->setSpecialValueText(text); } -void GenericVaraiableSpinbox::SetFixedValue(int value) +void GenericVariableSpinbox::SetFixedValue(int value) { _numberInt._value = value; const QSignalBlocker b(_fixedValueInt); @@ -117,7 +117,7 @@ void GenericVaraiableSpinbox::SetFixedValue(int value) EmitSignals(); } -void GenericVaraiableSpinbox::SetFixedValue(double value) +void GenericVariableSpinbox::SetFixedValue(double value) { _numberDouble._value = value; const QSignalBlocker b(_fixedValueDouble); @@ -125,14 +125,14 @@ void GenericVaraiableSpinbox::SetFixedValue(double value) EmitSignals(); } -void GenericVaraiableSpinbox::VariableChanged(const QString &name) +void GenericVariableSpinbox::VariableChanged(const QString &name) { _numberInt._variable = GetWeakVariableByQString(name); _numberDouble._variable = GetWeakVariableByQString(name); EmitSignals(); } -void GenericVaraiableSpinbox::ToggleTypeClicked(bool useVariable) +void GenericVariableSpinbox::ToggleTypeClicked(bool useVariable) { _numberInt._type = useVariable ? NumberVariable::Type::VARIABLE : NumberVariable::Type::FIXED_VALUE; @@ -144,7 +144,7 @@ void GenericVaraiableSpinbox::ToggleTypeClicked(bool useVariable) EmitSignals(); } -void GenericVaraiableSpinbox::EmitSignals() +void GenericVariableSpinbox::EmitSignals() { if (_wholeNumber) { emit FixedValueChanged(_numberInt); @@ -155,7 +155,7 @@ void GenericVaraiableSpinbox::EmitSignals() } } -void GenericVaraiableSpinbox::SetVisibility() +void GenericVariableSpinbox::SetVisibility() { if (_wholeNumber) { _fixedValueDouble->hide(); @@ -166,7 +166,7 @@ void GenericVaraiableSpinbox::SetVisibility() } } -void GenericVaraiableSpinbox::SetVisibilityInt() +void GenericVariableSpinbox::SetVisibilityInt() { if (_numberInt.IsFixedType()) { _fixedValueInt->show(); @@ -182,7 +182,7 @@ void GenericVaraiableSpinbox::SetVisibilityInt() updateGeometry(); } -void GenericVaraiableSpinbox::SetVisibilityDouble() +void GenericVariableSpinbox::SetVisibilityDouble() { if (_numberDouble.IsFixedType()) { _fixedValueDouble->show(); @@ -199,12 +199,12 @@ void GenericVaraiableSpinbox::SetVisibilityDouble() } VariableSpinBox::VariableSpinBox(QWidget *parent) - : GenericVaraiableSpinbox(parent, true) + : GenericVariableSpinbox(parent, true) { } VariableDoubleSpinBox::VariableDoubleSpinBox(QWidget *parent) - : GenericVaraiableSpinbox(parent, false) + : GenericVariableSpinbox(parent, false) { } diff --git a/lib/variables/variable-spinbox.hpp b/lib/variables/variable-spinbox.hpp index 9371fda2..ad072b73 100644 --- a/lib/variables/variable-spinbox.hpp +++ b/lib/variables/variable-spinbox.hpp @@ -9,10 +9,10 @@ namespace advss { -class ADVSS_EXPORT GenericVaraiableSpinbox : public QWidget { +class ADVSS_EXPORT GenericVariableSpinbox : public QWidget { Q_OBJECT public: - GenericVaraiableSpinbox(QWidget *parent, bool wholeNumber); + GenericVariableSpinbox(QWidget *parent, bool wholeNumber); void SetValue(const NumberVariable &); void SetValue(const NumberVariable &); void DisableVariableSelection(); @@ -59,7 +59,7 @@ private: bool _hideTypeToggle = false; }; -class ADVSS_EXPORT VariableSpinBox : public GenericVaraiableSpinbox { +class ADVSS_EXPORT VariableSpinBox : public GenericVariableSpinbox { Q_OBJECT public: @@ -68,7 +68,7 @@ public: QSpinBox *SpinBox() { return _fixedValueInt; } }; -class ADVSS_EXPORT VariableDoubleSpinBox : public GenericVaraiableSpinbox { +class ADVSS_EXPORT VariableDoubleSpinBox : public GenericVariableSpinbox { Q_OBJECT public: diff --git a/plugins/twitch/category-selection.cpp b/plugins/twitch/category-selection.cpp index 4325c991..af42d34b 100644 --- a/plugins/twitch/category-selection.cpp +++ b/plugins/twitch/category-selection.cpp @@ -139,7 +139,7 @@ void TwitchCategorySelection::SelectionChanged(int index) { TwitchCategory category{itemData(index).toInt(), currentText().toStdString()}; - emit CategoreyChanged(category); + emit CategoryChanged(category); } std::map 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); diff --git a/plugins/twitch/category-selection.hpp b/plugins/twitch/category-selection.hpp index 4c7e47e7..f1f140b8 100644 --- a/plugins/twitch/category-selection.hpp +++ b/plugins/twitch/category-selection.hpp @@ -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 &); signals: - void CategoreyChanged(const TwitchCategory &); + void CategoryChanged(const TwitchCategory &); private: TwitchCategorySelection *_selection; diff --git a/plugins/twitch/channel-selection.cpp b/plugins/twitch/channel-selection.cpp index f8f2e413..50752f14 100644 --- a/plugins/twitch/channel-selection.cpp +++ b/plugins/twitch/channel-selection.cpp @@ -1,4 +1,5 @@ #include "channel-selection.hpp" +#include "log-helper.hpp" #include "twitch-helpers.hpp" #include "token.hpp" diff --git a/plugins/twitch/macro-action-twitch.cpp b/plugins/twitch/macro-action-twitch.cpp index 7fdeca3e..61ce9b30 100644 --- a/plugins/twitch/macro-action-twitch.cpp +++ b/plugins/twitch/macro-action-twitch.cpp @@ -58,7 +58,7 @@ const static std::map 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 @@ -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(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(); diff --git a/plugins/twitch/macro-action-twitch.hpp b/plugins/twitch/macro-action-twitch.hpp index 9771bf07..70064e63 100644 --- a/plugins/twitch/macro-action-twitch.hpp +++ b/plugins/twitch/macro-action-twitch.hpp @@ -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 &); diff --git a/plugins/twitch/macro-condition-twitch.cpp b/plugins/twitch/macro-condition-twitch.cpp index 7bf7106e..ccdbc2b4 100644 --- a/plugins/twitch/macro-condition-twitch.cpp +++ b/plugins/twitch/macro-condition-twitch.cpp @@ -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; diff --git a/plugins/twitch/macro-condition-twitch.hpp b/plugins/twitch/macro-condition-twitch.hpp index 923c9e3a..eba6f480 100644 --- a/plugins/twitch/macro-condition-twitch.hpp +++ b/plugins/twitch/macro-condition-twitch.hpp @@ -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: