Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-03-23 18:35:01 -05:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up Twitch action

Browse Source 
* Allow filtering in action selection by typing
* Add spacing between action type definitions to allow reordering in
  future
This commit is contained in:
WarmUpTill 2023-10-12 21:37:45 +02:00 committed by WarmUpTill
parent 1e9173699c
commit babe93a6ce
2 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/macro-external/twitch/macro-action-twitch.cpp
View File

@ -335,8 +335,9 @@ bool MacroActionTwitch::ActionIsSupportedByToken()
static inline void populateActionSelection(QComboBox *list)
{
for (const auto &[_, name] : actionTypes) {
list->addItem(obs_module_text(name.c_str()));
for (const auto &[action, name] : actionTypes) {
list->addItem(obs_module_text(name.c_str()),
static_cast<int>(action));
}
}
@ -351,7 +352,7 @@ MacroActionTwitchEdit::MacroActionTwitchEdit(
QWidget *parent, std::shared_ptr<MacroActionTwitch> entryData)
: QWidget(parent),
_layout(new QHBoxLayout()),
_actions(new QComboBox()),
_actions(new FilterComboBox()),
_tokens(new TwitchConnectionSelection()),
_tokenPermissionWarning(new QLabel(obs_module_text(
"AdvSceneSwitcher.action.twitch.tokenPermissionsInsufficient"))),
@ -397,7 +398,7 @@ MacroActionTwitchEdit::MacroActionTwitchEdit(
QWidget::connect(_markerDescription, SIGNAL(editingFinished()), this,
SLOT(MarkerDescriptionChanged()));
QObject::connect(_clipHasDelay, SIGNAL(stateChanged(int)), this,
SLOT(HasClipDelayChanged(int)));
SLOT(ClipHasDelayChanged(int)));
QObject::connect(_duration, SIGNAL(DurationChanged(const Duration &)),
this, SLOT(DurationChanged(const Duration &)));
QWidget::connect(_announcementMessage, SIGNAL(textChanged()), this,
@ -587,7 +588,8 @@ void MacroActionTwitchEdit::UpdateEntryData()
return;
}
_actions->setCurrentIndex(static_cast<int>(_entryData->_action));
_actions->setCurrentIndex(
_actions->findData(static_cast<int>(_entryData->_action)));
_tokens->SetToken(_entryData->_token);
_streamTitle->setText(_entryData->_streamTitle);
_category->SetToken(_entryData->_token);
@ -604,14 +606,21 @@ void MacroActionTwitchEdit::UpdateEntryData()
SetupWidgetVisibility();
}
void MacroActionTwitchEdit::ActionChanged(int value)
void MacroActionTwitchEdit::ActionChanged(int idx)
{
if (_loading || !_entryData) {
return;
}
if (idx == -1) { // Reset to previous selection
_actions->setCurrentIndex(_actions->findData(
static_cast<int>(_entryData->_action)));
return;
}
auto lock = LockContext();
_entryData->_action = static_cast<MacroActionTwitch::Action>(value);
_entryData->_action = static_cast<MacroActionTwitch::Action>(
_actions->itemData(idx).toInt());
SetupWidgetVisibility();
}

18
src/macro-external/twitch/macro-action-twitch.hpp
View File

@ -27,14 +27,14 @@ public:
enum class Action {
TITLE,
CATEGORY,
MARKER,
CLIP,
COMMERCIAL,
ANNOUNCEMENT,
ENABLE_EMOTE_ONLY,
DISABLE_EMOTE_ONLY,
RAID,
CATEGORY = 10,
MARKER = 20,
CLIP = 30,
COMMERCIAL = 40,
ANNOUNCEMENT = 50,
ENABLE_EMOTE_ONLY = 60,
DISABLE_EMOTE_ONLY = 70,
RAID = 80,
};
enum class AnnouncementColor {
@ -113,7 +113,7 @@ private:
void SetupWidgetVisibility();
QHBoxLayout *_layout;
QComboBox *_actions;
FilterComboBox *_actions;
TwitchConnectionSelection *_tokens;
QLabel *_tokenPermissionWarning;
QTimer _tokenPermissionCheckTimer;