OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-03 01:53:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

UI,shared: Move Qt Wrappers to its own directory

Browse source
This commit is contained in:
tytan652 2024-01-17 08:24:40 +01:00
parent 1407fb315c
commit 85651a7d4b
60 changed files with 117 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
UI/adv-audio-control.cpp
View file

@ -5,7 +5,7 @@
#include <QComboBox>
#include <QCheckBox>
#include <cmath>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "adv-audio-control.hpp"
#include "window-basic-main.hpp"

2
UI/api-interface.cpp
View file

@ -1,6 +1,6 @@
#include <obs-frontend-internal.hpp>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include "window-basic-main-outputs.hpp"

2
UI/auth-listener.cpp
View file

@ -4,9 +4,9 @@
#include <QRegularExpressionMatch>
#include <QString>
#include <QtNetwork/QTcpSocket>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#define LOGO_URL "https://obsproject.com/assets/images/new_icon_small-r.png"

2
UI/auth-youtube.cpp
View file

@ -8,6 +8,7 @@
#include <QHBoxLayout>
#include <QUrl>
#include <QRandomGenerator>
#include <qt-wrappers.hpp>
#ifdef WIN32
#include <windows.h>
@ -18,7 +19,6 @@
#include "auth-listener.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "ui-config.h"
#include "youtube-api-wrappers.hpp"
#include "window-basic-main.hpp"

17
UI/cmake/legacy.cmake
View file

@ -71,6 +71,10 @@ find_package(CURL REQUIRED)
add_subdirectory(frontend-plugins)
add_executable(obs)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets Network Svg Xml COMPONENTS_LINUX Gui DBus)
target_link_libraries(obs PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
@ -147,8 +151,6 @@ target_sources(
platform.hpp
qt-display.cpp
qt-display.hpp
qt-wrappers.cpp
qt-wrappers.hpp
ui-validation.cpp
ui-validation.hpp
multiview.cpp
@ -306,8 +308,15 @@ target_compile_features(obs PRIVATE cxx_std_17)
target_include_directories(obs PRIVATE ${CMAKE_SOURCE_DIR}/deps/json11)
target_link_libraries(obs PRIVATE CURL::libcurl FFmpeg::avcodec FFmpeg::avutil FFmpeg::avformat OBS::libobs
OBS::frontend-api)
target_link_libraries(
obs
PRIVATE CURL::libcurl
FFmpeg::avcodec
FFmpeg::avutil
FFmpeg::avformat
OBS::libobs
OBS::frontend-api
OBS::qt-wrappers)
set_target_properties(obs PROPERTIES FOLDER "frontend")

2
UI/cmake/ui-elements.cmake
View file

@ -14,8 +14,6 @@ target_sources(
properties-view.cpp
properties-view.hpp
properties-view.moc.hpp
qt-wrappers.cpp
qt-wrappers.hpp
slider-ignorewheel.cpp
slider-ignorewheel.hpp
spinbox-ignorewheel.cpp

6
UI/cmake/ui-qt.cmake
View file

@ -8,7 +8,11 @@ if(OS_LINUX
find_package(Qt6 REQUIRED Gui DBus)
endif()
target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
target_link_libraries(obs-studio PRIVATE Qt::Widgets Qt::Svg Qt::Xml Qt::Network OBS::qt-wrappers)
set_target_properties(
obs-studio

2
UI/context-bar-controls.cpp
View file

@ -1,8 +1,8 @@
#include "window-basic-main.hpp"
#include "context-bar-controls.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QStandardItemModel>
#include <QColorDialog>
#include <QFontDialog>

5
UI/frontend-plugins/aja-output-ui/CMakeLists.txt
View file

@ -23,6 +23,10 @@ if(NOT TARGET OBS::aja-support)
add_subdirectory("${CMAKE_SOURCE_DIR}/plugins/aja" "${CMAKE_BINARY_DIR}/plugins/aja")
endif()
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
add_library(aja-output-ui MODULE)
add_library(OBS::aja-output-ui ALIAS aja-output-ui)
@ -40,6 +44,7 @@ target_link_libraries(
PRIVATE OBS::libobs
OBS::aja-support
OBS::frontend-api
OBS::qt-wrappers
OBS::ui-support
Qt::Widgets
AJA::LibAJANTV2

8
UI/frontend-plugins/aja-output-ui/cmake/legacy.cmake
View file

@ -9,6 +9,10 @@ find_package(LibAJANTV2 REQUIRED)
add_library(aja-output-ui MODULE)
add_library(OBS::aja-output-ui ALIAS aja-output-ui)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -53,8 +57,6 @@ target_sources(
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
@ -62,7 +64,7 @@ target_sources(
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp)
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api Qt::Widgets AJA::LibAJANTV2)
target_link_libraries(aja-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers Qt::Widgets AJA::LibAJANTV2)
if(OS_MACOS)
find_library(IOKIT_FRAMEWORK Iokit)

5
UI/frontend-plugins/decklink-output-ui/CMakeLists.txt
View file

@ -20,6 +20,10 @@ endif()
add_library(decklink-output-ui MODULE)
add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
target_sources(decklink-output-ui PRIVATE forms/output.ui)
target_sources(decklink-output-ui PRIVATE DecklinkOutputUI.cpp DecklinkOutputUI.h decklink-ui-main.cpp
@ -31,6 +35,7 @@ target_link_libraries(
decklink-output-ui
PRIVATE OBS::libobs
OBS::frontend-api
OBS::qt-wrappers
OBS::ui-support
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa.framework>>"

8
UI/frontend-plugins/decklink-output-ui/cmake/legacy.cmake
View file

@ -7,6 +7,10 @@ endif()
add_library(decklink-output-ui MODULE)
add_library(OBS::decklink-output-ui ALIAS decklink-output-ui)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -35,8 +39,6 @@ target_sources(
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
@ -44,7 +46,7 @@ target_sources(
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.hpp
${CMAKE_SOURCE_DIR}/UI/vertical-scroll-area.cpp)
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api Qt::Widgets)
target_link_libraries(decklink-output-ui PRIVATE OBS::libobs OBS::frontend-api OBS::qt-wrappers Qt::Widgets)
target_compile_features(decklink-output-ui PRIVATE cxx_std_17)

5
UI/frontend-plugins/frontend-tools/CMakeLists.txt
View file

@ -14,6 +14,10 @@ endif()
add_library(frontend-tools MODULE)
add_library(OBS::frontend-tools ALIAS frontend-tools)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
target_sources(
frontend-tools
PRIVATE # cmake-format: sortable
@ -45,6 +49,7 @@ target_link_libraries(
frontend-tools
PRIVATE OBS::frontend-api
OBS::libobs
OBS::qt-wrappers
OBS::ui-support
Qt::Widgets
"$<$<PLATFORM_ID:Darwin>:$<LINK_LIBRARY:FRAMEWORK,Cocoa>>"

8
UI/frontend-plugins/frontend-tools/cmake/legacy.cmake
View file

@ -3,6 +3,10 @@ project(frontend-tools)
add_library(frontend-tools MODULE)
add_library(OBS::frontend-tools ALIAS frontend-tools)
if(NOT TARGET OBS::qt-wrappers)
add_subdirectory("${CMAKE_SOURCE_DIR}/shared/qt/wrappers" "${CMAKE_BINARY_DIR}/shared/qt/wrappers")
endif()
find_qt(COMPONENTS Widgets COMPONENTS_LINUX Gui)
set_target_properties(
@ -34,8 +38,6 @@ target_sources(
${CMAKE_SOURCE_DIR}/UI/properties-view.cpp
${CMAKE_SOURCE_DIR}/UI/properties-view.hpp
${CMAKE_SOURCE_DIR}/UI/properties-view.moc.hpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.cpp
${CMAKE_SOURCE_DIR}/UI/qt-wrappers.hpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.cpp
${CMAKE_SOURCE_DIR}/UI/spinbox-ignorewheel.hpp
${CMAKE_SOURCE_DIR}/UI/slider-ignorewheel.cpp
@ -47,7 +49,7 @@ target_sources(
target_compile_features(frontend-tools PRIVATE cxx_std_17)
target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::libobs Qt::Widgets)
target_link_libraries(frontend-tools PRIVATE OBS::frontend-api OBS::qt-wrappers OBS::libobs Qt::Widgets)
if(OS_POSIX AND NOT OS_MACOS)
target_link_libraries(frontend-tools PRIVATE Qt::GuiPrivate)

2
UI/frontend-plugins/frontend-tools/scripts.cpp
View file

@ -1,7 +1,6 @@
#include "obs-module.h"
#include "scripts.hpp"
#include "../../properties-view.hpp"
#include "../../qt-wrappers.hpp"
#include "../../plain-text-edit.hpp"
#include <QFileDialog>
@ -18,6 +17,7 @@
#include <QMenu>
#include <QUrl>
#include <QDesktopServices>
#include <qt-wrappers.hpp>
#include <obs.hpp>
#include <obs-module.h>

2
UI/hotkey-edit.cpp
View file

@ -22,9 +22,9 @@
#include <QPointer>
#include <QStyle>
#include <QAction>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
void OBSHotkeyEdit::keyPressEvent(QKeyEvent *event)
{

2
UI/log-viewer.cpp
View file

@ -8,9 +8,9 @@
#include <QLayout>
#include <QDesktopServices>
#include <string>
#include <qt-wrappers.hpp>
#include "log-viewer.hpp"
#include "qt-wrappers.hpp"
OBSLogViewer::OBSLogViewer(QWidget *parent)
: QDialog(parent),

2
UI/media-controls.hpp
View file

@ -4,7 +4,7 @@
#include <QTimer>
#include <vector>
#include <obs.hpp>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
class Ui_MediaControls;

2
UI/obs-app.cpp
View file

@ -30,6 +30,7 @@
#include <util/cf-parser.h>
#include <obs-config.h>
#include <obs.hpp>
#include <qt-wrappers.hpp>
#include <QDir>
#include <QFile>
@ -38,7 +39,6 @@
#include <QProcess>
#include <QAccessible>
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "obs-proxy-style.hpp"
#include "log-viewer.hpp"

2
UI/platform-windows.cpp
View file

@ -19,9 +19,9 @@
#include <sstream>
#include "obs-config.h"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include <qt-wrappers.hpp>
#include <util/windows/win-version.h>
#include <util/platform.h>

2
UI/properties-view.cpp
View file

@ -27,12 +27,12 @@
#include "double-slider.hpp"
#include "slider-ignorewheel.hpp"
#include "spinbox-ignorewheel.hpp"
#include "qt-wrappers.hpp"
#include "properties-view.hpp"
#include "properties-view.moc.hpp"
#include "plain-text-edit.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <cstdlib>
#include <initializer_list>
#include <obs-data.h>

2
UI/qt-display.cpp
View file

@ -1,11 +1,11 @@
#include "qt-display.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include <QWindow>
#include <QScreen>
#include <QResizeEvent>
#include <QShowEvent>
#include <qt-wrappers.hpp>
#include <obs-config.h>
#ifdef _WIN32

2
UI/remote-text.cpp
View file

@ -16,8 +16,8 @@
******************************************************************************/
#include <util/curl/curl-helper.h>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
using namespace std;

2
UI/source-tree.cpp
View file

@ -1,10 +1,10 @@
#include "window-basic-main.hpp"
#include "obs-app.hpp"
#include "source-tree.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include "source-label.hpp"
#include <qt-wrappers.hpp>
#include <obs-frontend-api.h>
#include <obs.h>

2
UI/update/mac-update.cpp
View file

@ -1,11 +1,11 @@
#include "update-helpers.hpp"
#include "shared-update.hpp"
#include "qt-wrappers.hpp"
#include "mac-update.hpp"
#include "obs-app.hpp"
#include <string>
#include <qt-wrappers.hpp>
#include <QMessageBox>
/* ------------------------------------------------------------------------ */

2
UI/update/win-update.cpp
View file

@ -3,10 +3,10 @@
#include "shared-update.hpp"
#include "update-window.hpp"
#include "remote-text.hpp"
#include "qt-wrappers.hpp"
#include "win-update.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QMessageBox>
#include <string>

3
UI/visibility-item-widget.cpp
View file

@ -1,7 +1,8 @@
#include "visibility-item-widget.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "source-label.hpp"
#include <qt-wrappers.hpp>
#include <QListWidget>
#include <QLineEdit>
#include <QHBoxLayout>

3
UI/volume-control.cpp
View file

@ -1,10 +1,11 @@
#include "window-basic-main.hpp"
#include "volume-control.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "mute-checkbox.hpp"
#include "absolute-slider.hpp"
#include "source-label.hpp"
#include <qt-wrappers.hpp>
#include <QFontDatabase>
#include <QHBoxLayout>
#include <QPushButton>

2
UI/window-basic-about.cpp
View file

@ -1,7 +1,7 @@
#include "window-basic-about.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
#include <qt-wrappers.hpp>
#include <util/util.hpp>
#include <util/platform.h>
#include <platform.hpp>

2
UI/window-basic-adv-audio.cpp
View file

@ -3,7 +3,7 @@
#include "item-widget-helpers.hpp"
#include "adv-audio-control.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "ui_OBSAdvAudio.h"

2
UI/window-basic-auto-config-test.cpp
View file

@ -8,10 +8,10 @@
#include <graphics/vec4.h>
#include <graphics/graphics.h>
#include <graphics/math-extra.h>
#include <qt-wrappers.hpp>
#include "window-basic-auto-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "ui_AutoConfigTestPage.h"

2
UI/window-basic-auto-config.cpp
View file

@ -2,12 +2,12 @@
#include <QScreen>
#include <obs.hpp>
#include <qt-wrappers.hpp>
#include <nlohmann/json.hpp>
#include "window-basic-auto-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include "url-push-button.hpp"

2
UI/window-basic-filters.cpp
View file

@ -20,12 +20,12 @@
#include "window-basic-main.hpp"
#include "window-basic-filters.hpp"
#include "display-helpers.hpp"
#include "qt-wrappers.hpp"
#include "visibility-item-widget.hpp"
#include "item-widget-helpers.hpp"
#include "obs-app.hpp"
#include "undo-stack-obs.hpp"
#include <qt-wrappers.hpp>
#include <QMessageBox>
#include <QCloseEvent>
#include <obs-data.h>

2
UI/window-basic-interaction.cpp
View file

@ -18,9 +18,9 @@
#include "obs-app.hpp"
#include "window-basic-interaction.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include <qt-wrappers.hpp>
#include <QKeyEvent>
#include <QCloseEvent>
#include <QScreen>

2
UI/window-basic-main-browser.cpp
View file

@ -18,8 +18,8 @@
#include <QDir>
#include <QThread>
#include <QMessageBox>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <random>

2
UI/window-basic-main-dropfiles.cpp
View file

@ -9,9 +9,9 @@
#include <QSettings>
#endif
#include <string>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
using namespace std;

2
UI/window-basic-main-outputs.cpp
View file

@ -3,7 +3,7 @@
#include <cinttypes>
#include <QMessageBox>
#include <QPromise>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include "audio-encoders.hpp"
#include "multitrack-video-error.hpp"
#include "window-basic-main.hpp"

2
UI/window-basic-main-profiles.cpp
View file

@ -21,10 +21,10 @@
#include <QMessageBox>
#include <QVariant>
#include <QFileDialog>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "window-basic-auto-config.hpp"
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
extern void DestroyPanelCookieManager();
extern void DuplicateCurrentCookieProfile(ConfigFile &config);

2
UI/window-basic-main-scene-collections.cpp
View file

@ -21,11 +21,11 @@
#include <QVariant>
#include <QFileDialog>
#include <QStandardPaths>
#include <qt-wrappers.hpp>
#include "item-widget-helpers.hpp"
#include "window-basic-main.hpp"
#include "window-importer.hpp"
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
using namespace std;

3
UI/window-basic-main-screenshot.cpp
View file

@ -17,7 +17,8 @@
#include "window-basic-main.hpp"
#include "screenshot-obj.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#ifdef _WIN32
#include <wincodec.h>

2
UI/window-basic-main-transitions.cpp
View file

@ -20,6 +20,7 @@
#include <QToolTip>
#include <QMessageBox>
#include <util/dstr.hpp>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "window-basic-main-outputs.hpp"
#include "window-basic-vcam-config.hpp"
@ -27,7 +28,6 @@
#include "window-namedialog.hpp"
#include "menu-button.hpp"
#include "slider-ignorewheel.hpp"
#include "qt-wrappers.hpp"
#include "obs-hotkey.h"

2
UI/window-basic-main.cpp
View file

@ -36,6 +36,7 @@
#include <QScrollBar>
#include <QTextStream>
#include <QActionGroup>
#include <qt-wrappers.hpp>
#include <util/dstr.h>
#include <util/util.hpp>
@ -67,7 +68,6 @@
#include "window-youtube-actions.hpp"
#include "youtube-api-wrappers.hpp"
#endif
#include "qt-wrappers.hpp"
#include "context-bar-controls.hpp"
#include "obs-proxy-style.hpp"
#include "display-helpers.hpp"

2
UI/window-basic-properties.cpp
View file

@ -18,10 +18,10 @@
#include "obs-app.hpp"
#include "window-basic-properties.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "display-helpers.hpp"
#include "properties-view.hpp"
#include <qt-wrappers.hpp>
#include <QCloseEvent>
#include <QScreen>
#include <QWindow>

2
UI/window-basic-settings-a11y.cpp
View file

@ -2,7 +2,7 @@
#include "window-basic-main.hpp"
#include "obs-frontend-api.h"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QColorDialog>
enum ColorPreset {

2
UI/window-basic-settings-stream.cpp
View file

@ -1,12 +1,12 @@
#include <QMessageBox>
#include <QUrl>
#include <QUuid>
#include <qt-wrappers.hpp>
#include "window-basic-settings.hpp"
#include "obs-frontend-api.h"
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "url-push-button.hpp"
#ifdef BROWSER_AVAILABLE

2
UI/window-basic-settings.cpp
View file

@ -35,6 +35,7 @@
#include <QScreen>
#include <QStandardItemModel>
#include <QSpacerItem>
#include <qt-wrappers.hpp>
#include "audio-encoders.hpp"
#include "hotkey-edit.hpp"
@ -42,7 +43,6 @@
#include "obs-app.hpp"
#include "platform.hpp"
#include "properties-view.hpp"
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include "window-basic-settings.hpp"
#include "window-basic-main-outputs.hpp"

2
UI/window-basic-source-select.cpp
View file

@ -16,9 +16,9 @@
******************************************************************************/
#include <QMessageBox>
#include <qt-wrappers.hpp>
#include "window-basic-main.hpp"
#include "window-basic-source-select.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
struct AddSourceData {

2
UI/window-basic-stats.cpp
View file

@ -4,8 +4,8 @@
#include "window-basic-main.hpp"
#include "platform.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QPushButton>
#include <QScrollArea>
#include <QVBoxLayout>

2
UI/window-basic-vcam-config.cpp
View file

@ -1,7 +1,7 @@
#include "window-basic-vcam-config.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <util/util.hpp>
#include <util/platform.h>

2
UI/window-extra-browsers.cpp
View file

@ -1,8 +1,8 @@
#include "window-extra-browsers.hpp"
#include "window-dock-browser.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QLineEdit>
#include <QHBoxLayout>
#include <QUuid>

2
UI/window-importer.cpp
View file

@ -26,8 +26,8 @@
#include <QStyledItemDelegate>
#include <QDirIterator>
#include <QDropEvent>
#include <qt-wrappers.hpp>
#include "qt-wrappers.hpp"
#include "importers/importers.hpp"
extern bool SceneCollectionExists(const char *findName);

2
UI/window-missing-files.cpp
View file

@ -24,7 +24,7 @@
#include <QToolButton>
#include <QFileDialog>
#include "qt-wrappers.hpp"
#include <qt-wrappers.hpp>
enum MissingFilesColumn {
Source,

2
UI/window-namedialog.cpp
View file

@ -16,9 +16,9 @@
******************************************************************************/
#include "window-namedialog.hpp"
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include <qt-wrappers.hpp>
#include <QVBoxLayout>
NameDialog::NameDialog(QWidget *parent) : QDialog(parent)

2
UI/window-projector.cpp
View file

@ -3,10 +3,10 @@
#include <QMouseEvent>
#include <QMenu>
#include <QScreen>
#include <qt-wrappers.hpp>
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "display-helpers.hpp"
#include "qt-wrappers.hpp"
#include "platform.hpp"
#include "multiview.hpp"

2
UI/window-remux.cpp
View file

@ -31,8 +31,8 @@
#include <QStyledItemDelegate>
#include <QToolButton>
#include <QTimer>
#include <qt-wrappers.hpp>
#include "qt-wrappers.hpp"
#include "window-basic-main.hpp"
#include <memory>

2
UI/window-youtube-actions.cpp
View file

@ -2,9 +2,9 @@
#include "window-youtube-actions.hpp"
#include "obs-app.hpp"
#include "qt-wrappers.hpp"
#include "youtube-api-wrappers.hpp"
#include <qt-wrappers.hpp>
#include <QToolTip>
#include <QDateTime>
#include <QDesktopServices>

2
UI/youtube-api-wrappers.cpp
View file

@ -6,11 +6,11 @@
#include <string>
#include <iostream>
#include <qt-wrappers.hpp>
#include "auth-youtube.hpp"
#include "obs-app.hpp"
#include "window-basic-main.hpp"
#include "qt-wrappers.hpp"
#include "remote-text.hpp"
#include "ui-config.h"
#include "obf.h"

11
shared/qt/wrappers/CMakeLists.txt Normal file
View file

@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 3.22...3.25)
find_package(Qt6 REQUIRED Core Widgets)
add_library(qt-wrappers INTERFACE)
add_library(OBS::qt-wrappers ALIAS qt-wrappers)
target_sources(qt-wrappers INTERFACE qt-wrappers.cpp qt-wrappers.hpp)
target_include_directories(qt-wrappers INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}")
target_link_libraries(qt-wrappers INTERFACE Qt::Core Qt::Widgets OBS::libobs)

11
UI/qt-wrappers.cpp → shared/qt/wrappers/qt-wrappers.cpp
View file

@ -16,7 +16,6 @@
******************************************************************************/
#include "qt-wrappers.hpp"
#include "obs-app.hpp"
#include <graphics/graphics.h>
#include <util/threading.h>
@ -60,12 +59,12 @@ OBSMessageBox::question(QWidget *parent, const QString &title,
if (buttons & QMessageBox::Ok) {
QPushButton *button = mb.addButton(QMessageBox::Ok);
button->setText(QTStr("OK"));
button->setText(tr("OK"));
}
#define add_button(x) \
if (buttons & QMessageBox::x) { \
QPushButton *button = mb.addButton(QMessageBox::x); \
button->setText(QTStr(#x)); \
button->setText(tr(#x)); \
}
add_button(Open);
add_button(Save);
@ -88,7 +87,7 @@ void OBSMessageBox::information(QWidget *parent, const QString &title,
{
QMessageBox mb(QMessageBox::Information, title, text,
QMessageBox::NoButton, parent);
mb.addButton(QTStr("OK"), QMessageBox::AcceptRole);
mb.addButton(tr("OK"), QMessageBox::AcceptRole);
mb.exec();
}
@ -99,7 +98,7 @@ void OBSMessageBox::warning(QWidget *parent, const QString &title,
parent);
if (enableRichText)
mb.setTextFormat(Qt::RichText);
mb.addButton(QTStr("OK"), QMessageBox::AcceptRole);
mb.addButton(tr("OK"), QMessageBox::AcceptRole);
mb.exec();
}
@ -108,7 +107,7 @@ void OBSMessageBox::critical(QWidget *parent, const QString &title,
{
QMessageBox mb(QMessageBox::Critical, title, text,
QMessageBox::NoButton, parent);
mb.addButton(QTStr("OK"), QMessageBox::AcceptRole);
mb.addButton(tr("OK"), QMessageBox::AcceptRole);
mb.exec();
}

3
UI/qt-wrappers.hpp → shared/qt/wrappers/qt-wrappers.hpp
View file

@ -40,7 +40,8 @@ class QString;
class QLabel;
class QToolBar;
class OBSMessageBox {
class OBSMessageBox : QObject {
Q_OBJECT
public:
static QMessageBox::StandardButton
question(QWidget *parent, const QString &title, const QString &text,