ui: Update imported obs property-view widget

Upstream OBS has made is much easier to integrate the property-view
widget. It is now an inclueable cmake subdirectory that builds cleanly,
which means this project can use a pristine copy with no local
modifications. It does however require moving the source to the shared/
directory so that the build scripts don't need to be modified.

Signed-off-by: Grant Likely <[email protected]>

Author: glikely

.gitignore

@@ -7,6 +7,7 @@
 !/cmake
 !/data
 !/src
+!/shared
 !.clang-format
 !.gersemirc
 !.gitignore

CMakeLists.txt

@@ -29,6 +29,9 @@ if(ENABLE_FRONTEND_API)
   target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::obs-frontend-api)
 endif()
 
+add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
+target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE OBS::properties-view)
+
 if(ENABLE_QT)
   find_package(Qt6 COMPONENTS Widgets Core Svg Network Xml)
   target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE Qt6::Core Qt6::Widgets Qt6::Svg Qt6::Network Qt6::Xml)
@@ -59,13 +62,6 @@ target_sources(
           src/ptz-action-source.c
           src/circularlistview.cpp
           src/touch-control.cpp
-          src/imported/qt-wrappers.cpp
-          src/imported/obs-app.cpp
-          src/imported/properties-view.cpp
-          src/imported/vertical-scroll-area.cpp
-          src/imported/double-slider.cpp
-          src/imported/slider-ignorewheel.cpp
-          src/imported/spinbox-ignorewheel.cpp
           src/ptz.h
           src/ptz-controls.hpp
           src/ptz-device.hpp
@@ -75,15 +71,7 @@ target_sources(
           src/ptz-visca-tcp.hpp
           src/protocol-helpers.hpp
           src/circularlistview.hpp
-          src/touch-control.hpp
-          src/imported/qt-wrappers.hpp
-          src/imported/obs-app.hpp
-          src/imported/properties-view.hpp
-          src/imported/properties-view.moc.hpp
-          src/imported/vertical-scroll-area.hpp
-          src/imported/double-slider.hpp
-          src/imported/slider-ignorewheel.hpp
-          src/imported/spinbox-ignorewheel.hpp)
+          src/touch-control.hpp)
 
 option(ENABLE_USB_CAM "Enable USB camera support" OFF)
 if(ENABLE_USB_CAM)

shared/properties-view/.properties-view.cpp.swp

@@ -0,0 +1,59 @@
+cmake_minimum_required(VERSION 3.28...3.30)
+
+find_package(Qt6 REQUIRED Core Widgets)
+
+if(NOT TARGET OBS::qt-wrappers)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
+endif()
+
+if(NOT TARGET OBS::qt-plain-text-edit)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
+endif()
+
+if(NOT TARGET OBS::qt-vertical-scroll-area)
+  add_subdirectory(
+    "${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
+    "${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area"
+  )
+endif()
+
+if(NOT TARGET OBS::qt-slider-ignorewheel)
+  add_subdirectory(
+    "${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
+    "${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel"
+  )
+endif()
+
+if(NOT TARGET OBS::qt-icon-label)
+  add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/icon-label" "${CMAKE_BINARY_DIR}/shared/qt/icon-label")
+endif()
+
+add_library(properties-view INTERFACE)
+add_library(OBS::properties-view ALIAS properties-view)
+
+target_sources(
+  properties-view
+  INTERFACE
+    double-slider.cpp
+    double-slider.hpp
+    properties-view.cpp
+    properties-view.hpp
+    properties-view.moc.hpp
+    spinbox-ignorewheel.cpp
+    spinbox-ignorewheel.hpp
+)
+target_include_directories(properties-view INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
+
+target_link_libraries(
+  properties-view
+  INTERFACE
+    OBS::obs-frontend-api
+    OBS::libobs
+    OBS::qt-wrappers
+    OBS::qt-plain-text-edit
+    OBS::qt-vertical-scroll-area
+    OBS::qt-slider-ignorewheel
+    OBS::qt-icon-label
+    Qt::Core
+    Qt::Widgets
+)

shared/properties-view/CMakeLists.txt

@@ -1,15 +1,14 @@
-#include "double-slider.hpp"
+#include "moc_double-slider.cpp"
 
 #include <cmath>
 
 DoubleSlider::DoubleSlider(QWidget *parent) : SliderIgnoreScroll(parent)
 {
-	connect(this, SIGNAL(valueChanged(int)), this,
-		SLOT(intValChanged(int)));
+	connect(this, &DoubleSlider::valueChanged,
+		[this](int val) { emit doubleValChanged((minVal / minStep + val) * minStep); });
 }
 
-void DoubleSlider::setDoubleConstraints(double newMin, double newMax,
-					double newStep, double val)
+void DoubleSlider::setDoubleConstraints(double newMin, double newMax, double newStep, double val)
 {
 	minVal = newMin;
 	maxVal = newMax;
@@ -24,12 +23,7 @@ void DoubleSlider::setDoubleConstraints(double newMin, double newMax,
 	setDoubleVal(val);
 }
 
-void DoubleSlider::intValChanged(int val)
-{
-	emit doubleValChanged((minVal / minStep + val) * minStep);
-}
-
 void DoubleSlider::setDoubleVal(double val)
 {
-	setValue((int)lround((val - minVal) / minStep));
+	setValue(lround((val - minVal) / minStep));
 }

src/imported/double-slider.cpp shared/properties-view/double-slider.cppsrc/imported/double-slider.cpp renamed to shared/properties-view/double-slider.cpp

@@ -1,7 +1,7 @@
 #pragma once
 
 #include <QSlider>
-#include "slider-ignorewheel.hpp"
+#include <slider-ignorewheel.hpp>
 
 class DoubleSlider : public SliderIgnoreScroll {
 	Q_OBJECT
@@ -11,13 +11,11 @@ class DoubleSlider : public SliderIgnoreScroll {
 public:
 	DoubleSlider(QWidget *parent = nullptr);
 
-	void setDoubleConstraints(double newMin, double newMax, double newStep,
-				  double val);
+	void setDoubleConstraints(double newMin, double newMax, double newStep, double val);
 
 signals:
 	void doubleValChanged(double val);
 
 public slots:
-	void intValChanged(int val);
 	void setDoubleVal(double val);
 };