Skip to content

Commit 333e2c0

Browse files
tytan652tytan652
committed
UI,shared: Move OBSPropertiesView to its own subdirectory
1 parent 2c02e17 commit 333e2c0

22 files changed

+164
-277
lines changed

‎UI/cmake/legacy.cmake‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@ if(NOT TARGET OBS::qt-slider-ignorewheel)
9191
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
9292
endif()
9393

94+
if(NOT TARGET OBS::properties-view)
95+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
96+
endif()
97+
9498
target_link_libraries(obs PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
9599

96100
set_target_properties(
@@ -180,8 +184,6 @@ target_sources(
180184
audio-encoders.hpp
181185
balance-slider.hpp
182186
clickable-label.hpp
183-
double-slider.cpp
184-
double-slider.hpp
185187
horizontal-scroll-area.cpp
186188
horizontal-scroll-area.hpp
187189
item-widget-helpers.cpp
@@ -206,9 +208,6 @@ target_sources(
206208
menu-button.cpp
207209
menu-button.hpp
208210
mute-checkbox.hpp
209-
properties-view.cpp
210-
properties-view.hpp
211-
properties-view.moc.hpp
212211
record-button.cpp
213212
record-button.hpp
214213
remote-text.cpp
@@ -220,8 +219,6 @@ target_sources(
220219
slider-absoluteset-style.hpp
221220
source-label.cpp
222221
source-label.hpp
223-
spinbox-ignorewheel.cpp
224-
spinbox-ignorewheel.hpp
225222
source-tree.cpp
226223
source-tree.hpp
227224
url-push-button.cpp
@@ -312,7 +309,8 @@ target_link_libraries(
312309
OBS::qt-wrappers
313310
OBS::qt-plain-text-edit
314311
OBS::qt-vertical-scroll-area
315-
OBS::qt-slider-ignorewheel)
312+
OBS::qt-slider-ignorewheel
313+
OBS::properties-view)
316314

317315
set_target_properties(obs PROPERTIES FOLDER "frontend")
318316

‎UI/cmake/ui-elements.cmake‎

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,12 @@ if(NOT TARGET OBS::qt-slider-ignorewheel)
1212
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
1313
endif()
1414

15+
if(NOT TARGET OBS::properties-view)
16+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
17+
endif()
18+
1519
target_link_libraries(obs-studio PRIVATE OBS::qt-plain-text-edit OBS::qt-vertical-scroll-area
16-
OBS::qt-slider-ignorewheel)
20+
OBS::qt-slider-ignorewheel OBS::properties-view)
1721

1822
target_sources(
1923
obs-studio
@@ -26,8 +30,6 @@ target_sources(
2630
clickable-label.hpp
2731
context-bar-controls.cpp
2832
context-bar-controls.hpp
29-
double-slider.cpp
30-
double-slider.hpp
3133
expand-checkbox.hpp
3234
focus-list.cpp
3335
focus-list.hpp
@@ -50,9 +52,6 @@ target_sources(
5052
menu-button.cpp
5153
menu-button.hpp
5254
mute-checkbox.hpp
53-
properties-view.cpp
54-
properties-view.hpp
55-
properties-view.moc.hpp
5655
record-button.cpp
5756
record-button.hpp
5857
remote-text.cpp
@@ -66,8 +65,6 @@ target_sources(
6665
source-label.hpp
6766
source-tree.cpp
6867
source-tree.hpp
69-
spinbox-ignorewheel.cpp
70-
spinbox-ignorewheel.hpp
7168
undo-stack-obs.cpp
7269
undo-stack-obs.hpp
7370
url-push-button.cpp

‎UI/frontend-plugins/aja-output-ui/AJAOutputUI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

33
#include <QDialog>
4+
#include <properties-view.hpp>
45

56
#include "ui_output.h"
6-
#include "../../UI/properties-view.hpp"
77

88
namespace aja {
99
class CardManager;

‎UI/frontend-plugins/aja-output-ui/CMakeLists.txt‎

Lines changed: 5 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -13,22 +13,8 @@ find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
1313
add_library(aja-output-ui MODULE)
1414
add_library(OBS::aja-output-ui ALIAS aja-output-ui)
1515

16-
if(NOT TARGET OBS::qt-wrappers)
17-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
18-
endif()
19-
20-
if(NOT TARGET OBS::qt-plain-text-edit)
21-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
22-
endif()
23-
24-
if(NOT TARGET OBS::qt-vertical-scroll-area)
25-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
26-
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
27-
endif()
28-
29-
if(NOT TARGET OBS::qt-slider-ignorewheel)
30-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
31-
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
16+
if(NOT TARGET OBS::properties-view)
17+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
3218
endif()
3319

3420
target_sources(
@@ -52,27 +38,12 @@ target_sources(
5238
"${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.cpp"
5339
"${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.hpp"
5440
"${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.cpp"
55-
"${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp"
56-
"${CMAKE_SOURCE_DIR}/UI/double-slider.cpp"
57-
"${CMAKE_SOURCE_DIR}/UI/double-slider.hpp"
58-
"${CMAKE_SOURCE_DIR}/UI/properties-view.hpp"
59-
"${CMAKE_SOURCE_DIR}/UI/properties-view.cpp"
60-
"${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp"
61-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp"
62-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp")
41+
"${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp")
6342

6443
target_sources(aja-output-ui PRIVATE forms/output.ui)
6544

66-
target_link_libraries(
67-
aja-output-ui
68-
PRIVATE OBS::libobs
69-
OBS::frontend-api
70-
OBS::qt-wrappers
71-
OBS::qt-plain-text-edit
72-
OBS::qt-vertical-scroll-area
73-
OBS::qt-slider-ignorewheel
74-
Qt::Widgets
75-
AJA::LibAJANTV2)
45+
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets
46+
AJA::LibAJANTV2)
7647

7748
if(OS_WINDOWS)
7849
configure_file(cmake/windows/obs-module.rc.in aja-output-ui.rc)

‎UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake‎

Lines changed: 6 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -11,22 +11,8 @@ add_library(OBS::aja-output-ui ALIAS aja-output-ui)
1111

1212
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
1313

14-
if(NOT TARGET OBS::qt-wrappers)
15-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
16-
endif()
17-
18-
if(NOT TARGET OBS::qt-plain-text-edit)
19-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
20-
endif()
21-
22-
if(NOT TARGET OBS::qt-vertical-scroll-area)
23-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
24-
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
25-
endif()
26-
27-
if(NOT TARGET OBS::qt-slider-ignorewheel)
28-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
29-
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
14+
if(NOT TARGET OBS::properties-view)
15+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
3016
endif()
3117

3218
set_target_properties(
@@ -63,25 +49,10 @@ target_sources(
6349
${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.cpp
6450
${CMAKE_SOURCE_DIR}/plugins/aja/aja-vpid-data.hpp
6551
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.cpp
66-
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp
67-
${CMAKE_SOURCE_DIR}/UI/double-slider.cpp
68-
${CMAKE_SOURCE_DIR}/UI/double-slider.hpp
69-
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
70-
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
71-
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
72-
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
73-
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp)
74-
75-
target_link_libraries(
76-
aja-output-ui
77-
PRIVATE OBS::libobs
78-
OBS::frontend-api
79-
OBS::qt-wrappers
80-
OBS::qt-plain-text-edit
81-
OBS::qt-vertical-scroll-area
82-
OBS::qt-slider-ignorewheel
83-
Qt::Widgets
84-
AJA::LibAJANTV2)
52+
${CMAKE_SOURCE_DIR}/plugins/aja/aja-widget-io.hpp)
53+
54+
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets
55+
AJA::LibAJANTV2)
8556

8657
if(OS_MACOS)
8758
find_library(IOKIT_FRAMEWORK Iokit)

‎UI/frontend-plugins/decklink-output-ui/CMakeLists.txt‎

Lines changed: 5 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -12,49 +12,16 @@ find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
1212
add_library(decklink-output-ui MODULE)
1313
add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
1414

15-
if(NOT TARGET OBS::qt-wrappers)
16-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
17-
endif()
18-
19-
if(NOT TARGET OBS::qt-plain-text-edit)
20-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
21-
endif()
22-
23-
if(NOT TARGET OBS::qt-vertical-scroll-area)
24-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
25-
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
26-
endif()
27-
28-
if(NOT TARGET OBS::qt-slider-ignorewheel)
29-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
30-
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
15+
if(NOT TARGET OBS::properties-view)
16+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
3117
endif()
3218

3319
target_sources(decklink-output-ui PRIVATE forms/output.ui)
3420

35-
target_sources(
36-
decklink-output-ui
37-
PRIVATE DecklinkOutputUI.cpp
38-
DecklinkOutputUI.h
39-
decklink-ui-main.cpp
40-
decklink-ui-main.h
41-
"${CMAKE_SOURCE_DIR}/UI/double-slider.cpp"
42-
"${CMAKE_SOURCE_DIR}/UI/double-slider.hpp"
43-
"${CMAKE_SOURCE_DIR}/UI/properties-view.hpp"
44-
"${CMAKE_SOURCE_DIR}/UI/properties-view.cpp"
45-
"${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp"
46-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp"
47-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp")
21+
target_sources(decklink-output-ui PRIVATE DecklinkOutputUI.cpp DecklinkOutputUI.h decklink-ui-main.cpp
22+
decklink-ui-main.h)
4823

49-
target_link_libraries(
50-
decklink-output-ui
51-
PRIVATE OBS::libobs
52-
OBS::frontend-api
53-
OBS::qt-wrappers
54-
OBS::qt-plain-text-edit
55-
OBS::qt-vertical-scroll-area
56-
OBS::qt-slider-ignorewheel
57-
Qt::Widgets)
24+
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets)
5825

5926
if(OS_WINDOWS)
6027
configure_file(cmake/windows/obs-module.rc.in decklink-output-ui.rc)

‎UI/frontend-plugins/decklink-output-ui/DecklinkOutputUI.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
#pragma once
22

33
#include <QDialog>
4+
#include <properties-view.hpp>
45

56
#include "ui_output.h"
6-
#include "../../UI/properties-view.hpp"
77

88
class DecklinkOutputUI : public QDialog {
99
Q_OBJECT

‎UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake‎

Lines changed: 6 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,8 @@ add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
99

1010
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
1111

12-
if(NOT TARGET OBS::qt-wrappers)
13-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
14-
endif()
15-
16-
if(NOT TARGET OBS::qt-plain-text-edit)
17-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
18-
endif()
19-
20-
if(NOT TARGET OBS::qt-vertical-scroll-area)
21-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
22-
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
23-
endif()
24-
25-
if(NOT TARGET OBS::qt-slider-ignorewheel)
26-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
27-
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
12+
if(NOT TARGET OBS::properties-view)
13+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
2814
endif()
2915

3016
set_target_properties(
@@ -40,29 +26,10 @@ endif()
4026

4127
target_sources(decklink-output-ui PRIVATE forms/output.ui)
4228

43-
target_sources(
44-
decklink-output-ui
45-
PRIVATE DecklinkOutputUI.cpp
46-
DecklinkOutputUI.h
47-
decklink-ui-main.cpp
48-
decklink-ui-main.h
49-
${CMAKE_SOURCE_DIR}/UI/double-slider.cpp
50-
${CMAKE_SOURCE_DIR}/UI/double-slider.hpp
51-
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
52-
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
53-
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
54-
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
55-
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp)
56-
57-
target_link_libraries(
58-
decklink-output-ui
59-
PRIVATE OBS::libobs
60-
OBS::frontend-api
61-
OBS::qt-wrappers
62-
OBS::qt-plain-text-edit
63-
OBS::qt-vertical-scroll-area
64-
OBS::qt-slider-ignorewheel
65-
Qt::Widgets)
29+
target_sources(decklink-output-ui PRIVATE DecklinkOutputUI.cpp DecklinkOutputUI.h decklink-ui-main.cpp
30+
decklink-ui-main.h)
31+
32+
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::properties-view Qt::Widgets)
6633

6734
target_compile_features(decklink-output-ui PRIVATE cxx_std_17)
6835

‎UI/frontend-plugins/frontend-tools/CMakeLists.txt‎

Lines changed: 5 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,31 +15,12 @@ if(NOT TARGET OBS::qt-plain-text-edit)
1515
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/plain-text-edit" "${CMAKE_BINARY_DIR}/shared/qt/plain-text-edit")
1616
endif()
1717

18-
if(NOT TARGET OBS::qt-vertical-scroll-area)
19-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/vertical-scroll-area"
20-
"${CMAKE_BINARY_DIR}/shared/qt/vertical-scroll-area")
18+
if(NOT TARGET OBS::properties-view)
19+
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/properties-view" "${CMAKE_BINARY_DIR}/shared/properties-view")
2120
endif()
2221

23-
if(NOT TARGET OBS::qt-slider-ignorewheel)
24-
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/slider-ignorewheel"
25-
"${CMAKE_BINARY_DIR}/shared/qt/slider-ignorewheel")
26-
endif()
27-
28-
target_sources(
29-
frontend-tools
30-
PRIVATE frontend-tools.c
31-
auto-scene-switcher.hpp
32-
auto-scene-switcher.cpp
33-
output-timer.hpp
34-
tool-helpers.hpp
35-
output-timer.cpp
36-
"${CMAKE_SOURCE_DIR}/UI/double-slider.cpp"
37-
"${CMAKE_SOURCE_DIR}/UI/double-slider.hpp"
38-
"${CMAKE_SOURCE_DIR}/UI/properties-view.cpp"
39-
"${CMAKE_SOURCE_DIR}/UI/properties-view.hpp"
40-
"${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp"
41-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp"
42-
"${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp")
22+
target_sources(frontend-tools PRIVATE frontend-tools.c auto-scene-switcher.hpp auto-scene-switcher.cpp output-timer.hpp
23+
tool-helpers.hpp output-timer.cpp)
4324

4425
target_sources(frontend-tools PRIVATE forms/auto-scene-switcher.ui forms/captions.ui forms/output-timer.ui
4526
forms/scripts.ui)
@@ -50,8 +31,7 @@ target_link_libraries(
5031
OBS::libobs
5132
OBS::qt-wrappers
5233
OBS::qt-plain-text-edit
53-
OBS::qt-vertical-scroll-area
54-
OBS::qt-slider-ignorewheel
34+
OBS::properties-view
5535
Qt::Widgets
5636
$<$<PLATFORM_ID:Linux,FreeBSD>:Qt::GuiPrivate>)
5737

0 commit comments

Comments
 (0)