jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

UI: Add Twitch Activity Feed

Browse Source 
Closes obsproject/obs-studio#1721
This commit is contained in:
Alex Anderson 2019-03-06 14:26:12 -08:00 committed by jp9000
parent ec9e48f3c7
commit 7e23d1b63e
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
UI/auth-twitch.cpp
View File

@ -326,18 +326,41 @@ void TwitchAuth::LoadSecondaryUIPanes()
/* ----------------------------------- */
url = "https://www.twitch.tv/popout/";
url += name;
url += "/dashboard/live/activity-feed";
feed.reset(new TwitchWidget());
feed->setObjectName("twitchFeed");
feed->resize(300, 650);
feed->setMinimumSize(200, 300);
feed->setWindowTitle(QTStr("TwitchAuth.Feed"));
feed->setAllowedAreas(Qt::AllDockWidgetAreas);
browser = cef->create_widget(nullptr, url, panel_cookies);
feed->SetWidget(browser);
browser->setStartupScript(script);
main->addDockWidget(Qt::RightDockWidgetArea, feed.data());
feedMenu.reset(main->AddDockWidget(feed.data()));
/* ----------------------------------- */
info->setFloating(true);
stat->setFloating(true);
feed->setFloating(true);
QSize statSize = stat->frameSize();
info->move(pos.x() + 50, pos.y() + 50);
stat->move(pos.x() + size.width() / 2 - statSize.width() / 2,
pos.y() + size.height() / 2 - statSize.height() / 2);
feed->move(pos.x() + 100, pos.y() + 100);
if (firstLoad) {
info->setVisible(true);
stat->setVisible(false);
feed->setVisible(false);
} else {
const char *dockStateStr = config_get_string(main->Config(),
service(), "DockState");

2
UI/auth-twitch.hpp
View File

@ -17,9 +17,11 @@ class TwitchAuth : public OAuthStreamKey {
QSharedPointer<TwitchWidget> chat;
QSharedPointer<TwitchWidget> info;
QSharedPointer<TwitchWidget> stat;
QSharedPointer<TwitchWidget> feed;
QSharedPointer<QAction> chatMenu;
QSharedPointer<QAction> infoMenu;
QSharedPointer<QAction> statMenu;
QSharedPointer<QAction> feedMenu;
bool uiLoaded = false;
std::string name;

1
UI/data/locale/en-US.ini
View File

@ -110,6 +110,7 @@ Auth.ChannelFailure.Text="Failed to load channel information for %1\n\n%2: %3"
Auth.Chat="Chat"
Auth.StreamInfo="Stream Information"
TwitchAuth.Stats="Twitch Stats"
TwitchAuth.Feed="Twitch Activity Feed"
# copy filters
Copy.Filters="Copy Filters"