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

UI: Add ability to join discord server from help menu

Browse Source
This commit is contained in:
jp9000 2018-08-01 18:41:57 -07:00
parent 324071f5a3
commit 16ead25dd3
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -534,6 +534,7 @@ Basic.MainMenu.Tools="&Tools"
Basic.MainMenu.Help="&Help"
Basic.MainMenu.Help.HelpPortal="Help &Portal"
Basic.MainMenu.Help.Website="Visit &Website"
Basic.MainMenu.Help.Discord="Join &Discord Server"
Basic.MainMenu.Help.Logs="&Log Files"
Basic.MainMenu.Help.Logs.ShowLogs="&Show Log Files"
Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload &Current Log File"

6
UI/forms/OBSBasic.ui
View File

@ -146,6 +146,7 @@
</widget>
<addaction name="actionHelpPortal"/>
<addaction name="actionWebsite"/>
<addaction name="actionDiscord"/>
<addaction name="separator"/>
<addaction name="menuLogFiles"/>
<addaction name="menuCrashLogs"/>
@ -1650,6 +1651,11 @@
<string>Basic.MainMenu.Help.CrashLogs.UploadLastLog</string>
</property>
</action>
<action name="actionDiscord">
<property name="text">
<string>Basic.MainMenu.Help.Discord</string>
</property>
</action>
</widget>
<customwidgets>
<customwidget>

6
UI/window-basic-main.cpp
View File

@ -5251,6 +5251,12 @@ void OBSBasic::on_actionWebsite_triggered()
QDesktopServices::openUrl(url);
}
void OBSBasic::on_actionDiscord_triggered()
{
QUrl url = QUrl("https://discord.gg/obsproject", QUrl::TolerantMode);
QDesktopServices::openUrl(url);
}
void OBSBasic::on_actionShowSettingsFolder_triggered()
{
char path[512];

1
UI/window-basic-main.hpp
View File

@ -651,6 +651,7 @@ private slots:
void on_actionHelpPortal_triggered();
void on_actionWebsite_triggered();
void on_actionDiscord_triggered();
void on_preview_customContextMenuRequested(const QPoint &pos);
void on_program_customContextMenuRequested(const QPoint &pos);