diff --git a/UI/CMakeLists.txt b/UI/CMakeLists.txt
index 21717ec42..37e74745d 100644
--- a/UI/CMakeLists.txt
+++ b/UI/CMakeLists.txt
@@ -146,7 +146,6 @@ set(obs_SOURCES
window-basic-main-transitions.cpp
window-basic-main-dropfiles.cpp
window-basic-main-profiles.cpp
- window-license-agreement.cpp
window-basic-status-bar.cpp
window-basic-adv-audio.cpp
window-basic-transform.cpp
@@ -196,7 +195,6 @@ set(obs_HEADERS
window-basic-main-outputs.hpp
window-basic-source-select.hpp
window-basic-about.hpp
- window-license-agreement.hpp
window-basic-status-bar.hpp
window-basic-adv-audio.hpp
window-basic-transform.hpp
@@ -240,7 +238,6 @@ set(obs_UI
forms/AutoConfigStreamPage.ui
forms/AutoConfigTestPage.ui
forms/ColorSelect.ui
- forms/OBSLicenseAgreement.ui
forms/OBSLogReply.ui
forms/OBSBasic.ui
forms/OBSBasicTransform.ui
diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index 468bf24aa..b2cdaf3dd 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -267,13 +267,6 @@ LogReturnDialog="Log Upload Successful"
LogReturnDialog.CopyURL="Copy URL"
LogReturnDialog.ErrorUploadingLog="Error uploading log file"
-# license agreement dialog
-LicenseAgreement="License Agreement"
-LicenseAgreement.PleaseReview="Please review the license terms before using OBS. By using this program, you acknowledge that you have read and agree to the terms of the GNU General Public License v2.0. Please scroll down to see the rest of the agreement."
-LicenseAgreement.ClickIAgreeToContinue="If you accept the terms of the agreement, click I Agree to continue. You must accept the agreement to use OBS."
-LicenseAgreement.IAgree="I Agree"
-LicenseAgreement.Exit="Exit"
-
# remux dialog
Remux.SourceFile="OBS Recording"
Remux.TargetFile="Target File"
diff --git a/UI/forms/OBSLicenseAgreement.ui b/UI/forms/OBSLicenseAgreement.ui
deleted file mode 100644
index e9c2d4970..000000000
--- a/UI/forms/OBSLicenseAgreement.ui
+++ /dev/null
@@ -1,108 +0,0 @@
-
-
- OBSLicenseAgreement
-
-
-
- 0
- 0
- 457
- 430
-
-
-
-
- 200
- 300
-
-
-
- LicenseAgreement
-
-
- -
-
-
- LicenseAgreement.PleaseReview
-
-
- Qt::RichText
-
-
- true
-
-
- true
-
-
- Qt::TextBrowserInteraction
-
-
-
- -
-
-
-
-
-
- true
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- OK
-
-
-
-
-
-
-
-
-
-
-
- agree
- clicked()
- OBSLicenseAgreement
- accept()
-
-
- 138
- 419
-
-
- 40
- 424
-
-
-
-
-
diff --git a/UI/obs-app.cpp b/UI/obs-app.cpp
index 35f224c2f..d6d6710b0 100644
--- a/UI/obs-app.cpp
+++ b/UI/obs-app.cpp
@@ -39,7 +39,6 @@
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "window-basic-settings.hpp"
-#include "window-license-agreement.hpp"
#include "crash-report.hpp"
#include "platform.hpp"
@@ -1218,56 +1217,42 @@ bool OBSApp::OBSInit()
setAttribute(Qt::AA_UseHighDpiPixmaps);
- bool licenseAccepted = config_get_bool(globalConfig, "General",
- "LicenseAccepted");
- OBSLicenseAgreement agreement(nullptr);
-
- if (licenseAccepted || agreement.exec() == QDialog::Accepted) {
- if (!licenseAccepted) {
- config_set_bool(globalConfig, "General",
- "LicenseAccepted", true);
- config_save(globalConfig);
- }
-
- if (!StartupOBS(locale.c_str(), GetProfilerNameStore()))
- return false;
+ if (!StartupOBS(locale.c_str(), GetProfilerNameStore()))
+ return false;
#ifdef _WIN32
- bool browserHWAccel = config_get_bool(globalConfig, "General",
- "BrowserHWAccel");
+ bool browserHWAccel = config_get_bool(globalConfig, "General",
+ "BrowserHWAccel");
- obs_data_t *settings = obs_data_create();
- obs_data_set_bool(settings, "BrowserHWAccel", browserHWAccel);
- obs_apply_private_data(settings);
- obs_data_release(settings);
+ obs_data_t *settings = obs_data_create();
+ obs_data_set_bool(settings, "BrowserHWAccel", browserHWAccel);
+ obs_apply_private_data(settings);
+ obs_data_release(settings);
- blog(LOG_INFO, "Browser Hardware Acceleration: %s",
- browserHWAccel ? "true" : "false");
+ blog(LOG_INFO, "Browser Hardware Acceleration: %s",
+ browserHWAccel ? "true" : "false");
#endif
- blog(LOG_INFO, "Portable mode: %s",
- portable_mode ? "true" : "false");
+ blog(LOG_INFO, "Portable mode: %s",
+ portable_mode ? "true" : "false");
- setQuitOnLastWindowClosed(false);
+ setQuitOnLastWindowClosed(false);
- mainWindow = new OBSBasic();
+ mainWindow = new OBSBasic();
- mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
- connect(mainWindow, SIGNAL(destroyed()), this, SLOT(quit()));
+ mainWindow->setAttribute(Qt::WA_DeleteOnClose, true);
+ connect(mainWindow, SIGNAL(destroyed()), this, SLOT(quit()));
- mainWindow->OBSInit();
+ mainWindow->OBSInit();
- connect(this, &QGuiApplication::applicationStateChanged,
- [this](Qt::ApplicationState state)
- {
- ResetHotkeyState(
- state != Qt::ApplicationActive);
- });
- ResetHotkeyState(applicationState() != Qt::ApplicationActive);
- return true;
- } else {
- return false;
- }
+ connect(this, &QGuiApplication::applicationStateChanged,
+ [this](Qt::ApplicationState state)
+ {
+ ResetHotkeyState(
+ state != Qt::ApplicationActive);
+ });
+ ResetHotkeyState(applicationState() != Qt::ApplicationActive);
+ return true;
}
string OBSApp::GetVersionString() const
diff --git a/UI/window-license-agreement.cpp b/UI/window-license-agreement.cpp
deleted file mode 100644
index a7a5f3b33..000000000
--- a/UI/window-license-agreement.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
-#include
-#include
-#include
-#include
-#include "window-license-agreement.hpp"
-#include "qt-wrappers.hpp"
-
-using namespace std;
-
-OBSLicenseAgreement::OBSLicenseAgreement(QWidget *parent)
- : QDialog (parent),
- ui (new Ui::OBSLicenseAgreement)
-{
- ui->setupUi(this);
-
- string path;
- if (!GetDataFilePath("license/gplv2.txt", path))
- throw "Could not find license file";
-
- BPtr licenseText = os_quick_read_utf8_file(path.c_str());
- if (!licenseText || !*licenseText || strlen(licenseText) < 1000)
- throw "Invalid license file data";
-
- ui->license->setPlainText(QT_UTF8(licenseText));
-}
diff --git a/UI/window-license-agreement.hpp b/UI/window-license-agreement.hpp
deleted file mode 100644
index aa3a6f45b..000000000
--- a/UI/window-license-agreement.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#pragma once
-
-#include
-#include "ui_OBSLicenseAgreement.h"
-
-class OBSLicenseAgreement : public QDialog {
- Q_OBJECT
-
-private:
- std::unique_ptr ui;
-
-public:
- OBSLicenseAgreement(QWidget *parent);
-};