Skip to content

Commit ec669b2

Browse files
tytan652tytan652
committed
frontend: Separate transitions dock from the main window
1 parent a589bc0 commit ec669b2

11 files changed

Lines changed: 446 additions & 310 deletions

‎frontend/cmake/ui-qt.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ target_sources(
4343
forms/OBSBasicProperties.ui
4444
forms/OBSBasicSettings.ui
4545
forms/OBSBasicSourceSelect.ui
46+
forms/OBSBasicTransitions.ui
4647
forms/OBSBasicVCamConfig.ui
4748
forms/OBSExtraBrowsers.ui
4849
forms/OBSImporter.ui

‎frontend/cmake/ui-widgets.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,8 @@ target_sources(
5252
widgets/OBSBasicStats.hpp
5353
widgets/OBSBasicStatusBar.cpp
5454
widgets/OBSBasicStatusBar.hpp
55+
widgets/OBSBasicTransitions.cpp
56+
widgets/OBSBasicTransitions.hpp
5557
widgets/OBSMainWindow.hpp
5658
widgets/OBSProjector.cpp
5759
widgets/OBSProjector.hpp

‎frontend/forms/OBSBasic.ui‎

Lines changed: 0 additions & 232 deletions
Original file line numberDiff line numberDiff line change
@@ -1261,238 +1261,6 @@
12611261
</layout>
12621262
</widget>
12631263
</widget>
1264-
<widget class="OBSDock" name="transitionsDock">
1265-
<property name="features">
1266-
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
1267-
</property>
1268-
<property name="windowTitle">
1269-
<string>Basic.SceneTransitions</string>
1270-
</property>
1271-
<attribute name="dockWidgetArea">
1272-
<number>8</number>
1273-
</attribute>
1274-
<widget class="QWidget" name="dockWidgetContents_5">
1275-
<layout class="QVBoxLayout" name="verticalLayout_3">
1276-
<property name="spacing">
1277-
<number>0</number>
1278-
</property>
1279-
<property name="leftMargin">
1280-
<number>1</number>
1281-
</property>
1282-
<property name="topMargin">
1283-
<number>0</number>
1284-
</property>
1285-
<property name="rightMargin">
1286-
<number>1</number>
1287-
</property>
1288-
<property name="bottomMargin">
1289-
<number>1</number>
1290-
</property>
1291-
<item>
1292-
<widget class="QFrame" name="transitionsFrame">
1293-
<layout class="QVBoxLayout" name="verticalLayout_8">
1294-
<property name="spacing">
1295-
<number>0</number>
1296-
</property>
1297-
<property name="leftMargin">
1298-
<number>0</number>
1299-
</property>
1300-
<property name="topMargin">
1301-
<number>0</number>
1302-
</property>
1303-
<property name="rightMargin">
1304-
<number>0</number>
1305-
</property>
1306-
<property name="bottomMargin">
1307-
<number>0</number>
1308-
</property>
1309-
<item>
1310-
<widget class="QComboBox" name="transitions">
1311-
<property name="minimumSize">
1312-
<size>
1313-
<width>120</width>
1314-
<height>0</height>
1315-
</size>
1316-
</property>
1317-
<property name="accessibleName">
1318-
<string>Transition</string>
1319-
</property>
1320-
</widget>
1321-
</item>
1322-
<item>
1323-
<layout class="QHBoxLayout" name="horizontalLayout_3">
1324-
<property name="spacing">
1325-
<number>4</number>
1326-
</property>
1327-
<item>
1328-
<widget class="QLabel" name="transitionDurationLabel">
1329-
<property name="sizePolicy">
1330-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
1331-
<horstretch>0</horstretch>
1332-
<verstretch>0</verstretch>
1333-
</sizepolicy>
1334-
</property>
1335-
<property name="text">
1336-
<string>Basic.TransitionDuration</string>
1337-
</property>
1338-
<property name="buddy">
1339-
<cstring>transitionDuration</cstring>
1340-
</property>
1341-
</widget>
1342-
</item>
1343-
<item>
1344-
<widget class="QSpinBox" name="transitionDuration">
1345-
<property name="accessibleName">
1346-
<string>Basic.TransitionDuration</string>
1347-
</property>
1348-
<property name="suffix">
1349-
<string> ms</string>
1350-
</property>
1351-
<property name="minimum">
1352-
<number>50</number>
1353-
</property>
1354-
<property name="maximum">
1355-
<number>20000</number>
1356-
</property>
1357-
<property name="singleStep">
1358-
<number>50</number>
1359-
</property>
1360-
<property name="value">
1361-
<number>300</number>
1362-
</property>
1363-
</widget>
1364-
</item>
1365-
</layout>
1366-
</item>
1367-
<item>
1368-
<layout class="QHBoxLayout" name="horizontalLayout_4">
1369-
<property name="spacing">
1370-
<number>4</number>
1371-
</property>
1372-
<item>
1373-
<spacer name="horizontalSpacer">
1374-
<property name="orientation">
1375-
<enum>Qt::Horizontal</enum>
1376-
</property>
1377-
<property name="sizeType">
1378-
<enum>QSizePolicy::Expanding</enum>
1379-
</property>
1380-
<property name="sizeHint" stdset="0">
1381-
<size>
1382-
<width>40</width>
1383-
<height>20</height>
1384-
</size>
1385-
</property>
1386-
</spacer>
1387-
</item>
1388-
<item>
1389-
<widget class="QPushButton" name="transitionAdd">
1390-
<property name="sizePolicy">
1391-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1392-
<horstretch>0</horstretch>
1393-
<verstretch>0</verstretch>
1394-
</sizepolicy>
1395-
</property>
1396-
<property name="toolTip">
1397-
<string>Basic.AddTransition</string>
1398-
</property>
1399-
<property name="accessibleName">
1400-
<string>Basic.AddTransition</string>
1401-
</property>
1402-
<property name="text">
1403-
<string notr="true"/>
1404-
</property>
1405-
<property name="icon">
1406-
<iconset resource="obs.qrc">
1407-
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
1408-
</property>
1409-
<property name="flat">
1410-
<bool>false</bool>
1411-
</property>
1412-
<property name="class" stdset="0">
1413-
<string notr="true">btn-tool icon-plus</string>
1414-
</property>
1415-
</widget>
1416-
</item>
1417-
<item>
1418-
<widget class="QPushButton" name="transitionRemove">
1419-
<property name="sizePolicy">
1420-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1421-
<horstretch>0</horstretch>
1422-
<verstretch>0</verstretch>
1423-
</sizepolicy>
1424-
</property>
1425-
<property name="toolTip">
1426-
<string>Basic.RemoveTransition</string>
1427-
</property>
1428-
<property name="accessibleName">
1429-
<string>Basic.RemoveTransition</string>
1430-
</property>
1431-
<property name="text">
1432-
<string notr="true"/>
1433-
</property>
1434-
<property name="icon">
1435-
<iconset resource="obs.qrc">
1436-
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
1437-
</property>
1438-
<property name="flat">
1439-
<bool>false</bool>
1440-
</property>
1441-
<property name="class" stdset="0">
1442-
<string notr="true">btn-tool icon-trash</string>
1443-
</property>
1444-
</widget>
1445-
</item>
1446-
<item>
1447-
<widget class="QPushButton" name="transitionProps">
1448-
<property name="sizePolicy">
1449-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1450-
<horstretch>0</horstretch>
1451-
<verstretch>0</verstretch>
1452-
</sizepolicy>
1453-
</property>
1454-
<property name="toolTip">
1455-
<string>Basic.TransitionProperties</string>
1456-
</property>
1457-
<property name="accessibleName">
1458-
<string>Basic.TransitionProperties</string>
1459-
</property>
1460-
<property name="text">
1461-
<string notr="true"/>
1462-
</property>
1463-
<property name="icon">
1464-
<iconset resource="obs.qrc">
1465-
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
1466-
</property>
1467-
<property name="flat">
1468-
<bool>false</bool>
1469-
</property>
1470-
<property name="class" stdset="0">
1471-
<string notr="true">btn-tool icon-dots-vert</string>
1472-
</property>
1473-
</widget>
1474-
</item>
1475-
</layout>
1476-
</item>
1477-
<item>
1478-
<spacer name="verticalSpacer">
1479-
<property name="orientation">
1480-
<enum>Qt::Vertical</enum>
1481-
</property>
1482-
<property name="sizeHint" stdset="0">
1483-
<size>
1484-
<width>20</width>
1485-
<height>40</height>
1486-
</size>
1487-
</property>
1488-
</spacer>
1489-
</item>
1490-
</layout>
1491-
</widget>
1492-
</item>
1493-
</layout>
1494-
</widget>
1495-
</widget>
14961264
<action name="actionAddScene">
14971265
<property name="icon">
14981266
<iconset resource="obs.qrc">

0 commit comments

Comments
 (0)