Skip to content

Commit 593ac18

Browse files
tytan652tytan652
committed
frontend: Separate transitions dock from the main window
1 parent 4c2083d commit 593ac18

11 files changed

Lines changed: 442 additions & 308 deletions

‎frontend/cmake/ui-qt.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ target_sources(
4040
forms/OBSBasicProperties.ui
4141
forms/OBSBasicSettings.ui
4242
forms/OBSBasicSourceSelect.ui
43+
forms/OBSBasicTransitions.ui
4344
forms/OBSBasicVCamConfig.ui
4445
forms/OBSExtraBrowsers.ui
4546
forms/OBSImporter.ui

‎frontend/cmake/ui-widgets.cmake‎

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

‎frontend/forms/OBSBasic.ui‎

Lines changed: 0 additions & 232 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,238 +1401,6 @@
14011401
</layout>
14021402
</widget>
14031403
</widget>
1404-
<widget class="OBSDock" name="transitionsDock">
1405-
<property name="features">
1406-
<set>QDockWidget::DockWidgetClosable|QDockWidget::DockWidgetFloatable|QDockWidget::DockWidgetMovable</set>
1407-
</property>
1408-
<property name="windowTitle">
1409-
<string>Basic.SceneTransitions</string>
1410-
</property>
1411-
<attribute name="dockWidgetArea">
1412-
<number>8</number>
1413-
</attribute>
1414-
<widget class="QWidget" name="dockWidgetContents_5">
1415-
<layout class="QVBoxLayout" name="verticalLayout_3">
1416-
<property name="spacing">
1417-
<number>0</number>
1418-
</property>
1419-
<property name="leftMargin">
1420-
<number>1</number>
1421-
</property>
1422-
<property name="topMargin">
1423-
<number>0</number>
1424-
</property>
1425-
<property name="rightMargin">
1426-
<number>1</number>
1427-
</property>
1428-
<property name="bottomMargin">
1429-
<number>1</number>
1430-
</property>
1431-
<item>
1432-
<widget class="QFrame" name="transitionsFrame">
1433-
<layout class="QVBoxLayout" name="verticalLayout_8">
1434-
<property name="spacing">
1435-
<number>0</number>
1436-
</property>
1437-
<property name="leftMargin">
1438-
<number>0</number>
1439-
</property>
1440-
<property name="topMargin">
1441-
<number>0</number>
1442-
</property>
1443-
<property name="rightMargin">
1444-
<number>0</number>
1445-
</property>
1446-
<property name="bottomMargin">
1447-
<number>0</number>
1448-
</property>
1449-
<item>
1450-
<widget class="QComboBox" name="transitions">
1451-
<property name="minimumSize">
1452-
<size>
1453-
<width>120</width>
1454-
<height>0</height>
1455-
</size>
1456-
</property>
1457-
<property name="accessibleName">
1458-
<string>Transition</string>
1459-
</property>
1460-
</widget>
1461-
</item>
1462-
<item>
1463-
<layout class="QHBoxLayout" name="horizontalLayout_3">
1464-
<property name="spacing">
1465-
<number>4</number>
1466-
</property>
1467-
<item>
1468-
<widget class="QLabel" name="transitionDurationLabel">
1469-
<property name="sizePolicy">
1470-
<sizepolicy hsizetype="Maximum" vsizetype="Preferred">
1471-
<horstretch>0</horstretch>
1472-
<verstretch>0</verstretch>
1473-
</sizepolicy>
1474-
</property>
1475-
<property name="text">
1476-
<string>Basic.TransitionDuration</string>
1477-
</property>
1478-
<property name="buddy">
1479-
<cstring>transitionDuration</cstring>
1480-
</property>
1481-
</widget>
1482-
</item>
1483-
<item>
1484-
<widget class="QSpinBox" name="transitionDuration">
1485-
<property name="accessibleName">
1486-
<string>Basic.TransitionDuration</string>
1487-
</property>
1488-
<property name="suffix">
1489-
<string> ms</string>
1490-
</property>
1491-
<property name="minimum">
1492-
<number>50</number>
1493-
</property>
1494-
<property name="maximum">
1495-
<number>20000</number>
1496-
</property>
1497-
<property name="singleStep">
1498-
<number>50</number>
1499-
</property>
1500-
<property name="value">
1501-
<number>300</number>
1502-
</property>
1503-
</widget>
1504-
</item>
1505-
</layout>
1506-
</item>
1507-
<item>
1508-
<layout class="QHBoxLayout" name="horizontalLayout_4">
1509-
<property name="spacing">
1510-
<number>4</number>
1511-
</property>
1512-
<item>
1513-
<spacer name="horizontalSpacer">
1514-
<property name="orientation">
1515-
<enum>Qt::Horizontal</enum>
1516-
</property>
1517-
<property name="sizeType">
1518-
<enum>QSizePolicy::Expanding</enum>
1519-
</property>
1520-
<property name="sizeHint" stdset="0">
1521-
<size>
1522-
<width>40</width>
1523-
<height>20</height>
1524-
</size>
1525-
</property>
1526-
</spacer>
1527-
</item>
1528-
<item>
1529-
<widget class="QPushButton" name="transitionAdd">
1530-
<property name="sizePolicy">
1531-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1532-
<horstretch>0</horstretch>
1533-
<verstretch>0</verstretch>
1534-
</sizepolicy>
1535-
</property>
1536-
<property name="toolTip">
1537-
<string>Basic.AddTransition</string>
1538-
</property>
1539-
<property name="accessibleName">
1540-
<string>Basic.AddTransition</string>
1541-
</property>
1542-
<property name="text">
1543-
<string notr="true"/>
1544-
</property>
1545-
<property name="icon">
1546-
<iconset resource="obs.qrc">
1547-
<normaloff>:/res/images/plus.svg</normaloff>:/res/images/plus.svg</iconset>
1548-
</property>
1549-
<property name="flat">
1550-
<bool>false</bool>
1551-
</property>
1552-
<property name="class" stdset="0">
1553-
<string notr="true">btn-tool icon-plus</string>
1554-
</property>
1555-
</widget>
1556-
</item>
1557-
<item>
1558-
<widget class="QPushButton" name="transitionRemove">
1559-
<property name="sizePolicy">
1560-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1561-
<horstretch>0</horstretch>
1562-
<verstretch>0</verstretch>
1563-
</sizepolicy>
1564-
</property>
1565-
<property name="toolTip">
1566-
<string>Basic.RemoveTransition</string>
1567-
</property>
1568-
<property name="accessibleName">
1569-
<string>Basic.RemoveTransition</string>
1570-
</property>
1571-
<property name="text">
1572-
<string notr="true"/>
1573-
</property>
1574-
<property name="icon">
1575-
<iconset resource="obs.qrc">
1576-
<normaloff>:/res/images/minus.svg</normaloff>:/res/images/minus.svg</iconset>
1577-
</property>
1578-
<property name="flat">
1579-
<bool>false</bool>
1580-
</property>
1581-
<property name="class" stdset="0">
1582-
<string notr="true">btn-tool icon-trash</string>
1583-
</property>
1584-
</widget>
1585-
</item>
1586-
<item>
1587-
<widget class="QPushButton" name="transitionProps">
1588-
<property name="sizePolicy">
1589-
<sizepolicy hsizetype="Maximum" vsizetype="Maximum">
1590-
<horstretch>0</horstretch>
1591-
<verstretch>0</verstretch>
1592-
</sizepolicy>
1593-
</property>
1594-
<property name="toolTip">
1595-
<string>Basic.TransitionProperties</string>
1596-
</property>
1597-
<property name="accessibleName">
1598-
<string>Basic.TransitionProperties</string>
1599-
</property>
1600-
<property name="text">
1601-
<string notr="true"/>
1602-
</property>
1603-
<property name="icon">
1604-
<iconset resource="obs.qrc">
1605-
<normaloff>:/settings/images/settings/general.svg</normaloff>:/settings/images/settings/general.svg</iconset>
1606-
</property>
1607-
<property name="flat">
1608-
<bool>false</bool>
1609-
</property>
1610-
<property name="class" stdset="0">
1611-
<string notr="true">btn-tool icon-dots-vert</string>
1612-
</property>
1613-
</widget>
1614-
</item>
1615-
</layout>
1616-
</item>
1617-
<item>
1618-
<spacer name="verticalSpacer">
1619-
<property name="orientation">
1620-
<enum>Qt::Vertical</enum>
1621-
</property>
1622-
<property name="sizeHint" stdset="0">
1623-
<size>
1624-
<width>20</width>
1625-
<height>40</height>
1626-
</size>
1627-
</property>
1628-
</spacer>
1629-
</item>
1630-
</layout>
1631-
</widget>
1632-
</item>
1633-
</layout>
1634-
</widget>
1635-
</widget>
16361404
<action name="actionAddScene">
16371405
<property name="icon">
16381406
<iconset resource="obs.qrc">

0 commit comments

Comments
 (0)