mirror/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2026-01-27 15:48:44 -05:00
Code Issues Packages Projects Releases Wiki Activity

clang-format: Increase column limit from 80 to 120

Browse Source
This commit is contained in:
Ryan Foster
2024-10-04 17:33:58 -04:00
parent 109f64c446
commit a1fbf1015f
736 changed files with 22684 additions and 45435 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
UI/window-basic-about.cpp
View File

@@ -26,8 +26,7 @@ OBSAbout::OBSAbout(QWidget *parent) : QDialog(parent), ui(new Ui::OBSAbout)
#ifdef HAVE_OBSCONFIG_H
ver += obs_get_version_string();
#else
ver += LIBOBS_API_MAJOR_VER + "." + LIBOBS_API_MINOR_VER + "." +
LIBOBS_API_PATCH_VER;
ver += LIBOBS_API_MAJOR_VER + "." + LIBOBS_API_MINOR_VER + "." + LIBOBS_API_PATCH_VER;
#endif
ui->version->setText(ver + bitness);
@@ -37,9 +36,8 @@ OBSAbout::OBSAbout(QWidget *parent) : QDialog(parent), ui(new Ui::OBSAbout)
if (steam) {
delete ui->donate;
} else {
ui->donate->setText(
"&nbsp;&nbsp;<a href='https://obsproject.com/contribute'>" +
QTStr("About.Donate") + "</a>");
ui->donate->setText("&nbsp;&nbsp;<a href='https://obsproject.com/contribute'>" + QTStr("About.Donate") +
"</a>");
ui->donate->setTextInteractionFlags(Qt::TextBrowserInteraction);
ui->donate->setOpenExternalLinks(true);
}
@@ -61,24 +59,18 @@ OBSAbout::OBSAbout(QWidget *parent) : QDialog(parent), ui(new Ui::OBSAbout)
ui->license->setProperty("class", "bg-base");
ui->info->setProperty("class", "");
connect(ui->about, &ClickableLabel::clicked, this,
&OBSAbout::ShowAbout);
connect(ui->authors, &ClickableLabel::clicked, this,
&OBSAbout::ShowAuthors);
connect(ui->license, &ClickableLabel::clicked, this,
&OBSAbout::ShowLicense);
connect(ui->about, &ClickableLabel::clicked, this, &OBSAbout::ShowAbout);
connect(ui->authors, &ClickableLabel::clicked, this, &OBSAbout::ShowAuthors);
connect(ui->license, &ClickableLabel::clicked, this, &OBSAbout::ShowLicense);
QPointer<OBSAbout> about(this);
OBSBasic *main = OBSBasic::Get();
if (main->patronJson.empty() && !main->patronJsonThread) {
RemoteTextThread *thread = new RemoteTextThread(
"https://obsproject.com/patreon/about-box.json",
"application/json");
QObject::connect(thread, &RemoteTextThread::Result, main,
&OBSBasic::UpdatePatronJson);
QObject::connect(thread, &RemoteTextThread::Result, this,
&OBSAbout::ShowAbout);
RemoteTextThread *thread =
new RemoteTextThread("https://obsproject.com/patreon/about-box.json", "application/json");
QObject::connect(thread, &RemoteTextThread::Result, main, &OBSBasic::UpdatePatronJson);
QObject::connect(thread, &RemoteTextThread::Result, this, &OBSAbout::ShowAbout);
main->patronJsonThread.reset(thread);
thread->start();
} else {
@@ -134,9 +126,7 @@ void OBSAbout::ShowAbout()
void OBSAbout::ShowAuthors()
{
std::string path;
QString error =
QTStr("About.Error")
.arg("https://github.com/obsproject/obs-studio/blob/master/AUTHORS");
QString error = QTStr("About.Error").arg("https://github.com/obsproject/obs-studio/blob/master/AUTHORS");
#ifdef __APPLE__
if (!GetDataFilePath("AUTHORS", path)) {
@@ -162,9 +152,7 @@ void OBSAbout::ShowAuthors()
void OBSAbout::ShowLicense()
{
std::string path;
QString error =
QTStr("About.Error")
.arg("https://github.com/obsproject/obs-studio/blob/master/COPYING");
QString error = QTStr("About.Error").arg("https://github.com/obsproject/obs-studio/blob/master/COPYING");
if (!GetDataFilePath("license/gplv2.txt", path)) {
ui->textBrowser->setPlainText(error);