diff --git a/UI/data/locale/en-US.ini b/UI/data/locale/en-US.ini
index 35c06fc17..6c698a1b7 100644
--- a/UI/data/locale/en-US.ini
+++ b/UI/data/locale/en-US.ini
@@ -53,6 +53,7 @@ Left="Left"
Right="Right"
Top="Top"
Bottom="Bottom"
+Reset="Reset"
# quick transitions
QuickTransitions.SwapScenes="Swap Preview/Output Scenes After Transitioning"
diff --git a/UI/forms/OBSBasicTransform.ui b/UI/forms/OBSBasicTransform.ui
index 7f49ffaf5..c801b3da7 100644
--- a/UI/forms/OBSBasicTransform.ui
+++ b/UI/forms/OBSBasicTransform.ui
@@ -638,6 +638,13 @@
+ -
+
+
+ QDialogButtonBox::Reset|QDialogButtonBox::Close
+
+
+
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index f7a0b8e19..792742d62 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -462,7 +462,6 @@ private slots:
void on_actionCheckForUpdates_triggered();
void on_actionEditTransform_triggered();
- void on_actionResetTransform_triggered();
void on_actionRotate90CW_triggered();
void on_actionRotate90CCW_triggered();
void on_actionRotate180_triggered();
@@ -564,6 +563,9 @@ private slots:
void OpenSourceProjector();
void OpenSceneProjector();
+public slots:
+ void on_actionResetTransform_triggered();
+
public:
explicit OBSBasic(QWidget *parent = 0);
virtual ~OBSBasic();
diff --git a/UI/window-basic-transform.cpp b/UI/window-basic-transform.cpp
index 57ad6304f..f1143e7d1 100644
--- a/UI/window-basic-transform.cpp
+++ b/UI/window-basic-transform.cpp
@@ -1,3 +1,4 @@
+#include
#include "window-basic-transform.hpp"
#include "window-basic-main.hpp"
@@ -55,6 +56,11 @@ OBSBasicTransform::OBSBasicTransform(OBSBasic *parent)
HookWidget(ui->cropTop, ISCROLL_CHANGED, SLOT(OnCropChanged()));
HookWidget(ui->cropBottom, ISCROLL_CHANGED, SLOT(OnCropChanged()));
+ connect(ui->buttonBox->button(QDialogButtonBox::Reset),
+ SIGNAL(clicked()), this, SLOT(on_resetButton_clicked()));
+ connect(ui->buttonBox,
+ SIGNAL(rejected()), this, SLOT(close()));
+
installEventFilter(CreateShortcutFilter());
OBSScene curScene = main->GetCurrentScene();
@@ -288,3 +294,8 @@ void OBSBasicTransform::OnCropChanged()
obs_sceneitem_set_crop(item, &crop);
ignoreTransformSignal = false;
}
+
+void OBSBasicTransform::on_resetButton_clicked()
+{
+ main->on_actionResetTransform_triggered();
+}
diff --git a/UI/window-basic-transform.hpp b/UI/window-basic-transform.hpp
index 9764f28f6..c86a24440 100644
--- a/UI/window-basic-transform.hpp
+++ b/UI/window-basic-transform.hpp
@@ -42,6 +42,7 @@ private slots:
void OnBoundsType(int index);
void OnControlChanged();
void OnCropChanged();
+ void on_resetButton_clicked();
public:
OBSBasicTransform(OBSBasic *parent);